From 3bb4358ed9472a92a231ee891c1e164779548e67 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 11 Jun 2014 14:50:48 +0200 Subject: fix autopkgtest tests --- debian/tests/control | 2 +- debian/tests/run-tests | 1 + test/integration/framework | 2 ++ test/integration/test-external-dependency-solver-protocol | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/tests/control b/debian/tests/control index 209f16bfd..72e9deef7 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ Tests: run-tests Restrictions: allow-stderr -Depends: @, build-essential, fakeroot, wget, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4, libdb-dev +Depends: @, build-essential, fakeroot, wget, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4, libdb-dev, db-util diff --git a/debian/tests/run-tests b/debian/tests/run-tests index e6bc5e0d1..ebea3b200 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -12,6 +12,7 @@ make -C test/interactive-helper/ 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_DIR=/usr/lib/apt/solvers \ APT_INTEGRATION_TESTS_BUILD_DIR=/usr/bin \ APT_INTEGRATION_TESTS_LIBRARY_PATH=/dev/null/does/not/exist \ ./test/integration/run-tests diff --git a/test/integration/framework b/test/integration/framework index 7959699fd..6c9e8bd57 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -120,6 +120,7 @@ apthelper() { runapt "${APTHELPERBINDIR}/apt-helper" "$@"; } aptwebserver() { runapt "${APTWEBSERVERBINDIR}/aptwebserver" "$@"; } aptitude() { runapt aptitude "$@"; } aptextracttemplates() { runapt apt-extracttemplates "$@"; } +aptinternalsolver() { runapt "${APTINTERNALSOLVERBINDIR}/apt-internal-solver" "$@"; } dpkg() { command dpkg --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log "$@" @@ -181,6 +182,7 @@ setupenvironment() { METHODSDIR=${APT_INTEGRATION_TESTS_METHODS_DIR:-"${BUILDDIRECTORY}/methods"} APTHELPERBINDIR=${APT_INTEGRATION_TESTS_LIBEXEC_DIR:-"${BUILDDIRECTORY}"} APTWEBSERVERBINDIR=${APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR:-"${BUILDDIRECTORY}"} + APTINTERNALSOLVERBINDIR=${APT_INTEGRATION_TESTS_INTERNAL_SOLVER_DIR:-"${BUILDDIRECTORY}"} test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first" # ----- diff --git a/test/integration/test-external-dependency-solver-protocol b/test/integration/test-external-dependency-solver-protocol index 129565993..09230d383 100755 --- a/test/integration/test-external-dependency-solver-protocol +++ b/test/integration/test-external-dependency-solver-protocol @@ -53,7 +53,7 @@ testsuccess test -s /tmp/dump.edsp configarchitecture 'armel' msgtest 'Test direct calling is okay for' 'apt-internal-solver' -cat /tmp/dump.edsp | runapt apt-internal-solver > solver.result 2>&1 || true +cat /tmp/dump.edsp | aptinternalsolver > solver.result 2>&1 || true if [ "$(tail -n2 solver.result | head -n1 )" = "Message: Done" ]; then msgpass else -- cgit v1.2.3-70-g09d2 From 456821f91483f45b3ceb156f54ccc27983b71595 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 11 Jun 2014 18:17:45 +0200 Subject: fix test-apt-ftparchive-cachedb-lp1274466 and apt-internal-solver tests --- debian/tests/run-tests | 2 +- test/integration/framework | 4 ++-- test/integration/test-apt-ftparchive-cachedb-lp1274466 | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/tests/run-tests b/debian/tests/run-tests index ebea3b200..308031e9d 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -12,7 +12,7 @@ make -C test/interactive-helper/ 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_DIR=/usr/lib/apt/solvers \ +APT_INTEGRATION_TESTS_INTERNAL_SOLVER=/usr/lib/apt/solvers/apt \ APT_INTEGRATION_TESTS_BUILD_DIR=/usr/bin \ APT_INTEGRATION_TESTS_LIBRARY_PATH=/dev/null/does/not/exist \ ./test/integration/run-tests diff --git a/test/integration/framework b/test/integration/framework index 6c9e8bd57..a687dcb35 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -120,7 +120,7 @@ apthelper() { runapt "${APTHELPERBINDIR}/apt-helper" "$@"; } aptwebserver() { runapt "${APTWEBSERVERBINDIR}/aptwebserver" "$@"; } aptitude() { runapt aptitude "$@"; } aptextracttemplates() { runapt apt-extracttemplates "$@"; } -aptinternalsolver() { runapt "${APTINTERNALSOLVERBINDIR}/apt-internal-solver" "$@"; } +aptinternalsolver() { runapt "${APTINTERNALSOLVER}" "$@"; } dpkg() { command dpkg --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log "$@" @@ -182,7 +182,7 @@ setupenvironment() { METHODSDIR=${APT_INTEGRATION_TESTS_METHODS_DIR:-"${BUILDDIRECTORY}/methods"} APTHELPERBINDIR=${APT_INTEGRATION_TESTS_LIBEXEC_DIR:-"${BUILDDIRECTORY}"} APTWEBSERVERBINDIR=${APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR:-"${BUILDDIRECTORY}"} - APTINTERNALSOLVERBINDIR=${APT_INTEGRATION_TESTS_INTERNAL_SOLVER_DIR:-"${BUILDDIRECTORY}"} + APTINTERNALSOLVER=${APT_INTEGRATION_TESTS_INTERNAL_SOLVER:-"${BUILDDIRECTORY}/apt-internal-solver"} test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first" # ----- diff --git a/test/integration/test-apt-ftparchive-cachedb-lp1274466 b/test/integration/test-apt-ftparchive-cachedb-lp1274466 index 2a28d6ef0..579ae33a6 100755 --- a/test/integration/test-apt-ftparchive-cachedb-lp1274466 +++ b/test/integration/test-apt-ftparchive-cachedb-lp1274466 @@ -46,6 +46,8 @@ Description: an autogenerated dummy foo=1/test " aptftparchive --db old-format.db packages . # ensure that the db is updated and contains the new sha512 +db_dump old-format.db > old-format.dump + testsuccess grep 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc12a0e7cadb4b66764235c56e1009dbfe8a9a566fb1eedf47a992d1fff2cc3332c old-format.dump -- cgit v1.2.3-70-g09d2 From c355ea30383486e74635cd0248d3b53ed9759c39 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 5 Nov 2014 18:04:29 +0100 Subject: reenable patchsize limit option for pdiffs One word: "doh!" Commit f6d4ab9ad8a2cfe52737ab620dd252cf8ceec43d disabled the check to prevent apt from downloading bigger patches than the index it tries to patch. Happens rarly of course, but still. Detected by scan-build complaining about a dead assignment. To make up for the mistake a test is included as well. --- apt-pkg/acquire-item.cc | 2 +- test/integration/test-pdiff-usage | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 605ca7ae4..e0aef5874 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -619,7 +619,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ cur != available_patches.end(); ++cur) patchesSize += cur->patch_size; 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 diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index 5bad90214..d773dcd66 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -180,6 +180,40 @@ SHA256-Patches: testnopackage oldstuff testequal "$(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 + 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) +" aptcache show apt newstuff } echo 'Debug::pkgAcquire::Diffs "true"; Debug::Acquire::Transaction "true"; -- cgit v1.2.3-70-g09d2 From 4234d90d58b684824bf217d9226c50b7c9583346 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 5 Nov 2014 18:14:04 +0100 Subject: tests: silence clang on uninitilized variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The testcases have far worse problems if these ever end up being NULL and/or are not given a value by the method called, but clang is right to warn about it, just that we don't want to fix it in testcases… Git-Dch: Ignore --- test/libapt/cdrom_test.cc | 3 ++- test/libapt/sourcelist_test.cc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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/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" -- cgit v1.2.3-70-g09d2 From ce105e87404c53c09b8f9af4f76736b50458f0c7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 5 Nov 2014 18:26:01 +0100 Subject: (error) va_list 'args' was opened but not closed by va_end() The manpage of va_start and co additionally says: On some systems, va_end contains a closing '}' matching a '{' in va_start, so that both macros must occur in the same function, and in a way that allows this. So instead of return/breaking instantly, we save the return, make a proper turndown with va_end in all cases and only end after that. Reported-By: cppcheck Git-Dch: Ignore --- apt-pkg/contrib/strutl.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index ebf9c9ea6..0ac587a9e 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1319,10 +1319,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 +1333,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(); } -- cgit v1.2.3-70-g09d2 From 9dd940ed722e8235c615e79b7eb688eb427e9a23 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 5 Nov 2014 18:33:07 +0100 Subject: Assert statement calls a function which may have desired side effects: 'pos_is_okay' It does not have any desired sideeffect, so we just mark it as const to properly advertise this fact to developer, compiler and linter alike. Reported-By: cppcheck Git-Dch: Ignore --- methods/rred.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/methods/rred.cc b/methods/rred.cc index cabb3c456..774b58a40 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -150,11 +150,11 @@ class FileChanges { std::list::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::iterator x; + std::list::const_iterator x; for (x = changes.begin(); x != where; ++x) { assert(x != changes.end()); cpos += x->offset + x->add_cnt; -- cgit v1.2.3-70-g09d2 From ad5ffe1ffb203eb58e5e25fe6f4c0dabc53253c9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 5 Nov 2014 18:42:56 +0100 Subject: Division by result of sizeof(). memset() expects a size in bytes "did you intend to multiply instead?" is what cppcheck helpful says and it is absolutely right. Doesn't make a whole lot of a difference though as we are talking about 'char' in this testcase, but just to be sure. Reported-By: cppcheck Git-Dch: Ignore --- test/libapt/fileutl_test.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/libapt/fileutl_test.cc b/test/libapt/fileutl_test.cc index 8d47c5098..57d5bbdc2 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"; -- cgit v1.2.3-70-g09d2 From 23fb7b2cbbda62c99a199d29ad62205b23d35af4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 5 Nov 2014 18:56:12 +0100 Subject: (style) Variable 'res' is assigned a value that is never used Checking the return value of this (and many other calls) in this testcase is a good idea, so we do it now. Reported-By: cppcheck Git-Dch: Ignore --- test/libapt/fileutl_test.cc | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/test/libapt/fileutl_test.cc b/test/libapt/fileutl_test.cc index 57d5bbdc2..a2c303768 100644 --- a/test/libapt/fileutl_test.cc +++ b/test/libapt/fileutl_test.cc @@ -252,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) { -- cgit v1.2.3-70-g09d2 From 586d8704716a10e0f8b9c400cab500f5353eebe6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 26 Oct 2014 23:17:03 +0100 Subject: replace ignore-deprecated #pragma dance with _Pragma For compatibility we use/provide and fill quiet some deprecated methods and fields, which subsequently earns us a warning for using them. These warnings therefore have to be disabled for these codeparts and that is what this change does now in a slightly more elegant way. Git-Dch: Ignore --- apt-pkg/acquire-item.cc | 18 ++----- apt-pkg/cacheset.cc | 46 ++++------------- apt-pkg/cacheset.h | 118 ++++++++++--------------------------------- apt-pkg/contrib/hashes.cc | 27 +++------- apt-pkg/contrib/hashes.h | 9 +--- apt-pkg/contrib/macros.h | 16 ++++++ apt-pkg/deb/debsrcrecords.cc | 20 +------- apt-pkg/indexrecords.cc | 9 +--- apt-pkg/indexrecords.h | 10 +--- apt-pkg/pkgcachegen.cc | 9 +--- apt-pkg/srcrecords.h | 10 +--- apt-pkg/upgrade.cc | 10 +--- apt-pkg/vendorlist.cc | 10 ++-- 13 files changed, 76 insertions(+), 236 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index e0aef5874..2df638a83 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -104,10 +104,7 @@ static bool AllowInsecureRepositories(indexRecords const * const MetaIndexParser // Acquire::Item::Item - Constructor /*{{{*/ -#if __GNUC__ >= 4 - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif +APT_IGNORE_DEPRECATED_PUSH pkgAcquire::Item::Item(pkgAcquire *Owner, HashStringList const &ExpectedHashes, pkgAcqMetaBase *TransactionManager) @@ -120,9 +117,7 @@ pkgAcquire::Item::Item(pkgAcquire *Owner, if(TransactionManager != NULL) TransactionManager->Add(this); } -#if __GNUC__ >= 4 - #pragma GCC diagnostic pop -#endif +APT_IGNORE_DEPRECATED_POP /*}}}*/ // Acquire::Item::~Item - Destructor /*{{{*/ // --------------------------------------------------------------------- @@ -275,14 +270,7 @@ bool pkgAcquire::Item::RenameOnError(pkgAcquire::Item::RenameOnErrorState const 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 /*{{{*/ diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 76a7e717e..9127a4064 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -613,19 +613,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 +658,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 +696,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: @@ -772,16 +757,11 @@ pkgCache::VerIterator CacheSetHelper::canNotGetCandInstVer(pkgCacheFile &Cache, APT_CONST 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; @@ -807,20 +787,14 @@ APT_CONST void CacheSetHelper::showFnmatchSelection(pkgCache::PkgIterator const APT_CONST 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: diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index f3f1d1fc6..884e8b859 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -23,6 +23,7 @@ #include #include #include +#include #ifndef APT_8_CLEANER_HEADERS #include @@ -224,14 +225,7 @@ 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(return getPkg().Section();) } inline bool Purge() const {return getPkg().Purge(); } inline const char *Arch() const {return getPkg().Arch(); } @@ -261,14 +255,9 @@ 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; } @@ -290,19 +279,14 @@ 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 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; @@ -371,14 +355,9 @@ public: /*{{{*/ PackageContainer() : PackageContainerInterface() {} 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 +418,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 +431,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 @@ -663,65 +637,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 +689,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 +697,7 @@ public: CacheSetHelper &helper) { return FromDependency(vci, Cache, D, (CacheSetHelper::VerSelector)selector, helper); } -#if __GNUC__ >= 4 - #pragma GCC diagnostic pop -#endif +APT_IGNORE_DEPRECATED_POP protected: /*{{{*/ @@ -879,10 +828,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 +852,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 +871,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 +883,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 +924,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 +936,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/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index 55180c642..6e7080bc9 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -258,10 +258,7 @@ public: bool Hashes::Add(const unsigned char * const Data,unsigned long long const Size, unsigned int const Hashes) { bool Res = true; -#if __GNUC__ >= 4 - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif +APT_IGNORE_DEPRECATED_PUSH if ((Hashes & MD5SUM) == MD5SUM) Res &= MD5.Add(Data, Size); if ((Hashes & SHA1SUM) == SHA1SUM) @@ -270,9 +267,7 @@ bool Hashes::Add(const unsigned char * const Data,unsigned long long const Size, Res &= SHA256.Add(Data, Size); if ((Hashes & SHA512SUM) == SHA512SUM) Res &= SHA512.Add(Data, Size); -#if __GNUC__ >= 4 - #pragma GCC diagnostic pop -#endif +APT_IGNORE_DEPRECATED_POP d->FileSize += Size; return Res; } @@ -323,28 +318,18 @@ bool Hashes::AddFD(FileFd &Fd,unsigned long long Size, unsigned int const Hashes HashStringList Hashes::GetHashStringList() { HashStringList hashes; -#if __GNUC__ >= 4 - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif +APT_IGNORE_DEPRECATED_PUSH 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 +APT_IGNORE_DEPRECATED_POP std::string SizeStr; strprintf(SizeStr, "%llu", d->FileSize); hashes.push_back(HashString("Checksum-FileSize", SizeStr)); return hashes; } -#if __GNUC__ >= 4 - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif +APT_IGNORE_DEPRECATED_PUSH Hashes::Hashes() { d = new PrivateHashes(); } 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..ca186d704 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -189,15 +189,10 @@ class Hashes HashStringList GetHashStringList(); -#if __GNUC__ >= 4 - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif +APT_IGNORE_DEPRECATED_PUSH 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) diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index 3a5e37c63..c0af4b2c8 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -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. diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index 97f43aca2..d3c137bb9 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -170,16 +170,8 @@ bool debSrcRecordParser::Files(std::vector &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()); @@ -192,16 +184,8 @@ bool debSrcRecordParser::Files(std::vector &List) F.Size = 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 if (checksumField == "Files") - F.MD5Hash = hash; -#if __GNUC__ >= 4 - #pragma GCC diagnostic pop -#endif + APT_IGNORE_DEPRECATED(F.MD5Hash = hash;) // 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/indexrecords.cc b/apt-pkg/indexrecords.cc index e1e9ba657..0f27af32b 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -119,14 +119,7 @@ bool indexRecords::Load(const string Filename) /*{{{*/ 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 + APT_IGNORE_DEPRECATED(Sum->Hash = HashString(HashString::SupportedHashes()[i],Hash);) Entries[Name] = Sum; } Entries[Name]->Hashes.push_back(HashString(HashString::SupportedHashes()[i],Hash)); diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h index 88a06779c..06b9dafa6 100644 --- a/apt-pkg/indexrecords.h +++ b/apt-pkg/indexrecords.h @@ -76,11 +76,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 +85,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/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 9e6931fa6..a2c1c8760 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -668,14 +668,7 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name 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); diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h index c68d374bb..de2b6ff64 100644 --- a/apt-pkg/srcrecords.h +++ b/apt-pkg/srcrecords.h @@ -30,11 +30,7 @@ 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 { @@ -44,9 +40,7 @@ class pkgSrcRecords 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 diff --git a/apt-pkg/upgrade.cc b/apt-pkg/upgrade.cc index ca670bdf5..41e76802a 100644 --- a/apt-pkg/upgrade.cc +++ b/apt-pkg/upgrade.cc @@ -282,11 +282,7 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache) // APT::Upgrade::Upgrade - Upgrade using a specific strategy /*{{{*/ bool APT::Upgrade::Upgrade(pkgDepCache &Cache, int mode, OpProgress * const Progress) { -#if __GNUC__ >= 4 - // the deprecated methods will become our privates, so that is fine - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif +APT_IGNORE_DEPRECATED_PUSH if (mode == ALLOW_EVERYTHING) return pkgDistUpgrade(Cache, Progress); else if ((mode & ~FORBID_REMOVE_PACKAGES) == 0) @@ -295,9 +291,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/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 -#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 #include @@ -163,6 +161,4 @@ const Vendor* pkgVendorList::FindVendor(const std::vector GPGVOutput) /* } /*}}}*/ -#if __GNUC__ >= 4 - #pragma GCC diagnostic pop -#endif +APT_IGNORE_DEPRECATED_POP -- cgit v1.2.3-70-g09d2 From ccf6bdb3efc54165c76b42aae94c498a36acbe1b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 7 Nov 2014 14:20:36 +0100 Subject: use a abi version check similar to the gcc check Git-Dch: Ignore --- apt-pkg/contrib/macros.h | 1 + apt-pkg/deb/deblistparser.cc | 2 +- apt-pkg/deb/deblistparser.h | 2 +- apt-pkg/deb/debmetaindex.cc | 2 +- apt-pkg/deb/debmetaindex.h | 2 +- apt-pkg/metaindex.h | 4 +++- apt-pkg/packagemanager.cc | 6 +++--- apt-pkg/packagemanager.h | 12 +++++------- apt-pkg/pkgcachegen.h | 2 +- apt-private/private-install.cc | 6 +++--- 10 files changed, 20 insertions(+), 19 deletions(-) diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index c0af4b2c8..14541d4d8 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -156,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/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 616d8296d..42db341b3 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -992,7 +992,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..a757e69f1 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -71,7 +71,7 @@ class debListParser : public pkgCacheGenerator::ListParser virtual std::vector 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, diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index c103da8f7..a6c88b393 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -78,7 +78,7 @@ string debReleaseIndex::MetaIndexURI(const char *Type) const return Res; } -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +#if APT_PKG_ABI >= 0x0413 std::string debReleaseIndex::LocalFileName() const { // see if we have a InRelease file diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h index 399543953..3d35401ec 100644 --- a/apt-pkg/deb/debmetaindex.h +++ b/apt-pkg/deb/debmetaindex.h @@ -53,7 +53,7 @@ class debReleaseIndex : public metaIndex { std::string MetaIndexFile(const char *Types) const; std::string MetaIndexURI(const char *Type) const; -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +#if APT_PKG_ABI >= 413 virtual std::string LocalFileName() const; #endif diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h index 7c4d0c1aa..ae73c27dd 100644 --- a/apt-pkg/metaindex.h +++ b/apt-pkg/metaindex.h @@ -40,9 +40,11 @@ class metaIndex virtual const char* GetType() const {return Type;} // interface to to query it -#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +#if APT_PKG_ABI >= 413 // returns the path of the local file (or "" if its not available) virtual std::string LocalFileName() const {return "";}; +#else + std::string LocalFileName() const; #endif // Interface for acquire diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 2247d04db..ba48c53cc 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -1059,7 +1059,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 +1096,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 +1120,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..fce0ad301 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -96,12 +96,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 +112,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 +127,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 diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 54c4f9e7a..93f30a703 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -178,7 +178,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) +#if APT_PKG_ABI >= 413 virtual #endif APT_PURE bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver); diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc index 2a4c3eea5..79a22edf4 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; @@ -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; -- cgit v1.2.3-70-g09d2 From 60b64ffc3468579183abc1bac0179943d782a52e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 7 Nov 2014 14:21:35 +0100 Subject: guard ABI changes for LFS in apt-inst Git-Dch: Ignore --- apt-inst/contrib/arfile.h | 5 +++++ apt-inst/contrib/extracttar.cc | 5 +++++ apt-inst/contrib/extracttar.h | 11 ++++++++++- apt-inst/deb/debfile.cc | 8 ++++++++ apt-inst/deb/debfile.h | 12 ++++++++++-- apt-inst/dirstream.h | 12 +++++++++++- 6 files changed, 49 insertions(+), 4 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 +#include #ifndef APT_8_CLEANER_HEADERS #include #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 +#include #include @@ -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 #include #include +#include #include @@ -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 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() {}; }; -- cgit v1.2.3-70-g09d2 From f105aaba433f5a8b9c4326dd0d704501bf07d1e5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 6 Nov 2014 12:53:59 +0100 Subject: better non-virtual metaIndex.LocalFileName() implementation We can't add a new virtual method without breaking the ABI, but we can freely add new methods, so for older ABIs we just implement this method with a dynamic_cast, so that clients can be more ignorant about the API here and especially don't need to pull a very dirty trick by assuming internal knowledge (like apt-get did here). --- apt-pkg/deb/debmetaindex.cc | 2 -- apt-pkg/deb/debmetaindex.h | 3 ++- apt-pkg/metaindex.cc | 40 ++++++++++++++++++++++++++++++++++++++++ apt-pkg/metaindex.h | 25 ++++++------------------- cmdline/apt-get.cc | 30 ++---------------------------- debian/libapt-pkg4.15.symbols | 1 + 6 files changed, 51 insertions(+), 50 deletions(-) create mode 100644 apt-pkg/metaindex.cc diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index a6c88b393..d99fd8393 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -78,7 +78,6 @@ string debReleaseIndex::MetaIndexURI(const char *Type) const return Res; } -#if APT_PKG_ABI >= 0x0413 std::string debReleaseIndex::LocalFileName() const { // see if we have a InRelease file @@ -92,7 +91,6 @@ std::string debReleaseIndex::LocalFileName() const return ""; } -#endif string debReleaseIndex::IndexURISuffix(const char *Type, string const &Section, string const &Arch) const { diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h index 3d35401ec..4a8e454c7 100644 --- a/apt-pkg/deb/debmetaindex.h +++ b/apt-pkg/deb/debmetaindex.h @@ -54,8 +54,9 @@ class debReleaseIndex : public metaIndex { std::string MetaIndexURI(const char *Type) const; #if APT_PKG_ABI >= 413 - virtual std::string LocalFileName() const; + 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; diff --git a/apt-pkg/metaindex.cc b/apt-pkg/metaindex.cc new file mode 100644 index 000000000..31a8ec009 --- /dev/null +++ b/apt-pkg/metaindex.cc @@ -0,0 +1,40 @@ +// Include Files /*{{{*/ +#include +#include + +#include + +#include +#include + /*}}}*/ + +#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13) +std::string metaIndex::LocalFileName() const { return ""; } +#else +#include +std::string metaIndex::LocalFileName() const +{ + debReleaseIndex const * deb = dynamic_cast(this); + if (deb != NULL) + return deb->LocalFileName(); + + return ""; +} +#endif + +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::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 ae73c27dd..6c3d2880b 100644 --- a/apt-pkg/metaindex.h +++ b/apt-pkg/metaindex.h @@ -41,8 +41,8 @@ class metaIndex // interface to to query it #if APT_PKG_ABI >= 413 - // returns the path of the local file (or "" if its not available) - virtual std::string LocalFileName() const {return "";}; + /** \return the path of the local file (or "" if its not available) */ + virtual std::string LocalFileName() const; #else std::string LocalFileName() const; #endif @@ -50,25 +50,12 @@ class metaIndex // 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 *GetIndexFiles() = 0; + virtual std::vector *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 ~metaIndex() - { - if (Indexes == 0) - return; - for (std::vector::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/cmdline/apt-get.cc b/cmdline/apt-get.cc index b6786faf8..e9e38debc 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -136,28 +136,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 +154,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); diff --git a/debian/libapt-pkg4.15.symbols b/debian/libapt-pkg4.15.symbols index 90f67b5cd..a6c5c21ea 100644 --- a/debian/libapt-pkg4.15.symbols +++ b/debian/libapt-pkg4.15.symbols @@ -1789,6 +1789,7 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER# (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, std::allocator > const&, std::basic_string, std::allocator > const&, char const*)@Base" 1.1~exp9 ### demangle strangeness - buildd report it as MISSING and as new… (c++)"pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > const*, indexRecords*)@Base" 0.8.0 (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > const*, indexRecords*)@Base" 0.8.0 -- cgit v1.2.3-70-g09d2 From dce45dbe97531de6806707445da97d3f22285db8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 6 Nov 2014 12:41:04 +0100 Subject: mark internal interfaces as hidden MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have a bunch of classes which are of no use for the outside world, but were still exported and so needed to preserve ABI/API. Marking them as hidden to not export them any longer is a big API break in theory, but in practice nobody is using them – as if they would its a bug. --- apt-pkg/acquire-item.h | 33 ++-- apt-pkg/deb/debindexfile.cc | 28 +-- apt-pkg/deb/debindexfile.h | 14 +- apt-pkg/deb/deblistparser.h | 18 +- apt-pkg/deb/debmetaindex.cc | 15 +- apt-pkg/deb/debmetaindex.h | 4 +- apt-pkg/deb/debrecords.h | 4 +- apt-pkg/deb/debsrcrecords.h | 4 +- apt-pkg/deb/debsystem.cc | 2 +- apt-pkg/edsp/edspindexfile.cc | 4 +- apt-pkg/edsp/edspindexfile.h | 2 +- apt-pkg/edsp/edsplistparser.h | 2 +- apt-pkg/edsp/edspsystem.cc | 4 +- apt-pkg/edsp/edspsystem.h | 4 +- apt-pkg/init.cc | 2 +- apt-pkg/pkgcachegen.h | 10 +- debian/libapt-pkg4.15.symbols | 419 ------------------------------------------ 17 files changed, 72 insertions(+), 497 deletions(-) diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 10d7e6a09..6fcb42c3a 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -342,7 +342,7 @@ class pkgAcquire::Item : public WeakPointable }; /*}}}*/ /** \brief Information about an index patch (aka diff). */ /*{{{*/ -struct DiffInfo { +struct APT_HIDDEN DiffInfo { /** The filename of the diff. */ std::string file; @@ -359,9 +359,7 @@ struct DiffInfo { unsigned long long patch_size; }; /*}}}*/ - /*}}}*/ - -class pkgAcqMetaBase : public pkgAcquire::Item +class pkgAcqMetaBase : public pkgAcquire::Item /*{{{*/ { void *d; @@ -441,12 +439,12 @@ class pkgAcqMetaBase : public pkgAcquire::Item bool TransactionHasError() APT_PURE; 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, 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); @@ -459,7 +457,7 @@ class pkgAcqMetaBase : public pkgAcquire::Item 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. @@ -468,7 +466,7 @@ class pkgAcqMetaBase : public pkgAcquire::Item * * \sa pkgAcqMetaIndex */ -class pkgAcqMetaSig : public pkgAcqMetaBase +class APT_HIDDEN pkgAcqMetaSig : public pkgAcqMetaBase { void *d; @@ -512,7 +510,6 @@ class pkgAcqMetaSig : public pkgAcqMetaBase virtual ~pkgAcqMetaSig(); }; /*}}}*/ - /** \brief An item that is responsible for downloading the meta-index {{{ * file (i.e., Release) itself and verifying its signature. * @@ -523,7 +520,7 @@ 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; @@ -568,7 +565,7 @@ class pkgAcqMetaIndex : public pkgAcqMetaBase }; /*}}}*/ /** \brief An item repsonsible for downloading clearsigned metaindexes {{{*/ -class pkgAcqMetaClearSig : public pkgAcqMetaIndex +class APT_HIDDEN pkgAcqMetaClearSig : public pkgAcqMetaIndex { void *d; @@ -607,8 +604,6 @@ public: virtual ~pkgAcqMetaClearSig(); }; /*}}}*/ - - /** \brief Common base class for all classes that deal with fetching {{{ indexes */ @@ -652,7 +647,7 @@ class pkgAcqBaseIndex : public pkgAcquire::Item * * \sa pkgAcqIndexDiffs, pkgAcqIndex */ -class pkgAcqDiffIndex : public pkgAcqBaseIndex +class APT_HIDDEN pkgAcqDiffIndex : public pkgAcqBaseIndex { void *d; @@ -725,7 +720,7 @@ class pkgAcqDiffIndex : public pkgAcqBaseIndex * * \sa pkgAcqDiffIndex, pkgAcqIndex */ -class pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex +class APT_HIDDEN pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex { void *d; @@ -813,7 +808,7 @@ class pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex * * \sa pkgAcqDiffIndex, pkgAcqIndex */ -class pkgAcqIndexDiffs : public pkgAcqBaseIndex +class APT_HIDDEN pkgAcqIndexDiffs : public pkgAcqBaseIndex { void *d; @@ -929,7 +924,7 @@ class pkgAcqIndexDiffs : public pkgAcqBaseIndex * * \todo Why does pkgAcqIndex have protected members? */ -class pkgAcqIndex : public pkgAcqBaseIndex +class APT_HIDDEN pkgAcqIndex : public pkgAcqBaseIndex { void *d; @@ -1028,7 +1023,7 @@ class pkgAcqIndex : public pkgAcqBaseIndex }; /*}}}*/ /** \brief Information about an index file. */ /*{{{*/ -class IndexTarget +class APT_HIDDEN IndexTarget { void *d; @@ -1053,7 +1048,7 @@ class IndexTarget }; /*}}}*/ /** \brief Information about an optional index file. */ /*{{{*/ -class OptionalIndexTarget : public IndexTarget +class APT_HIDDEN OptionalIndexTarget : public IndexTarget { void *d; diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 335f9d36e..cecfe41a9 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -802,13 +802,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 +818,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,7 +833,7 @@ 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 @@ -842,7 +842,7 @@ class debIFTypeDebPkgFile : public pkgIndexFile::Type }; 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 +851,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 +861,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 { diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index d727d9547..312e915f1 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -28,7 +28,7 @@ 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; @@ -55,7 +55,7 @@ class debStatusIndex : public pkgIndexFile virtual ~debStatusIndex(); }; -class debPackagesIndex : public pkgIndexFile +class APT_HIDDEN debPackagesIndex : public pkgIndexFile { /** \brief dpointer placeholder (for later in case we need it) */ void *d; @@ -92,7 +92,7 @@ class debPackagesIndex : public pkgIndexFile virtual ~debPackagesIndex(); }; -class debTranslationsIndex : public pkgIndexFile +class APT_HIDDEN debTranslationsIndex : public pkgIndexFile { /** \brief dpointer placeholder (for later in case we need it) */ void *d; @@ -126,7 +126,7 @@ class debTranslationsIndex : public pkgIndexFile virtual ~debTranslationsIndex(); }; -class debSourcesIndex : public pkgIndexFile +class APT_HIDDEN debSourcesIndex : public pkgIndexFile { /** \brief dpointer placeholder (for later in case we need it) */ void *d; @@ -163,7 +163,7 @@ class debSourcesIndex : public pkgIndexFile virtual ~debSourcesIndex(); }; -class debDebPkgFileIndex : public pkgIndexFile +class APT_HIDDEN debDebPkgFileIndex : public pkgIndexFile { private: void *d; @@ -193,7 +193,7 @@ class debDebPkgFileIndex : public pkgIndexFile virtual ~debDebPkgFileIndex(); }; -class debDscFileIndex : public pkgIndexFile +class APT_HIDDEN debDscFileIndex : public pkgIndexFile { private: std::string DscFile; @@ -211,7 +211,7 @@ class debDscFileIndex : public pkgIndexFile 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.h b/apt-pkg/deb/deblistparser.h index a757e69f1..6279d8399 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(); @@ -84,26 +84,26 @@ class debListParser : public pkgCacheGenerator::ListParser bool LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,FileFd &File, std::string section); - 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); - 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 d99fd8393..81e067424 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -392,7 +392,7 @@ debReleaseIndex::debSectionEntry::debSectionEntry (string const &Section, bool const &IsSrc): Section(Section), IsSrc(IsSrc) {} -class debSLTypeDebian : public pkgSourceList::Type +class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type { protected: @@ -484,7 +484,7 @@ debDebFileMetaIndex::debDebFileMetaIndex(std::string const &DebFile) } -class debSLTypeDeb : public debSLTypeDebian +class APT_HIDDEN debSLTypeDeb : public debSLTypeDebian { public: @@ -502,7 +502,7 @@ class debSLTypeDeb : public debSLTypeDebian } }; -class debSLTypeDebSrc : public debSLTypeDebian +class APT_HIDDEN debSLTypeDebSrc : public debSLTypeDebian { public: @@ -520,7 +520,7 @@ class debSLTypeDebSrc : public debSLTypeDebian } }; -class debSLTypeDebFile : public pkgSourceList::Type +class APT_HIDDEN debSLTypeDebFile : public pkgSourceList::Type { public: @@ -539,6 +539,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 4a8e454c7..94d005760 100644 --- a/apt-pkg/deb/debmetaindex.h +++ b/apt-pkg/deb/debmetaindex.h @@ -21,7 +21,7 @@ class pkgIndexFile; class debDebPkgFileIndex; class IndexTarget; -class debReleaseIndex : public metaIndex { +class APT_HIDDEN debReleaseIndex : public metaIndex { public: class debSectionEntry @@ -74,7 +74,7 @@ class debReleaseIndex : public metaIndex { void PushSectionEntry(const debSectionEntry *Entry); }; -class debDebFileMetaIndex : public metaIndex +class APT_HIDDEN debDebFileMetaIndex : public metaIndex { private: std::string DebFile; diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h index 6b5f94334..7091c38e6 100644 --- a/apt-pkg/deb/debrecords.h +++ b/apt-pkg/deb/debrecords.h @@ -25,7 +25,7 @@ #include #endif -class debRecordParser : public pkgRecords::Parser +class APT_HIDDEN debRecordParser : public pkgRecords::Parser { /** \brief dpointer placeholder (for later in case we need it) */ void *d; @@ -64,7 +64,7 @@ class debRecordParser : public pkgRecords::Parser }; // custom record parser that reads deb files directly -class debDebFileRecordParser : public debRecordParser +class APT_HIDDEN debDebFileRecordParser : public debRecordParser { public: virtual std::string FileName() { diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index a0a151875..1a09f6546 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; @@ -61,7 +61,7 @@ class debSrcRecordParser : public pkgSrcRecords::Parser 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/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc index c38f24567..d00536362 100644 --- a/apt-pkg/edsp/edspindexfile.cc +++ b/apt-pkg/edsp/edspindexfile.cc @@ -65,7 +65,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,7 +75,7 @@ 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 { diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h index 609a2cde4..8c18d8cbd 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; diff --git a/apt-pkg/edsp/edsplistparser.h b/apt-pkg/edsp/edsplistparser.h index 959fb587f..86cd77606 100644 --- a/apt-pkg/edsp/edsplistparser.h +++ b/apt-pkg/edsp/edsplistparser.h @@ -25,7 +25,7 @@ class FileFd; -class edspListParser : public debListParser +class APT_HIDDEN edspListParser : public debListParser { public: virtual bool NewVersion(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 /*}}}*/ -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..06a63f40c 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; @@ -45,6 +45,4 @@ class edspSystem : public pkgSystem ~edspSystem(); }; -extern edspSystem edspSys; - #endif diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index d04c51621..f756eab26 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); diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 93f30a703..c4ace713d 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -34,7 +34,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()); }; @@ -111,10 +111,10 @@ class pkgCacheGenerator /*{{{*/ 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); @@ -136,7 +136,7 @@ class pkgCacheGenerator /*{{{*/ }; /*}}}*/ // This is the abstract package list parser class. /*{{{*/ -class pkgCacheGenerator::ListParser +class APT_HIDDEN pkgCacheGenerator::ListParser { pkgCacheGenerator *Owner; friend class pkgCacheGenerator; diff --git a/debian/libapt-pkg4.15.symbols b/debian/libapt-pkg4.15.symbols index a6c5c21ea..9888223a9 100644 --- a/debian/libapt-pkg4.15.symbols +++ b/debian/libapt-pkg4.15.symbols @@ -76,13 +76,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER# (c++)"stringcmp(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >)@Base" 0.8.0 (c++)"stringcmp(char const*, char const*, char const*, char const*)@Base" 0.8.0 (c++)"strprintf(std::basic_string, std::allocator >&, char const*, ...)@Base" 0.8.0 - (c++)"guard variable for pkgCacheGenerator::Dynamic::toReMap@Base" 0.8.0 - (c++)"guard variable for pkgCacheGenerator::Dynamic::toReMap@Base" 0.8.0 - (c++)"guard variable for pkgCacheGenerator::Dynamic::toReMap@Base" 0.8.0 - (c++)"guard variable for pkgCacheGenerator::Dynamic::toReMap@Base" 0.8.0 - (c++)"guard variable for pkgCacheGenerator::Dynamic::toReMap@Base" 0.8.0 - (c++)"guard variable for pkgCacheGenerator::Dynamic::toReMap@Base" 0.8.0 - (c++)"guard variable for pkgCacheGenerator::Dynamic::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, std::allocator >)@Base" 0.8.0 @@ -207,9 +200,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER# (c++)"PackageCopy::RewriteEntry(_IO_FILE*, std::basic_string, std::allocator >)@Base" 0.8.0 (c++)"PackageCopy::Type()@Base" 0.8.0 (c++)"PackageCopy::~PackageCopy()@Base" 0.8.0 - (c++)"pkgAcqIndex::Failed(std::basic_string, std::allocator >, 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 @@ -252,9 +242,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, std::allocator >)@Base" 0.8.0 (c++)"indexRecords::Lookup(std::basic_string, std::allocator >)@Base" 0.8.0 (c++)"indexRecords::MetaKeys()@Base" 0.8.0 @@ -330,27 +317,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, std::allocator >&, std::basic_string, std::allocator >&, 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, std::allocator >)@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, std::allocator >)@Base" 0.8.0 - (c++)"debListParser::Package()@Base" 0.8.0 - (c++)"debListParser::Version()@Base" 0.8.0 - (c++)"debListParser::GrabWord(std::basic_string, std::allocator >, debListParser::WordList*, unsigned char&)@Base" 0.8.0 - (c++)"debListParser::debListParser(FileFd*, std::basic_string, std::allocator > const&)@Base" 0.8.0 - (c++)"debListParser::~debListParser()@Base" 0.8.0 (c++)"pkgAcqArchive::Failed(std::basic_string, std::allocator >, pkgAcquire::MethodConfig*)@Base" 0.8.0 (c++)"pkgAcqArchive::DescURI()@Base" 0.8.0 (c++)"pkgAcqArchive::Finished()@Base" 0.8.0 @@ -358,9 +327,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, std::allocator >&)@Base" 0.8.0 (c++)"pkgAcqArchive::~pkgAcqArchive()@Base" 0.8.0 - (c++)"pkgAcqMetaSig::Failed(std::basic_string, std::allocator >, 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, std::allocator >)@Base" 0.8.0 (c++)"pkgSourceList::ReadMainList()@Base" 0.8.0 (c++)"pkgSourceList::ReadSourceDir(std::basic_string, std::allocator >)@Base" 0.8.0 @@ -393,38 +359,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, std::allocator >)@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, std::allocator >, 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, std::allocator > const&, bool const&)@Base" 0.8.0 - (c++)"debReleaseIndex::PushSectionEntry(debReleaseIndex::debSectionEntry const*)@Base" 0.8.0 - (c++)"debReleaseIndex::PushSectionEntry(std::basic_string, std::allocator > const&, debReleaseIndex::debSectionEntry const*)@Base" 0.8.0 - (c++)"debReleaseIndex::PushSectionEntry(std::vector, std::allocator >, std::allocator, std::allocator > > > const&, debReleaseIndex::debSectionEntry const*)@Base" 0.8.0 - (c++)"debReleaseIndex::debReleaseIndex(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > 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, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, bool)@Base" 0.8.0 - (c++)"debSourcesIndex::~debSourcesIndex()@Base" 0.8.0 - (c++)"pkgAcqDiffIndex::ParseDiffIndex(std::basic_string, std::allocator >)@Base" 0.8.0 - (c++)"pkgAcqDiffIndex::Failed(std::basic_string, std::allocator >, 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, std::allocator >, 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, std::allocator > const&, char const*)@Base" 0.8.0 (c++)"pkgVersionMatch::Find(pkgCache::PkgIterator)@Base" 0.8.0 @@ -433,11 +367,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER# (c++)"pkgVersionMatch::pkgVersionMatch(std::basic_string, std::allocator >, pkgVersionMatch::MatchType)@Base" 0.8.0 (c++)"pkgVersionMatch::~pkgVersionMatch()@Base" 0.8.0 (c++)"TranslationsCopy::CopyTranslations(std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector, std::allocator >, std::allocator, std::allocator > > >&, pkgCdromStatus*)@Base" 0.8.0 - (c++)"debPackagesIndex::debPackagesIndex(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, bool const&, std::basic_string, std::allocator > const&)@Base" 0.8.0 - (c++)"debPackagesIndex::~debPackagesIndex()@Base" 0.8.0 - (c++)"pkgAcqIndexDiffs::Failed(std::basic_string, std::allocator >, 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 +377,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, std::allocator >, pkgCache&)@Base" 0.8.0 - (c++)"pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, unsigned int, unsigned int)@Base" 0.8.0 - (c++)"pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > 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, std::allocator > const&, std::basic_string, std::allocator > const&)@Base" 0.8.0 - (c++)"pkgCacheGenerator::SelectFile(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > 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::toReMap@Base" 0.8.0 - (c++)"pkgCacheGenerator::Dynamic::toReMap@Base" 0.8.0 - (c++)"pkgCacheGenerator::Dynamic::toReMap@Base" 0.8.0 - (c++)"pkgCacheGenerator::Dynamic::toReMap@Base" 0.8.0 - (c++)"pkgCacheGenerator::Dynamic::toReMap@Base" 0.8.0 - (c++)"pkgCacheGenerator::Dynamic::toReMap@Base" 0.8.0 - (c++)"pkgCacheGenerator::Dynamic::toReMap@Base" 0.8.0 - (c++)"pkgCacheGenerator::NewGroup(pkgCache::GrpIterator&, std::basic_string, std::allocator > 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 +400,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 >&, 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 >&)@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 +420,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, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, char const*)@Base" 0.8.0 - (c++)"debTranslationsIndex::~debTranslationsIndex()@Base" 0.8.0 (c++)"APT::CacheFilter::PackageNameMatchesRegEx::PackageNameMatchesRegEx(std::basic_string, std::allocator > 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 +453,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER# (c++)"Vendor::CheckDist(std::basic_string, std::allocator >)@Base" 0.8.0 (c++)"Vendor::Vendor(std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector >*)@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 +544,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 >&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator > const, std::basic_string, std::allocator > > > > 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, std::allocator > const&) const@Base" 0.8.0 @@ -660,10 +554,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 +577,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, std::allocator > 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, std::allocator > const&, std::basic_string, std::allocator > const&) const@Base" 0.8.0 - (c++)"debReleaseIndex::SourceIndexURI(char const*, std::basic_string, std::allocator > const&) const@Base" 0.8.0 - (c++)"debReleaseIndex::ComputeIndexTargets() const@Base" 0.8.0 - (c++)"debReleaseIndex::SourceIndexURISuffix(char const*, std::basic_string, std::allocator > const&) const@Base" 0.8.0 - (c++)"debReleaseIndex::Info(char const*, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&) const@Base" 0.8.0 - (c++)"debReleaseIndex::IndexURI(char const*, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&) const@Base" 0.8.0 - (c++)"debReleaseIndex::IsTrusted() const@Base" 0.8.0 - (c++)"debSLTypeDebSrc::CreateItem(std::vector >&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator > const, std::basic_string, std::allocator > > > > const&) const@Base" 0.8.0 - (c++)"debSLTypeDebian::CreateItemInternal(std::vector >&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, bool const&, std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator > const, std::basic_string, std::allocator > > > > const&) const@Base" 0.8.0 - (c++)"debSourcesIndex::ArchiveURI(std::basic_string, std::allocator >) 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, std::allocator >) 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, std::allocator >) const@Base" 0.8.0 (c++)"pkgCache::DepIterator::AllTargets() const@Base" 0.8.0 @@ -776,42 +618,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 +654,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 +680,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 +716,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 +742,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 +777,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 +799,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 >&, pkgCache::DepIterator)@Base" 0.8.0 (c++)"operator<<(std::basic_ostream >&, 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 +859,22 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER# (c++)"pkgDepCache::SetCandidateRelease(pkgCache::VerIterator, std::basic_string, std::allocator > const&)@Base" 0.8.11 (c++)"RealFileExists(std::basic_string, std::allocator >)@Base" 0.8.11 (c++)"StripEpoch(std::basic_string, std::allocator > const&)@Base" 0.8.11 - (c++)"pkgAcqIndex::Init(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > 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, std::allocator >, pkgAcquire::MethodConfig*)@Base" 0.8.11 - (c++)"pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire*, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::vector > 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, std::allocator > const&) const@Base" 0.8.11 - (c++)"debReleaseIndex::TranslationIndexURISuffix(char const*, std::basic_string, std::allocator > 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, std::allocator > const&, std::basic_string, std::allocator > 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, std::allocator > const&)@Base" 0.8.15.4 (c++)"GetModificationTime(std::basic_string, std::allocator > const&)@Base" 0.8.15.6 (c++)"pkgSourceList::GetLastModifiedTime()@Base" 0.8.15.6 - (c++)"pkgCacheGenerator::NewDepends(pkgCache::PkgIterator&, pkgCache::VerIterator&, std::basic_string, std::allocator > 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 >&)@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, std::allocator >)@Base" 0.8.16~exp2 - (c++)"edspListParser::DescriptionLanguage()@Base" 0.8.16~exp2 - (c++)"edspListParser::edspListParser(FileFd*, std::basic_string, std::allocator > const&)@Base" 0.8.16~exp2 - (c++)"edspListParser::~edspListParser()@Base" 0.8.16~exp2 - (c++)"edspIndex::edspIndex(std::basic_string, std::allocator >)@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, std::allocator > const&, _IO_FILE*)@Base" 0.8.16~exp2 (c++)"EDSP::ReadRequest(int, std::list, std::allocator >, std::allocator, std::allocator > > >&, std::list, std::allocator >, std::allocator, std::allocator > > >&, bool&, bool&, bool&)@Base" 0.8.16~exp2 (c++)"EDSP::ApplyRequest(std::list, std::allocator >, std::allocator, std::allocator > > > const&, std::list, std::allocator >, std::allocator, std::allocator > > > const&, pkgDepCache&)@Base" 0.8.16~exp2 @@ -1149,19 +889,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 +934,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, std::allocator >&, 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, std::allocator > const&, std::basic_string, std::allocator > 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, std::allocator > 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 +1097,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, std::allocator >, 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, std::allocator >)@Base" 0.9.14.3~exp1 (c++)"pkgSourceList::ParseFileOldStyle(std::basic_string, std::allocator >)@Base" 0.9.14.3~exp1 (c++)"pkgSourceList::Type::ParseStanza(std::vector >&, pkgTagSection&, int, FileFd&)@Base" 0.9.14.3~exp1 ### install foo.deb support - (c++)"debDebFileMetaIndex::ArchiveURI(std::basic_string, std::allocator > const&) const@Base" 1.1~exp1 - (c++)"debDebFileMetaIndex::~debDebFileMetaIndex()@Base" 1.1~exp1 - (c++)"debDebFileMetaIndex::debDebFileMetaIndex(std::basic_string, std::allocator > 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, std::allocator > 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, std::allocator >) const@Base" 1.1~exp1 - (c++)"debDebPkgFileIndex::~debDebPkgFileIndex()@Base" 1.1~exp1 - (c++)"debDebPkgFileIndex::debDebPkgFileIndex(std::basic_string, std::allocator >)@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, std::allocator >&)@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, std::allocator > const&, pkgIndexFile const*)@Base" 1.1~exp1 - (c++)"debIFTypeDebianSourceDir::CreateSrcPkgParser(std::basic_string, std::allocator >) 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, std::allocator >) 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, std::allocator > 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 >&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::map, std::allocator >, std::basic_string, std::allocator >, std::less, std::allocator > >, std::allocator, std::allocator > const, std::basic_string, std::allocator > > > > const&) const@Base" 1.1~exp1 - (c++)"debSLTypeDebFile::~debSLTypeDebFile()@Base" 1.1~exp1 (c++)"flAbsPath(std::basic_string, std::allocator >)@Base" 1.1~exp1 (c++)"GetTempFile(std::basic_string, std::allocator > const&, bool)@Base" 1.1~exp1 (c++)"pkgIndexFile::Type::CreateSrcPkgParser(std::basic_string, std::allocator >) 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 +1225,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, std::allocator > const&)@Base" 1.1~exp1 - (c++)"debRecordParser::ShortDesc(std::basic_string, std::allocator > 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 +1243,9 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER# (c++)"indexRecords::GetSupportsAcquireByHash() const@Base" 1.1~exp1 (c++)"pkgAcqArchive::Done(std::basic_string, std::allocator >, 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, std::allocator >, 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, std::allocator >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp1 (c++)"pkgAcqFile::pkgAcqFile(pkgAcquire*, std::basic_string, std::allocator >, HashStringList const&, unsigned long long, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, bool)@Base" 1.1~exp1 - (c++)"pkgAcqIndex::Custom600Headers() const@Base" 1.1~exp1 - (c++)"pkgAcqIndexDiffs::Done(std::basic_string, std::allocator >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp1 - (c++)"pkgAcqIndex::Done(std::basic_string, std::allocator >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp1 - (c++)"pkgAcqIndex::InitByHashIfNeeded(std::basic_string, std::allocator >)@Base" 1.1~exp1 - (c++)"pkgAcqIndexMergeDiffs::Done(std::basic_string, std::allocator >, 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, std::allocator >, 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, std::allocator >, 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, std::allocator >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp1 @@ -1644,19 +1259,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 >)@Base" 1.1~exp4 - (c++)"pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire*, pkgAcqMetaBase*, IndexTarget const*, HashStringList const&, indexRecords*, DiffInfo const&, std::vector > 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, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, HashStringList const&)@Base" 1.1~exp4 - (c++)"pkgAcqIndex::ReverifyAfterIMS()@Base" 1.1~exp4 - (c++)"pkgAcqIndex::StageDecompressDone(std::basic_string, std::allocator >, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp4 - (c++)"pkgAcqIndex::StageDownloadDone(std::basic_string, std::allocator >, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp4 - (c++)"pkgAcqIndex::ValidateFile(std::basic_string, std::allocator > 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, std::allocator >, std::basic_string, std::allocator > const&)@Base" 1.1~exp4 @@ -1670,11 +1274,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER# (c++)"pkgAcqMetaBase::TransactionStageCopy(pkgAcquire::Item*, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&)@Base" 1.1~exp4 (c++)"pkgAcqMetaBase::TransactionStageRemoval(pkgAcquire::Item*, std::basic_string, std::allocator > const&)@Base" 1.1~exp4 (c++)"pkgAcqMetaBase::VerifyVendor(std::basic_string, std::allocator >, std::basic_string, std::allocator > const&)@Base" 1.1~exp4 - (c++)"pkgAcqMetaClearSig::Done(std::basic_string, std::allocator >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp4 - (c++)"pkgAcqMetaIndex::Finished()@Base" 1.1~exp4 - (c++)"pkgAcqMetaIndex::Init(std::basic_string, std::allocator >, std::basic_string, std::allocator >)@Base" 1.1~exp4 - (c++)"pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire*, pkgAcqMetaBase*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > const*, indexRecords*)@Base" 1.1~exp4 - (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, pkgAcqMetaBase*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > const*, indexRecords*)@Base" 1.1~exp4 (c++)"pkgAcquire::GetLock(std::basic_string, std::allocator > 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 +1309,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER# (c++)"pkgCdrom::DropTranslation(std::vector, std::allocator >, std::allocator, std::allocator > > >&)@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 >&, 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 +1338,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER# (c++)"debListParser::ParseDepends(char const*, char const*, std::basic_string, std::allocator >&, std::basic_string, std::allocator >&, unsigned int&)@Base" 0.9.16 (c++)"debListParser::ParseDepends(char const*, char const*, std::basic_string, std::allocator >&, std::basic_string, std::allocator >&, unsigned int&, bool const&)@Base" 0.9.16 (c++)"debListParser::ParseDepends(char const*, char const*, std::basic_string, std::allocator >&, std::basic_string, std::allocator >&, 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, std::allocator >, std::basic_string, std::allocator >)@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,12 +1346,6 @@ 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++)"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++)"APT::Progress::PackageManager::PackageManager()@Base" 1.1~exp1 @@ -1775,14 +1366,11 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER# (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, std::allocator > 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::allocator > >::iterator::getPkg() const@Base" 1.1~exp4 (c++)"typeinfo for APT::PackageContainer, std::allocator > >::iterator@Base" 1.1~exp4 (c++)"typeinfo name for APT::PackageContainer, std::allocator > >::iterator@Base" 1.1~exp4 (c++)"vtable for APT::PackageContainer, std::allocator > >::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, std::allocator >, unsigned int, unsigned long)@Base" 1.1~exp4 (c++)"indexRecords::indexRecords(std::basic_string, std::allocator > const&)@Base" 1.1~exp5 @@ -1790,16 +1378,11 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER# (c++)"indexRecords::IsNeverTrusted() const@Base" 1.1~exp5 (c++)"indexRecords::SetTrusted(bool)@Base" 1.1~exp5 (c++)"metaIndex::metaIndex(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, char const*)@Base" 1.1~exp9 -### demangle strangeness - buildd report it as MISSING and as new… - (c++)"pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > const*, indexRecords*)@Base" 0.8.0 - (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > 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 > >::iterator std::max_element > >::iterator, CompareProviders>(APT::VersionContainer > >::iterator, APT::VersionContainer > >::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 @@ -1808,10 +1391,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::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0 (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct<__gnu_cxx::__normal_iterator, std::allocator > > >(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 (c++|optional=std)"char* std::basic_string, std::allocator >::_S_construct<__gnu_cxx::__normal_iterator, std::allocator > > >(__gnu_cxx::__normal_iterator, std::allocator > >, __gnu_cxx::__normal_iterator, std::allocator > >, std::allocator const&, std::forward_iterator_tag)@Base" 0.8.0 -- cgit v1.2.3-70-g09d2 From 765190e493645e13b5651625d87fd9c8db910a85 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 7 Nov 2014 16:45:18 +0100 Subject: guard ABI changes for SourcePkg/Ver in pkgCache Git-Dch: Ignore --- apt-pkg/cacheiterators.h | 2 ++ apt-pkg/deb/deblistparser.cc | 2 ++ apt-pkg/deb/dpkgpm.cc | 11 +++++++++- apt-pkg/edsp.cc | 7 ++++++ apt-pkg/pkgcache.h | 2 ++ cmdline/apt-cache.cc | 2 ++ cmdline/apt-get.cc | 52 ++++++++++++++++++++++++++++++++++++++++---- 7 files changed, 73 insertions(+), 5 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index b0c02d4a2..f8f4c05ce 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -215,12 +215,14 @@ class pkgCache::VerIterator : public Iterator { // 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"; diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 42db341b3..462818a03 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 diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 0cded32e1..3f6039e0d 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1684,7 +1684,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 +1823,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 diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc index 2ba914b16..3c6a7e30f 100644 --- a/apt-pkg/edsp.cc +++ b/apt-pkg/edsp.cc @@ -96,7 +96,14 @@ void EDSP::WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgI 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) diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 4f8568205..a7b7fa539 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -510,12 +510,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 */ diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 0f4f7e1ce..1bd75dfba 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -389,8 +389,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) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index e9e38debc..eca4a723b 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -170,7 +170,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) { @@ -278,10 +282,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; } } @@ -312,10 +327,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 } } } @@ -717,6 +739,9 @@ 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; @@ -744,8 +769,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()); } @@ -1004,6 +1032,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; @@ -1050,7 +1081,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) @@ -1407,9 +1442,18 @@ static string GetChangelogPath(CacheFile &Cache, pkgRecords Recs(Cache); pkgRecords::Parser &rec=Recs.Lookup(Ver.FileList()); string path = flNotFile(rec.FileName()); +#if APT_PKG_ABI >= 413 path.append(Ver.SourcePkgName()); path.append("_"); path.append(StripEpoch(Ver.SourceVerStr())); +#else + string srcpkg = rec.SourcePkg().empty() ? Ver.ParentPkg().Name() : rec.SourcePkg(); + string ver = Ver.VerStr(); + // if there is a source version it always wins + if (rec.SourceVer() != "") + ver = rec.SourceVer(); + path += srcpkg + "_" + StripEpoch(ver); +#endif return path; } /*}}}*/ -- cgit v1.2.3-70-g09d2 From 02e20767719873fa8f1919bd0e7a75f63e00c484 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 7 Nov 2014 17:49:36 +0100 Subject: guard const-ification API changes Git-Dch: Ignore --- apt-pkg/acquire-item.cc | 28 ++++++++++++++++++++++++++++ apt-pkg/acquire-item.h | 41 ++++++++++++++++++++++++++++++++++++++++- apt-pkg/contrib/hashes.h | 2 ++ apt-pkg/pkgrecords.h | 7 +++++++ apt-pkg/tagfile.cc | 4 ++++ apt-pkg/tagfile.h | 4 ++++ 6 files changed, 85 insertions(+), 1 deletion(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 2df638a83..dd85fda79 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -373,7 +373,11 @@ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner, // AcqIndex::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- /* The only header we use is the last-modified header. */ +#if APT_PKG_ABI >= 413 string pkgAcqDiffIndex::Custom600Headers() const +#else +string pkgAcqDiffIndex::Custom600Headers() +#endif { string Final = _config->FindDir("Dir::State::lists"); Final += URItoFileName(Desc.URI); @@ -1239,7 +1243,11 @@ void pkgAcqIndex::InitByHashIfNeeded(const std::string MetaKey) // AcqIndex::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- /* The only header we use is the last-modified header. */ +#if APT_PKG_ABI >= 413 string pkgAcqIndex::Custom600Headers() const +#else +string pkgAcqIndex::Custom600Headers() +#endif { string Final = GetFinalFilename(); @@ -1638,7 +1646,11 @@ pkgAcqMetaSig::~pkgAcqMetaSig() /*{{{*/ /*}}}*/ // pkgAcqMetaSig::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- +#if APT_PKG_ABI >= 413 string pkgAcqMetaSig::Custom600Headers() const +#else +string pkgAcqMetaSig::Custom600Headers() +#endif { std::string Header = GetCustom600Headers(RealURI); return Header; @@ -1783,7 +1795,11 @@ void pkgAcqMetaIndex::Init(std::string URIDesc, std::string ShortDesc) /*}}}*/ // pkgAcqMetaIndex::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- +#if APT_PKG_ABI >= 413 string pkgAcqMetaIndex::Custom600Headers() const +#else +string pkgAcqMetaIndex::Custom600Headers() +#endif { return GetCustom600Headers(RealURI); } @@ -2107,7 +2123,11 @@ pkgAcqMetaClearSig::~pkgAcqMetaClearSig() /*{{{*/ /*}}}*/ // pkgAcqMetaClearSig::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- +#if APT_PKG_ABI >= 413 string pkgAcqMetaClearSig::Custom600Headers() const +#else +string pkgAcqMetaClearSig::Custom600Headers() +#endif { string Header = GetCustom600Headers(RealURI); Header += "\nFail-Ignore: true"; @@ -2499,7 +2519,11 @@ void pkgAcqArchive::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*}}}*/ // AcqArchive::IsTrusted - Determine whether this archive comes from a trusted source /*{{{*/ // --------------------------------------------------------------------- +#if APT_PKG_ABI >= 413 APT_PURE bool pkgAcqArchive::IsTrusted() const +#else +APT_PURE bool pkgAcqArchive::IsTrusted() +#endif { return Trusted; } @@ -2644,7 +2668,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. */ +#if APT_PKG_ABI >= 413 string pkgAcqFile::Custom600Headers() const +#else +string pkgAcqFile::Custom600Headers() +#endif { if (IsIndexFile) return "\nIndex-File: true"; diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 6fcb42c3a..1af737e00 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -254,7 +254,11 @@ class pkgAcquire::Item : public WeakPointable * line, so they should (if nonempty) have a leading newline and * no trailing newline. */ +#if APT_PKG_ABI >= 413 virtual std::string Custom600Headers() const {return std::string();}; +#else + virtual std::string Custom600Headers() {return std::string();}; +#endif /** \brief A "descriptive" URI-like string. * @@ -280,9 +284,16 @@ class pkgAcquire::Item : public WeakPointable /** \return the acquire process with which this item is associated. */ pkgAcquire *GetOwner() const {return Owner;}; +#if APT_PKG_ABI < 413 + pkgAcquire *GetOwner() {return Owner;}; +#endif /** \return \b true if this object is being fetched from a trusted source. */ +#if APT_PKG_ABI >= 413 virtual bool IsTrusted() const {return false;}; +#else + virtual bool IsTrusted() {return false;}; +#endif /** \brief Report mirror problem * @@ -497,7 +508,11 @@ class APT_HIDDEN pkgAcqMetaSig : public pkgAcqMetaBase virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes, pkgAcquire::MethodConfig *Cnf); +#if APT_PKG_ABI >= 413 virtual std::string Custom600Headers() const; +#else + virtual std::string Custom600Headers(); +#endif virtual std::string DescURI() {return RealURI; }; /** \brief Create a new pkgAcqMetaSig. */ @@ -551,7 +566,11 @@ class APT_HIDDEN pkgAcqMetaIndex : public pkgAcqMetaBase 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); +#if APT_PKG_ABI >= 413 virtual std::string Custom600Headers() const; +#else + virtual std::string Custom600Headers(); +#endif virtual std::string DescURI() {return RealURI; }; virtual void Finished(); @@ -589,7 +608,11 @@ class APT_HIDDEN pkgAcqMetaClearSig : public pkgAcqMetaIndex public: virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf); +#if APT_PKG_ABI >= 413 virtual std::string Custom600Headers() const; +#else + virtual std::string Custom600Headers(); +#endif virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes, pkgAcquire::MethodConfig *Cnf); @@ -675,7 +698,11 @@ class APT_HIDDEN pkgAcqDiffIndex : public pkgAcqBaseIndex virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes, pkgAcquire::MethodConfig *Cnf); virtual std::string DescURI() {return RealURI + "Index";}; +#if APT_PKG_ABI >= 413 virtual std::string Custom600Headers() const; +#else + virtual std::string Custom600Headers(); +#endif /** \brief Parse the Index file for a set of Packages diffs. * @@ -989,7 +1016,11 @@ class APT_HIDDEN pkgAcqIndex : public pkgAcqBaseIndex virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes, pkgAcquire::MethodConfig *Cnf); +#if APT_PKG_ABI >= 413 virtual std::string Custom600Headers() const; +#else + virtual std::string Custom600Headers(); +#endif virtual std::string DescURI() {return Desc.URI;}; /** \brief Create a pkgAcqIndex. @@ -1111,8 +1142,12 @@ class pkgAcqArchive : public pkgAcquire::Item virtual std::string DescURI() {return Desc.URI;}; virtual std::string ShortDesc() {return Desc.ShortDesc;}; virtual void Finished(); +#if APT_PKG_ABI >= 413 virtual bool IsTrusted() const; - +#else + virtual bool IsTrusted(); +#endif + /** \brief Create a new pkgAcqArchive. * * \param Owner The pkgAcquire object with which this item is @@ -1161,7 +1196,11 @@ class pkgAcqFile : public pkgAcquire::Item virtual void Done(std::string Message,unsigned long long Size, HashStringList const &CalcHashes, pkgAcquire::MethodConfig *Cnf); virtual std::string DescURI() {return Desc.URI;}; +#if APT_PKG_ABI >= 413 virtual std::string Custom600Headers() const; +#else + virtual std::string Custom600Headers(); +#endif /** \brief Create a new pkgAcqFile object. * diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index ca186d704..154862457 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; diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index a902da8b8..bcc05baba 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -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();}; diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index b263baf66..e667c495f 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -408,7 +408,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); diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index 4cd99b2fc..99e2a8d93 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -97,7 +97,11 @@ 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;} -- cgit v1.2.3-70-g09d2 From fa5404ab01bdf06eaf147d9f133139e6c89b906a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 7 Nov 2014 18:18:14 +0100 Subject: explicit overload methods instead of adding parameters Adding a new parameter (with a default) is an ABI break, but you can overload a method, which is "just" an API break for everyone doing references to this method (aka: nobody). Git-Dch: Ignore --- apt-pkg/algorithms.cc | 12 ++++++++++++ apt-pkg/algorithms.h | 10 ++++++++++ apt-pkg/contrib/configuration.cc | 6 ++++++ apt-pkg/contrib/configuration.h | 8 ++++++++ apt-pkg/depcache.h | 4 ++-- apt-pkg/indexrecords.cc | 13 +++++++++++++ apt-pkg/indexrecords.h | 6 +++++- apt-pkg/tagfile.cc | 6 ++++++ apt-pkg/tagfile.h | 6 ++++++ apt-pkg/upgrade.cc | 18 ++++++++++++++++-- apt-pkg/upgrade.h | 13 +++++++++---- debian/libapt-pkg4.15.symbols | 6 ++++-- 12 files changed, 97 insertions(+), 11 deletions(-) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 71b5ac2c1..c8696b8ad 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -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..2ac28c0d7 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -138,10 +138,20 @@ 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(); diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 4380d64b9..483d5bb1b 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -253,6 +253,12 @@ 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 */ +#if APT_PKG_ABI < 413 +vector Configuration::FindVector(const char *Name) const +{ + return FindVector(Name, ""); +} +#endif vector Configuration::FindVector(const char *Name, std::string const &Default) const { vector Vec; diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index 2ecea8bee..8d7d51037 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -84,8 +84,16 @@ class Configuration * * \param Name of the parent node * \param Default list of values separated by commas */ +#if APT_PKG_ABI >= 413 std::vector FindVector(const char *Name, std::string const &Default = "") const; std::vector FindVector(std::string const &Name, std::string const &Default = "") const { return FindVector(Name.c_str(), Default); }; +#else + std::vector FindVector(const char *Name, std::string const &Default) const; + std::vector FindVector(std::string const &Name, std::string const &Default) const { return FindVector(Name.c_str(), Default); }; + std::vector FindVector(const char *Name) const; + std::vector FindVector(std::string const &Name) const { return FindVector(Name.c_str(), ""); }; +#endif + 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/depcache.h b/apt-pkg/depcache.h index 5554e1a69..20d263c67 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -109,7 +109,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 +120,7 @@ class pkgDepCache : protected pkgCache::Namespace * * \return \b false if an error occurred. */ - APT_HIDDEN bool Sweep(); + bool Sweep(); public: diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index 0f27af32b..d65266f64 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -270,10 +270,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 06b9dafa6..35e534c12 100644 --- a/apt-pkg/indexrecords.h +++ b/apt-pkg/indexrecords.h @@ -42,8 +42,12 @@ class indexRecords std::map 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); diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index e667c495f..3ee5c7076 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -281,6 +281,12 @@ pkgTagSection::pkgTagSection() } /*}}}*/ // 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; diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index 99e2a8d93..ac6d42089 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -86,7 +86,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); diff --git a/apt-pkg/upgrade.cc b/apt-pkg/upgrade.cc index 41e76802a..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") @@ -119,6 +119,10 @@ bool pkgDistUpgrade(pkgDepCache &Cache, OpProgress * const Progress) if (Progress != NULL) Progress->Done(); return success; +} +bool pkgDistUpgrade(pkgDepCache &Cache) +{ + return pkgDistUpgrade(Cache, NULL); } /*}}}*/ // AllUpgradeNoNewPackages - Upgrade but no removals or new pkgs /*{{{*/ @@ -229,9 +233,13 @@ 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,6 +288,12 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache) } /*}}}*/ // APT::Upgrade::Upgrade - Upgrade using a specific strategy /*{{{*/ +#if APT_PKG_ABI < 413 +bool APT::Upgrade::Upgrade(pkgDepCache &Cache, int mode) +{ + return Upgrade(Cache, mode, NULL); +} +#endif bool APT::Upgrade::Upgrade(pkgDepCache &Cache, int mode, OpProgress * const Progress) { APT_IGNORE_DEPRECATED_PUSH 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/debian/libapt-pkg4.15.symbols b/debian/libapt-pkg4.15.symbols index 9888223a9..5e0c0244d 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, std::allocator > const&, std::vector, std::allocator >, std::allocator, std::allocator > > > const&, bool const&)@Base" 0.8.0 (c++)"GetListOfFilesInDir(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, bool const&, bool const&)@Base" 0.8.0 (c++)"pkgMakeOnlyStatusCache(OpProgress&, DynamicMMap**)@Base" 0.8.0 @@ -233,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 @@ -1362,8 +1366,6 @@ 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, std::allocator > const&, std::basic_string, std::allocator > 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++)"pkgCache::PkgIterator::Section() const@Base" 1.1~exp4 -- cgit v1.2.3-70-g09d2 From 32ab4bd05cb298f6bf1f9574f5b20570beaae429 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 7 Nov 2014 19:18:21 +0100 Subject: guard pkg/grp hashtable creation changes The change itself is no problem ABI wise, but the remove of the old undynamic hashtables is, so we bring it back for older abis and happily use the now available free space to backport more recent additions like the dynamic hashtable itself. Git-Dch: Ignore --- apt-pkg/pkgcache.cc | 39 ++++++++++++--------- apt-pkg/pkgcache.h | 93 ++++++++++++++++++++++++++++++++++++++++++-------- apt-pkg/pkgcachegen.cc | 18 +++++----- cmdline/apt-cache.cc | 13 ++++--- 4 files changed, 118 insertions(+), 45 deletions(-) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 572685ba5..8d6e242b1 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -82,10 +82,13 @@ pkgCache::Header::Header() MaxDescFileSize = 0; FileList = 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; @@ -114,6 +117,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 +127,7 @@ pkgCache::pkgCache(MMap *Map, bool DoMap) : Map(*Map) if (DoMap == true) ReMap(); } +APT_IGNORE_DEPRECATED_POP /*}}}*/ // Cache::ReMap - Reopen the cache file /*{{{*/ // --------------------------------------------------------------------- @@ -162,7 +167,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 +181,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 +197,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 +205,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 +216,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) @@ -273,7 +278,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 +364,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 +412,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 +425,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 +439,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]; } } /*}}}*/ diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index a7b7fa539..2ba23c5c0 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 /*{{{*/ @@ -109,6 +138,7 @@ class pkgCache /*{{{*/ struct Description; struct Provides; struct Dependency; + struct StringItem; struct VerFile; struct DescFile; @@ -185,6 +215,7 @@ class pkgCache /*{{{*/ Description *DescP; Provides *ProvideP; Dependency *DepP; + APT_DEPRECATED StringItem *StringItemP; char *StrP; virtual bool ReMap(bool const &Errorchecks = true); @@ -288,12 +319,17 @@ 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; +#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 +355,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 +400,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 +437,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,7 +472,7 @@ 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; }; @@ -464,7 +520,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 +535,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 +549,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; }; @@ -556,16 +612,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; }; @@ -593,7 +649,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 /*{{{*/ @@ -620,7 +676,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 @@ -656,6 +712,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; } diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index a2c1c8760..ba454f057 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -74,7 +74,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 +96,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(); } @@ -616,7 +616,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,18 +652,18 @@ 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; diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 1bd75dfba..9bac45029 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -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 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); @@ -447,13 +450,13 @@ static bool Stats(CommandLine &) 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("PkgHashTable", Cache->PkgP, Cache->Head().PkgHashTable(), Cache->Head().HashTableSize); - ShowHashTableStats("GrpHashTable", Cache->GrpP, Cache->Head().GrpHashTable(), Cache->Head().HashTableSize); + ShowHashTableStats("PkgHashTable", Cache->PkgP, Cache->Head().PkgHashTableP(), Cache->Head().GetHashTableSize(), PackageNext); + ShowHashTableStats("GrpHashTable", Cache->GrpP, Cache->Head().GrpHashTableP(), Cache->Head().GetHashTableSize(), GroupNext); return true; } -- cgit v1.2.3-70-g09d2 From 0dc0b42d73ffd08bbdbe08b0678fbaae02364622 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 7 Nov 2014 21:26:49 +0100 Subject: revert useless abibreak in sourceslist.h No idea what the intension was here, but it seems like a leftover from a workover which happened to be done differently later. As it doesn't provide anything at the moment we just revert to the previous abi here. Git-Dch: Ignore --- apt-pkg/sourcelist.h | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 35b786e1a..998357509 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -52,23 +52,15 @@ class pkgAcquire; class pkgIndexFile; class metaIndex; -class pkgSource -{ - protected: - - std::vector SrcList; - -}; - -class pkgSourceList : public pkgSource +class pkgSourceList { 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::const_iterator const_iterator; - - public: + + protected: + + std::vector SrcList; int ParseFileDeb822(std::string File); bool ParseFileOldStyle(std::string File); + public: + bool ReadMainList(); bool Read(std::string File); -- cgit v1.2.3-70-g09d2 From bc4ccfeb6096fc6f9a74e2abff3abe31261b5df2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 7 Nov 2014 21:52:31 +0100 Subject: restore ABI of pkgTagSection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have a d-pointer available here, so go ahead and use it which also helps in hidding some dirty details here. The "hard" part is keeping the abi for the inlined methods so that they don't break – at least not more than before as much of the point beside a speedup is support for more than 256 fields in a single section. --- apt-pkg/tagfile.cc | 105 ++++++++++++++++++++++++++++++------------ apt-pkg/tagfile.h | 24 +++++----- debian/libapt-pkg4.15.symbols | 1 + 3 files changed, 87 insertions(+), 43 deletions(-) diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 3ee5c7076..590206f17 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 Tags; +}; + static unsigned long AlphaHash(const char *Text, size_t Length) /*{{{*/ { /* This very simple hash function for the last 8 letters gives @@ -274,11 +291,18 @@ 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 @@ -292,9 +316,9 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength, bool const R 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); @@ -305,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) @@ -335,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) @@ -377,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; } @@ -430,16 +470,16 @@ bool pkgTagSection::Exists(const char* const Tag) 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; @@ -457,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"); @@ -571,11 +611,16 @@ 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; } /*}}}*/ // TFRewrite - Rewrite a control record /*{{{*/ @@ -768,4 +813,4 @@ bool TFRewrite(FILE *Output,pkgTagSection const &Tags,const char *Order[], } /*}}}*/ -pkgTagSection::~pkgTagSection() {} +pkgTagSection::~pkgTagSection() { delete d; } diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index ac6d42089..d09e7046c 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -33,23 +33,22 @@ #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 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; @@ -109,8 +108,7 @@ class pkgTagSection 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 { diff --git a/debian/libapt-pkg4.15.symbols b/debian/libapt-pkg4.15.symbols index 5e0c0244d..55b7f33c3 100644 --- a/debian/libapt-pkg4.15.symbols +++ b/debian/libapt-pkg4.15.symbols @@ -1380,6 +1380,7 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER# (c++)"indexRecords::IsNeverTrusted() const@Base" 1.1~exp5 (c++)"indexRecords::SetTrusted(bool)@Base" 1.1~exp5 (c++)"metaIndex::metaIndex(std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, char const*)@Base" 1.1~exp9 + (c++)"pkgTagSection::Get(char const*&, char const*&, unsigned int) const@Base" 1.1~exp9 ### 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 -- cgit v1.2.3-70-g09d2 From 20801f613690b330c79b4f7a30dc3ff52b722468 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 8 Nov 2014 14:23:18 +0100 Subject: fix variable naming typo used in debug output Git-Dch: Ignore --- apt-pkg/acquire-worker.cc | 10 +++++----- test/integration/test-apt-update-ims | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 724bdfd49..f4d1ad412 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -346,28 +346,28 @@ bool pkgAcquire::Worker::RunMessages() Owner->DestFile.c_str(), LookupTag(Message,"Size","0").c_str(),TotalSize); // see if there is a hash to verify - HashStringList RecivedHashes; + HashStringList ReceivedHashes; 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)); + ReceivedHashes.push_back(HashString(hs->HashType(), hashsum)); } if(_config->FindB("Debug::pkgAcquire::Auth", false) == true) { std::clog << "201 URI Done: " << Owner->DescURI() << endl - << "RecivedHash:" << endl; - for (HashStringList::const_iterator hs = RecivedHashes.begin(); hs != RecivedHashes.end(); ++hs) + << "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; } - Owner->Done(Message, ServerSize, RecivedHashes, Config); + Owner->Done(Message, ServerSize, ReceivedHashes, Config); ItemDone(); // Log that we are done diff --git a/test/integration/test-apt-update-ims b/test/integration/test-apt-update-ims index 5394a9f30..0fa882d78 100755 --- a/test/integration/test-apt-update-ims +++ b/test/integration/test-apt-update-ims @@ -30,7 +30,7 @@ runtest() { # 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 + aptget update -o Debug::pkgAcquire::Auth=1 2>&1 | grep -A2 'ReceivedHash:' | grep -q -- '- SHA' && msgpass || msgfail # ensure no leftovers in partial testfailure ls "rootdir/var/lib/apt/lists/partial/*" -- cgit v1.2.3-70-g09d2 From ad7e0941b376d792911f240377094a2e78ca8756 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 8 Nov 2014 18:14:46 +0100 Subject: streamline display of --help in all tools By convention, if I run a tool with --help or --version I expect it to exit successfully with the usage, while if I do call it wrong (like without any parameters) I expect the usage message shown with a non-zero exit. --- apt-pkg/contrib/cmndline.cc | 3 ++ apt-pkg/contrib/cmndline.h | 1 + apt-private/private-cmndline.cc | 33 ++++++++++++++++++ apt-private/private-cmndline.h | 6 ++++ cmdline/apt-cache.cc | 18 ++-------- cmdline/apt-cdrom.cc | 15 ++------- cmdline/apt-config.cc | 15 ++------- cmdline/apt-extracttemplates.cc | 32 +++++++----------- cmdline/apt-get.cc | 22 ++---------- cmdline/apt-helper.cc | 21 ++---------- cmdline/apt-internal-solver.cc | 17 +++------- cmdline/apt-mark.cc | 22 ++---------- cmdline/apt-sortpkgs.cc | 24 +++++-------- cmdline/apt.cc | 20 ++--------- cmdline/makefile | 8 ++--- debian/tests/run-tests | 1 + ftparchive/apt-ftparchive.cc | 19 +++-------- ftparchive/makefile | 4 +-- prepare-release | 4 +-- test/integration/framework | 2 ++ test/integration/test-00-commands-have-help | 52 +++++++++++++++++++++++++++++ 21 files changed, 149 insertions(+), 190 deletions(-) create mode 100755 test/integration/test-00-commands-have-help 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 @@ -33,6 +33,9 @@ using namespace std; 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-private/private-cmndline.cc b/apt-private/private-cmndline.cc index aa01be757..bb9a00803 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -2,12 +2,17 @@ #include #include +#include +#include +#include +#include #include #include #include #include +#include #include /*}}}*/ @@ -287,3 +292,31 @@ std::vector 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 +class Configuration; +class pkgSystem; + APT_PUBLIC std::vector 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/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 9bac45029..12ed4f719 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1896,23 +1896,9 @@ 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"); diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 53efe65b8..8ac73fd7e 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -249,19 +249,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 || _config->FindB("version") == true || - CmdL.FileSize() == 0) - return ShowHelp(CmdL); + CommandLine CmdL; + ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp); // Deal with stdout not being a tty if (isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index 40ba468eb..e0b8a624e 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -115,19 +115,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 const langs = APT::Configuration::getLanguages(true); _config->Clear("Acquire::Languages"); diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index f95b9e5ba..5211ee027 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -33,6 +33,8 @@ #include #include +#include + #include #include #include @@ -215,15 +217,15 @@ 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, + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); - 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 +236,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 +358,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 eca4a723b..a9053bdfd 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1746,26 +1746,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..1b832f165 100644 --- a/cmdline/apt-helper.cc +++ b/cmdline/apt-helper.cc @@ -108,25 +108,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..4fabeb02f 100644 --- a/cmdline/apt-internal-solver.cc +++ b/cmdline/apt-internal-solver.cc @@ -24,7 +24,9 @@ #include #include #include + #include +#include #include #include @@ -79,19 +81,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-mark.cc b/cmdline/apt-mark.cc index ed348358a..487f3d8a1 100644 --- a/cmdline/apt-mark.cc +++ b/cmdline/apt-mark.cc @@ -441,26 +441,8 @@ 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; - } + CommandLine CmdL; + ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp); // Deal with stdout not being a tty if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc index c2b11890a..9b66ad4db 100644 --- a/cmdline/apt-sortpkgs.cc +++ b/cmdline/apt-sortpkgs.cc @@ -23,6 +23,8 @@ #include #include +#include + #include #include #include @@ -142,12 +144,12 @@ 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__); if (_config->FindB("version") == true) - return 0; + return true; cout << _("Usage: apt-sortpkgs [options] file1 [file2 ...]\n" @@ -161,7 +163,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 +181,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..056cd213f 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -119,15 +119,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 +133,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/debian/tests/run-tests b/debian/tests/run-tests index 9d7c484fc..7cc37f618 100644 --- a/debian/tests/run-tests +++ b/debian/tests/run-tests @@ -15,6 +15,7 @@ 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/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index ebf99a8f8..7d9af4178 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -19,6 +19,8 @@ #include #include +#include + #include #include #include @@ -1060,21 +1062,8 @@ 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; - } - + ParseCommandLine(CmdL, Cmds, Args, &_config, NULL, argc, argv, ShowHelp); + // Setup the output streams c0out.rdbuf(clog.rdbuf()); c1out.rdbuf(clog.rdbuf()); 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/prepare-release b/prepare-release index e61266eef..67f4638d6 100755 --- a/prepare-release +++ b/prepare-release @@ -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..dd66f2a0c 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -128,6 +128,7 @@ 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 "$@" @@ -194,6 +195,7 @@ setupenvironment() { 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" # ----- diff --git a/test/integration/test-00-commands-have-help b/test/integration/test-00-commands-have-help new file mode 100755 index 000000000..ebf8b8cfa --- /dev/null +++ b/test/integration/test-00-commands-have-help @@ -0,0 +1,52 @@ +#!/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 .* compiled on ' ${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 -- cgit v1.2.3-70-g09d2 From d9e518c6f7dc0ad464495b586d1b8e115d54d41a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 8 Nov 2014 20:44:44 +0100 Subject: use the same code to detect quiet setting in all tools Git-Dch: Ignore --- apt-private/private-output.cc | 8 ++-- apt-private/private-output.h | 3 +- cmdline/apt-cache.cc | 4 +- cmdline/apt-cdrom.cc | 7 ++- cmdline/apt-mark.cc | 18 +------ ftparchive/apt-ftparchive.cc | 19 ++------ test/integration/test-apt-ftparchive-cachedb | 30 +++++++----- test/integration/test-apt-ftparchive-src-cachedb | 60 +++++++++++------------- 8 files changed, 63 insertions(+), 86 deletions(-) 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 * 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 #include +#include // 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 * const out = std::cout.rdbuf()); void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records, pkgCache::VerIterator const &V, std::ostream &out, diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 12ed4f719..342ad1858 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1899,9 +1899,7 @@ int main(int argc,const char *argv[]) /*{{{*/ CommandLine CmdL; ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp); - // 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 8ac73fd7e..327039e00 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -31,6 +31,7 @@ #include #include +#include #include /*}}}*/ @@ -252,10 +253,8 @@ int main(int argc,const char *argv[]) /*{{{*/ CommandLine CmdL; ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp); - // Deal with stdout not being a tty - if (isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) - _config->Set("quiet","1"); - + InitOutput(); + // Match the operation bool returned = CmdL.DispatchArg(Cmds); diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc index 487f3d8a1..2702dbbd3 100644 --- a/cmdline/apt-mark.cc +++ b/cmdline/apt-mark.cc @@ -22,6 +22,7 @@ #include #include +#include #include #include @@ -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) { @@ -444,18 +441,7 @@ int main(int argc,const char *argv[]) /*{{{*/ CommandLine CmdL; ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp); - // Deal with stdout not being a tty - if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) - _config->Set("quiet","1"); - - // 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/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index 7d9af4178..adf1b6d73 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -20,6 +20,7 @@ #include #include +#include #include #include @@ -42,11 +43,7 @@ #include /*}}}*/ -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 /*{{{*/ @@ -1064,16 +1061,10 @@ int main(int argc, const char *argv[]) CommandLine CmdL(Args,_config); ParseCommandLine(CmdL, Cmds, Args, &_config, NULL, argc, argv, ShowHelp); - // Setup the output streams - c0out.rdbuf(clog.rdbuf()); - c1out.rdbuf(clog.rdbuf()); - c2out.rdbuf(clog.rdbuf()); + _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/test/integration/test-apt-ftparchive-cachedb b/test/integration/test-apt-ftparchive-cachedb index 0e1986bcd..866e5a469 100755 --- a/test/integration/test-apt-ftparchive-cachedb +++ b/test/integration/test-apt-ftparchive-cachedb @@ -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 "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 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 - diff --git a/test/integration/test-apt-ftparchive-src-cachedb b/test/integration/test-apt-ftparchive-src-cachedb index e7b148530..6e857c0cb 100755 --- a/test/integration/test-apt-ftparchive-src-cachedb +++ b/test/integration/test-apt-ftparchive-src-cachedb @@ -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 @@ -191,8 +186,9 @@ E: DSC file 'aptarchive/pool/invalid/toobig_1.0.dsc' is too large!" aptftparchiv # 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" -- cgit v1.2.3-70-g09d2 From 061ee5f0efa9d8e8fe4796c13af68fe282a21073 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 8 Nov 2014 22:23:19 +0100 Subject: enhance apt-extracttemplates test The tool checks for debconf version before printing the info it extracts, so that it doesn't extract data which can't be interpreted before debconf is upgraded. It is only fair to check for this behaviour in the tests. Git-Dch: Ignore --- test/integration/framework | 1 + test/integration/test-apt-extracttemplates | 69 ++++++++++++++++++++---------- 2 files changed, 48 insertions(+), 22 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index dd66f2a0c..0da9e2aab 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -1110,6 +1110,7 @@ testempty() { if "$@" >$COMPAREFILE 2>&1 && test ! -s $COMPAREFILE; then msgpass else + echo cat $COMPAREFILE msgfail fi diff --git a/test/integration/test-apt-extracttemplates b/test/integration/test-apt-extracttemplates index ae2cc8bc2..276862464 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 -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?' -- cgit v1.2.3-70-g09d2 From 7824564bfde681eddf6969174bba7604d6f34848 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 8 Nov 2014 23:59:31 +0100 Subject: fix test to not spoil output with warnings Git-Dch: Ignore --- .../test-bug-624218-Translation-file-handling | 57 +++++++++++++++------- 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/test/integration/test-bug-624218-Translation-file-handling b/test/integration/test-bug-624218-Translation-file-handling index d32bd513b..652386892 100755 --- a/test/integration/test-bug-624218-Translation-file-handling +++ b/test/integration/test-bug-624218-Translation-file-handling @@ -8,80 +8,101 @@ 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 +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' '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/testsuccess.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 +cp rootdir/tmp/testsuccess.output testsuccess.output +testsuccess grep -q -e 'Translation-ast_DE$' testsuccess.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/testsuccess.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/testsuccess.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 +cp rootdir/tmp/testsuccess.output testsuccess.output +testsuccess grep -q -e 'Translation-ast_DE' testsuccess.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/testsuccess.output rm -rf rootdir/var/lib/apt/lists -- cgit v1.2.3-70-g09d2 From 374f8492e6f109e8427816a8f513e5e8feda9049 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 9 Nov 2014 15:40:19 +0100 Subject: allow uninstalled packages to be put on hold MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit dpkg wants to know about a package before it can be put on hold, so we have to at least hint about its existance in the available file it "maintaince" to know about such stuff. The simple thing would probably be to just feed all Packages files into dpkg as well, but what would be the point really? Exactly, so we take a shortcut here and just create dummies in the available file if we need to which isn't going to be that common as usually you are holding packages back and not off. Who would have thought that a simple feature like setting a package on hold requires more than 200 lines of code… at least with the testcase it is now explicitly tested code. --- cmdline/apt-mark.cc | 63 ++++++++++++++++++++++++++++++++---- test/integration/test-apt-mark | 72 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 6 deletions(-) create mode 100755 test/integration/test-apt-mark diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc index 2702dbbd3..860982f9e 100644 --- a/cmdline/apt-mark.cc +++ b/cmdline/apt-mark.cc @@ -275,10 +275,64 @@ static bool DoHold(CommandLine &CmdL) } Args.erase(Args.begin() + BaseArgs, Args.end()); - Args.push_back("--set-selections"); + Args.push_back("--merge-avail"); + 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 = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + { + if (Pkg->CurrentVer != 0) + continue; + 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 \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); + + 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); + + external[0] = -1; + external[1] = -1; if (pipe(external) != 0) return _error->WarningE("DoHold", "Can't create IPC pipe for dpkg --set-selections"); @@ -289,16 +343,13 @@ 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); } - FILE* dpkg = fdopen(external[1], "w"); + dpkg = fdopen(external[1], "w"); for (APT::PackageList::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { if (dpkgMultiArch == false) diff --git a/test/integration/test-apt-mark b/test/integration/test-apt-mark new file mode 100755 index 000000000..69e0f933d --- /dev/null +++ b/test/integration/test-apt-mark @@ -0,0 +1,72 @@ +#!/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 + testequal 'bar +dpkg +foo' aptmark showmanual + testequal 'bar +foo' aptmark showmanual bar foo uninstalled +} +testmarkonpkgasauto() { + testsuccess aptmark $1 foo + testequal 'foo' aptmark showauto + testequal 'foo' aptmark showauto foo + testequal 'bar +dpkg' aptmark showmanual + testequal 'bar' aptmark showmanual bar + + testsuccess aptmark $2 foo + testnoautopkg +} + +testequal 'E: No packages found' aptmark auto +testequal 'E: No packages found' aptmark manual + +testnoautopkg +testmarkonpkgasauto 'auto' 'manual' +testmarkonpkgasauto 'markauto' 'unmarkauto' + +testnoholdpkg() { + testempty aptmark showhold + testempty aptmark showholds # typical "typo" + testempty aptmark showhold dpkg + testempty aptmark showholds dpkg +} +testmarkonepkgashold() { + testsuccess aptmark hold $1 + testequal "$1" aptmark showhold + testequal "$1" aptmark showholds + testsuccess aptmark unhold $1 + testnoholdpkg +} + +testequal 'E: No packages found' aptmark hold +testequal 'E: No packages found' aptmark unhold + +testnoholdpkg +testmarkonepkgashold 'foo' +testmarkonepkgashold 'bar' +testmarkonepkgashold 'uninstalled' +testmarkonepkgashold 'uninstalled-native' + +testequal 'uninstalled set on hold.' aptmark hold uninstalled +testequal 'uninstalled-native set on hold.' aptmark hold uninstalled-native -- cgit v1.2.3-70-g09d2 From bf6ac7ca615922c23d1f3cf1963efc5be9c23e32 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 9 Nov 2014 15:57:43 +0100 Subject: use getline() instead of rolling our own We use it in other places already as well even though it is farly new addition to the POSIX family with 2008, but rolling our own here is really something which should be avoided in such a important method. Git-Dch: Ignore --- methods/gpgv.cc | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) 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) -- cgit v1.2.3-70-g09d2 From 7e04a6bf23d857db60afd2ec3d0f4a8271b1c597 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 9 Nov 2014 19:04:54 +0100 Subject: use pkgAcquire::GetLock instead of own code Do the same with less code in apt-get. This especially ensures that the lock file (and the parent directories) exist before we are trying to lock. It also means that clean now creates the directories if they are missing so we returned to a proper clean state now. Git-Dch: Ignore --- apt-pkg/acquire.cc | 2 ++ cmdline/apt-get.cc | 22 ++-------------------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 2c89c2dea..07c4646f5 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -152,6 +152,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()); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index a9053bdfd..eab792264 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -558,30 +558,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(); -- cgit v1.2.3-70-g09d2 From 546dbfc82ad9ff0308b365bca3731a1118b1d251 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 9 Nov 2014 21:26:20 +0100 Subject: disable the lock disabling in the tests We create our own directories here and work without root in them, so we can also test the locking with them as it is how we usually operate. Git-Dch: Ignore --- test/integration/framework | 3 +-- test/integration/test-apt-get-update-unauth-warning | 5 +++-- test/integration/test-apt-update-transactions | 1 + test/integration/test-ubuntu-bug-346386-apt-get-update-paywall | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index 0da9e2aab..d28085ee4 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -236,7 +236,6 @@ 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 # store apt-key were we can access it, even if we run it as a different user @@ -1412,7 +1411,7 @@ aptautotest() { aptautotest_aptget_update() { if ! test -d "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists"; then return; fi # all copied files are properly chmodded - for file in $(find "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" -maxdepth 1 -type f); do + for file in $(find "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" -maxdepth 1 -type f ! -name 'lock'); do testfilestats "$file" '%U:%G:%a' '=' "${USER}:${USER}:644" done } diff --git a/test/integration/test-apt-get-update-unauth-warning b/test/integration/test-apt-get-update-unauth-warning index 0389415c1..80c51152d 100755 --- a/test/integration/test-apt-get-update-unauth-warning +++ b/test/integration/test-apt-get-update-unauth-warning @@ -27,8 +27,9 @@ W: The repository 'file: unstable Release' does not have a Release file. This is 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 +testequal 'Listing...' apt list foo +testequal 'lock +partial' ls rootdir/var/lib/apt/lists # allow override testequal "Ign file: unstable InRelease diff --git a/test/integration/test-apt-update-transactions b/test/integration/test-apt-update-transactions index fe352c762..bf425a22e 100755 --- a/test/integration/test-apt-update-transactions +++ b/test/integration/test-apt-update-transactions @@ -49,6 +49,7 @@ 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 + touch rootdir/var/lib/apt/lists/lock if [ "$(id -u)" = '0' ]; then chown _apt:root rootdir/var/lib/apt/lists/partial fi 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 -- cgit v1.2.3-70-g09d2 From 3f439e2b7126fb82952cd7bc12b8d6cb01352219 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 18 Aug 2013 23:17:05 +0200 Subject: add a simple container for HashStrings APT supports more than just one HashString and even allows to enforce the usage of a specific hash. This class is intended to help with storage and passing around of the HashStrings. The cherry-pick here the un-const-ification of HashType() compared to f4c3850ea335545e297504941dc8c7a8f1c83358. The point of this commit is adding infrastructure for the next one. All by itself, it just adds new symbols. Git-Dch: Ignore --- apt-pkg/contrib/hashes.cc | 118 +++++++++++++++++++++++++++++++++++++----- apt-pkg/contrib/hashes.h | 84 +++++++++++++++++++++++++++++- debian/libapt-pkg4.12.symbols | 8 +++ test/libapt/hashsums_test.cc | 64 ++++++++++++++++++----- 4 files changed, 247 insertions(+), 27 deletions(-) diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index 15f83615d..bb11a3fca 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -27,7 +27,7 @@ #include /*}}}*/ -const char* HashString::_SupportedHashes[] = +const char * HashString::_SupportedHashes[] = { "SHA512", "SHA256", "SHA1", "MD5Sum", NULL }; @@ -42,11 +42,16 @@ HashString::HashString(std::string Type, std::string Hash) : Type(Type), Hash(Ha HashString::HashString(std::string StringedHash) /*{{{*/ { - // legacy: md5sum without "MD5Sum:" prefix - if (StringedHash.find(":") == std::string::npos && StringedHash.size() == 32) + if (StringedHash.find(":") == std::string::npos) { - Type = "MD5Sum"; - Hash = StringedHash; + // legacy: md5sum without "MD5Sum:" prefix + if (StringedHash.size() == 32) + { + Type = "MD5Sum"; + Hash = StringedHash; + } + if(_config->FindB("Debug::Hashes",false) == true) + std::clog << "HashString(string): invalid StringedHash " << StringedHash << std::endl; return; } std::string::size_type pos = StringedHash.find(":"); @@ -82,25 +87,25 @@ std::string HashString::GetHashForFile(std::string filename) const /*{{{*/ std::string fileHash; FileFd Fd(filename, FileFd::ReadOnly); - if(Type == "MD5Sum") + if(strcasecmp(Type.c_str(), "MD5Sum") == 0) { MD5Summation MD5; MD5.AddFD(Fd); fileHash = (std::string)MD5.Result(); } - else if (Type == "SHA1") + else if (strcasecmp(Type.c_str(), "SHA1") == 0) { SHA1Summation SHA1; SHA1.AddFD(Fd); fileHash = (std::string)SHA1.Result(); } - else if (Type == "SHA256") + else if (strcasecmp(Type.c_str(), "SHA256") == 0) { SHA256Summation SHA256; SHA256.AddFD(Fd); fileHash = (std::string)SHA256.Result(); } - else if (Type == "SHA512") + else if (strcasecmp(Type.c_str(), "SHA512") == 0) { SHA512Summation SHA512; SHA512.AddFD(Fd); @@ -111,20 +116,105 @@ std::string HashString::GetHashForFile(std::string filename) const /*{{{*/ return fileHash; } /*}}}*/ -const char** HashString::SupportedHashes() +const char** HashString::SupportedHashes() /*{{{*/ { return _SupportedHashes; } - -APT_PURE bool HashString::empty() const + /*}}}*/ +APT_PURE bool HashString::empty() const /*{{{*/ { return (Type.empty() || Hash.empty()); } + /*}}}*/ +std::string HashString::toStr() const /*{{{*/ +{ + return Type + ":" + Hash; +} + /*}}}*/ +APT_PURE bool HashString::operator==(HashString const &other) const /*{{{*/ +{ + return (strcasecmp(Type.c_str(), other.Type.c_str()) == 0 && Hash == other.Hash); +} +APT_PURE bool HashString::operator!=(HashString const &other) const +{ + return !(*this == other); +} + /*}}}*/ + +HashString const * HashStringList::find(char const * const type) const /*{{{*/ +{ + if (type == NULL || type[0] == '\0') + { + std::string forcedType = _config->Find("Acquire::ForceHash", ""); + if (forcedType.empty() == false) + return find(forcedType.c_str()); + for (char const * const * t = HashString::SupportedHashes(); *t != NULL; ++t) + for (std::vector::const_iterator hs = list.begin(); hs != list.end(); ++hs) + if (strcasecmp(hs->HashType().c_str(), *t) == 0) + return &*hs; + return NULL; + } + for (std::vector::const_iterator hs = list.begin(); hs != list.end(); ++hs) + if (strcasecmp(hs->HashType().c_str(), type) == 0) + return &*hs; + return NULL; +} + /*}}}*/ +bool HashStringList::supported(char const * const type) /*{{{*/ +{ + for (char const * const * t = HashString::SupportedHashes(); *t != NULL; ++t) + if (strcasecmp(*t, type) == 0) + return true; + return false; +} + /*}}}*/ +bool HashStringList::push_back(const HashString &hashString) /*{{{*/ +{ + if (hashString.HashType().empty() == true || + hashString.HashValue().empty() == true || + supported(hashString.HashType().c_str()) == false) + return false; + + // ensure that each type is added only once + HashString const * const hs = find(hashString.HashType().c_str()); + if (hs != NULL) + return *hs == hashString; -std::string HashString::toStr() const + list.push_back(hashString); + return true; +} + /*}}}*/ +bool HashStringList::VerifyFile(std::string filename) const /*{{{*/ { - return Type + std::string(":") + Hash; + if (list.empty() == true) + return false; + HashString const * const hs = find(NULL); + if (hs == NULL || hs->VerifyFile(filename) == false) + return false; + return true; } + /*}}}*/ +bool HashStringList::operator==(HashStringList const &other) const /*{{{*/ +{ + short matches = 0; + for (const_iterator hs = begin(); hs != end(); ++hs) + { + HashString const * const ohs = other.find(hs->HashType()); + if (ohs == NULL) + continue; + if (*hs != *ohs) + return false; + ++matches; + } + if (matches == 0) + return false; + return true; +} +bool HashStringList::operator!=(HashStringList const &other) const +{ + return !(*this == other); +} + /*}}}*/ // Hashes::AddFD - Add the contents of the FD /*{{{*/ // --------------------------------------------------------------------- diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index 7a62f8a8f..5a4213868 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -41,7 +42,7 @@ class HashString protected: std::string Type; std::string Hash; - static const char* _SupportedHashes[10]; + static const char * _SupportedHashes[10]; // internal helper std::string GetHashForFile(std::string filename) const; @@ -53,6 +54,8 @@ class HashString // get hash type used std::string HashType() { return Type; }; + std::string HashType() const { return Type; }; + std::string HashValue() const { return Hash; }; // verify the given filename against the currently loaded hash bool VerifyFile(std::string filename) const; @@ -64,11 +67,90 @@ class HashString // helper std::string toStr() const; // convert to str as "type:hash" bool empty() const; + bool operator==(HashString const &other) const; + bool operator!=(HashString const &other) const; // return the list of hashes we support static APT_CONST const char** SupportedHashes(); }; +class HashStringList +{ + public: + /** find best hash if no specific one is requested + * + * @param type of the checksum to return, can be \b NULL + * @return If type is \b NULL (or the empty string) it will + * return the 'best' hash; otherwise the hash which was + * specifically requested. If no hash is found \b NULL will be returned. + */ + HashString const * find(char const * const type) const; + HashString const * find(std::string const &type) const { return find(type.c_str()); } + /** check if the given hash type is supported + * + * @param type to check + * @return true if supported, otherwise false + */ + static APT_PURE bool supported(char const * const type); + /** add the given #HashString to the list + * + * @param hashString to add + * @return true if the hash is added because it is supported and + * not already a different hash of the same type included, otherwise false + */ + bool push_back(const HashString &hashString); + /** @return size of the list of HashStrings */ + size_t size() const { return list.size(); } + + /** take the 'best' hash and verify file with it + * + * @param filename to verify + * @return true if the file matches the hashsum, otherwise false + */ + bool VerifyFile(std::string filename) const; + + /** is the list empty ? + * + * @return \b true if the list is empty, otherwise \b false + */ + bool empty() const { return list.empty(); } + + typedef std::vector::const_iterator const_iterator; + + /** iterator to the first element */ + const_iterator begin() const { return list.begin(); } + + /** iterator to the end element */ + const_iterator end() const { return list.end(); } + + /** start fresh with a clear list */ + void clear() { list.clear(); } + + /** compare two HashStringList for similarity. + * + * Two lists are similar if at least one hashtype is in both lists + * and the hashsum matches. All hashes are checked, if one doesn't + * match false is returned regardless of how many matched before. + */ + bool operator==(HashStringList const &other) const; + bool operator!=(HashStringList const &other) const; + + HashStringList() {} + + // simplifying API-compatibility constructors + HashStringList(std::string const &hash) { + if (hash.empty() == false) + list.push_back(HashString(hash)); + } + HashStringList(char const * const hash) { + if (hash != NULL && hash[0] != '\0') + list.push_back(HashString(hash)); + } + + private: + std::vector list; +}; + class Hashes { public: diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index 3fa128cff..d89f07bb5 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -1579,6 +1579,14 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (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++)"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, std::allocator >) 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 ### demangle strangeness - buildd report it as MISSING and as new… (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > const*, indexRecords*)@Base" 0.8.0 ### gcc-4.6 artefacts diff --git a/test/libapt/hashsums_test.cc b/test/libapt/hashsums_test.cc index c06d85e03..ac7d41582 100644 --- a/test/libapt/hashsums_test.cc +++ b/test/libapt/hashsums_test.cc @@ -207,16 +207,56 @@ TEST(HashSumsTest, FileBased) } fd.Close(); - { - HashString sha2("SHA256", sha256.Value()); - EXPECT_TRUE(sha2.VerifyFile(__FILE__)); - } - { - HashString sha2("SHA512", sha512.Value()); - EXPECT_TRUE(sha2.VerifyFile(__FILE__)); - } - { - HashString sha2("SHA256:" + sha256.Value()); - EXPECT_TRUE(sha2.VerifyFile(__FILE__)); - } + HashString sha2file("SHA512", sha512.Value()); + EXPECT_TRUE(sha2file.VerifyFile(__FILE__)); + HashString sha2wrong("SHA512", "00000000000"); + EXPECT_FALSE(sha2wrong.VerifyFile(__FILE__)); + EXPECT_EQ(sha2file, sha2file); + EXPECT_TRUE(sha2file == sha2file); + EXPECT_NE(sha2file, sha2wrong); + EXPECT_TRUE(sha2file != sha2wrong); + + HashString sha2big("SHA256", sha256.Value()); + EXPECT_TRUE(sha2big.VerifyFile(__FILE__)); + HashString sha2small("sha256:" + sha256.Value()); + EXPECT_TRUE(sha2small.VerifyFile(__FILE__)); + EXPECT_EQ(sha2big, sha2small); + EXPECT_TRUE(sha2big == sha2small); + EXPECT_FALSE(sha2big != sha2small); + + HashStringList hashes; + EXPECT_TRUE(hashes.empty()); + EXPECT_TRUE(hashes.push_back(sha2file)); + EXPECT_FALSE(hashes.empty()); + EXPECT_EQ(1, hashes.size()); + + HashStringList wrong; + EXPECT_TRUE(wrong.push_back(sha2wrong)); + EXPECT_NE(wrong, hashes); + EXPECT_FALSE(wrong == hashes); + EXPECT_TRUE(wrong != hashes); + + HashStringList similar; + EXPECT_TRUE(similar.push_back(sha2big)); + EXPECT_NE(similar, hashes); + EXPECT_FALSE(similar == hashes); + EXPECT_TRUE(similar != hashes); + + EXPECT_TRUE(hashes.push_back(sha2big)); + EXPECT_EQ(2, hashes.size()); + EXPECT_TRUE(hashes.push_back(sha2small)); + EXPECT_EQ(2, hashes.size()); + EXPECT_FALSE(hashes.push_back(sha2wrong)); + EXPECT_EQ(2, hashes.size()); + EXPECT_TRUE(hashes.VerifyFile(__FILE__)); + + EXPECT_EQ(similar, hashes); + EXPECT_TRUE(similar == hashes); + EXPECT_FALSE(similar != hashes); + similar.clear(); + EXPECT_TRUE(similar.empty()); + EXPECT_EQ(0, similar.size()); + EXPECT_NE(similar, hashes); + EXPECT_FALSE(similar == hashes); + EXPECT_TRUE(similar != hashes); } -- cgit v1.2.3-70-g09d2 From 3a2b39ee602dd5a98b8fdaee2f1c8e0b13a276e2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 18 Aug 2013 23:27:24 +0200 Subject: use 'best' hash for source authentication Collect all hashes we can get from the source record and put them into a HashStringList so that 'apt-get source' can use it instead of using always the MD5sum. We therefore also deprecate the MD5 struct member in favor of the list. While at it, the parsing of the Files is enhanced so that records which miss "Files" (aka MD5 checksums) are still searched for other checksums as they include just as much data, just not with a nice and catchy name. This is a cherry-pick of 1262d35 with some dirty tricks to preserve ABI. LP: 1098738 --- apt-pkg/deb/debsrcrecords.cc | 162 +++++++++---- apt-pkg/deb/debsrcrecords.h | 1 + apt-pkg/srcrecords.cc | 31 ++- apt-pkg/srcrecords.h | 21 +- cmdline/apt-get.cc | 28 ++- debian/libapt-pkg4.12.symbols | 2 + .../test-ubuntu-bug-1098738-apt-get-source-md5sum | 260 +++++++++++++++++++++ 7 files changed, 445 insertions(+), 60 deletions(-) create mode 100755 test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index a444cbe4d..49a348dd4 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -118,13 +118,32 @@ bool debSrcRecordParser::BuildDepends(std::vector &List) +bool debSrcRecordParser::Files(std::vector &F) { - List.erase(List.begin(),List.end()); - - string Files = Sect.FindS("Files"); - if (Files.empty() == true) + std::vector F2; + if (Files2(F2) == false) return false; + for (std::vector::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 &List) +{ + List.clear(); // Stash the / terminated directory prefix string Base = Sect.FindS("Directory"); @@ -133,51 +152,106 @@ bool debSrcRecordParser::Files(std::vector &List) std::vector const compExts = APT::Configuration::getCompressorExtensions(); - // Iterate over the entire list grabbing each triplet - const char *C = Files.c_str(); - while (*C != 0) - { - pkgSrcRecords::File F; - string Size; - - // Parse each of the elements - if (ParseQuoteWord(C,F.MD5Hash) == false || - ParseQuoteWord(C,Size) == false || - ParseQuoteWord(C,F.Path) == false) - return _error->Error("Error parsing file record"); - - // Parse the size and append the directory - F.Size = atoi(Size.c_str()); - F.Path = Base + F.Path; - - // Try to guess what sort of file it is we are getting. - string::size_type Pos = F.Path.length()-1; - while (1) + for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type) + { + // derive field from checksum type + std::string checksumField("Checksums-"); + if (strcmp(*type, "MD5Sum") == 0) + checksumField = "Files"; // historic name for MD5 checksums + else + checksumField.append(*type); + + string const Files = Sect.FindS(checksumField.c_str()); + if (Files.empty() == true) + continue; + + // Iterate over the entire list grabbing each triplet + const char *C = Files.c_str(); + while (*C != 0) { - string::size_type Tmp = F.Path.rfind('.',Pos); - if (Tmp == string::npos) - break; - if (F.Type == "tar") { - // source v3 has extension 'debian.tar.*' instead of 'diff.*' - if (string(F.Path, Tmp+1, Pos-Tmp) == "debian") - F.Type = "diff"; - break; - } - F.Type = string(F.Path,Tmp+1,Pos-Tmp); - - if (std::find(compExts.begin(), compExts.end(), std::string(".").append(F.Type)) != compExts.end() || - F.Type == "tar") + string hash, size, path; + + // Parse each of the elements + if (ParseQuoteWord(C, hash) == false || + ParseQuoteWord(C, size) == false || + ParseQuoteWord(C, path) == false) + return _error->Error("Error parsing file record in %s of source package %s", checksumField.c_str(), Package().c_str()); + + HashString const hashString(*type, hash); + if (Base.empty() == false) + path = Base + path; + + // look if we have a record for this file already + std::vector::iterator file = List.begin(); + for (; file != List.end(); ++file) + if (file->Path == path) + break; + + // we have it already, store the new hash and be done + if (file != List.end()) { - Pos = Tmp-1; +#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 + // 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()); continue; } - - break; + + // we haven't seen this file yet + pkgSrcRecords::File2 F; + F.Path = path; + 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 + F.Size = F.FileSize; + if (checksumField == "Files") + F.MD5Hash = hash; +#if __GNUC__ >= 4 + #pragma GCC diagnostic pop +#endif + + // Try to guess what sort of file it is we are getting. + string::size_type Pos = F.Path.length()-1; + while (1) + { + string::size_type Tmp = F.Path.rfind('.',Pos); + if (Tmp == string::npos) + break; + if (F.Type == "tar") { + // source v3 has extension 'debian.tar.*' instead of 'diff.*' + if (string(F.Path, Tmp+1, Pos-Tmp) == "debian") + F.Type = "diff"; + break; + } + F.Type = string(F.Path,Tmp+1,Pos-Tmp); + + if (std::find(compExts.begin(), compExts.end(), std::string(".").append(F.Type)) != compExts.end() || + F.Type == "tar") + { + Pos = Tmp-1; + continue; + } + + break; + } + List.push_back(F); } - - List.push_back(F); } - + return true; } /*}}}*/ diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index b65d1480b..2a3fc86c9 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -53,6 +53,7 @@ class debSrcRecordParser : public pkgSrcRecords::Parser return std::string(Start,Stop); }; virtual bool Files(std::vector &F); + bool Files2(std::vector &F); debSrcRecordParser(std::string const &File,pkgIndexFile const *Index) : Parser(Index), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400), 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 #include +#include #include #include #include @@ -147,5 +148,33 @@ const char *pkgSrcRecords::Parser::BuildDepType(unsigned char const &Type) return fields[Type]; } /*}}}*/ +bool pkgSrcRecords::Parser::Files2(std::vector &F2)/*{{{*/ +{ + debSrcRecordParser * const deb = dynamic_cast(this); + if (deb != NULL) + return deb->Files2(F2); - + std::vector F; + if (Files(F) == false) + return false; + for (std::vector::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 e000e176a..dde22bd65 100644 --- a/apt-pkg/srcrecords.h +++ b/apt-pkg/srcrecords.h @@ -14,6 +14,7 @@ #define PKGLIB_SRCRECORDS_H #include +#include #include #include @@ -29,15 +30,28 @@ 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 // Describes a single file struct File { - std::string MD5Hash; - unsigned long Size; + APT_DEPRECATED std::string MD5Hash; + APT_DEPRECATED unsigned long Size; std::string Path; std::string Type; }; - + struct File2 : public File + { + unsigned long long FileSize; + HashStringList Hashes; + }; +#if __GNUC__ >= 4 + #pragma GCC diagnostic pop +#endif + // Abstract parser for each source record class Parser { @@ -77,6 +91,7 @@ class pkgSrcRecords static const char *BuildDepType(unsigned char const &Type) APT_PURE; virtual bool Files(std::vector &F) = 0; + bool Files2(std::vector &F); Parser(const pkgIndexFile *Index) : iIndex(Index) {}; virtual ~Parser() {}; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index cfa79339b..a28537712 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -797,13 +797,13 @@ static bool DoSource(CommandLine &CmdL) } // Back track - vector Lst; - if (Last->Files(Lst) == false) { + vector Lst; + if (Last->Files2(Lst) == false) { return false; } // Load them into the fetcher - for (vector::const_iterator I = Lst.begin(); + for (vector::const_iterator I = Lst.begin(); I != Lst.end(); ++I) { // Try to guess what sort of file it is we are getting. @@ -832,22 +832,26 @@ static bool DoSource(CommandLine &CmdL) queued.insert(Last->Index().ArchiveURI(I->Path)); // check if we have a file with that md5 sum already localy - if(!I->MD5Hash.empty() && FileExists(flNotDir(I->Path))) - { - FileFd Fd(flNotDir(I->Path), FileFd::ReadOnly); - MD5Summation sum; - sum.AddFD(Fd.Fd(), Fd.Size()); - Fd.Close(); - if((string)sum.Result() == I->MD5Hash) + std::string localFile = flNotDir(I->Path); + if (FileExists(localFile) == true) + if(I->Hashes.VerifyFile(localFile) == true) { ioprintf(c1out,_("Skipping already downloaded file '%s'\n"), - flNotDir(I->Path).c_str()); + localFile.c_str()); continue; } + + // see if we have a hash (Acquire::ForceHash is the only way to have none) + HashString const * const hs = I->Hashes.find(NULL); + if (hs == NULL && _config->FindB("APT::Get::AllowUnauthenticated",false) == false) + { + ioprintf(c1out, "Skipping download of file '%s' as requested hashsum is not available for authentication\n", + localFile.c_str()); + continue; } new pkgAcqFile(&Fetcher,Last->Index().ArchiveURI(I->Path), - I->MD5Hash,I->Size, + hs != NULL ? hs->toStr() : "", I->FileSize, Last->Index().SourceInfo(*Last,*I),Src); } } diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols index d89f07bb5..d481e51ed 100644 --- a/debian/libapt-pkg4.12.symbols +++ b/debian/libapt-pkg4.12.symbols @@ -1587,6 +1587,8 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER# (c++)"HashStringList::VerifyFile(std::basic_string, std::allocator >) 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 >&)@Base" 1.0.9.4 + (c++)"debSrcRecordParser::Files2(std::vector >&)@Base" 1.0.9.4 ### demangle strangeness - buildd report it as MISSING and as new… (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::basic_string, std::allocator >, std::vector > const*, indexRecords*)@Base" 0.8.0 ### gcc-4.6 artefacts diff --git a/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum b/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum new file mode 100755 index 000000000..9bdc81264 --- /dev/null +++ b/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum @@ -0,0 +1,260 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture 'native' + +cat > aptarchive/Sources < +Architecture: all +Files: + d41d8cd98f00b204e9800998ecf8427e 0 pkg-md5-ok_1.0.dsc + d41d8cd98f00b204e9800998ecf8427e 0 pkg-md5-ok_1.0.tar.gz + +Package: pkg-sha256-ok +Binary: pkg-sha256-ok +Version: 1.0 +Maintainer: Joe Sixpack +Architecture: all +Files: + d41d8cd98f00b204e9800998ecf8427e 0 pkg-sha256-ok_1.0.dsc + d41d8cd98f00b204e9800998ecf8427e 0 pkg-sha256-ok_1.0.tar.gz +Checksums-Sha1: + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 pkg-sha256-ok_1.0.dsc + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 pkg-sha256-ok_1.0.tar.gz +Checksums-Sha256: + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 pkg-sha256-ok_1.0.dsc + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 pkg-sha256-ok_1.0.tar.gz + +Package: pkg-sha256-bad +Binary: pkg-sha256-bad +Version: 1.0 +Maintainer: Joe Sixpack +Architecture: all +Files: + d41d8cd98f00b204e9800998ecf8427e 0 pkg-sha256-bad_1.0.dsc + d41d8cd98f00b204e9800998ecf8427e 0 pkg-sha256-bad_1.0.tar.gz +Checksums-Sha1: + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 pkg-sha256-bad_1.0.dsc + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 pkg-sha256-bad_1.0.tar.gz +Checksums-Sha256: + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 pkg-sha256-bad_1.0.dsc + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 pkg-sha256-bad_1.0.tar.gz + +Package: pkg-no-md5 +Binary: pkg-no-md5 +Version: 1.0 +Maintainer: Joe Sixpack +Architecture: all +Checksums-Sha1: + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 pkg-no-md5_1.0.dsc + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 pkg-no-md5_1.0.tar.gz +Checksums-Sha256: + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 pkg-no-md5_1.0.dsc + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 pkg-no-md5_1.0.tar.gz + +Package: pkg-mixed-ok +Binary: pkg-mixed-ok +Version: 1.0 +Maintainer: Joe Sixpack +Architecture: all +Checksums-Sha1: + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 pkg-mixed-ok_1.0.tar.gz +Checksums-Sha256: + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 pkg-mixed-ok_1.0.dsc + +Package: pkg-mixed-sha1-bad +Binary: pkg-mixed-sha1-bad +Version: 1.0 +Maintainer: Joe Sixpack +Architecture: all +Checksums-Sha1: + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 pkg-mixed-sha1-bad_1.0.dsc +Checksums-Sha256: + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 pkg-mixed-sha1-bad_1.0.tar.gz + +Package: pkg-mixed-sha2-bad +Binary: pkg-mixed-sha2-bad +Version: 1.0 +Maintainer: Joe Sixpack +Architecture: all +Checksums-Sha1: + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 pkg-mixed-sha2-bad_1.0.dsc +Checksums-Sha256: + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 pkg-mixed-sha2-bad_1.0.tar.gz + +Package: pkg-md5-disagree +Binary: pkg-md5-disagree +Version: 1.0 +Maintainer: Joe Sixpack +Architecture: all +Files: + d41d8cd98f00b204e9800998ecf8427e 0 pkg-md5-disagree_1.0.dsc + d41d8cd98f00b204e9800998ecf8427e 0 pkg-md5-disagree_1.0.tar.gz + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 pkg-md5-disagree_1.0.dsc + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 pkg-md5-disagree_1.0.tar.gz + +Package: pkg-md5-agree +Binary: pkg-md5-agree +Version: 1.0 +Maintainer: Joe Sixpack +Architecture: all +Files: + d41d8cd98f00b204e9800998ecf8427e 0 pkg-md5-agree_1.0.dsc + d41d8cd98f00b204e9800998ecf8427e 0 pkg-md5-agree_1.0.tar.gz + d41d8cd98f00b204e9800998ecf8427e 0 pkg-md5-agree_1.0.tar.gz + d41d8cd98f00b204e9800998ecf8427e 0 pkg-md5-agree_1.0.dsc + +Package: pkg-sha256-disagree +Binary: pkg-sha256-disagree +Version: 1.0 +Maintainer: Joe Sixpack +Architecture: all +Files: + d41d8cd98f00b204e9800998ecf8427e 0 pkg-sha256-disagree_1.0.dsc + d41d8cd98f00b204e9800998ecf8427e 0 pkg-sha256-disagree_1.0.tar.gz +Checksums-Sha1: + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 pkg-sha256-disagree_1.0.dsc + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 pkg-sha256-disagree_1.0.tar.gz +Checksums-Sha256: + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 pkg-sha256-disagree_1.0.dsc + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 pkg-sha256-disagree_1.0.tar.gz + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 pkg-sha256-disagree_1.0.dsc + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 pkg-sha256-disagree_1.0.tar.gz +EOF + +# create fetchable files +for x in 'pkg-md5-ok' 'pkg-sha256-ok' 'pkg-sha256-bad' 'pkg-no-md5' \ + 'pkg-mixed-ok' 'pkg-mixed-sha1-bad' 'pkg-mixed-sha2-bad' \ + 'pkg-md5-agree' 'pkg-md5-disagree' 'pkg-sha256-disagree'; do + touch aptarchive/${x}_1.0.dsc aptarchive/${x}_1.0.tar.gz +done + +setupaptarchive +changetowebserver +testsuccess aptget update + +testok() { + rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz + testequal "Reading package lists... +Building dependency tree... +Need to get 0 B of source archives. +Get:1 http://localhost:8080/ $1 1.0 (dsc) +Get:2 http://localhost:8080/ $1 1.0 (tar) +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 + rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz +} + +testkeep() { + touch ${1}_1.0.dsc ${1}_1.0.tar.gz + testequal "Reading package lists... +Building dependency tree... +Skipping already downloaded file '${1}_1.0.dsc' +Skipping already downloaded file '${1}_1.0.tar.gz' +Need to get 0 B of source archives. +Download complete and in download only mode" aptget source -d "$@" + msgtest 'Files already downloaded are kept for' "$1" + testsuccess --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 +} + +testmismatch() { + rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz + testequal "Reading package lists... +Building dependency tree... +Need to get 0 B of source archives. +Get:1 http://localhost:8080/ $1 1.0 (dsc) +Get:2 http://localhost:8080/ $1 1.0 (tar) +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 + +E: Failed to fetch some archives." aptget source -d "$@" + msgtest 'Files were not download as they have hashsum mismatches for' "$1" + 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... +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 +Need to get 0 B of source archives. +Download complete and in download only mode" aptget source -d "$@" -o Acquire::ForceHash=ROT26 + msgtest 'Files were not download as hash is unavailable for' "$1" + 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... +Building dependency tree... +Need to get 0 B of source archives. +Get:1 http://localhost:8080/ $1 1.0 (dsc) +Get:2 http://localhost:8080/ $1 1.0 (tar) +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 +} + +testok pkg-md5-ok +testkeep pkg-md5-ok +testok pkg-sha256-ok +testkeep pkg-sha256-ok + +# pkg-sha256-bad has a bad SHA sum, but good MD5 sum. If apt is +# checking the best available hash (as it should), this will trigger +# a hash mismatch. +testmismatch pkg-sha256-bad +testmismatch pkg-sha256-bad +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... +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 +Need to get 0 B of source archives. +Download complete and in download only mode" aptget source -d pkg-no-md5 -o Acquire::ForceHash=MD5Sum +msgtest 'Files were not download as MD5 is not available for this package' 'pkg-no-md5' +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... +Building dependency tree... +Need to get 0 B of source archives. +Get:1 http://localhost:8080/ pkg-mixed-sha1-bad 1.0 (tar) +Get:2 http://localhost:8080/ pkg-mixed-sha1-bad 1.0 (dsc) +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... +Building dependency tree... +Need to get 0 B of source archives. +Get:1 http://localhost:8080/ pkg-mixed-sha2-bad 1.0 (tar) +Get:2 http://localhost:8080/ pkg-mixed-sha2-bad 1.0 (dsc) +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 +msgtest 'Only dsc file is downloaded as the tar has hashsum mismatch' 'pkg-mixed-sha2-bad' +testsuccess --nomsg test -e pkg-mixed-sha2-bad_1.0.dsc -a ! -e pkg-mixed-sha2-bad_1.0.tar.gz + +# it gets even more pathologic: multiple entries for one file, some even disagreeing! +testok pkg-md5-agree +testequal '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... +Building dependency tree... +E: Error parsing checksum in Checksums-SHA256 of source package pkg-sha256-disagree' aptget source -d pkg-sha256-disagree -- cgit v1.2.3-70-g09d2 From 50ef3344c3afaaf9943142906b2f976a0337d264 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 13 Jun 2014 08:35:32 +0200 Subject: deprecate the Section member from package struct MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A version belongs to a section and has hence a section member of its own. A package on the other hand can have multiple versions from different sections. This was "solved" by using the section which was parsed first as order of sources.list defines, but that is obviously a horribly unpredictable thing. Users are way better of with the Section() as returned by the version they are dealing with. It is likely the same for all versions of a package, but in the few cases it isn't, it is important (like packages moving from main/* to contrib/* or into oldlibs …). Backport of 7a66977 which actually instantly removes the member. --- apt-pkg/cacheiterators.h | 4 +++- apt-pkg/cacheset.h | 11 ++++++++++- apt-pkg/depcache.cc | 2 +- apt-pkg/pkgcache.cc | 5 ++++- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 2fdf8404d..513f40f17 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -160,7 +160,9 @@ class pkgCache::PkgIterator: public Iterator { // Accessors inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;} - inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;} + // Versions have sections - and packages can have different versions with different sections + // so this interface is broken by design. Run as fast as you can to Version.Section(). + APT_DEPRECATED inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;} 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;} diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 16a3daa42..b7229bc04 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -118,7 +118,16 @@ public: inline const char *Name() const {return getPkg().Name(); } inline std::string FullName(bool const Pretty) const { return getPkg().FullName(Pretty); } inline std::string FullName() const { return getPkg().FullName(); } - inline const char *Section() const {return getPkg().Section(); } + 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 + } inline bool Purge() const {return getPkg().Purge(); } inline const char *Arch() const {return getPkg().Arch(); } inline pkgCache::GrpIterator Group() const { return getPkg().Group(); } diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 42e31396b..16282df21 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1226,7 +1226,7 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, continue; } // now check if we should consider it a automatic dependency or not - if(InstPkg->CurrentVer == 0 && Pkg->Section != 0 && ConfigValueInSubTree("APT::Never-MarkAuto-Sections", Pkg.Section())) + if(InstPkg->CurrentVer == 0 && InstVer->Section != 0 && ConfigValueInSubTree("APT::Never-MarkAuto-Sections", InstVer.Section())) { if(DebugAutoInstall == true) std::clog << OutputInDepth(Depth) << "Setting NOT as auto-installed (direct " diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 58a63459f..d7c9656b9 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -524,7 +524,10 @@ operator<<(std::ostream& out, pkgCache::PkgIterator Pkg) out << " -> " << candidate; if ( newest != "none" && candidate != newest) out << " | " << newest; - out << " > ( " << string(Pkg.Section()==0?"none":Pkg.Section()) << " )"; + if (Pkg->VersionList == 0) + out << " > ( none )"; + else + out << " > ( " << string(Pkg.VersionList().Section()==0?"unknown":Pkg.VersionList().Section()) << " )"; return out; } /*}}}*/ -- cgit v1.2.3-70-g09d2 From c505fa33a6441b451971ce6c636cf2ca4dacdc1d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 28 Sep 2014 01:25:21 +0200 Subject: allow options between command and -- on commandline This used to work before we implemented a stricter commandline parser and e.g. the dd-schroot-cmd command constructs commandlines like this. Reported-By: Helmut Grohne --- apt-pkg/contrib/cmndline.cc | 19 +++++++----- test/libapt/commandline_test.cc | 68 +++++++++++++++++++++++++++++++++++++++++ test/libapt/makefile | 4 +-- 3 files changed, 81 insertions(+), 10 deletions(-) diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index 3799c822d..93c1f4664 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -47,23 +47,26 @@ CommandLine::~CommandLine() char const * CommandLine::GetCommand(Dispatch const * const Map, unsigned int const argc, char const * const * const argv) { - // if there is a -- on the line there must be the word we search for around it - // as -- marks the end of the options, just not sure if the command can be - // considered an option or not, so accept both + // if there is a -- on the line there must be the word we search for either + // before it (as -- marks the end of the options) or right after it (as we can't + // decide if the command is actually an option, given that in theory, you could + // have parameters named like commands) for (size_t i = 1; i < argc; ++i) { if (strcmp(argv[i], "--") != 0) continue; - ++i; - if (i < argc) + // check if command is before -- + for (size_t k = 1; k < i; ++k) for (size_t j = 0; Map[j].Match != NULL; ++j) - if (strcmp(argv[i], Map[j].Match) == 0) + if (strcmp(argv[k], Map[j].Match) == 0) return Map[j].Match; - i -= 2; - if (i != 0) + // see if the next token after -- is the command + ++i; + if (i < argc) for (size_t j = 0; Map[j].Match != NULL; ++j) if (strcmp(argv[i], Map[j].Match) == 0) return Map[j].Match; + // we found a --, but not a command return NULL; } // no --, so search for the first word matching a command diff --git a/test/libapt/commandline_test.cc b/test/libapt/commandline_test.cc index e403a28c8..627f1b486 100644 --- a/test/libapt/commandline_test.cc +++ b/test/libapt/commandline_test.cc @@ -2,6 +2,7 @@ #include #include +#include #include @@ -85,3 +86,70 @@ TEST(CommandLineTest, BoolParsing) } } + +bool DoVoid(CommandLine &) { return false; } + +TEST(CommandLineTest,GetCommand) +{ + CommandLine::Dispatch Cmds[] = { {"install",&DoVoid}, {"remove", &DoVoid}, {0,0} }; + { + char const * argv[] = { "apt-get", "-t", "unstable", "remove", "-d", "foo" }; + char const * com = CommandLine::GetCommand(Cmds, sizeof(argv)/sizeof(argv[0]), argv); + EXPECT_STREQ("remove", com); + std::vector Args = getCommandArgs("apt-get", com); + ::Configuration c; + CommandLine CmdL(Args.data(), &c); + ASSERT_TRUE(CmdL.Parse(sizeof(argv)/sizeof(argv[0]), argv)); + EXPECT_EQ(c.Find("APT::Default-Release"), "unstable"); + EXPECT_TRUE(c.FindB("APT::Get::Download-Only")); + ASSERT_EQ(2, CmdL.FileSize()); + EXPECT_EQ(std::string(CmdL.FileList[0]), "remove"); + EXPECT_EQ(std::string(CmdL.FileList[1]), "foo"); + } + { + char const * argv[] = {"apt-get", "-t", "unstable", "remove", "--", "-d", "foo" }; + char const * com = CommandLine::GetCommand(Cmds, sizeof(argv)/sizeof(argv[0]), argv); + EXPECT_STREQ("remove", com); + std::vector Args = getCommandArgs("apt-get", com); + ::Configuration c; + CommandLine CmdL(Args.data(), &c); + ASSERT_TRUE(CmdL.Parse(sizeof(argv)/sizeof(argv[0]), argv)); + EXPECT_EQ(c.Find("APT::Default-Release"), "unstable"); + EXPECT_FALSE(c.FindB("APT::Get::Download-Only")); + ASSERT_EQ(3, CmdL.FileSize()); + EXPECT_EQ(std::string(CmdL.FileList[0]), "remove"); + EXPECT_EQ(std::string(CmdL.FileList[1]), "-d"); + EXPECT_EQ(std::string(CmdL.FileList[2]), "foo"); + } + { + char const * argv[] = {"apt-get", "-t", "unstable", "--", "remove", "-d", "foo" }; + char const * com = CommandLine::GetCommand(Cmds, sizeof(argv)/sizeof(argv[0]), argv); + EXPECT_STREQ("remove", com); + std::vector Args = getCommandArgs("apt-get", com); + ::Configuration c; + CommandLine CmdL(Args.data(), &c); + ASSERT_TRUE(CmdL.Parse(sizeof(argv)/sizeof(argv[0]), argv)); + EXPECT_EQ(c.Find("APT::Default-Release"), "unstable"); + EXPECT_FALSE(c.FindB("APT::Get::Download-Only")); + ASSERT_EQ(CmdL.FileSize(), 3); + EXPECT_EQ(std::string(CmdL.FileList[0]), "remove"); + EXPECT_EQ(std::string(CmdL.FileList[1]), "-d"); + EXPECT_EQ(std::string(CmdL.FileList[2]), "foo"); + } + { + char const * argv[] = {"apt-get", "install", "-t", "unstable", "--", "remove", "-d", "foo" }; + char const * com = CommandLine::GetCommand(Cmds, sizeof(argv)/sizeof(argv[0]), argv); + EXPECT_STREQ("install", com); + std::vector Args = getCommandArgs("apt-get", com); + ::Configuration c; + CommandLine CmdL(Args.data(), &c); + ASSERT_TRUE(CmdL.Parse(sizeof(argv)/sizeof(argv[0]), argv)); + EXPECT_EQ(c.Find("APT::Default-Release"), "unstable"); + EXPECT_FALSE(c.FindB("APT::Get::Download-Only")); + ASSERT_EQ(CmdL.FileSize(), 4); + EXPECT_EQ(std::string(CmdL.FileList[0]), "install"); + EXPECT_EQ(std::string(CmdL.FileList[1]), "remove"); + EXPECT_EQ(std::string(CmdL.FileList[2]), "-d"); + EXPECT_EQ(std::string(CmdL.FileList[3]), "foo"); + } +} diff --git a/test/libapt/makefile b/test/libapt/makefile index 69a13fd92..7f23ace46 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -14,8 +14,8 @@ test: $(BIN)/gtest$(BASENAME) $(BIN)/gtest$(BASENAME): $(LIB)/gtest.a PROGRAM = gtest${BASENAME} -SLIBS = -lapt-pkg -pthread $(LIB)/gtest.a -LIB_MAKES = apt-pkg/makefile +SLIBS = -lapt-pkg -lapt-private -pthread $(LIB)/gtest.a +LIB_MAKES = apt-pkg/makefile apt-private/makefile SOURCE = gtest_runner.cc $(wildcard *-helpers.cc *_test.cc) include $(PROGRAM_H) -- cgit v1.2.3-70-g09d2 From 8cc3535f2cdcfe1301b641dae8dfadf99658c732 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 18 Oct 2014 14:44:41 +0200 Subject: reenable support for -s (and co) in apt-get source The conversion to accept only relevant options for commands has forgotten another one, so adding it again even through the usecase might very well be equally good served by --print-uris. Closes: 742578 --- apt-private/private-cmndline.cc | 2 +- test/integration/test-apt-get-source | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index a4490f5b4..0b5ba5b4f 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -166,7 +166,7 @@ static bool addArgumentsAPTGet(std::vector &Args, char const if (CmdMatches("install", "remove", "purge", "upgrade", "dist-upgrade", "deselect-upgrade", "autoremove", "clean", "autoclean", "check", - "build-dep", "full-upgrade")) + "build-dep", "full-upgrade", "source")) { addArg('s', "simulate", "APT::Get::Simulate", 0); addArg('s', "just-print", "APT::Get::Simulate", 0); diff --git a/test/integration/test-apt-get-source b/test/integration/test-apt-get-source index 33bd980d0..b27cbbe96 100755 --- a/test/integration/test-apt-get-source +++ b/test/integration/test-apt-get-source @@ -82,3 +82,7 @@ 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. +Fetch source foo" aptget source -q -s foo -- cgit v1.2.3-70-g09d2 From d94082d5b98cdc10f9bc71377229bb57489ffaab Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 10 Nov 2014 17:21:57 +0100 Subject: change codenames to jessie as stable POV in docs --- doc/apt-verbatim.ent | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 126f26b8b..f32f6675f 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -228,10 +228,10 @@ - - - - + + + + - + diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 5538e4a04..257521beb 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.0.8\n" +"Project-Id-Version: apt-doc 1.0.9.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-09-18 07:57+0200\n" +"POT-Creation-Date: 2014-12-03 14:48+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/apt-all.pot b/po/apt-all.pot index d2229a936..7e94b07aa 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 1.0.8\n" +"Project-Id-Version: apt 1.0.9.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -154,7 +154,7 @@ msgid " Version table:" msgstr "" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -303,7 +303,7 @@ msgstr "" msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "" @@ -323,151 +323,151 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1356 #, 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:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -566,7 +566,7 @@ msgstr "" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -658,16 +658,16 @@ msgstr "" msgid "Disk not found." msgstr "" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "" @@ -719,7 +719,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "" @@ -741,7 +741,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -802,7 +802,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "" @@ -811,7 +811,7 @@ msgstr "" msgid "Unable to fetch file, server said '%s'" msgstr "" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "" @@ -861,7 +861,7 @@ msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "" @@ -998,39 +998,17 @@ msgstr "" msgid "Internal error" msgstr "" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "" - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "" - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "" - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" +#: apt-private/private-list.cc:129 +msgid "Listing" msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" +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:93 msgid "Correcting dependencies..." @@ -1060,33 +1038,204 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "" -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" +#: apt-private/private-output.cc:265 +#, c-format +msgid "[installed,upgradable to: %s]" msgstr "" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" +#: apt-private/private-output.cc:268 +msgid "[installed,local]" msgstr "" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" +#: apt-private/private-output.cc:272 +msgid "[installed,automatic]" msgstr "" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" +#: apt-private/private-output.cc:274 +msgid "[installed]" msgstr "" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" +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:35 +#, 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:97 +#, 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:101 +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:82 @@ -1138,6 +1287,10 @@ msgstr "" msgid "You don't have enough free space in %s." msgstr "" +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "" + #: apt-private/private-install.cc:216 apt-private/private-install.cc:238 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" @@ -1326,250 +1479,97 @@ msgstr "" msgid "Package '%s' is not installed, so not removed\n" msgstr "" -#: apt-private/private-list.cc:129 -msgid "Listing" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: apt-private/private-list.cc:159 -#, 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-download.cc:40 +msgid "Authentication warning overridden.\n" +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-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, " +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" msgstr "" -#: apt-private/private-output.cc:731 -#, c-format -msgid "%lu reinstalled, " +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" msgstr "" -#: apt-private/private-output.cc:733 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format -msgid "%lu downgraded, " +msgid "Failed to fetch %s %s\n" msgstr "" -#: apt-private/private-output.cc:735 +#: apt-private/private-sources.cc:58 #, c-format -msgid "%lu to remove and %lu not upgraded.\n" +msgid "Failed to parse %s. Edit again? " msgstr "" -#: apt-private/private-output.cc:739 +#: apt-private/private-sources.cc:70 #, c-format -msgid "%lu not fully installed or removed.\n" +msgid "Your '%s' file changed, please run 'apt-get update'." 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]" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" 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]" +#: apt-private/private-upgrade.cc:25 +msgid "Calculating upgrade... " msgstr "" -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:778 -msgid "Y" +#: apt-private/private-upgrade.cc:28 +msgid "Done" msgstr "" -#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:784 -msgid "N" +#: apt-private/acqprogress.cc:66 +msgid "Hit " msgstr "" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 -#, c-format -msgid "Regex compilation error - %s" +#: apt-private/acqprogress.cc:90 +msgid "Get:" msgstr "" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" +#: apt-private/acqprogress.cc:121 +msgid "Ign " 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)" +#: apt-private/acqprogress.cc:125 +msgid "Err " msgstr "" -#: apt-private/private-sources.cc:58 +#: apt-private/acqprogress.cc:146 #, c-format -msgid "Failed to parse %s. Edit again? " +msgid "Fetched %sB in %s (%sB/s)\n" msgstr "" -#: apt-private/private-sources.cc:70 +#: apt-private/acqprogress.cc:236 #, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "" - -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" +msgid " [Working]" msgstr "" -#: apt-private/private-update.cc:90 +#: apt-private/acqprogress.cc:297 #, 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:94 -msgid "All packages are up to date." -msgstr "" - -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "" - -#: apt-private/private-upgrade.cc:28 -msgid "Done" +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format msgid "Unable to read %s" msgstr "" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1603,7 +1603,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "" @@ -1641,530 +1641,508 @@ msgstr "" msgid "Merging available information" msgstr "" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" msgstr "" -#: cmdline/apt-extracttemplates.cc:254 -#, c-format -msgid "Unable to mkstemp %s" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" msgstr "" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" msgstr "" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" msgstr "" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" +#: apt-inst/filelist.cc:477 +#, c-format +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" 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 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing directory %s" +msgid "Double add of diversion %s -> %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" +#: apt-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" msgstr "" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#, c-format +msgid "The path %s is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/extract.cc:132 #, c-format -msgid "Error processing contents %s" +msgid "Unpacking %s more than once" msgstr "" -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" msgstr "" -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" +#: apt-inst/extract.cc:152 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "" + +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format -msgid "Some files are missing in the package file group `%s'" +msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "DB was corrupted, file renamed to %s.old" +msgid "Failed to rename %s to %s" msgstr "" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:249 #, c-format -msgid "DB is old, attempting to upgrade %s" +msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" msgstr "" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "" + +#: apt-inst/extract.cc:421 #, c-format -msgid "Unable to open DB file %s: %s" +msgid "Overwrite package match with no version for %s" msgstr "" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to stat %s" +msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: ftparchive/cachedb.cc:332 -msgid "Failed to read .dsc" +#: apt-inst/extract.cc:498 +#, c-format +msgid "Unable to stat %s" msgstr "" -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#, c-format +msgid "Failed to write file %s" msgstr "" -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" +#: apt-inst/dirstream.cc:105 +#, c-format +msgid "Failed to close file %s" msgstr "" -#: ftparchive/writer.cc:91 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "W: Unable to read directory %s\n" +msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: ftparchive/writer.cc:96 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "W: Unable to stat %s\n" +msgid "Internal error, could not locate member %s" msgstr "" -#: ftparchive/writer.cc:152 -msgid "E: " +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" msgstr "" -#: ftparchive/writer.cc:154 -msgid "W: " +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" msgstr "" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" msgstr "" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid "Failed to resolve %s" +msgid "Invalid archive member header %s" msgstr "" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" msgstr "" -#: ftparchive/writer.cc:219 -#, c-format -msgid "Failed to open %s" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" msgstr "" -#: ftparchive/writer.cc:278 -#, c-format -msgid " DeLink %s [%s]\n" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" msgstr "" -#: ftparchive/writer.cc:286 -#, c-format -msgid "Failed to readlink %s" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" msgstr "" -#: ftparchive/writer.cc:290 -#, c-format -msgid "Failed to unlink %s" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " msgstr "" -#: ftparchive/writer.cc:298 -#, c-format -msgid "*** Failed to link %s to %s" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" msgstr "" -#: ftparchive/writer.cc:308 -#, c-format -msgid " DeLink limit of %sB hit.\n" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" msgstr "" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" +#: apt-inst/contrib/extracttar.cc:308 +#, c-format +msgid "Unknown TAR header type %u, member %s" msgstr "" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid " %s has no override entry\n" +msgid "Progress: [%3i%%]" msgstr "" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" msgstr "" -#: ftparchive/writer.cc:706 +#: apt-pkg/init.cc:146 #, c-format -msgid " %s has no source override entry\n" +msgid "Packaging system '%s' is not supported" msgstr "" -#: ftparchive/writer.cc:710 +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "" + +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid " %s has no binary override entry either\n" +msgid "Wrote %i records.\n" msgstr "" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#, c-format +msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "Unable to open %s" +msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "Malformed override %s line %llu (%s)" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Failed to read the override file %s" +msgid "Can't find authentication record for: %s" msgstr "" -#: ftparchive/override.cc:166 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "Malformed override %s line %llu #1" +msgid "Hash mismatch for: %s" msgstr "" -#: ftparchive/override.cc:178 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "Malformed override %s line %llu #2" +msgid "The method driver %s could not be found." msgstr "" -#: ftparchive/override.cc:191 +#: apt-pkg/acquire-worker.cc:118 #, c-format -msgid "Malformed override %s line %llu #3" +msgid "Is the package %s installed?" msgstr "" -#: ftparchive/multicompress.cc:73 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "Unknown compression algorithm '%s'" +msgid "Method %s did not start correctly" msgstr "" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "Compressed output %s needs a compression set" +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." msgstr "" -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" msgstr "" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" msgstr "" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" msgstr "" -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" msgstr "" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Failed to rename %s to %s" +msgid "This APT does not support the versioning system '%s'" msgstr "" -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" msgstr "" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" msgstr "" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" msgstr "" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" msgstr "" -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" msgstr "" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" msgstr "" -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" msgstr "" -#: apt-inst/extract.cc:142 -#, c-format -msgid "The directory %s is diverted" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" msgstr "" -#: apt-inst/extract.cc:152 +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "" + +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "" + +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "" + +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "" + +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "" + +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "" + +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" +msgid "Index file type '%s' is not supported" msgstr "" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" +#: apt-pkg/sourcelist.cc:127 +#, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" -#: apt-inst/extract.cc:249 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "The directory %s is being replaced by a non-directory" +msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" +#: apt-pkg/sourcelist.cc:173 +#, c-format +msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-inst/extract.cc:293 -msgid "The path is too long" +#: apt-pkg/sourcelist.cc:184 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-inst/extract.cc:421 +#: apt-pkg/sourcelist.cc:190 #, c-format -msgid "Overwrite package match with no version for %s" +msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-inst/extract.cc:438 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "File %s/%s overwrites the one in the package %s" +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-inst/extract.cc:498 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Unable to stat %s" +msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" +#: apt-pkg/sourcelist.cc:208 +#, c-format +msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" +#: apt-pkg/sourcelist.cc:211 +#, c-format +msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" +#: apt-pkg/sourcelist.cc:217 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" +#: apt-pkg/sourcelist.cc:224 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-inst/filelist.cc:477 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgid "Opening %s" msgstr "" -#: apt-inst/filelist.cc:506 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "Double add of diversion %s -> %s" +msgid "Line %u too long in source list %s." msgstr "" -#: apt-inst/filelist.cc:549 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "Duplicate conf file %s/%s" +msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" +#: apt-pkg/sourcelist.cc:375 +#, c-format +msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" +#: apt-pkg/sourcelist.cc:416 +#, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" -#: apt-inst/contrib/arfile.cc:96 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 #, c-format -msgid "Invalid archive member header %s" +msgid "Clean of %s is not supported" msgstr "" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." msgstr "" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, c-format +msgid "Error occurred while processing %s (%s%d)" msgstr "" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" +#: apt-pkg/pkgcachegen.cc:263 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Unknown TAR header type %u, member %s" +msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "Couldn't stat source package list %s" msgstr "" -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" msgstr "" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" msgstr "" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "List directory %spartial is missing." +msgid "Unable to write to %s" msgstr "" -#: apt-pkg/acquire.cc:91 -#, c-format -msgid "Archives directory %spartial is missing." +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire.cc:99 -#, c-format -msgid "Unable to lock directory %s" +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" msgstr "" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, c-format -msgid "Clean of %s is not supported" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" msgstr "" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" msgstr "" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 @@ -2184,35 +2162,35 @@ msgstr "" msgid "Invalid file format" msgstr "" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, 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:1589 +#: apt-pkg/acquire-item.cc:1656 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" -#: apt-pkg/acquire-item.cc:1631 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2220,132 +2198,110 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, 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:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." +msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Is the package %s installed?" +msgid "List directory %spartial is missing." msgstr "" -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Method %s did not start correctly" +msgid "Archives directory %spartial is missing." msgstr "" -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 #, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgid "Unable to lock directory %s" msgstr "" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "" - -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." -msgstr "" - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/cacheset.cc:489 +#: apt-pkg/acquire.cc:904 #, c-format -msgid "Release '%s' for '%s' was not found" +msgid "Retrieving file %li of %li" msgstr "" -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cacheset.cc:603 +#: apt-pkg/policy.cc:83 #, c-format -msgid "Couldn't find task '%s'" +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -#: apt-pkg/cacheset.cc:609 +#: apt-pkg/policy.cc:422 #, c-format -msgid "Couldn't find any package by regex '%s'" +msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/cacheset.cc:615 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Couldn't find any package by glob '%s'" +msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/cacheset.cc:626 -#, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" - -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +msgid "Could not configure '%s'. " msgstr "" -#: apt-pkg/cacheset.cc:663 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select installed version from package %s as it is not installed" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/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 @@ -2419,9 +2375,20 @@ msgstr "" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." msgstr "" #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 @@ -2450,54 +2417,66 @@ msgstr "" msgid "Failed to write temporary StateFile %s" msgstr "" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" msgstr "" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" msgstr "" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" +msgid "Couldn't find any package by regex '%s'" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 #, c-format -msgid "Wrote %i records with %i missing files.\n" +msgid "Couldn't find any package by glob '%s'" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i mismatched files\n" +msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Can't find authentication record for: %s" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Hash mismatch for: %s" +msgid "Can't select candidate version from package %s as it has no candidate" +msgstr "" + +#: apt-pkg/cacheset.cc:663 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" msgstr "" #: apt-pkg/indexrecords.cc:78 @@ -2525,794 +2504,810 @@ msgstr "" msgid "Invalid 'Date' entry in Release file %s" msgstr "" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" +msgid "%lid %lih %limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:57 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Progress: [%3i%%]" -msgstr "" - -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" +msgid "%lih %limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "%limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "Could not configure '%s'. " +msgid "%lis" msgstr "" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" - -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "" - -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "" - -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" +msgid "Selection %s not found" msgstr "" -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" +#: apt-pkg/contrib/fileutl.cc:190 +#, c-format +msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format -msgid "This APT does not support the versioning system '%s'" +msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" msgstr "" -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/pkgcache.cc:334 -msgid "important" +#: apt-pkg/contrib/fileutl.cc:913 +#, c-format +msgid "Problem closing the gzip file %s" msgstr "" -#: apt-pkg/pkgcache.cc:334 -msgid "required" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" msgstr "" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, c-format +msgid "Could not open file descriptor %d" msgstr "" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" +#: apt-pkg/contrib/fileutl.cc:1514 +#, c-format +msgid "read, still have %llu to read but none left" 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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format -msgid "Error occurred while processing %s (%s%d)" +msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:1938 +#, c-format +msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Package %s %s was not found while processing file dependencies" +msgid "%c%s... Error!" msgstr "" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "" - -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "" - -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" +msgid "%c%s... Done" msgstr "" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" +#: apt-pkg/contrib/progress.cc:181 +msgid "..." msgstr "" -#: apt-pkg/pkgrecords.cc:38 +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 #, c-format -msgid "Index file type '%s' is not supported" +msgid "%c%s... %u%%" msgstr "" -#: 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" +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" +msgid "Couldn't duplicate file descriptor %i" msgstr "" -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/mmap.cc:119 #, c-format -msgid "Did not understand pin type %s" -msgstr "" - -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" +msgid "Couldn't make mmap of %llu bytes" msgstr "" -#: apt-pkg/sourcelist.cc:127 -#, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" msgstr "" -#: apt-pkg/sourcelist.cc:170 -#, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" msgstr "" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" +msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/sourcelist.cc:184 -#, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" msgstr "" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/mmap.cc:341 #, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." msgstr "" -#: apt-pkg/sourcelist.cc:206 -#, c-format -msgid "Malformed line %lu in source list %s (URI)" +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "Malformed line %lu in source list %s (dist)" +msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/sourcelist.cc:211 -#, c-format -msgid "Malformed line %lu in source list %s (URI parse)" +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/sourcelist.cc:217 +#: apt-pkg/contrib/configuration.cc:519 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" +msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/sourcelist.cc:224 +#: apt-pkg/contrib/configuration.cc:633 #, c-format -msgid "Malformed line %lu in source list %s (dist parse)" +msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/sourcelist.cc:335 +#: apt-pkg/contrib/configuration.cc:801 #, c-format -msgid "Opening %s" +msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/sourcelist.cc:371 +#: apt-pkg/contrib/configuration.cc:820 #, c-format -msgid "Malformed line %u in source list %s (type)" +msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/sourcelist.cc:375 +#: apt-pkg/contrib/configuration.cc:837 #, c-format -msgid "Type '%s' is not known on line %u in source list %s" +msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/sourcelist.cc:416 +#: apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "Type '%s' is not known on stanza %u in source list %s" -msgstr "" - -#: apt-pkg/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" +msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "Unable to parse package file %s (1)" +msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format -msgid "Unable to parse package file %s (2)" +msgid "Syntax error %s:%u: Included from here" 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." +#: apt-pkg/contrib/configuration.cc:897 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/configuration.cc:900 #, c-format -msgid "Vendor block %s contains no fingerprint" +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:65 +#: apt-pkg/contrib/configuration.cc:950 #, c-format -msgid "Unable to stat the mount point %s" +msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, c-format +msgid "No keyring installed in %s." msgstr "" -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "" -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format msgid "Command line option %s is not understood" msgstr "" -#: apt-pkg/contrib/cmndline.cc:168 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format msgid "Option %s requires an argument." msgstr "" -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:519 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Unrecognized type abbreviation: '%c'" +msgid "Installing %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:633 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Opening configuration file %s" +msgid "Configuring %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:801 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." +msgid "Removing %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:820 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Syntax error %s:%u: Malformed tag" +msgid "Completely removing %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" +msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/deb/dpkgpm.cc:115 #, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgid "Running post-installation trigger %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:884 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" +msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, c-format -msgid "Syntax error %s:%u: Included from here" +msgid "Could not open file '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgid "Preparing %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:900 +#: apt-pkg/deb/dpkgpm.cc:1008 #, c-format -msgid "Syntax error %s:%u: clear directive requires an option tree as argument" +msgid "Unpacking %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" +msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Not using locking for read only lock file %s" +msgid "Installed %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "Could not open lock file %s" +msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Not using locking for nfs mounted lock file %s" +msgid "Removed %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Could not get lock %s" +msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "List of files can't be created as '%s' is not a directory" +msgid "Completely removed %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgid "Can not write log (%s)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:412 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/contrib/fileutl.cc:421 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "" + +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1726 msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -#: apt-pkg/contrib/fileutl.cc:824 -#, c-format -msgid "Sub-process %s received a segmentation fault." +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" msgstr "" -#: apt-pkg/contrib/fileutl.cc:826 -#, c-format -msgid "Sub-process %s received signal %u." +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" msgstr "" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" msgstr "" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "Sub-process %s exited unexpectedly" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" msgstr "" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/debsystem.cc:94 #, c-format -msgid "Problem closing the gzip file %s" +msgid "Unable to lock the administration directory (%s), are you root?" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1101 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 #, c-format -msgid "Could not open file %s" +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "" + +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" + +#: cmdline/apt-extracttemplates.cc:254 #, c-format -msgid "Could not open file descriptor %d" +msgid "Unable to mkstemp %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1514 +#: 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 #, c-format -msgid "read, still have %llu to read but none left" +msgid "Error processing directory %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "write, still have %llu to write but couldn't" +msgid "Error processing contents %s" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1915 -#, c-format -msgid "Problem closing the file %s" +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1927 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "Problem renaming the file %s to %s" +msgid "Some files are missing in the package file group `%s'" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1938 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "Problem unlinking the file %s" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" +msgid "DB was corrupted, file renamed to %s.old" msgstr "" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "No keyring installed in %s." -msgstr "" - -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" +msgid "DB is old, attempting to upgrade %s" msgstr "" -#: apt-pkg/contrib/mmap.cc:111 -#, c-format -msgid "Couldn't duplicate file descriptor %i" +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" -#: apt-pkg/contrib/mmap.cc:119 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "" - -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "" - -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" +msgid "Unable to open DB file %s: %s" msgstr "" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" +#: ftparchive/cachedb.cc:332 +msgid "Failed to read .dsc" msgstr "" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" msgstr "" -#: apt-pkg/contrib/mmap.cc:341 -#, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" msgstr "" -#: apt-pkg/contrib/mmap.cc:446 +#: ftparchive/writer.cc:91 #, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "" - -#: apt-pkg/contrib/mmap.cc:449 -msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +msgid "W: Unable to read directory %s\n" msgstr "" -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/writer.cc:96 #, c-format -msgid "%c%s... Error!" +msgid "W: Unable to stat %s\n" msgstr "" -#: apt-pkg/contrib/progress.cc:150 -#, c-format -msgid "%c%s... Done" +#: ftparchive/writer.cc:152 +msgid "E: " msgstr "" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +#: ftparchive/writer.cc:154 +msgid "W: " msgstr "" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, c-format -msgid "%c%s... %u%%" +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " msgstr "" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%lid %lih %limin %lis" +msgid "Failed to resolve %s" msgstr "" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" msgstr "" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/writer.cc:219 #, c-format -msgid "%limin %lis" +msgid "Failed to open %s" msgstr "" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:278 #, c-format -msgid "%lis" +msgid " DeLink %s [%s]\n" msgstr "" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:286 #, c-format -msgid "Selection %s not found" +msgid "Failed to readlink %s" msgstr "" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:290 #, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +msgid "Failed to unlink %s" msgstr "" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:298 #, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid "*** Failed to link %s to %s" msgstr "" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:308 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgid " DeLink limit of %sB hit.\n" msgstr "" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Installing %s" +msgid " %s has no override entry\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Configuring %s" +msgid " %s maintainer is %s not %s\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:706 #, c-format -msgid "Removing %s" +msgid " %s has no source override entry\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:710 #, c-format -msgid "Completely removing %s" +msgid " %s has no binary override entry either\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:99 -#, c-format -msgid "Noting disappearance of %s" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Running post-installation trigger %s" +msgid "Unable to open %s" msgstr "" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 #, c-format -msgid "Directory '%s' missing" +msgid "Malformed override %s line %llu (%s)" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Could not open file '%s'" +msgid "Failed to read the override file %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/override.cc:166 #, c-format -msgid "Preparing %s" +msgid "Malformed override %s line %llu #1" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/override.cc:178 #, c-format -msgid "Unpacking %s" +msgid "Malformed override %s line %llu #2" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:191 #, c-format -msgid "Preparing to configure %s" +msgid "Malformed override %s line %llu #3" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Installed %s" +msgid "Unknown compression algorithm '%s'" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/multicompress.cc:103 #, c-format -msgid "Preparing for removal of %s" +msgid "Compressed output %s needs a compression set" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1007 -#, c-format -msgid "Removed %s" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1012 -#, c-format -msgid "Preparing to completely remove %s" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1013 -#, c-format -msgid "Completely removed %s" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/multicompress.cc:232 #, c-format -msgid "Can not write log (%s)" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" +msgid "Internal error, failed to create %s" msgstr "" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1707 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" diff --git a/po/ar.po b/po/ar.po index c4069143e..21241d76c 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -161,7 +161,7 @@ msgid " Version table:" msgstr " جدول النسخ:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -311,7 +311,7 @@ msgstr "تعذر قَفْل دليل التنزيل" msgid "Must specify at least one package to fetch source for" msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "تعذر العثور على مصدر الحزمة %s" @@ -331,151 +331,151 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "تخطي الملف '%s' المنزل مسبقاً\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "تعذر حساب المساحة الحرة في %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "ليس هناك مساحة كافية في %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "إحضار المصدر %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "فشل إحضار بعض الأرشيفات." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "اكتمل التنزيل وفي وضع التنزيل فقط" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "أمر فك الحزمة '%s' فشل.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "أمر البناء '%s' فشل.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1356 #, 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:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "الاتصال بـ%s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "الوحدات المدعومة:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -575,7 +575,7 @@ msgstr "%s هي النسخة الأحدث.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -669,16 +669,16 @@ msgstr "تعذر فكّ القرص المدمج من %s، إذ قد يكون ل msgid "Disk not found." msgstr "لم يُعثر على القرص." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "لم يُعثر على الملف" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "فشيل تنفيذ stat" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "فشل تعيين وقت التعديل" @@ -732,7 +732,7 @@ msgstr "فشل أمر نص تسجيل الدخول البرمجي '%s'، ردّ msgid "TYPE failed, server said: %s" msgstr "فشل TYPE، ردّ الخادم: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "انتهى وقت الاتصال" @@ -754,7 +754,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -815,7 +815,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "تعذر قبول الاتصال" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "" @@ -824,7 +824,7 @@ msgstr "" msgid "Unable to fetch file, server said '%s'" msgstr "تعذر إحضار الملف، ردّ الخادم '%s'" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "" @@ -874,7 +874,7 @@ msgstr "تعذر الاتصال بـ%s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "الاتصال بـ%s" @@ -1011,42 +1011,17 @@ msgstr "فشل الاتصال" msgid "Internal error" msgstr "خطأ داخلي" -#: apt-private/acqprogress.cc:66 -msgid "Hit " +#: apt-private/private-list.cc:129 +msgid "Listing" msgstr "" -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "جلب:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "تجاهل" - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "خطأ" - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "جلب %sب في %s (%sب/ث)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [يعمل]" - -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"تغيير الوسط: الرجاء إدخال القرص المُسمّى\n" -" '%s'\n" -"في السوّاقة '%s' وضغط مفتاح الإدخال\n" +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:93 msgid "Correcting dependencies..." @@ -1076,34 +1051,210 @@ msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح msgid "Unmet dependencies. Try using -f." msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "تحذير: تعذرت المصادقة على الحزم التالية!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [مُثبّتة]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "تم غض النظر عن تحذير المصادقة.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [مُثبّتة]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "تعذرت المصادقة على بعض الحزم" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "تثبيت هذه الحزم دون التحقق منها؟" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [مُثبّتة]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "هناك مشاكل وتم استخدام -y دون --force-yes" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [مُثبّتة]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "فشل إحضار %s %s\n" +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:35 +#, 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:97 +#, 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:101 +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:82 msgid "Internal error, InstallPackages was called with broken packages!" @@ -1154,8 +1305,12 @@ msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n" msgid "You don't have enough free space in %s." msgstr "ليس هناك مساحة كافية في %s." -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "هناك مشاكل وتم استخدام -y دون --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." msgstr "" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be @@ -1350,853 +1505,675 @@ msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n" msgid "Package '%s' is not installed, so not removed\n" msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n" -#: apt-private/private-list.cc:129 -msgid "Listing" -msgstr "" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "تحذير: تعذرت المصادقة على الحزم التالية!" -#: apt-private/private-list.cc:159 +#: apt-private/private-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "تم غض النظر عن تحذير المصادقة.\n" + +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "تعذرت المصادقة على بعض الحزم" + +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "تثبيت هذه الحزم دون التحقق منها؟" + +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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] "" +msgid "Failed to fetch %s %s\n" +msgstr "فشل إحضار %s %s\n" -#: 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!" +#: apt-private/private-sources.cc:58 +#, fuzzy, c-format +msgid "Failed to parse %s. Edit again? " +msgstr "فشل تغيير اسم %s إلى %s" + +#: apt-private/private-sources.cc:70 +#, c-format +msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 -#: apt-private/private-show.cc:89 -msgid "unknown" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" -#: apt-private/private-output.cc:265 -#, fuzzy, c-format -msgid "[installed,upgradable to: %s]" -msgstr " [مُثبّتة]" +#: apt-private/private-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "حساب الترقية..." -#: apt-private/private-output.cc:268 -#, fuzzy -msgid "[installed,local]" -msgstr " [مُثبّتة]" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "تمّ" -#: apt-private/private-output.cc:270 -msgid "[installed,auto-removable]" +#: apt-private/acqprogress.cc:66 +msgid "Hit " msgstr "" -#: apt-private/private-output.cc:272 -#, fuzzy -msgid "[installed,automatic]" -msgstr " [مُثبّتة]" +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "جلب:" -#: apt-private/private-output.cc:274 -#, fuzzy -msgid "[installed]" -msgstr " [مُثبّتة]" +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "تجاهل" -#: apt-private/private-output.cc:277 +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "خطأ" + +#: apt-private/acqprogress.cc:146 #, c-format -msgid "[upgradable from: %s]" -msgstr "" +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "جلب %sب في %s (%sب/ث)\n" -#: apt-private/private-output.cc:281 -msgid "[residual-config]" -msgstr "" +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [يعمل]" -#: apt-private/private-output.cc:455 +#: apt-private/acqprogress.cc:297 #, c-format -msgid "but %s is installed" -msgstr "إلا أن %s مثبت" +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"تغيير الوسط: الرجاء إدخال القرص المُسمّى\n" +" '%s'\n" +"في السوّاقة '%s' وضغط مفتاح الإدخال\n" -#: apt-private/private-output.cc:457 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "but %s is to be installed" -msgstr "إلا أنه سيتم تثبيت %s" +msgid "Unable to read %s" +msgstr "تعذرت قراءة %s" -#: apt-private/private-output.cc:464 -msgid "but it is not installable" -msgstr "إلا أنه غير قابل للتثبيت" +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 +#, c-format +msgid "Unable to change to %s" +msgstr "" -#: apt-private/private-output.cc:466 -msgid "but it is a virtual package" -msgstr "إلا أنها حزمة وهمية" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" -#: apt-private/private-output.cc:469 -msgid "but it is not installed" -msgstr "إلا أنها غير مثبتة" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 +#, fuzzy, c-format +msgid "Can not read mirror file '%s'" +msgstr "فشل إغلاق الملف %s" -#: apt-private/private-output.cc:469 -msgid "but it is not going to be installed" -msgstr "إلا أنه لن يتم تثبيتها" +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "فشل إغلاق الملف %s" -#: apt-private/private-output.cc:474 -msgid " or" -msgstr " أو" +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" +msgstr "" -#: apt-private/private-output.cc:488 apt-private/private-output.cc:500 -msgid "The following packages have unmet dependencies:" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "سيتم تثبيت الحزم الجديدة التالية:" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "سيتم إزالة الحزم التالية:" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "إعداد افتراضيّ سيّء!" -#: apt-private/private-output.cc:571 -msgid "The following packages have been kept back:" -msgstr "سيتم الإبقاء على الحزم التالية:" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "اضغط مفتاح الإدخال للاستمرار." -#: apt-private/private-output.cc:592 -msgid "The following packages will be upgraded:" -msgstr "ستتم ترقية الحزم التالية:" +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" -#: apt-private/private-output.cc:613 -msgid "The following packages will be DOWNGRADED:" -msgstr "سيتم تثبيط الحزم التالية:" +#: dselect/install:102 +#, fuzzy +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "حدثت بعض الأخطاء أثناء فك الحزمة. سأقوم بتهيئة " -#: apt-private/private-output.cc:633 -msgid "The following held packages will be changed:" -msgstr "سيتم تغيير الحزم المبقاة التالية:" +#: dselect/install:103 +#, fuzzy +msgid "will be configured. This may result in duplicate errors" +msgstr "الحزم التي تم تثبيتها. قد يتسبب هذا بظهر أخطاء متكررة" -#: apt-private/private-output.cc:688 -#, c-format -msgid "%s (due to %s) " -msgstr "%s (بسبب %s) " +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "أو أخطاء سبّبتها المُعتمدات المفقودة. لا بأس بهذا، فقط الأخطاء" -#: apt-private/private-output.cc:696 +#: dselect/install:105 msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها وتشغيل التثبيت مجدداً" + +#: dselect/update:30 +msgid "Merging available information" +msgstr "دمج المعلومات المتوفرة" + +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" msgstr "" -"تحذير: ستتم إزالة الحزم الأساسية التالية.\n" -"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!" -#: apt-private/private-output.cc:727 -#, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، " +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "" -#: apt-private/private-output.cc:731 -#, c-format -msgid "%lu reinstalled, " -msgstr "%lu أعيد تثبيتها، " +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "" -#: apt-private/private-output.cc:733 -#, c-format -msgid "%lu downgraded, " -msgstr "%lu مثبطة، " +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "خطأ داخلي في AddDiversion" -#: apt-private/private-output.cc:735 +#: apt-inst/filelist.cc:477 #, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "" -#: apt-private/private-output.cc:739 +#: apt-inst/filelist.cc:506 #, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" +msgid "Double add of diversion %s -> %s" +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 "[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:35 +#: apt-inst/filelist.cc:549 #, c-format -msgid "Regex compilation error - %s" -msgstr "" - -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +msgid "Duplicate conf file %s/%s" +msgstr "ملف تهيئة مُزدوج %s/%s" -#: apt-private/private-show.cc:156 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, 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-sources.cc:58 -#, fuzzy, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "فشل تغيير اسم %s إلى %s" +msgid "The path %s is too long" +msgstr "المسار %s طويل جداً" -#: apt-private/private-sources.cc:70 +#: apt-inst/extract.cc:132 #, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "" - -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "لا يقبل الأمر update أية مُعطيات" +msgid "Unpacking %s more than once" +msgstr "فكّ تحزيم %s أكثر من مرّة" -#: apt-private/private-update.cc:90 +#: apt-inst/extract.cc:142 #, 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:94 -msgid "All packages are up to date." +msgid "The directory %s is diverted" msgstr "" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "حساب الترقية..." - -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "تمّ" - -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 -#, c-format -msgid "Unable to read %s" -msgstr "تعذرت قراءة %s" - -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to change to %s" +msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 -#, c-format -msgid "No mirror file '%s' found " +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" msgstr "" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:287 -#, fuzzy, c-format -msgid "Can not read mirror file '%s'" -msgstr "فشل إغلاق الملف %s" - -#: methods/mirror.cc:315 -#, fuzzy, c-format -msgid "No entry found in mirror file '%s'" -msgstr "فشل إغلاق الملف %s" - -#: methods/mirror.cc:445 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format -msgid "[Mirror: %s]" -msgstr "" - -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "" - -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" +msgid "Failed to stat %s" msgstr "" -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "إعداد افتراضيّ سيّء!" - -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "اضغط مفتاح الإدخال للاستمرار." +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "فشل تغيير اسم %s إلى %s" -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" +#: apt-inst/extract.cc:249 +#, c-format +msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: dselect/install:102 -#, fuzzy -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "حدثت بعض الأخطاء أثناء فك الحزمة. سأقوم بتهيئة " - -#: dselect/install:103 -#, fuzzy -msgid "will be configured. This may result in duplicate errors" -msgstr "الحزم التي تم تثبيتها. قد يتسبب هذا بظهر أخطاء متكررة" - -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "أو أخطاء سبّبتها المُعتمدات المفقودة. لا بأس بهذا، فقط الأخطاء" - -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" -msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها وتشغيل التثبيت مجدداً" - -#: dselect/update:30 -msgid "Merging available information" -msgstr "دمج المعلومات المتوفرة" - -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" msgstr "" -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "تعذر إنشاء %s" +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "المسار طويل جداً" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-inst/extract.cc:421 #, c-format -msgid "Unable to write to %s" -msgstr "تعذرت الكتابة إلى %s" - -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟" - -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "قائمة توسيعات الحزمة طويلة جداً" +msgid "Overwrite package match with no version for %s" +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 +#: apt-inst/extract.cc:438 #, c-format -msgid "Error processing directory %s" -msgstr "خطأ في معالجة الدليل %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "قائمة توسيعات المصدر طويلة جداً" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/extract.cc:498 #, c-format -msgid "Error processing contents %s" -msgstr "خطأ في معالجة المحتويات %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" +msgid "Unable to stat %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "لم تُطابق أية تحديدات" - -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'" +msgid "Failed to write file %s" +msgstr "فشلت كتابة الملف %s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old" +msgid "Failed to close file %s" +msgstr "فشل إغلاق الملف %s" -#: ftparchive/cachedb.cc:83 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "قاعدة البيانات قديمة، محاولة ترقية %s" - -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: ftparchive/cachedb.cc:99 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" +msgid "Internal error, could not locate member %s" +msgstr "خطأ داخلي، تعذر العثور على العضو %s" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 -#, c-format -msgid "Failed to stat %s" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" msgstr "" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "تعذرت إزالة %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "توقيع الأرشيف غير صالح" -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" msgstr "" -#: ftparchive/writer.cc:91 -#, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: تعذرت قراءة الدليل %s\n" +#: apt-inst/contrib/arfile.cc:96 +#, fuzzy, c-format +msgid "Invalid archive member header %s" +msgstr "توقيع الأرشيف غير صالح" -#: ftparchive/writer.cc:96 -#, c-format -msgid "W: Unable to stat %s\n" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" msgstr "" -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " - -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "W: " - -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "الأرشيف قصير جداً" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 -#, c-format -msgid "Failed to resolve %s" -msgstr "" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "فشلت قراءة ترويسات الأرشيف" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" msgstr "" -#: ftparchive/writer.cc:219 -#, c-format -msgid "Failed to open %s" -msgstr "فشل فتح %s" - -#: ftparchive/writer.cc:278 -#, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "فشل تنفيذ gzip" -#: ftparchive/writer.cc:286 -#, c-format -msgid "Failed to readlink %s" -msgstr "" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "أرشيف فاسد" -#: ftparchive/writer.cc:290 -#, c-format -msgid "Failed to unlink %s" -msgstr "" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد" -#: ftparchive/writer.cc:298 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** فشل ربط %s بـ%s" +msgid "Unknown TAR header type %u, member %s" +msgstr "" -#: ftparchive/writer.cc:308 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid " DeLink limit of %sB hit.\n" +msgid "Progress: [%3i%%]" msgstr "" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" msgstr "" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 +#: apt-pkg/init.cc:146 #, c-format -msgid " %s has no override entry\n" -msgstr "" +msgid "Packaging system '%s' is not supported" +msgstr "نظام الحزم '%s' غير مدعوم" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" msgstr "" -#: ftparchive/writer.cc:706 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid " %s has no source override entry\n" +msgid "Wrote %i records.\n" msgstr "" -#: ftparchive/writer.cc:710 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid " %s has no binary override entry either\n" +msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - فشل تعيين الذاكرة" - -#: ftparchive/override.cc:38 ftparchive/override.cc:142 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "Unable to open %s" -msgstr "تعذر فتح %s" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "Malformed override %s line %llu (%s)" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Failed to read the override file %s" +msgid "Can't find authentication record for: %s" msgstr "" -#: ftparchive/override.cc:166 +#: apt-pkg/indexcopy.cc:521 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "MD5Sum غير متطابقة" + +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "Malformed override %s line %llu #1" +msgid "The method driver %s could not be found." msgstr "" -#: ftparchive/override.cc:178 +#: apt-pkg/acquire-worker.cc:118 #, c-format -msgid "Malformed override %s line %llu #2" +msgid "Is the package %s installed?" msgstr "" -#: ftparchive/override.cc:191 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "Malformed override %s line %llu #3" +msgid "Method %s did not start correctly" msgstr "" -#: ftparchive/multicompress.cc:73 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "Unknown compression algorithm '%s'" +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 "" -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل" + +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "تعذرت قراءة قائمة المصادر." + +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" msgstr "" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" msgstr "" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" msgstr "" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" msgstr "" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Internal error, failed to create %s" -msgstr "خطأ داخلي، تعذر إنشاء %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" +msgid "This APT does not support the versioning system '%s'" msgstr "" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" msgstr "" -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "يعتمد" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "فشل تغيير اسم %s إلى %s" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "يعتمد مسبقاً" -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "يستحسن" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "سجل حزمة مجهول!" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "يقترح" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "يعارض" + +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "يستبدل" + +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "يُلغي" + +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" msgstr "" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" -msgstr "فشلت كتابة الملف %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "" -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "فشل إغلاق الملف %s" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "مهم" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "المسار %s طويل جداً" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "مطلوب" -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" -msgstr "فكّ تحزيم %s أكثر من مرّة" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "قياسي" -#: apt-inst/extract.cc:142 +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "اختياري" + +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "إضافي" + +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "The directory %s is diverted" +msgid "Index file type '%s' is not supported" msgstr "" -#: apt-inst/extract.cc:152 +#: apt-pkg/sourcelist.cc:127 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" +msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" +#: apt-pkg/sourcelist.cc:170 +#, c-format +msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-inst/extract.cc:249 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "The directory %s is being replaced by a non-directory" +msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" +#: apt-pkg/sourcelist.cc:184 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "المسار طويل جداً" - -#: apt-inst/extract.cc:421 +#: apt-pkg/sourcelist.cc:190 #, c-format -msgid "Overwrite package match with no version for %s" +msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-inst/extract.cc:438 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "File %s/%s overwrites the one in the package %s" +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-inst/extract.cc:498 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Unable to stat %s" +msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" +#: 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-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" +#: apt-pkg/sourcelist.cc:217 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" +#: apt-pkg/sourcelist.cc:224 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "خطأ داخلي في AddDiversion" +#: apt-pkg/sourcelist.cc:335 +#, c-format +msgid "Opening %s" +msgstr "فتح %s" -#: apt-inst/filelist.cc:477 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgid "Line %u too long in source list %s." msgstr "" -#: apt-inst/filelist.cc:506 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "Double add of diversion %s -> %s" +msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-inst/filelist.cc:549 +#: apt-pkg/sourcelist.cc:375 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "ملف تهيئة مُزدوج %s/%s" - -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "توقيع الأرشيف غير صالح" +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" +#: apt-pkg/sourcelist.cc:416 +#, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" -#: apt-inst/contrib/arfile.cc:96 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 #, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "توقيع الأرشيف غير صالح" +msgid "Clean of %s is not supported" +msgstr "نظام الحزم '%s' غير مدعوم" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." msgstr "" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "الأرشيف قصير جداً" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "فشل تنفيذ gzip" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "أرشيف فاسد" +#: apt-pkg/pkgcachegen.cc:263 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد" +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "" -#: apt-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Unknown TAR header type %u, member %s" +msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "Couldn't stat source package list %s" msgstr "" -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "خطأ داخلي، تعذر العثور على العضو %s" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "قراءة قوائم الحزم" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" msgstr "" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "List directory %spartial is missing." +msgid "Unable to write to %s" +msgstr "تعذرت الكتابة إلى %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire.cc:91 -#, c-format -msgid "Archives directory %spartial is missing." +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" msgstr "" -#: apt-pkg/acquire.cc:99 -#, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "تعذر قفل دليل القائمة" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "نظام الحزم '%s' غير مدعوم" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" msgstr "" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 @@ -2218,35 +2195,35 @@ msgstr "الحجم غير متطابق" msgid "Invalid file format" msgstr "عمليّة غير صالحة %s" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, 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:1589 +#: apt-pkg/acquire-item.cc:1656 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" -#: apt-pkg/acquire-item.cc:1631 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2254,132 +2231,110 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, 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:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." +msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Is the package %s installed?" +msgid "List directory %spartial is missing." msgstr "" -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Method %s did not start correctly" +msgid "Archives directory %spartial is missing." msgstr "" -#: apt-pkg/acquire-worker.cc:455 -#, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "الرجاء إدخال القرص المُسمّى '%s' في السوّاقة '%s' وضغط مفتاح الإدخال." +#: apt-pkg/acquire.cc:99 +#, fuzzy, c-format +msgid "Unable to lock directory %s" +msgstr "تعذر قفل دليل القائمة" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" msgstr "" -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "تعذرت قراءة قائمة المصادر." - -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'" - -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/policy.cc:83 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'" - -#: apt-pkg/cacheset.cc:603 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "تعذر العثور على الحزمة %s" - -#: apt-pkg/cacheset.cc:609 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "تعذر العثور على الحزمة %s" - -#: apt-pkg/cacheset.cc:615 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "تعذر العثور على الحزمة %s" +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" +msgstr "" -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/policy.cc:422 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" +msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/policy.cc:444 #, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/cacheset.cc:663 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "فشل إغلاق الملف %s" + +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select installed version from package %s as it is not installed" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/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 @@ -2455,9 +2410,20 @@ msgstr "كتابة لائحة المصادر الجديدة\n" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." msgstr "" #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 @@ -2487,56 +2453,68 @@ msgstr "فشل فتح %s" msgid "Failed to write temporary StateFile %s" msgstr "فشلت كتابة الملف %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "تعذر العثور على الحزمة %s" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "تعذر العثور على الحزمة %s" + +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "تعذر العثور على الحزمة %s" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records.\n" +msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i missing files.\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i mismatched files\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:663 #, c-format -msgid "Can't find authentication record for: %s" +msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "MD5Sum غير متطابقة" - #: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" @@ -2562,799 +2540,816 @@ msgstr "لاحظ، تحديد %s بدلاً من %s\n" msgid "Invalid 'Date' entry in Release file %s" msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "نظام الحزم '%s' غير مدعوم" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" +msgid "%lid %lih %limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:57 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Progress: [%3i%%]" -msgstr "" - -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" +msgid "%lih %limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "%limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "فشل إغلاق الملف %s" - -#: apt-pkg/packagemanager.cc:630 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" - -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" +msgid "%lis" msgstr "" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "" +#: apt-pkg/contrib/strutl.cc:1258 +#, c-format +msgid "Selection %s not found" +msgstr "تعذر العثور على التحديد %s" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" +#: apt-pkg/contrib/fileutl.cc:190 +#, c-format +msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:218 #, c-format -msgid "This APT does not support the versioning system '%s'" +msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" msgstr "" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "يعتمد" - -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "يعتمد مسبقاً" - -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "يستحسن" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "يقترح" - -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "يعارض" - -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "يستبدل" - -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "يُلغي" - -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "مهم" - -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "مطلوب" - -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "قياسي" - -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "اختياري" - -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "إضافي" - -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" 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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 -#, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)" - -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 #, c-format -msgid "Package %s %s was not found while processing file dependencies" +msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/fileutl.cc:913 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "مشكلة في إغلاق الملف" + +#: apt-pkg/contrib/fileutl.cc:1101 #, c-format -msgid "Couldn't stat source package list %s" +msgid "Could not open file %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "قراءة قوائم الحزم" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, fuzzy, c-format +msgid "Could not open file descriptor %d" +msgstr "فشل إغلاق الملف %s" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format -msgid "Index file type '%s' is not supported" +msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/policy.cc:422 -#, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "" +#: apt-pkg/contrib/fileutl.cc:1915 +#, fuzzy, c-format +msgid "Problem closing the file %s" +msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/policy.cc:444 -#, c-format -msgid "Did not understand pin type %s" -msgstr "" +#: apt-pkg/contrib/fileutl.cc:1927 +#, fuzzy, c-format +msgid "Problem renaming the file %s to %s" +msgstr "مشكلة في مزامنة الملف" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "" +#: apt-pkg/contrib/fileutl.cc:1938 +#, fuzzy, c-format +msgid "Problem unlinking the file %s" +msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "مشكلة في مزامنة الملف" + +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "" +msgid "%c%s... Error!" +msgstr "%c%s... خطأ!" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgid "%c%s... Done" +msgstr "%c%s... تمّ" + +#: apt-pkg/contrib/progress.cc:181 +msgid "..." msgstr "" -#: apt-pkg/sourcelist.cc:173 -#, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... تمّ" + +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgid "Couldn't duplicate file descriptor %i" msgstr "" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/mmap.cc:119 +#, fuzzy, c-format +msgid "Couldn't make mmap of %llu bytes" +msgstr "تعذر التغيير إلى %s" + +#: apt-pkg/contrib/mmap.cc:146 +#, fuzzy +msgid "Unable to close mmap" +msgstr "تعذر فتح %s" + +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "تعذر إرسال الأمر PORT" + +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/mmap.cc:322 +#, fuzzy +msgid "Failed to truncate file" +msgstr "فشلت كتابة الملف %s" + +#: apt-pkg/contrib/mmap.cc:341 #, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Malformed line %lu in source list %s (URI)" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." msgstr "" -#: apt-pkg/sourcelist.cc:208 -#, c-format -msgid "Malformed line %lu in source list %s (dist)" +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" +msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/sourcelist.cc:217 -#, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/sourcelist.cc:224 +#: apt-pkg/contrib/configuration.cc:519 #, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "اختصار نوع مجهول: '%c'" -#: apt-pkg/sourcelist.cc:335 +#: apt-pkg/contrib/configuration.cc:633 #, c-format -msgid "Opening %s" -msgstr "فتح %s" +msgid "Opening configuration file %s" +msgstr "فتح ملف التهيئة %s" -#: apt-pkg/sourcelist.cc:371 +#: apt-pkg/contrib/configuration.cc:801 #, c-format -msgid "Malformed line %u in source list %s (type)" +msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/sourcelist.cc:375 +#: apt-pkg/contrib/configuration.cc:820 #, c-format -msgid "Type '%s' is not known on line %u in source list %s" +msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/sourcelist.cc:416 +#: apt-pkg/contrib/configuration.cc:837 #, c-format -msgid "Type '%s' is not known on stanza %u in source list %s" +msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" +#: apt-pkg/contrib/configuration.cc:877 +#, c-format +msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "Unable to parse package file %s (1)" +msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format -msgid "Unable to parse package file %s (2)" +msgid "Syntax error %s:%u: Included from here" 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." +#: apt-pkg/contrib/configuration.cc:897 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/configuration.cc:900 #, c-format -msgid "Vendor block %s contains no fingerprint" +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:65 +#: apt-pkg/contrib/configuration.cc:950 #, c-format -msgid "Unable to stat the mount point %s" +msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "إجهاض التثبيت." -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "خيار سطر الأمر '%c' [من %s] مجهول." -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format msgid "Command line option %s is not understood" msgstr "خيار سطر الأمر %s غير مفهوم" -#: apt-pkg/contrib/cmndline.cc:168 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format msgid "Option %s requires an argument." msgstr "الخيار %s يتطلّب مُعطى." -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "الخيار '%s' طويل جداً" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "عمليّة غير صالحة %s" -#: apt-pkg/contrib/configuration.cc:519 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "اختصار نوع مجهول: '%c'" +#: apt-pkg/deb/dpkgpm.cc:110 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "تم تثبيت %s" -#: apt-pkg/contrib/configuration.cc:633 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Opening configuration file %s" -msgstr "فتح ملف التهيئة %s" +msgid "Configuring %s" +msgstr "تهيئة %s" -#: apt-pkg/contrib/configuration.cc:801 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "" +msgid "Removing %s" +msgstr "إزالة %s" -#: apt-pkg/contrib/configuration.cc:820 +#: apt-pkg/deb/dpkgpm.cc:113 +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "تمت إزالة %s بالكامل" + +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Syntax error %s:%u: Malformed tag" +msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:115 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" +msgid "Running post-installation trigger %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:877 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 +#, fuzzy, c-format +msgid "Could not open file '%s'" +msgstr "فشل إغلاق الملف %s" + +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "" +msgid "Preparing %s" +msgstr "تحضير %s" -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#: apt-pkg/deb/dpkgpm.cc:1008 #, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "" +msgid "Unpacking %s" +msgstr "فتح %s" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "" +msgid "Preparing to configure %s" +msgstr "التحضير لتهيئة %s" -#: apt-pkg/contrib/configuration.cc:900 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Syntax error %s:%u: clear directive requires an option tree as argument" -msgstr "" +msgid "Installed %s" +msgstr "تم تثبيت %s" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "" +msgid "Preparing for removal of %s" +msgstr "التحضير لإزالة %s" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "" +msgid "Removed %s" +msgstr "تم إزالة %s" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Could not open lock file %s" -msgstr "" +msgid "Preparing to completely remove %s" +msgstr "التحضير لإزالة %s بالكامل" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "" +msgid "Completely removed %s" +msgstr "تمت إزالة %s بالكامل" -#: apt-pkg/contrib/fileutl.cc:223 -#, c-format -msgid "Could not get lock %s" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "تعذرت الكتابة إلى %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 -#, c-format -msgid "List of files can't be created as '%s' is not a directory" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/contrib/fileutl.cc:394 -#, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" msgstr "" -#: apt-pkg/contrib/fileutl.cc:412 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/contrib/fileutl.cc:421 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1726 msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -#: apt-pkg/contrib/fileutl.cc:824 -#, c-format -msgid "Sub-process %s received a segmentation fault." +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" msgstr "" -#: apt-pkg/contrib/fileutl.cc:826 -#, c-format -msgid "Sub-process %s received signal %u." +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" msgstr "" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" msgstr "" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 -#, c-format -msgid "Sub-process %s exited unexpectedly" +#: apt-pkg/deb/dpkgpm.cc:1774 +msgid "" +"No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/contrib/fileutl.cc:913 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "مشكلة في إغلاق الملف" - -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "Could not open file %s" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format -msgid "Could not open file descriptor %d" -msgstr "فشل إغلاق الملف %s" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "" +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "تعذر قفل دليل القائمة" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " +#. 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/contrib/fileutl.cc:1514 -#, c-format -msgid "read, still have %llu to read but none left" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, c-format -msgid "write, still have %llu to write but couldn't" +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1915 +#: cmdline/apt-extracttemplates.cc:254 #, fuzzy, c-format -msgid "Problem closing the file %s" -msgstr "مشكلة في إغلاق الملف" +msgid "Unable to mkstemp %s" +msgstr "تعذر إنشاء %s" -#: apt-pkg/contrib/fileutl.cc:1927 -#, fuzzy, c-format -msgid "Problem renaming the file %s to %s" -msgstr "مشكلة في مزامنة الملف" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟" -#: apt-pkg/contrib/fileutl.cc:1938 -#, fuzzy, c-format -msgid "Problem unlinking the file %s" -msgstr "مشكلة في إغلاق الملف" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "قائمة توسيعات الحزمة طويلة جداً" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -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 +#, c-format +msgid "Error processing directory %s" +msgstr "خطأ في معالجة الدليل %s" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "إجهاض التثبيت." +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "قائمة توسيعات المصدر طويلة جداً" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات" -#: apt-pkg/contrib/mmap.cc:111 +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "" - -#: apt-pkg/contrib/mmap.cc:119 -#, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "تعذر التغيير إلى %s" +msgid "Error processing contents %s" +msgstr "خطأ في معالجة المحتويات %s" -#: apt-pkg/contrib/mmap.cc:146 -#, fuzzy -msgid "Unable to close mmap" -msgstr "تعذر فتح %s" +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -#, fuzzy -msgid "Unable to synchronize mmap" -msgstr "تعذر إرسال الأمر PORT" +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "لم تُطابق أية تحديدات" -#: apt-pkg/contrib/mmap.cc:290 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "" +msgid "Some files are missing in the package file group `%s'" +msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'" -#: apt-pkg/contrib/mmap.cc:322 -#, fuzzy -msgid "Failed to truncate file" -msgstr "فشلت كتابة الملف %s" +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old" -#: apt-pkg/contrib/mmap.cc:341 +#: ftparchive/cachedb.cc:83 #, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "قاعدة البيانات قديمة، محاولة ترقية %s" + +#: ftparchive/cachedb.cc:94 msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" -#: apt-pkg/contrib/mmap.cc:446 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +msgid "Unable to open DB file %s: %s" +msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "تعذرت إزالة %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" msgstr "" -#: apt-pkg/contrib/mmap.cc:449 -msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" msgstr "" -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/writer.cc:91 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... خطأ!" +msgid "W: Unable to read directory %s\n" +msgstr "W: تعذرت قراءة الدليل %s\n" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/writer.cc:96 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... تمّ" - -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +msgid "W: Unable to stat %s\n" msgstr "" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... تمّ" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "W: " -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " msgstr "" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%limin %lis" +msgid "Failed to resolve %s" msgstr "" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 -#, c-format -msgid "%lis" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" msgstr "" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:219 #, c-format -msgid "Selection %s not found" -msgstr "تعذر العثور على التحديد %s" +msgid "Failed to open %s" +msgstr "فشل فتح %s" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:278 #, 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 "تعذر قفل دليل القائمة" +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:286 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgid "Failed to readlink %s" msgstr "" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" +#: ftparchive/writer.cc:290 +#, c-format +msgid "Failed to unlink %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:95 -#, fuzzy, c-format -msgid "Installing %s" -msgstr "تم تثبيت %s" - -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:298 #, c-format -msgid "Configuring %s" -msgstr "تهيئة %s" +msgid "*** Failed to link %s to %s" +msgstr "*** فشل ربط %s بـ%s" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:308 #, c-format -msgid "Removing %s" -msgstr "إزالة %s" +msgid " DeLink limit of %sB hit.\n" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:98 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "تمت إزالة %s بالكامل" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Noting disappearance of %s" +msgid " %s has no override entry\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Running post-installation trigger %s" +msgid " %s maintainer is %s not %s\n" msgstr "" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:706 #, c-format -msgid "Directory '%s' missing" +msgid " %s has no source override entry\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "فشل إغلاق الملف %s" - -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:710 #, c-format -msgid "Preparing %s" -msgstr "تحضير %s" +msgid " %s has no binary override entry either\n" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:993 -#, c-format -msgid "Unpacking %s" -msgstr "فتح %s" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - فشل تعيين الذاكرة" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing to configure %s" -msgstr "التحضير لتهيئة %s" +msgid "Unable to open %s" +msgstr "تعذر فتح %s" -#: apt-pkg/deb/dpkgpm.cc:1000 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 #, c-format -msgid "Installed %s" -msgstr "تم تثبيت %s" +msgid "Malformed override %s line %llu (%s)" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing for removal of %s" -msgstr "التحضير لإزالة %s" +msgid "Failed to read the override file %s" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:166 #, c-format -msgid "Removed %s" -msgstr "تم إزالة %s" +msgid "Malformed override %s line %llu #1" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:178 #, c-format -msgid "Preparing to completely remove %s" -msgstr "التحضير لإزالة %s بالكامل" +msgid "Malformed override %s line %llu #2" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/override.cc:191 #, c-format -msgid "Completely removed %s" -msgstr "تمت إزالة %s بالكامل" - -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "تعذرت الكتابة إلى %s" +msgid "Malformed override %s line %llu #3" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" +#: ftparchive/multicompress.cc:73 +#, c-format +msgid "Unknown compression algorithm '%s'" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" msgstr "" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "خطأ داخلي، تعذر إنشاء %s" + +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1707 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "سجل حزمة مجهول!" + +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" #, fuzzy diff --git a/po/ast.po b/po/ast.po index 629c8f2da..76e1581ae 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2010-10-02 23:35+0100\n" "Last-Translator: Iñigo Varela \n" "Language-Team: Asturian (ast)\n" @@ -154,7 +154,7 @@ msgid " Version table:" msgstr " Tabla de versiones:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -354,7 +354,7 @@ msgstr "Nun pue bloquiase'l direutoriu de descarga" 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Nun pudo alcontrase un paquete fonte pa %s" @@ -380,97 +380,97 @@ msgstr "" "pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal " "paquete.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando'l ficheru yá descargáu '%s'\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nun pue determinase l'espaciu llibre de %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Nun hai espaciu llibre bastante en %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai falta descargar %sB d'archivos fonte.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Fonte descargada %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Falló la descarga de dellos archivos." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Descarga completa y en mou de sólo descarga" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orde de desempaquetáu '%s'.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orde build '%s'.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Falló el procesu fíu" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s nun tien dependencies de construcción.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -479,7 +479,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -488,14 +488,14 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -504,7 +504,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:1358 +#: cmdline/apt-get.cc:1362 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -513,30 +513,30 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, 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:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Fallu al procesar les dependencies de construcción" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Coneutando a %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Módulos sofitaos:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -681,7 +681,7 @@ msgstr "%s yá ta na versión más nueva.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero nun taba ellí" @@ -775,16 +775,16 @@ msgstr "Nun se pudo desmontar el CD-ROM de %s; puede que se tea usando entá." msgid "Disk not found." msgstr "Nun s'atopa'l discu." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Nun s'atopa'l ficheru." -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Falló al lleer" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Nun se pudo afitar la hora de modificación" @@ -838,7 +838,7 @@ msgstr "Falló la orde '%s' del guión d'entrada; el sirvidor dixo: %s" msgid "TYPE failed, server said: %s" msgstr "La triba (TYPE) falló; el sirvidor dixo: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Gandió'l tiempu de conexón" @@ -860,7 +860,7 @@ msgstr "Una rempuesta revirtió'l buffer." msgid "Protocol corruption" msgstr "Corrupción del protocolu" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -921,7 +921,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:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Hebo un problema al xenerar el hash del ficheru" @@ -930,7 +930,7 @@ msgstr "Hebo un problema al xenerar el hash del ficheru" msgid "Unable to fetch file, server said '%s'" msgstr "Nun se pudo descargar el ficheru; el sirvidor dixo '%s'" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Gandió'l tiempu del zócalu de datos" @@ -980,7 +980,7 @@ msgstr "Nun se pudo coneutar a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Coneutando a %s" @@ -1120,42 +1120,17 @@ msgstr "Fallo la conexón" msgid "Internal error" msgstr "Fallu internu" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Oxe " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Des:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ign " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Err " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Descargaos %sB en %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Tresnando]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Cambeu de mediu: Por favor meti'l discu etiquetáu\n" -" '%s'\n" -"na unidá '%s' y calca Intro\n" +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:93 msgid "Correcting dependencies..." @@ -1185,165 +1160,350 @@ msgstr "Habríes d'executar 'apt-get -f install' para igualo." msgid "Unmet dependencies. Try using -f." msgstr "Dependencies incumplíes. Téntalo usando -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "AVISU: ¡Nun pudieron autenticase los siguientes paquetes!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instaláu]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Avisu d'autenticación saltáu.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [Instaláu]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Dellos paquetes nun pudieron autenticase" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "¿Instalar esos paquetes ensin verificación?" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Instaláu]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Hai problemes y utilizose -y ensin --force-yes" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Instaláu]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Falló algamar %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!" - -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgáu." - -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Error internu, ordenar nun finó" +msgid "[upgradable from: %s]" +msgstr "" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" msgstr "" -"Que raro... Los tamaños nun concasen, escribe 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 -#: apt-private/private-install.cc:155 +#: apt-private/private-output.cc:455 #, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "Hai que descargar %sB/%sB d'archivos.\n" +msgid "but %s is installed" +msgstr "pero %s ta instaláu" -#. 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:160 +#: apt-private/private-output.cc:457 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "Hai que descargar %sB d'archivos.\n" +msgid "but %s is to be installed" +msgstr "pero %s ta pa instalar" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Tres d'esta operación, van usase %sB d'espaciu de discu adicional.\n" +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "pero nun ye instalable" -#. 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:172 -#, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Tres d'esta operación, van lliberase %sB d'espaciu de discu.\n" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "pero ye un paquete virtual" -#: apt-private/private-install.cc:200 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "Nun tienes espaciu libre bastante en %s." +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "pero nun ta instaláu" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Conseñose Trivial Only pero ésta nun ye una operación trivial." +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "pero nun va instalase" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Sí, ¡facer lo que digo!" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " o" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Tas a piques de facer daqué potencialmente dañible.\n" -"Pa continuar escribe la frase '%s'\n" -" ?] " +#: 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-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Encaboxar." +#: apt-private/private-output.cc:523 +msgid "The following NEW packages will be installed:" +msgstr "Van instalase los siguientes paquetes NUEVOS:" -#: apt-private/private-install.cc:243 -msgid "Do you want to continue?" -msgstr "¿Quies continuar?" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "Los siguientes paquetes van DESANICIASE:" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Dellos ficheros nun pudieron descargase" +#: apt-private/private-output.cc:571 +msgid "The following packages have been kept back:" +msgstr "Los siguientes paquetes tan reteníos:" -#: apt-private/private-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Nun pudieron algamase dellos archivos, ¿seique executando apt-get update o " -"tentando --fix-missing?" +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "Los siguientes paquetes van actualizase:" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing y cambéu de mediu nun ta sofitao actualmente" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" +msgstr "Los siguientes paquetes van DESACTUALIZASE:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Nun pudieron iguase los paquetes que falten." +#: 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-install.cc:330 -msgid "Aborting install." -msgstr "Encaboxando la instalación." +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (por %s) " -#: apt-private/private-install.cc:366 +#: apt-private/private-output.cc:696 msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"El siguiente paquete desapareció del sistema como\n" -"tolos ficheros fueron sobroescritos por otros paquetes:" -msgstr[1] "" -"Los siguientes paquetes desaparecieron del sistema como\n" -"tolos ficheros fueron sobroescritos por otros paquetes:" +"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-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Nota: Esto faise automáticamente y baxo demanda por dpkg." +#: apt-private/private-output.cc:727 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu actualizaos, %lu nuevos instalaos, " -#: apt-private/private-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover" +#: apt-private/private-output.cc:731 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu reinstalaos, " -#: apt-private/private-install.cc:499 -msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." -msgstr "" +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgáu." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Error internu, ordenar nun finó" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Que raro... Los tamaños nun concasen, escribe 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Hai que descargar %sB/%sB d'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 +#: apt-private/private-install.cc:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Hai que descargar %sB d'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 +#: apt-private/private-install.cc:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Tres d'esta operación, van usase %sB d'espaciu de discu adicional.\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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Tres d'esta operación, van lliberase %sB d'espaciu de discu.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Nun tienes espaciu libre bastante en %s." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Hai problemes y utilizose -y ensin --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "Conseñose Trivial Only pero ésta nun ye 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Sí, ¡facer lo que digo!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Tas a piques de facer daqué potencialmente dañible.\n" +"Pa continuar escribe la frase '%s'\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Encaboxar." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "¿Quies continuar?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Dellos ficheros nun pudieron descargase" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Nun pudieron algamase dellos archivos, ¿seique executando apt-get update o " +"tentando --fix-missing?" + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing y cambéu de mediu nun ta sofitao actualmente" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Nun pudieron iguase los paquetes que falten." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Encaboxando la instalación." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"El siguiente paquete desapareció del sistema como\n" +"tolos ficheros fueron sobroescritos por otros paquetes:" +msgstr[1] "" +"Los siguientes paquetes desaparecieron del sistema como\n" +"tolos ficheros fueron sobroescritos por otros paquetes:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Nota: Esto faise automáticamente y baxo demanda por dpkg." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover" + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" "Hmm, paez que AutoRemover destruyó daqué, lo que nun tendría\n" "por qué pasar. Por favor, unvía un informe de fallu escontra apt." @@ -1473,211 +1633,26 @@ 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:129 -msgid "Listing" -msgstr "" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "AVISU: ¡Nun pudieron autenticase los siguientes paquetes!" -#: apt-private/private-list.cc:159 -#, 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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Avisu d'autenticación saltáu.\n" -#: 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:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Dellos paquetes nun pudieron autenticase" -#: 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:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Error de compilación d'espresión regular - %s" - -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "¿Instalar esos paquetes ensin verificación?" -#: apt-private/private-show.cc:156 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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 "" +msgid "Failed to fetch %s %s\n" +msgstr "Falló algamar %s %s\n" #: apt-private/private-sources.cc:58 #, fuzzy, c-format @@ -1689,20 +1664,8 @@ msgstr "Nun pudo renomase %s como %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: 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:90 -#, 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:94 -msgid "All packages are up to date." +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" #: apt-private/private-upgrade.cc:25 @@ -1713,20 +1676,57 @@ msgstr "Calculando l'anovamientu... " msgid "Done" msgstr "Fecho" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Oxe " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Des:" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ign " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Err " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Descargaos %sB en %s (%sB/s)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Tresnando]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Cambeu de mediu: Por favor meti'l discu etiquetáu\n" +" '%s'\n" +"na unidá '%s' y calca 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-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, 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:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1760,7 +1760,7 @@ msgstr "[Espeyu: %s]" msgid "Failed to create IPC pipe to subprocess" msgstr "Falló criar un tubu IPC al soprocesu" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "Conexón encaboxada prematuramente" @@ -1803,655 +1803,565 @@ msgstr "" msgid "Merging available information" msgstr "Fusionando información disponible" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n" -"\n" -"apt-extracttemplates ye un preséu pa sacar información de\n" -"configuración y plantíes de paquetes de debian.\n" -"\n" -"Opciones:\n" -"-h Esti testu d'aida.\n" -"-t Define'l direutoriu temporal\n" -"-c=? Llei esti ficheru de configuración\n" -"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/" -"tmp\n" - -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Nun ye a lleer %s" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "Llamóse a DropNode nun nodu que ta entá enllazáu" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "Nun se pue escribir en %s" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "¡Fallu al atopar l'elementu enllazáu!" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Nun se pue alcontrar la versión de debconf. ¿Ta instaláu debconf?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Falló al allugar una desvíu" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "La llista d'estensión de paquetes ye enforma llarga" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Fallu internu en AddDiversion" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "Error al procesar el direutoriu %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "La llista d'estensión de fontes ye enforma llarga" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Error al escribir la cabecera al ficheru de conteníos" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Intentando sobrescribir un desvíu, %s -> %s and %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "Error al procesar conteníos %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Uso: apt-ftparchive [escoyetes] orde\n" -"Ordes: packages camin-binariu [ficheru-disvíos [prefixu-camin]]\n" -" sources camin-fonte [ficheru-disvíos [prefixu-camin]]\n" -" contents camin\n" -" release camin\n" -" generate config [grupos]\n" -" clean config\n" -"\n" -"apt-ftparchive xenera índices p'archivos de Debian. Sofita dellos\n" -"estilos de xeneración de reemplazos pa dpkg-scanpackages y\n" -"dpkg-scansources, dende los automatizáos dafechu a los funcionales .\n" -"\n" -"apt-ftparchive xenera ficheros Package d'un árbol de .debs. El ficheru\n" -"Package tien los conteníos de tolos campos de control de cada paquete,\n" -"neto que la suma MD5 y el tamañu del ficheru. Puede usase un ficheru\n" -"de disvíos pa forzar el valor de Priority y Section.\n" -"\n" -"De mou asemeyáu, apt-ftparchive xenera ficheros Sources pa un árbol\n" -"de .dscs. Puede utilizase la opción --source-override pa conseñar un\n" -"ficheru de disvíu de fonte.\n" -"\n" -"Les ordes «packages» y «sources» han d'executase na raiz de l'árbol.\n" -"BinaryPath tien qu'apuntar a la base de la gueta recursiva, y el ficheru\n" -"de disvíos tien que contener les marques de los disvíos. El prefixu de\n" -"camín, si esiste, améstase a los campos de nome de ficheru. Darréu,\n" -"un exemplu d'usu basáu nos archivos de Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Escoyetes:\n" -" -h Esti testu d'aida\n" -" --md5 Xenerar control MD5 \n" -" -s=? Ficheru de desvíu de fontes\n" -" -q Sele\n" -" -d=? Seleiciona la base de datos de caché opcional \n" -" --no-delink Activa'l mou de depuración de desenllaces\n" -" --contents Xenerar ficheru de conteníos de control\n" -" -c=? Lleer esti ficheru de configuración\n" -" -o=? Afita una escoyeta de configuración propia" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Nun concasó denguna seleición" +msgid "Double add of diversion %s -> %s" +msgstr "Doble suma de desvíu %s -> %s" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Falten dellos ficheros nel grupu de ficheros de paquete `%s'" +msgid "Duplicate conf file %s/%s" +msgstr "Ficheru de configuración duplicáu %s/%s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "La BD corrompiose, ficheru renomáu como %s.old" +msgid "The path %s is too long" +msgstr "La trayeutoria %s ye enforma llarga" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "La DB ye antigua, tentando actualizar %s" +msgid "Unpacking %s more than once" +msgstr "Desempaquetando %s más d'una vegada" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"El formatu de la base de datos nun ye válidu. Si anovaste dende una versión " -"anterior d'apt, desanicia y recrea la base de datos." +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "El direutorio %s ta desviáu" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Nun pudo abrise'l ficheru de BD %s: %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "El paquete ta tentando escribir nel oxetivu desviáu %s/%s" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "La trayeutoria de desviación ye enforma llarga" + +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Nun pudo lleese %s" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Nun pudo lleese l'enllaz %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "L'archivu nun tien rexistru de control" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Nun pudo algamase un cursor" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "A: Nun pudo lleese'l direutoriu %s\n" +msgid "Failed to rename %s to %s" +msgstr "Nun pudo renomase %s como %s" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "A: Nun pudo lleese %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "El direutoriu %s ta reemplazándose por un non-direutoriu" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "A: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Fallu al atopar el nodu nel so bote d'enllaz" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: Errores aplicables al ficheru " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "La trayeutoria ye perllarga" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "Nun pudo resolvese %s" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Falló'l percorríu pol árbol" +msgid "Overwrite package match with no version for %s" +msgstr "Sobreescribiendo concordancia del paquete ensin versión pa %s" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to open %s" -msgstr "Nun pudo abrise %s" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s" -#: ftparchive/writer.cc:278 +#: apt-inst/extract.cc:498 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " Desenllazar %s [%s]\n" +msgid "Unable to stat %s" +msgstr "Nun ye a lleer %s" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Failed to readlink %s" -msgstr "Nun pudo lleese l'enllaz %s" +msgid "Failed to write file %s" +msgstr "Falló la escritura nel ficheru %s" -#: ftparchive/writer.cc:290 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to unlink %s" -msgstr "Nun pudo desenllazase %s" +msgid "Failed to close file %s" +msgstr "Falló al pesllar el ficheru %s" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Falló enllazar enllazr %s a %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Esti nun ye un ficheru DEB válidu, falta'l miembru '%s'" -#: ftparchive/writer.cc:308 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Alcanzose'l llímite of %sB de desenllaz.\n" - -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "L'archivu nun tien el campu paquetes" +msgid "Internal error, could not locate member %s" +msgstr "Error internu, nun se pue atopar el miembru %s" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s nun tien la entrada saltos\n" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Ficheru de control inanalizable" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " el curiador de %s ye %s y non %s\n" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Robla del ficheru inválida" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s nun tien la entrada saltos de fonte\n" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Fallu al lleer la testera de miembru del ficheru" -#: ftparchive/writer.cc:710 +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s tampoco nun tiene una entrada binaria de saltos\n" +msgid "Invalid archive member header %s" +msgstr "Testera de miembru del archivu %s inválida" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Nun pudo allugase memoria" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Testera de miembru del ficheru inválida" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Nun pudo abrise %s" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "El ficheru ye perpequeñu" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Saltu mal formáu %s llinia %lu #1" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Falló al lleer les testeres del ficheru" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Nun pudo lleese'l ficheru de saltos %s" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Fallu al crear les tuberíes" -#: ftparchive/override.cc:166 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Saltu mal formáu %s llinia %lu #1" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Fallu al executar gzip " -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Saltu mal formáu %s llinia %lu #2" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Ficheru tollíu" -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Saltu mal formáu %s llinia %lu #3" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Falló la suma de control de tar, ficheru tollíu" -#: ftparchive/multicompress.cc:73 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Algoritmu de compresión desconocíu '%s'" +msgid "Unknown TAR header type %u, member %s" +msgstr "Testera del TAR triba %u desconocida, miembru %s" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "La salida comprimida %s necesita un xuegu de compresión" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Nun pudo criase FICHERU*" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Nun pudo biforcase" +msgid "Progress: [%3i%%]" +msgstr "" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Comprimir fíu" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "Executando dpkt" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/init.cc:146 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Error internu, nun pudo criase %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Fallu na ES al soprocesu/ficheru" +msgid "Packaging system '%s' is not supported" +msgstr "El sistema d'empaquetáu '%s' nun ta sofitáu" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Nun pudo lleese al computar MD5" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Nun pudo determinase una triba de sistema d'empaquetáu afayadiza" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Problem unlinking %s" -msgstr "Problema al desenllazar %s" +msgid "Wrote %i records.\n" +msgstr "%i rexistros escritos.\n" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Nun pudo renomase %s como %s" - -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n" -"\n" -"apt-extracttemplates ye un preséu pa sacar información de\n" -"configuración y plantíes de paquetes de debian.\n" -"\n" -"Opciones:\n" -"-h Esti testu d'aida.\n" -"-t Define'l direutoriu temporal\n" -"-c=? Llei esti ficheru de configuración\n" -"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/" -"tmp\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "%i rexistros escritos con %i ficheros de menos.\n" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "¡Rexistru de paquetes desconocíu!" +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"Usu: apt-sortpkgs [opciones] ficheru1 [ficheru2 ...]\n" -"\n" -"apt-sortpkgs ye un preséu cenciellu pa tresnar ficheros de paquetes.\n" -"La opción -s úsase pa indicar qué triba de ficheru ye.\n" -"\n" -"Opciones:\n" -"-h Esti testu d'aida.\n" -"-s Usa ordenamientu de ficheros fonte\n" -"-c=? Llei esti ficheru de configuración\n" -"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::\n" -"cache=/tmp\n" +"Escribiéronse %i rexistros con %i ficheros perdíos y %i ficheros que nun " +"concasen\n" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Failed to write file %s" -msgstr "Falló la escritura nel ficheru %s" +msgid "Can't find authentication record for: %s" +msgstr "Nun puede alcontrase'l rexistru d'autenticación pa: %s" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "Failed to close file %s" -msgstr "Falló al pesllar el ficheru %s" +msgid "Hash mismatch for: %s" +msgstr "El hash nun concasa pa: %s" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "The path %s is too long" -msgstr "La trayeutoria %s ye enforma llarga" +msgid "The method driver %s could not be found." +msgstr "Nun pudo alncontrase'l controlador de métodu %s." -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" -msgstr "Desempaquetando %s más d'una vegada" +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n" -#: apt-inst/extract.cc:142 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "The directory %s is diverted" -msgstr "El direutorio %s ta desviáu" +msgid "Method %s did not start correctly" +msgstr "El métodu %s nun entamó correchamente" -#: apt-inst/extract.cc:152 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "El paquete ta tentando escribir nel oxetivu desviáu %s/%s" +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-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "La trayeutoria de desviación ye enforma llarga" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "" +"Nun pudieron analizase o abrise les llistes de paquetes o el ficheru d'estáu." -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "El direutoriu %s ta reemplazándose por un non-direutoriu" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Has d'executar apt-get update pa iguar estos problemes" -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Fallu al atopar el nodu nel so bote d'enllaz" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Nun pudo lleese la llista de fontes." -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "La trayeutoria ye perllarga" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Caché de paquetes balera." -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Sobreescribiendo concordancia del paquete ensin versión pa %s" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "El ficheru de caché de paquetes ta tollíu" -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "El ficheru de caché de paquetes ye una versión incompatible" -#: apt-inst/extract.cc:498 +#: apt-pkg/pkgcache.cc:169 +#, 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:174 #, c-format -msgid "Unable to stat %s" -msgstr "Nun ye a lleer %s" +msgid "This APT does not support the versioning system '%s'" +msgstr "Esti APT nun soporta'l sistema de versiones '%s'" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "Llamóse a DropNode nun nodu que ta entá enllazáu" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "La caché de paquetes creóse pa una arquitectura estremada" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "¡Fallu al atopar l'elementu enllazáu!" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Depende de" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Falló al allugar una desvíu" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Predepende de" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Fallu internu en AddDiversion" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Suxer" -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Intentando sobrescribir un desvíu, %s -> %s and %s/%s" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Recomienda" -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Doble suma de desvíu %s -> %s" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "En conflictu con" -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Ficheru de configuración duplicáu %s/%s" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Sustituye a" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Robla del ficheru inválida" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Fai obsoletu a" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Fallu al lleer la testera de miembru del ficheru" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Ruempe" -#: apt-inst/contrib/arfile.cc:96 -#, c-format -msgid "Invalid archive member header %s" -msgstr "Testera de miembru del archivu %s inválida" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Aumenta" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Testera de miembru del ficheru inválida" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "importante" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "El ficheru ye perpequeñu" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "requeríu" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Falló al lleer les testeres del ficheru" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "estándar" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Fallu al crear les tuberíes" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "opcional" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Fallu al executar gzip " +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "extra" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Ficheru tollíu" +#: apt-pkg/pkgrecords.cc:38 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada" -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Falló la suma de control de tar, ficheru tollíu" +#: 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-inst/contrib/extracttar.cc:308 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Testera del TAR triba %u desconocida, miembru %s" +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-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Esti nun ye un ficheru DEB válidu, falta'l miembru '%s'" +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-inst/deb/debfile.cc:132 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "Error internu, nun se pue atopar el miembru %s" - -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Ficheru de control inanalizable" +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/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/sourcelist.cc:190 #, c-format -msgid "List directory %spartial is missing." -msgstr "Falta'l direutoriu de llistes %spartial." +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/acquire.cc:91 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "Archives directory %spartial is missing." -msgstr "Falta'l direutoriu d'archivos %spartial." +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/acquire.cc:99 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Unable to lock directory %s" -msgstr "Nun pudo bloquiase'l direutoriu %s" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Llinia %lu mal formada na llista d'oríxenes %s (URI)" -#: apt-pkg/acquire.cc:490 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/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)" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Descargando ficheru %li de %li (falten %s)" +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/acquire.cc:904 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "Retrieving file %li of %li" -msgstr "Descargando ficheru %li de %li" +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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "falló'l cambiu de nome, %s (%s -> %s)." +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/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "La suma hash nun concasa" +#: apt-pkg/sourcelist.cc:335 +#, c-format +msgid "Opening %s" +msgstr "Abriendo %s" -#: apt-pkg/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "El tamañu nun concasa" +#: 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/acquire-item.cc:173 -#, fuzzy -msgid "Invalid file format" -msgstr "Operación incorreuta: %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/acquire-item.cc:1573 +#: apt-pkg/sourcelist.cc:375 #, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" -msgstr "" +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/acquire-item.cc:1589 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format -msgid "Unable to find hash sum for '%s' in Release file" -msgstr "Nun se pudo parchear el ficheru release %s" +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/acquire-item.cc:1631 -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/clean.cc:39 apt-pkg/acquire.cc:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/clean.cc:64 #, c-format -msgid "" -"Release file for %s is expired (invalid since %s). Updates for this " -"repository will not be applied." -msgstr "" +msgid "Unable to stat %s." +msgstr "Nun pudo lleese %s." -#: apt-pkg/acquire-item.cc:1691 -#, c-format +#: apt-pkg/pkgcachegen.cc:93 +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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Hebo un error al procesar %s (FindPkg)" + +#: apt-pkg/pkgcachegen.cc:257 +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:260 +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:263 +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:266 +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:576 +#, 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:1211 +#, 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:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Lleendo llista de paquetes" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Recoyendo ficheros qu'apurren" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Nun se pue escribir en %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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:241 +msgid "Send request to solver" +msgstr "" + +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "" + +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" + +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "falló'l cambiu de nome, %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "La suma hash nun concasa" + +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "El tamañu nun concasa" + +#: apt-pkg/acquire-item.cc:173 +#, fuzzy +msgid "Invalid file format" +msgstr "Operación incorreuta: %s" + +#: apt-pkg/acquire-item.cc:1640 +#, 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:1656 +#, 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:1698 +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:1736 +#, 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:1758 +#, 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:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2461,12 +2371,12 @@ 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:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "Fallu GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2475,12 +2385,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:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2488,128 +2398,103 @@ msgstr "" "Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal " "paquete %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Nun pudo alncontrase'l controlador de métodu %s." +msgid "Vendor block %s contains no fingerprint" +msgstr "El bloque de fornidor %s nun contién una buelga dixital" -#: apt-pkg/acquire-worker.cc:118 -#, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n" +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#, c-format +msgid "List directory %spartial is missing." +msgstr "Falta'l direutoriu de llistes %spartial." -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Method %s did not start correctly" -msgstr "El métodu %s nun entamó correchamente" +msgid "Archives directory %spartial is missing." +msgstr "Falta'l direutoriu d'archivos %spartial." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 #, 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 "Unable to lock directory %s" +msgstr "Nun pudo bloquiase'l direutoriu %s" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"El paquete %s necesita reinstalase, pero nun s'alcuentra un archivu pa el." +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Descargando ficheru %li de %li (falten %s)" -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Error, pkgProblemResolver::Resolve xeneró frañadures, esto puede ser pola " -"mor de paquetes reteníos." +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Descargando ficheru %li de %li" -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos." +#: 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/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." +#: 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 "" -"Nun pudieron analizase o abrise les llistes de paquetes o el ficheru d'estáu." - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Has d'executar apt-get update pa iguar estos problemes" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Nun pudo lleese la llista de fontes." -#: apt-pkg/cacheset.cc:489 +#: apt-pkg/policy.cc:422 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Nun s'alcontró la distribución '%s' pa '%s'" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "" +"Rexistru inválidu nel ficheru de preferencies %s, nun hai cabecera Paquete" -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Nun s'alcontró la versión '%s' pa '%s'" +msgid "Did not understand pin type %s" +msgstr "Nun s'entiende'l tipu de pin %s" -#: apt-pkg/cacheset.cc:603 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "Nun pudo alcontrase la xera '%s'" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Nun hai prioridá (o ye cero) conseñada pa pin" -#: apt-pkg/cacheset.cc:609 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Nun pudo alcontrase dengún paquete por regex '%s'" +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +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/cacheset.cc:615 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Nun pudo alcontrase dengún paquete por regex '%s'" +msgid "Could not configure '%s'. " +msgstr "Nun pudo abrise'l ficheru '%s'" -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" +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 "" -"Nun pueden seleicionase versiones pal paquete'%s' como puramente virtual" +"Esta execución d'instalación va requerir desaniciar temporalmente'l paquete " +"esencial %s por un cote de Conflictos/Pre-Dependencies. Esto normalmente ye " +"malo, pero si daveres quies facelo, activa la opción APT::Force-LoopBreak." -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 -#, c-format +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 +#, fuzzy msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Some index files failed to download. They have been ignored, or old ones " +"used instead." msgstr "" -"Nun puede seleicionase l'instalador o versión candidata pal paquete '%s' " -"como non tien nengún d'ellos" +"Nun pudieron descargase dellos ficheros d'índiz; inoráronse o usáronse los " +"antiguos nel so llugar." -#: apt-pkg/cacheset.cc:647 -#, 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:655 -#, 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:663 -#, 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/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/cdrom.cc:571 -msgid "Unmounting CD-ROM...\n" -msgstr "Desmontando'l CD-ROM...\n" - -#: apt-pkg/cdrom.cc:586 +#: apt-pkg/cdrom.cc:571 +msgid "Unmounting CD-ROM...\n" +msgstr "Desmontando'l CD-ROM...\n" + +#: apt-pkg/cdrom.cc:586 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Usando el puntu de montaxe de CD-ROM %s\n" @@ -2682,10 +2567,24 @@ msgstr "Escribiendo llista nueva d'oríxenes\n" msgid "Source list entries for this disc are:\n" msgstr "Les entraes de la llista d'oríxenes pa esti discu son:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Nun pudo lleese %s." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"El paquete %s necesita reinstalase, pero nun s'alcuentra un archivu pa el." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Error, pkgProblemResolver::Resolve xeneró frañadures, esto puede ser pola " +"mor de paquetes reteníos." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos." #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2713,57 +2612,75 @@ msgstr "Nun se pudo abrir el ficheru d'estáu %s" msgid "Failed to write temporary StateFile %s" msgstr "Falló la escritura del ficheru temporal d'estáu %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Nun s'alcontró la distribución '%s' pa '%s'" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Nun s'alcontró la versión '%s' pa '%s'" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Nun pudo alcontrase la xera '%s'" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "%i rexistros escritos.\n" +msgid "Couldn't find any package by regex '%s'" +msgstr "Nun pudo alcontrase dengún paquete por regex '%s'" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, 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:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "%i rexistros escritos con %i ficheros de menos.\n" +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/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"Nun puede seleicionase l'instalador o versión candidata pal paquete '%s' " +"como non tien nengún d'ellos" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -"Escribiéronse %i rexistros con %i ficheros perdíos y %i ficheros que nun " -"concasen\n" +"Nun puede seleicionase la versión más nueva pal paquete'%s' como puramente " +"virtual" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "Nun puede alcontrase'l rexistru d'autenticación pa: %s" +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/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:663 #, c-format -msgid "Hash mismatch for: %s" -msgstr "El hash nun concasa pa: %s" +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/indexrecords.cc:78 #, c-format @@ -2790,834 +2707,912 @@ msgstr "Entrada inválida pa 'Valid-Until' nel ficheru release %s" msgid "Invalid 'Date' entry in Release file %s" msgstr "Entrada inválida pa 'Date' nel ficheru release %s" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "El sistema d'empaquetáu '%s' nun ta sofitáu" +msgid "%lid %lih %limin %lis" +msgstr "%lid %lih %limin %lis" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Nun pudo determinase una triba de sistema d'empaquetáu afayadiza" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" +msgstr "%lih %limin %lis" -#: apt-pkg/install-progress.cc:57 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Progress: [%3i%%]" -msgstr "" +msgid "%limin %lis" +msgstr "%limin %lis" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "Executando dpkt" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" +msgstr "%lis" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" -"Nun pudó facese la configuración inmediatamente en '%s'. Por favor, mira man " -"5 apt.conf embaxo APT::Immediate-Configure for details. (%d)" +msgid "Selection %s not found" +msgstr "Escoyeta %s que nun s'atopa" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "Nun pudo abrise'l ficheru '%s'" +#: apt-pkg/contrib/fileutl.cc:190 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "Nun ta usándose bloquéu pal ficheru de bloquéu de sólo llectura %s" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:195 #, 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 execución d'instalación va requerir desaniciar temporalmente'l paquete " -"esencial %s por un cote de Conflictos/Pre-Dependencies. Esto normalmente ye " -"malo, pero si daveres quies facelo, activa la opción APT::Force-LoopBreak." +msgid "Could not open lock file %s" +msgstr "Nun puede abrise'l ficheru de bloquéu %s" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Caché de paquetes balera." +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Nun ta usándose bloquéu pal ficheru de bloquéu %s montáu per nfs" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "El ficheru de caché de paquetes ta tollíu" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Nun se pudo torgar %s" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "El ficheru de caché de paquetes ye una versión incompatible" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" -#: apt-pkg/pkgcache.cc:169 -#, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "El ficheru de caché de paquetes ta tollíu" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:412 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Esti APT nun soporta'l sistema de versiones '%s'" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "La caché de paquetes creóse pa una arquitectura estremada" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Depende de" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "El subprocesu %s recibió un fallu de segmentación." -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Predepende de" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "El subprocesu %s recibió una señal %u." -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Suxer" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "El subprocesu %s devolvió un códigu d'error (%u)" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Recomienda" - -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "En conflictu con" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "El subprocesu %s terminó de manera inesperada" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Sustituye a" +#: apt-pkg/contrib/fileutl.cc:913 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problemes zarrando'l ficheru gzip %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Fai obsoletu a" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Nun se pudo abrir el ficheru %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Ruempe" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "Nun pudo abrise un ficheru descriptor %d" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Aumenta" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Nun pudo criase'l soprocesu IPC" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "importante" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Nun pudo executase'l compresor " -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "requeríu" +#: apt-pkg/contrib/fileutl.cc:1514 +#, fuzzy, c-format +msgid "read, still have %llu to read but none left" +msgstr "lleíos, entá tenía de lleer %lu pero nun queda nada" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "estándar" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, fuzzy, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "escritos, entá tenía d'escribir %lu pero nun pudo facerse" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "opcional" +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" +msgstr "Problemes zarrando'l ficheru %s" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "extra" +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Hai problemes al renomar el ficheru %s a %s" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "La caché tien un sistema de versiones incompatible" +#: apt-pkg/contrib/fileutl.cc:1938 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "Hai problemes desvenceyando'l ficheru %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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 -#, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Hebo un error al procesar %s (FindPkg)" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Hai problemes al sincronizar el ficheru" -#: apt-pkg/pkgcachegen.cc:257 -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/contrib/progress.cc:148 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... ¡Fallu!" -#: apt-pkg/pkgcachegen.cc:260 -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/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Fecho" -#: apt-pkg/pkgcachegen.cc:263 -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/contrib/progress.cc:181 +msgid "..." +msgstr "" -#: apt-pkg/pkgcachegen.cc:266 -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." +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Fecho" -#: apt-pkg/pkgcachegen.cc:576 -#, 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/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Nun se puede facer mmap d'un ficheru baleru" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Nun se puede lleer la llista de paquetes d'oríxenes %s" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Nun pudo duplicase'l ficheru descriptor %i" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Lleendo llista de paquetes" +#: apt-pkg/contrib/mmap.cc:119 +#, fuzzy, c-format +msgid "Couldn't make mmap of %llu bytes" +msgstr "Nun se pudo facer mmap de %lu bytes" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Recoyendo ficheros qu'apurren" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Nun pudo zarrase mmap" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Fallu de E/S al grabar caché d'oríxenes" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Nun se pudo sincronizase mmap " -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Nun se pudo facer mmap de %lu bytes" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Falló al francer el ficheru" + +#: apt-pkg/contrib/mmap.cc:341 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" +"Dynamic MMap escosó l'espaciu. Por favor aumenta'l tamañu de APT::Cache-" +"Start. El valor actual ye : %lu. (man 5 apt.conf)" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." msgstr "" -"Rexistru inválidu nel ficheru de preferencies %s, nun hai cabecera Paquete" +"Nun pudó incrementase'l tamañu de MMap col llímite de %lu bytes ya torgáu" -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Nun pudó incrementase'l tamañu de MMap ya que crecer automáticamente ta " +"desactivao pol usuariu." + +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "Did not understand pin type %s" -msgstr "Nun s'entiende'l tipu de pin %s" +msgid "Unable to stat the mount point %s" +msgstr "Nun puede algamase información del puntu de montaxe %s" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Nun hai prioridá (o ye cero) conseñada pa pin" +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Nun se pudo montar el CD-ROM" -#: 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/contrib/configuration.cc:519 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Triba d'abreviatura que nun se reconoz: «%c»" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/configuration.cc:633 #, 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)" +msgid "Opening configuration file %s" +msgstr "Abriendo ficheros de configuración %s" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/configuration.cc:801 #, 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)" +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/sourcelist.cc:184 +#: apt-pkg/contrib/configuration.cc:820 #, 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)" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Fallu de sintaxis %s:%u: Marca mal formada" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/configuration.cc:837 #, 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)" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Fallu de sintaxis %s:%u: Puxarra extra dempués del valor" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -"Llinia %lu mal formada na llista d'oríxenes %s ([%s] clave %s nun tien valor)" +"Error de sintaxis %s:%u: Les directives pueden facese sólo nel nivel cimeru" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Llinia %lu mal formada na llista d'oríxenes %s (URI)" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Fallu de sintaxis %s:%u: Demasiaes inclusiones añeraes" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist)" +msgid "Syntax error %s:%u: Included from here" +msgstr "Fallu de sintaxis %s:%u: Incluyendo dende equí" -#: 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: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/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list" - -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/configuration.cc:897 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Error de sintaxis %s:%u: La directiva '%s' nun ta sofitada" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/configuration.cc:900 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)" - -#: 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." +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -"Nun pudieron descargase dellos ficheros d'índiz; inoráronse o usáronse los " -"antiguos nel so llugar." +"Fallu de sintaxis %s:%u: Directiva llimpia requier un tres opciones como " +"argumentos" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/configuration.cc:950 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "El bloque de fornidor %s nun contién una buelga dixital" +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/cdromutl.cc:65 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "Nun puede algamase información del puntu de montaxe %s" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "Nun se pudo montar el CD-ROM" +msgid "No keyring installed in %s." +msgstr "L'aniellu de claves nun s'instaló en %s." -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, 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:168 +#: apt-pkg/contrib/cmndline.cc:171 #, 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:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format msgid "Option %s requires an argument." msgstr "La opción %s necesita un argumentu." -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Opción %s: L'axuste del elementu de configuración ha tener un =." -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, 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:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "Opción '%s' enforma llarga" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, 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:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "Operación incorreuta: %s" -#: apt-pkg/contrib/configuration.cc:519 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Triba d'abreviatura que nun se reconoz: «%c»" +msgid "Installing %s" +msgstr "Instalando %s" -#: apt-pkg/contrib/configuration.cc:633 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Opening configuration file %s" -msgstr "Abriendo ficheros de configuración %s" +msgid "Configuring %s" +msgstr "Configurando %s" -#: apt-pkg/contrib/configuration.cc:801 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, 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." +msgid "Removing %s" +msgstr "Desinstalando %s" -#: apt-pkg/contrib/configuration.cc:820 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Fallu de sintaxis %s:%u: Marca mal formada" +msgid "Completely removing %s" +msgstr "Desinstalóse dafechu %s" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Fallu de sintaxis %s:%u: Puxarra extra dempués del valor" +msgid "Noting disappearance of %s" +msgstr "Anotando desaniciáu de %s" -#: apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/deb/dpkgpm.cc:115 #, 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" +msgid "Running post-installation trigger %s" +msgstr "Executando activador de post-instalación de %s" -#: apt-pkg/contrib/configuration.cc:884 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Fallu de sintaxis %s:%u: Demasiaes inclusiones añeraes" +msgid "Directory '%s' missing" +msgstr "Falta'l direutoriu '%s'." -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Fallu de sintaxis %s:%u: Incluyendo dende equí" +msgid "Could not open file '%s'" +msgstr "Nun pudo abrise'l ficheru '%s'" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Error de sintaxis %s:%u: La directiva '%s' nun ta sofitada" +msgid "Preparing %s" +msgstr "Preparando %s" -#: apt-pkg/contrib/configuration.cc:900 +#: apt-pkg/deb/dpkgpm.cc:1008 #, 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" +msgid "Unpacking %s" +msgstr "Desempaquetando %s" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:1013 #, 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" +msgid "Preparing to configure %s" +msgstr "Preparándose pa configurar %s" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Nun ta usándose bloquéu pal ficheru de bloquéu de sólo llectura %s" +msgid "Installed %s" +msgstr "%s instaláu" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "Could not open lock file %s" -msgstr "Nun puede abrise'l ficheru de bloquéu %s" +msgid "Preparing for removal of %s" +msgstr "Preparándose pa desinstalar %s" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Nun ta usándose bloquéu pal ficheru de bloquéu %s montáu per nfs" +msgid "Removed %s" +msgstr "%s desinstaláu" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Could not get lock %s" -msgstr "Nun se pudo torgar %s" +msgid "Preparing to completely remove %s" +msgstr "Preparándose pa desinstalar dafechu %s" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "List of files can't be created as '%s' is not a directory" +msgid "Completely removed %s" +msgstr "Desinstalóse dafechu %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Nun se pue escribir en %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/contrib/fileutl.cc:394 -#, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/contrib/fileutl.cc:412 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +#: apt-pkg/deb/dpkgpm.cc:1719 +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:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "problemes de dependencies - déxase ensin configurar" + +#: apt-pkg/deb/dpkgpm.cc:1726 +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/contrib/fileutl.cc:421 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1732 msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +"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/contrib/fileutl.cc:824 -#, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "El subprocesu %s recibió un fallu de segmentación." +#: apt-pkg/deb/dpkgpm.cc:1739 +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/contrib/fileutl.cc:826 -#, c-format -msgid "Sub-process %s received signal %u." -msgstr "El subprocesu %s recibió una señal %u." +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +#, 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/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "El subprocesu %s devolvió un códigu d'error (%u)" +#: apt-pkg/deb/dpkgpm.cc:1774 +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/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "El subprocesu %s terminó de manera inesperada" +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/contrib/fileutl.cc:913 +#: apt-pkg/deb/debsystem.cc:94 #, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problemes zarrando'l ficheru gzip %s" +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Nun pudo bloquiase'l direutoriu d'alministración (%s), ¿yes root?" -#: apt-pkg/contrib/fileutl.cc:1101 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 #, c-format -msgid "Could not open file %s" -msgstr "Nun se pudo abrir el ficheru %s" +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/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 -#, c-format -msgid "Could not open file descriptor %d" -msgstr "Nun pudo abrise un ficheru descriptor %d" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "Non bloquiáu" -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Nun pudo criase'l soprocesu IPC" - -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Nun pudo executase'l compresor " - -#: apt-pkg/contrib/fileutl.cc:1514 -#, fuzzy, c-format -msgid "read, still have %llu to read but none left" -msgstr "lleíos, entá tenía de lleer %lu pero nun queda nada" +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n" +"\n" +"apt-extracttemplates ye un preséu pa sacar información de\n" +"configuración y plantíes de paquetes de debian.\n" +"\n" +"Opciones:\n" +"-h Esti testu d'aida.\n" +"-t Define'l direutoriu temporal\n" +"-c=? Llei esti ficheru de configuración\n" +"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/" +"tmp\n" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#: cmdline/apt-extracttemplates.cc:254 #, fuzzy, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "escritos, entá tenía d'escribir %lu pero nun pudo facerse" - -#: apt-pkg/contrib/fileutl.cc:1915 -#, c-format -msgid "Problem closing the file %s" -msgstr "Problemes zarrando'l ficheru %s" - -#: apt-pkg/contrib/fileutl.cc:1927 -#, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Hai problemes al renomar el ficheru %s a %s" - -#: apt-pkg/contrib/fileutl.cc:1938 -#, c-format -msgid "Problem unlinking the file %s" -msgstr "Hai problemes desvenceyando'l ficheru %s" - -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Hai problemes al sincronizar el ficheru" +msgid "Unable to mkstemp %s" +msgstr "Nun ye a lleer %s" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 -#, c-format -msgid "No keyring installed in %s." -msgstr "L'aniellu de claves nun s'instaló en %s." +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Nun se pue alcontrar la versión de debconf. ¿Ta instaláu debconf?" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Nun se puede facer mmap d'un ficheru baleru" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "La llista d'estensión de paquetes ye enforma llarga" -#: apt-pkg/contrib/mmap.cc:111 +#: 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 #, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Nun pudo duplicase'l ficheru descriptor %i" - -#: apt-pkg/contrib/mmap.cc:119 -#, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Nun se pudo facer mmap de %lu bytes" - -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Nun pudo zarrase mmap" - -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Nun se pudo sincronizase mmap " +msgid "Error processing directory %s" +msgstr "Error al procesar el direutoriu %s" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Nun se pudo facer mmap de %lu bytes" +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "La llista d'estensión de fontes ye enforma llarga" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Falló al francer el ficheru" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Error al escribir la cabecera al ficheru de conteníos" -#: apt-pkg/contrib/mmap.cc:341 +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "" -"Dynamic MMap escosó l'espaciu. Por favor aumenta'l tamañu de APT::Cache-" -"Start. El valor actual ye : %lu. (man 5 apt.conf)" +msgid "Error processing contents %s" +msgstr "Error al procesar conteníos %s" -#: apt-pkg/contrib/mmap.cc:446 -#, c-format +#: ftparchive/apt-ftparchive.cc:626 msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" -"Nun pudó incrementase'l tamañu de MMap col llímite de %lu bytes ya torgáu" +"Uso: apt-ftparchive [escoyetes] orde\n" +"Ordes: packages camin-binariu [ficheru-disvíos [prefixu-camin]]\n" +" sources camin-fonte [ficheru-disvíos [prefixu-camin]]\n" +" contents camin\n" +" release camin\n" +" generate config [grupos]\n" +" clean config\n" +"\n" +"apt-ftparchive xenera índices p'archivos de Debian. Sofita dellos\n" +"estilos de xeneración de reemplazos pa dpkg-scanpackages y\n" +"dpkg-scansources, dende los automatizáos dafechu a los funcionales .\n" +"\n" +"apt-ftparchive xenera ficheros Package d'un árbol de .debs. El ficheru\n" +"Package tien los conteníos de tolos campos de control de cada paquete,\n" +"neto que la suma MD5 y el tamañu del ficheru. Puede usase un ficheru\n" +"de disvíos pa forzar el valor de Priority y Section.\n" +"\n" +"De mou asemeyáu, apt-ftparchive xenera ficheros Sources pa un árbol\n" +"de .dscs. Puede utilizase la opción --source-override pa conseñar un\n" +"ficheru de disvíu de fonte.\n" +"\n" +"Les ordes «packages» y «sources» han d'executase na raiz de l'árbol.\n" +"BinaryPath tien qu'apuntar a la base de la gueta recursiva, y el ficheru\n" +"de disvíos tien que contener les marques de los disvíos. El prefixu de\n" +"camín, si esiste, améstase a los campos de nome de ficheru. Darréu,\n" +"un exemplu d'usu basáu nos archivos de Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Escoyetes:\n" +" -h Esti testu d'aida\n" +" --md5 Xenerar control MD5 \n" +" -s=? Ficheru de desvíu de fontes\n" +" -q Sele\n" +" -d=? Seleiciona la base de datos de caché opcional \n" +" --no-delink Activa'l mou de depuración de desenllaces\n" +" --contents Xenerar ficheru de conteníos de control\n" +" -c=? Lleer esti ficheru de configuración\n" +" -o=? Afita una escoyeta de configuración propia" -#: apt-pkg/contrib/mmap.cc:449 -msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." -msgstr "" -"Nun pudó incrementase'l tamañu de MMap ya que crecer automáticamente ta " -"desactivao pol usuariu." +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Nun concasó denguna seleición" -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... ¡Fallu!" +msgid "Some files are missing in the package file group `%s'" +msgstr "Falten dellos ficheros nel grupu de ficheros de paquete `%s'" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Fecho" - -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "" - -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Fecho" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "La BD corrompiose, ficheru renomáu como %s.old" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%lid %lih %limin %lis" +msgid "DB is old, attempting to upgrade %s" +msgstr "La DB ye antigua, tentando actualizar %s" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" -msgstr "%lih %limin %lis" +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"El formatu de la base de datos nun ye válidu. Si anovaste dende una versión " +"anterior d'apt, desanicia y recrea la base de datos." -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "%limin %lis" -msgstr "%limin %lis" +msgid "Unable to open DB file %s: %s" +msgstr "Nun pudo abrise'l ficheru de BD %s: %s" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 -#, c-format -msgid "%lis" -msgstr "%lis" +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Nun pudo lleese l'enllaz %s" -#: apt-pkg/contrib/strutl.cc:1258 -#, c-format -msgid "Selection %s not found" -msgstr "Escoyeta %s que nun s'atopa" +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "L'archivu nun tien rexistru de control" -#: 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?" +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Nun pudo algamase un cursor" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:91 #, 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 "W: Unable to read directory %s\n" +msgstr "A: Nun pudo lleese'l direutoriu %s\n" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:96 #, 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. " +msgid "W: Unable to stat %s\n" +msgstr "A: Nun pudo lleese %s\n" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "Non bloquiáu" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " -#: apt-pkg/deb/dpkgpm.cc:95 -#, c-format -msgid "Installing %s" -msgstr "Instalando %s" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "A: " -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 -#, c-format -msgid "Configuring %s" -msgstr "Configurando %s" +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: Errores aplicables al ficheru " -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "Removing %s" -msgstr "Desinstalando %s" +msgid "Failed to resolve %s" +msgstr "Nun pudo resolvese %s" -#: apt-pkg/deb/dpkgpm.cc:98 -#, c-format -msgid "Completely removing %s" -msgstr "Desinstalóse dafechu %s" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Falló'l percorríu pol árbol" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:219 #, c-format -msgid "Noting disappearance of %s" -msgstr "Anotando desaniciáu de %s" +msgid "Failed to open %s" +msgstr "Nun pudo abrise %s" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:278 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Executando activador de post-instalación de %s" +msgid " DeLink %s [%s]\n" +msgstr " Desenllazar %s [%s]\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:286 #, c-format -msgid "Directory '%s' missing" -msgstr "Falta'l direutoriu '%s'." +msgid "Failed to readlink %s" +msgstr "Nun pudo lleese l'enllaz %s" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:290 #, c-format -msgid "Could not open file '%s'" -msgstr "Nun pudo abrise'l ficheru '%s'" +msgid "Failed to unlink %s" +msgstr "Nun pudo desenllazase %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:298 #, c-format -msgid "Preparing %s" -msgstr "Preparando %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Falló enllazar enllazr %s a %s" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:308 #, c-format -msgid "Unpacking %s" -msgstr "Desempaquetando %s" +msgid " DeLink limit of %sB hit.\n" +msgstr " Alcanzose'l llímite of %sB de desenllaz.\n" + +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "L'archivu nun tien el campu paquetes" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Preparing to configure %s" -msgstr "Preparándose pa configurar %s" +msgid " %s has no override entry\n" +msgstr " %s nun tien la entrada saltos\n" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Installed %s" -msgstr "%s instaláu" +msgid " %s maintainer is %s not %s\n" +msgstr " el curiador de %s ye %s y non %s\n" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing for removal of %s" -msgstr "Preparándose pa desinstalar %s" +msgid " %s has no source override entry\n" +msgstr " %s nun tien la entrada saltos de fonte\n" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/writer.cc:710 #, c-format -msgid "Removed %s" -msgstr "%s desinstaláu" +msgid " %s has no binary override entry either\n" +msgstr " %s tampoco nun tiene una entrada binaria de saltos\n" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Nun pudo allugase memoria" + +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Preparándose pa desinstalar dafechu %s" +msgid "Unable to open %s" +msgstr "Nun pudo abrise %s" -#: apt-pkg/deb/dpkgpm.cc:1013 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Saltu mal formáu %s llinia %lu #1" + +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Completely removed %s" -msgstr "Desinstalóse dafechu %s" +msgid "Failed to read the override file %s" +msgstr "Nun pudo lleese'l ficheru de saltos %s" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/override.cc:166 #, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Nun se pue escribir en %s" +msgid "Malformed override %s line %llu #1" +msgstr "Saltu mal formáu %s llinia %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "Saltu mal formáu %s llinia %lu #2" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "Saltu mal formáu %s llinia %lu #3" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" +#: ftparchive/multicompress.cc:73 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Algoritmu de compresión desconocíu '%s'" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "Ensin informe escritu d'apport porque MaxReports llegó dafechu" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "La salida comprimida %s necesita un xuegu de compresión" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "problemes de dependencies - déxase ensin configurar" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Nun pudo criase FICHERU*" -#: apt-pkg/deb/dpkgpm.cc:1694 -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" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Nun pudo biforcase" -#: apt-pkg/deb/dpkgpm.cc:1700 -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" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Comprimir fíu" -#: apt-pkg/deb/dpkgpm.cc:1707 -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" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Error internu, nun pudo criase %s" + +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "Fallu na ES al soprocesu/ficheru" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Nun pudo lleese al computar MD5" + +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Problema al desenllazar %s" + +#: cmdline/apt-internal-solver.cc:49 #, fuzzy msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de " -"discu llenu" +"Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n" +"\n" +"apt-extracttemplates ye un preséu pa sacar información de\n" +"configuración y plantíes de paquetes de debian.\n" +"\n" +"Opciones:\n" +"-h Esti testu d'aida.\n" +"-t Define'l direutoriu temporal\n" +"-c=? Llei esti ficheru de configuración\n" +"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/" +"tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "¡Rexistru de paquetes desconocíu!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu E/S " -"dpkg" +"Usu: apt-sortpkgs [opciones] ficheru1 [ficheru2 ...]\n" +"\n" +"apt-sortpkgs ye un preséu cenciellu pa tresnar ficheros de paquetes.\n" +"La opción -s úsase pa indicar qué triba de ficheru ye.\n" +"\n" +"Opciones:\n" +"-h Esti testu d'aida.\n" +"-s Usa ordenamientu de ficheros fonte\n" +"-c=? Llei esti ficheru de configuración\n" +"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::\n" +"cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/bg.po b/po/bg.po index ea7382513..dae97727a 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2012-06-25 17:23+0300\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Таблица с версиите:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -358,7 +358,7 @@ msgstr "Неуспех при заключването на директория msgid "Must specify at least one package to fetch source for" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Неуспех при намирането на изходен код на пакет %s" @@ -385,80 +385,80 @@ msgstr "" "за да изтеглите последните промени в пакета (евентуално в процес на " "разработка).\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускане на вече изтегления файл „%s“\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех при определянето на свободното пространство в %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Нямате достатъчно свободно пространство в %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Изтегляне на изходен код %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Неуспех при изтеглянето на някои архиви." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Изтеглянето завърши в режим само на изтегляне" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" -#: cmdline/apt-get.cc:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Командата за разпакетиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Командата за компилиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Процесът-потомък пропадна" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "" "Трябва да укажете поне един пакет за проверка на зависимости за компилиране" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -467,18 +467,18 @@ msgstr "" "Липсва информация за архитектурата %s. Прегледайте информацията за APT::" "Architectures в apt.conf(5)." -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Неуспех при получаването на информация за зависимостите за компилиране на %s" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -487,7 +487,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, %s не се позволява " "за пакети „%s“" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -496,14 +496,14 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "не може да бъде намерен" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " "пакет %s е твърде нов" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -512,7 +512,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже версията " "кандидат на пакета %s не може да удовлетвори изискването за версия" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -521,30 +521,30 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "няма подходящи версии" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Журнал на промените в %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Поддържани модули:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -688,7 +688,7 @@ msgstr "Пакетът „%s“ вече е задържан.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Изчака се завършването на %s, но той не беше пуснат" @@ -802,16 +802,16 @@ msgstr "Неуспех при демонтирането на CD-ROM в %s, мо msgid "Disk not found." msgstr "Дискът не е намерен." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Файлът не е намерен" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Неуспех при получаването на атрибути" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Неуспех при задаването на време на промяна" @@ -865,7 +865,7 @@ msgstr "Командата „%s“ на скрипта за влизане се msgid "TYPE failed, server said: %s" msgstr "TYPE се провали, сървърът съобщи: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Допустимото време за свързването изтече" @@ -887,7 +887,7 @@ msgstr "Отговорът препълни буфера." msgid "Protocol corruption" msgstr "Развален протокол" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -950,7 +950,7 @@ msgstr "Времето за установяване на връзка с гне msgid "Unable to accept connection" msgstr "Невъзможно е да се приеме свързването" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Проблем при хеширане на файла" @@ -959,7 +959,7 @@ msgstr "Проблем при хеширане на файла" msgid "Unable to fetch file, server said '%s'" msgstr "Неуспех при изтеглянето на файла, сървърът съобщи „%s“" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Времето за връзка с гнездо за данни изтече" @@ -1009,7 +1009,7 @@ msgstr "Неуспех при свързване с %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Свързване с %s" @@ -1152,42 +1152,17 @@ msgstr "Неуспех при свързването" msgid "Internal error" msgstr "Вътрешна грешка" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Поп " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Изт:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Игн " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Грш " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Изтеглени %sB за %s (%sB/сек)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [В процес на работа]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Смяна на носител: сложете диска с етикет\n" -" „%s“\n" -"в устройството „%s“ и натиснете „Enter“\n" +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:93 msgid "Correcting dependencies..." @@ -1219,175 +1194,359 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "Неудовлетворени зависимости. Опитайте с „-f“." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Инсталиран]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Предупреждението за удостоверяването е пренебрегнато.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [Инсталиран]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Някои пакети не можаха да бъдат удостоверени" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Инсталиране на тези пакети без проверка?" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Инсталиран]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Има проблеми и „-y“ е използвано без „--force-yes“" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Инсталиран]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Неуспех при изтеглянето на %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!" - -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено." - -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Вътрешна грешка, „Ordering“ не завърши" - -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgid "[upgradable from: %s]" msgstr "" -"Странно... Размерите не съвпадат, изпратете е-поща на 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 -#: apt-private/private-install.cc:155 -#, c-format -msgid "Need to get %sB/%sB of 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 -#: apt-private/private-install.cc:160 -#, c-format -msgid "Need to get %sB of archives.\n" -msgstr "Необходимо е да се изтеглят %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 -#: apt-private/private-install.cc:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" msgstr "" -"След тази операция ще бъде използвано %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 -#: apt-private/private-install.cc:172 +#: apt-private/private-output.cc:455 #, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n" +msgid "but %s is installed" +msgstr "но е инсталиран %s" -#: apt-private/private-install.cc:200 +#: apt-private/private-output.cc:457 #, c-format -msgid "You don't have enough free space in %s." -msgstr "Нямате достатъчно свободно пространство в %s." +msgid "but %s is to be installed" +msgstr "но ще бъде инсталиран %s" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Указано е „Trivial Only“, но това не е тривиална операция." +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "но той не може да бъде инсталиран" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Да, прави каквото казвам!" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "но той е виртуален пакет" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"На път сте да направите нещо потенциално опасно.\n" -"За да продължите, въведете фразата „%s“\n" -" ?] " +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "но той не е инсталиран" -#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Прекъсване." +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "но той няма да бъде инсталиран" -#: apt-private/private-install.cc:243 -msgid "Do you want to continue?" -msgstr "Искате ли да продължите?" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " или" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Някои файлове не можаха да бъдат изтеглени" +#: apt-private/private-output.cc:488 apt-private/private-output.cc:500 +msgid "The following packages have unmet dependencies:" +msgstr "Следните пакети имат неудовлетворени зависимости:" -#: apt-private/private-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ " -"или да опитате с „--fix-missing“?" +#: apt-private/private-output.cc:523 +msgid "The following NEW packages will be installed:" +msgstr "Следните НОВИ пакети ще бъдат инсталирани:" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "„--fix-missing“ и превключване на носители не се поддържа все още" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Неуспех при коригирането на липсващите пакети." +#: apt-private/private-output.cc:571 +msgid "The following packages have been kept back:" +msgstr "Следните пакети няма да бъдат променени:" -#: apt-private/private-install.cc:330 -msgid "Aborting install." -msgstr "Прекъсване на инсталирането." +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "Следните пакети ще бъдат актуализирани:" -#: apt-private/private-install.cc:366 -msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"Следният пакет е отстранен от системата поради препокриване на всичките му " -"файлове от други пакети:" -msgstr[1] "" -"Следните пакети са отстранени от системата поради препокриване на всичките " -"им файлове от други пакети:" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" +msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:" -#: apt-private/private-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Това се прави автоматично от dpkg." +#: apt-private/private-output.cc:633 +msgid "The following held packages will be changed:" +msgstr "Следните задържани пакети ще бъдат променени:" -#: apt-private/private-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран" +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (поради %s) " -#: apt-private/private-install.cc:499 +#: apt-private/private-output.cc:696 msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" msgstr "" -"Хм, изглежда AutoRemover скапа нещо, а това не би трябвало\n" -"да се случва. Съобщете за грешка в пакета apt." +"ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n" +"Това НЕ би трябвало да става освен ако знаете точно какво правите!" -#. -#. if (Packages == 1) -#. { -#. c1out << std::endl; -#. c1out << +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Вътрешна грешка, „Ordering“ не завърши" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Странно... Размерите не съвпадат, изпратете е-поща на 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of 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 +#: apt-private/private-install.cc:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Необходимо е да се изтеглят %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 +#: apt-private/private-install.cc:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "" +"След тази операция ще бъде използвано %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 +#: apt-private/private-install.cc:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Нямате достатъчно свободно пространство в %s." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Има проблеми и „-y“ е използвано без „--force-yes“" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "Указано е „Trivial Only“, но това не е тривиална операция." + +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Да, прави каквото казвам!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"На път сте да направите нещо потенциално опасно.\n" +"За да продължите, въведете фразата „%s“\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Прекъсване." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Искате ли да продължите?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Някои файлове не можаха да бъдат изтеглени" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ " +"или да опитате с „--fix-missing“?" + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "„--fix-missing“ и превключване на носители не се поддържа все още" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Неуспех при коригирането на липсващите пакети." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Прекъсване на инсталирането." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"Следният пакет е отстранен от системата поради препокриване на всичките му " +"файлове от други пакети:" +msgstr[1] "" +"Следните пакети са отстранени от системата поради препокриване на всичките " +"им файлове от други пакети:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Това се прави автоматично от dpkg." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран" + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"Хм, изглежда AutoRemover скапа нещо, а това не би трябвало\n" +"да се случва. Съобщете за грешка в пакета apt." + +#. +#. if (Packages == 1) +#. { +#. c1out << std::endl; +#. c1out << #. _("Since you only requested a single operation it is extremely likely that\n" #. "the package is simply not installable and a bug report against\n" #. "that package should be filed.") << std::endl; @@ -1511,210 +1670,26 @@ msgstr "" msgid "Package '%s' is not installed, so not removed\n" msgstr "Пакетът „%s“ не е инсталиран, така че не е премахнат\n" -#: apt-private/private-list.cc:129 -msgid "Listing" -msgstr "" - -#: apt-private/private-list.cc:159 -#, 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-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +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-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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Предупреждението за удостоверяването е пренебрегнато.\n" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Грешка при компилирането на регулярния израз - %s" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Някои пакети не можаха да бъдат удостоверени" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Инсталиране на тези пакети без проверка?" -#: apt-private/private-show.cc:156 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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 "" +msgid "Failed to fetch %s %s\n" +msgstr "Неуспех при изтеглянето на %s %s\n" #: apt-private/private-sources.cc:58 #, fuzzy, c-format @@ -1726,20 +1701,8 @@ msgstr "Неуспех при преименуването на %s на %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Командата „update“ не възприема аргументи" - -#: apt-private/private-update.cc:90 -#, 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:94 -msgid "All packages are up to date." +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" #: apt-private/private-upgrade.cc:25 @@ -1750,20 +1713,57 @@ msgstr "Изчисляване на актуализацията..." msgid "Done" msgstr "Готово" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Поп " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Изт:" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Игн " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Грш " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Изтеглени %sB за %s (%sB/сек)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [В процес на работа]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Смяна на носител: сложете диска с етикет\n" +" „%s“\n" +"в устройството „%s“ и натиснете „Enter“\n" + #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format msgid "Unable to read %s" msgstr "Неуспех при четенето на %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1797,7 +1797,7 @@ msgstr "[Огледален сървър: %s]" msgid "Failed to create IPC pipe to subprocess" msgstr "Неуспех при създаването на IPC pipe към подпроцеса" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "Връзката прекъсна преждевременно" @@ -1837,610 +1837,526 @@ msgstr "" msgid "Merging available information" msgstr "Смесване на наличната информация" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Употреба: apt-extracttemplates файл1 [файл2 ...]\n" -"\n" -"apt-extracttemplates е инструмент за извличане на конфигурационна " -"информация\n" -"и шаблони от дебиански пакети\n" -"\n" -"Опции:\n" -" -h Този помощен текст.\n" -" -t Настройване на временна директория\n" -" -c=? Четене на този конфигурационен файл.\n" -" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" -"tmp\n" - -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Неуспех при получаването на атрибути за %s" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "Извикан е DropNode за все още използван възел" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "Неуспех при записа на %s" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Грешка при намирането на хеш-елемента!" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Неуспех при установяване на отклонението" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Списъкът с разширения на пакети и твърде дълъг" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Вътрешна грешка в AddDiversion" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "Грешка при обработката на директория %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Списъкът с разширения на източници е твърде дълъг" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Грешка при запазването на заглавната част във файла със съдържание" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Опит за изменение на отклонение, %s -> %s и %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "Грешка при обработката на съдържание %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Употреба: apt-ftparchive [опции] команда\n" -"Команди: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents път\n" -" release път\n" -" generate config [групи]\n" -" clean config\n" -"\n" -"apt-ftparchive генерира индексни файлове за архиви на Дебиан. Поддържа\n" -"много стилове на генериране от напълно автоматично до функционални\n" -"замени на dpkg-scanpackages и dpkg-scansources.\n" -"\n" -"apt-ftparchive генерира „Package“ файлове от дърво с .deb файлове. Файлът\n" -"„Package“ представлява съдържанието на всички контролни полета на всеки\n" -"пакет, както и MD5 хеш и размер на файла. Стойностите на полетата \n" -"„Priority“ и „Section“ могат да бъдат изменени с файл „override“.\n" -"\n" -"По подобен начин apt-ftparchive генерира „Sources“ файлове от дърво с .dsc \n" -"файлове. Опцията --source-override може да се използва за указване на файл\n" -"„override“ за пакети с изходен код.\n" -"\n" -"Командите „packages“ и „sources“ трябва да се изпълняват в корена на " -"дървото.\n" -"BinaryPath трябва да сочи към основата, където започва рекурсивното търсене " -"и\n" -"файла „override“ трябва да съдържа всички флагове за преназначаване. " -"Pathprefix\n" -"се прибавя към полетата на файловите имена, ако съществува. Пример за " -"употреба\n" -"от архива на Дебиан:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Опции:\n" -" -h Този помощен текст.\n" -" --md5 Управление на генерирането на MD5.\n" -" -s=? Файл „override“ за пакети с изходен код.\n" -" -q Без показване на съобщения.\n" -" -d=? Избор на допълнителна база от данни за кеширане.\n" -" --no-delink Включване на режим за премахване на връзки.\n" -" --contents Управление на генерирането на файлове със съдържание.\n" -" -c=? Четене на този конфигурационен файл.\n" -" -o=? Настройване на произволна конфигурационна опция" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Няма съвпадения на избора" +msgid "Double add of diversion %s -> %s" +msgstr "Двойно добавяне на отклонение %s -> %s" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Липсват някои файлове от групата с файлови пакети „%s“" +msgid "Duplicate conf file %s/%s" +msgstr "Дублиран конфигурационен файл %s/%s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "БД е повредена, файлът е преименуван на %s.old" +msgid "The path %s is too long" +msgstr "Пътят %s е твърде дълъг" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "БД е стара, опит за актуализиране на %s" +msgid "Unpacking %s more than once" +msgstr "Разпакетиране на %s повече от веднъж" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"Невалиден формат на БД. Ако сте обновили от по-стара версия на apt, " -"премахнете базата от данни и я създайте наново." +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "Директорията %s е отклонена" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Неуспех при отварянето на файл %s от БД: %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Пакетът се опитва да пише в целта за отклонение %s/%s" + +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Пътят за отклонение е твърде дълъг" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Грешка при получаването на атрибути за %s" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Неуспех при прочитането на връзка %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "В архива няма поле „control“" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Неуспех при получаването на курсор" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: Неуспех при четенето на директория %s\n" +msgid "Failed to rename %s to %s" +msgstr "Неуспех при преименуването на %s на %s" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "W: Неуспех при четенето на %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "Директорията %s се заменя с не-директория" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "W: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Неуспех при намирането на възел в неговия хеш" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: Грешките се отнасят за файла " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Пътят е твърде дълъг" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "Неуспех при превръщането на %s" +msgid "Overwrite package match with no version for %s" +msgstr "Файловете се заменят със съдържанието на пакета %s без версия" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Неуспех при обхода на дървото" +#: apt-inst/extract.cc:438 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Файл %s/%s заменя този в пакет %s" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:498 #, c-format -msgid "Failed to open %s" -msgstr "Неуспех при отварянето на %s" +msgid "Unable to stat %s" +msgstr "Неуспех при получаването на атрибути за %s" -#: ftparchive/writer.cc:278 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid " DeLink %s [%s]\n" -msgstr "DeLink %s [%s]\n" +msgid "Failed to write file %s" +msgstr "Неуспех при запис на файл %s" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to readlink %s" -msgstr "Неуспех при прочитането на връзка %s" +msgid "Failed to close file %s" +msgstr "Неуспех при затварянето на файл %s" -#: ftparchive/writer.cc:290 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "Failed to unlink %s" -msgstr "Неуспех при премахването на връзка %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Това не е валиден DEB архив, липсва елемент „%s“" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Неуспех при създаването на връзка %s към %s" +msgid "Internal error, could not locate member %s" +msgstr "Вътрешна грешка, неуспех при намирането на съставна част %s" -#: ftparchive/writer.cc:308 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr "Превишен лимит на DeLink от %sB.\n" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Контролен файл, невъзможен за анализ" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Архивът няма поле „package“" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Невалиден подпис на архива" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s няма запис „override“\n" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Грешка при четене на заглавната част на елемента на архива" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " поддържащия пакета %s е %s, а не %s\n" +msgid "Invalid archive member header %s" +msgstr "Невалидна заглавна част %s на елемента на архива" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s няма запис „source override“\n" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Невалидна заглавна част на елемента на архива" -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s няма също и запис „binary override“\n" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Архивът е твърде кратък" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Неуспех при заделянето на памет" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Неуспех при четенето на заглавните части на архива" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Неуспех при отварянето на %s" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Неуспех при създаването на програмни канали" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Неправилно форматиран override %s, ред %llu #1" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Неуспех при изпълнението на gzip" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Неуспех при четенето на override файл %s" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Развален архив" -#: ftparchive/override.cc:166 +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Невярна контролна сума на tar, развален архив" + +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Неправилно форматиран override %s, ред %llu #1" +msgid "Unknown TAR header type %u, member %s" +msgstr "Непозната заглавна част на TAR тип %u, елемент %s" -#: ftparchive/override.cc:178 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Неправилно форматиран override %s, ред %llu #2" +msgid "Progress: [%3i%%]" +msgstr "" -#: ftparchive/override.cc:191 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "Изпълняване на dpkg" + +#: apt-pkg/init.cc:146 #, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Неправилно форматиран override %s, ред %llu #3" +msgid "Packaging system '%s' is not supported" +msgstr "Пакетната система „%s“ не е поддържана" -#: ftparchive/multicompress.cc:73 +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Неуспех при определянето на подходяща пакетна система" + +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Непознат алгоритъм за компресия „%s“" +msgid "Wrote %i records.\n" +msgstr "Записани са %i записа.\n" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Компресираният изход %s изисква настройка за компресирането" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Записани са %i записа с %i липсващи файла.\n" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Неуспех при създаването на FILE*" +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Записани са %i записа с %i несъответстващи файла\n" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Неуспех при пускането на подпроцес" +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Процес-потомък за компресиране" +#: apt-pkg/indexcopy.cc:515 +#, c-format +msgid "Can't find authentication record for: %s" +msgstr "Не е намерен oторизационен запис за: %s" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Вътрешна грешка, неуспех при създаването на %s" +msgid "Hash mismatch for: %s" +msgstr "Несъответствие на контролната сума за: %s" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "В/И към подпроцеса/файла пропадна" +#: apt-pkg/acquire-worker.cc:116 +#, c-format +msgid "The method driver %s could not be found." +msgstr "Неуспех при намирането на драйвер за метод %s." -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Неуспех при четене докато се изчислява MD5" +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "Problem unlinking %s" -msgstr "Неуспех при премахването на връзка на %s" +msgid "Method %s did not start correctly" +msgstr "Методът %s не стартира правилно" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Неуспех при преименуването на %s на %s" +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“." -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." msgstr "" -"Употреба: apt-internal-solver\n" -"\n" -"apt-internal-solver е интерфейс към вградения в APT механизъм за " -"удовлетворяване на зависимости\n" -"\n" -"Опции:\n" -" -h Този помощен текст\n" -" -q Изход, подходящ за журнал — без индикатор на напредъка\n" -" -c=? Указване на файл с настройки\n" -" -o=? Указване на произволна настройка, напр. -o dir::cache=/tmp\n" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Непознат запис за пакет!" +"Списъците с пакети или файлът за състояние не можаха да бъдат анализирани " +"или отворени." -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" msgstr "" -"Употреба: apt-sortpkgs [опции] файл1 [файл2 ...]\n" -"\n" -"apt-sortpkgs е опростен инструмент за сортиране на пакетни файлове. Опцията\n" -"„-s“ се използва, за да покаже типа на файла.\n" -"\n" -"Опции:\n" -" -h Този помощен текст.\n" -" -s Използване на сортиране по изходен код.\n" -" -c=? Четене на този конфигурационен файл.\n" -" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" -"tmp\n" +"Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" -msgstr "Неуспех при запис на файл %s" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Списъкът с източници не можа да бъде прочетен." -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "Неуспех при затварянето на файл %s" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Празен кеш на пакети" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "Пътят %s е твърде дълъг" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Файлът за кеш на пакети е повреден" -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" -msgstr "Разпакетиране на %s повече от веднъж" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Файлът за кеш на пакети е несъвместима версия" -#: apt-inst/extract.cc:142 -#, c-format -msgid "The directory %s is diverted" -msgstr "Директорията %s е отклонена" +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" +msgstr "Файлът за кеш на пакети е повреден, твърде малък е" -#: apt-inst/extract.cc:152 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Пакетът се опитва да пише в целта за отклонение %s/%s" - -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Пътят за отклонение е твърде дълъг" +msgid "This APT does not support the versioning system '%s'" +msgstr "Тази версия на APT не поддържа система за версии „%s“" -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Директорията %s се заменя с не-директория" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Кешът на пакети е бил направен за различна архитектура" -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Неуспех при намирането на възел в неговия хеш" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Зависи от" -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Пътят е твърде дълъг" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Предварително зависи от" -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Файловете се заменят със съдържанието на пакета %s без версия" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Предлага се" -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Файл %s/%s заменя този в пакет %s" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Препоръчва се" -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "Неуспех при получаването на атрибути за %s" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "В конфликт с" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "Извикан е DropNode за все още използван възел" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Заменя" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Грешка при намирането на хеш-елемента!" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Изважда от употреба" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Неуспех при установяване на отклонението" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Чупи" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Вътрешна грешка в AddDiversion" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Подобрява" -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Опит за изменение на отклонение, %s -> %s и %s/%s" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "важен" -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Двойно добавяне на отклонение %s -> %s" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "изискван" -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Дублиран конфигурационен файл %s/%s" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "стандартен" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Невалиден подпис на архива" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "незадължителен" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Грешка при четене на заглавната част на елемента на архива" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "допълнителен" -#: apt-inst/contrib/arfile.cc:96 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Invalid archive member header %s" -msgstr "Невалидна заглавна част %s на елемента на архива" +msgid "Index file type '%s' is not supported" +msgstr "Не се поддържа индексен файл от типа „%s“" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Невалидна заглавна част на елемента на архива" +#: apt-pkg/sourcelist.cc:127 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Архивът е твърде кратък" +#: apt-pkg/sourcelist.cc:170 +#, c-format +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "" +"Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Неуспех при четенето на заглавните части на архива" +#: apt-pkg/sourcelist.cc:173 +#, c-format +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "" +"Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Неуспех при създаването на програмни канали" +#: 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-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Неуспех при изпълнението на gzip" +#: apt-pkg/sourcelist.cc:190 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "Лошо форматиран ред %lu в списъка с източници %s (липсва ключ в [%s])" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -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-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Невярна контролна сума на tar, развален архив" +#: apt-pkg/sourcelist.cc:206 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)" -#: apt-inst/contrib/extracttar.cc:308 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Непозната заглавна част на TAR тип %u, елемент %s" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Това не е валиден DEB архив, липсва елемент „%s“" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" -#: apt-inst/deb/debfile.cc:132 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "Вътрешна грешка, неуспех при намирането на съставна част %s" +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "" +"Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Контролен файл, невъзможен за анализ" +#: apt-pkg/sourcelist.cc:224 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "" +"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "List directory %spartial is missing." -msgstr "Директорията със списъци %spartial липсва." +msgid "Opening %s" +msgstr "Отваряне на %s" -#: apt-pkg/acquire.cc:91 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "Archives directory %spartial is missing." -msgstr "Директорията за архиви %spartial липсва." +msgid "Line %u too long in source list %s." +msgstr "Ред %u в списъка с източници %s е твърде дълъг." -#: apt-pkg/acquire.cc:99 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "Unable to lock directory %s" -msgstr "Неуспех при заключване на директорията %s" +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/acquire.cc:490 apt-pkg/clean.cc:39 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 #, fuzzy, c-format msgid "Clean of %s is not supported" msgstr "Не се поддържа индексен файл от типа „%s“" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Изтегляне на файл %li от %li (остават %s)" - -#: apt-pkg/acquire.cc:904 +#: apt-pkg/clean.cc:64 #, c-format -msgid "Retrieving file %li of %li" -msgstr "Изтегляне на файл %li от %li" +msgid "Unable to stat %s." +msgstr "Неуспех при получаването на атрибути на %s." + +#: apt-pkg/pkgcachegen.cc:93 +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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Възникна грешка при обработката на %s (%s%d)" + +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "" +"Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на " +"APT." + +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT." + +#: apt-pkg/pkgcachegen.cc:263 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Еха, надхвърлихте броя описания, на който е способна тази версия на APT." + +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "" +"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT." + +#: apt-pkg/pkgcachegen.cc:576 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости" + +#: apt-pkg/pkgcachegen.cc:1211 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "" +"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s" + +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Четене на списъците с пакети" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Събиране на информация за „Осигурява“" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Неуспех при записа на %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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:241 +msgid "Send request to solver" +msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости" + +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "Подготовка за приемане на решение" + +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" +"Външната програма за удовлетворяване на зависимости се провали без да изведе " +"съобщение за грешка" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "Изпълняване на външна програма за удовлетворяване на зависимости" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2460,7 +2376,7 @@ msgstr "Несъответствие на размера" msgid "Invalid file format" msgstr "Невалидна операция %s" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2469,16 +2385,16 @@ msgstr "" "Не може да се открие елемент „%s“ във файла Release (объркан ред в sources." "list или повреден файл)" -#: apt-pkg/acquire-item.cc:1589 +#: apt-pkg/acquire-item.cc:1656 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Не е открита контролна сума за „%s“ във файла Release" -#: apt-pkg/acquire-item.cc:1631 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2487,12 +2403,12 @@ msgstr "" "Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се " "прилагат обновявания от това хранилище." -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2502,12 +2418,12 @@ msgstr "" "използват старите индексни файлове. Грешка от GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "Грешка от GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2516,138 +2432,110 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Неуспех при намирането на драйвер за метод %s." - -#: apt-pkg/acquire-worker.cc:118 -#, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" +msgid "Vendor block %s contains no fingerprint" +msgstr "Блокът на производителя %s не съдържа отпечатък" -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Method %s did not start correctly" -msgstr "Методът %s не стартира правилно" +msgid "List directory %spartial is missing." +msgstr "Директорията със списъци %spartial липсва." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“." +msgid "Archives directory %spartial is missing." +msgstr "Директорията за архиви %spartial липсва." -#: apt-pkg/algorithms.cc:265 +#: apt-pkg/acquire.cc:99 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за " -"него." - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е " -"причинено от задържани пакети." - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "" -"Неуспех при коригирането на проблемите, имате задържани счупени пакети." - -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." -msgstr "" -"Списъците с пакети или файлът за състояние не можаха да бъдат анализирани " -"или отворени." - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "" -"Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Списъкът с източници не можа да бъде прочетен." +msgid "Unable to lock directory %s" +msgstr "Неуспех при заключване на директорията %s" -#: apt-pkg/cacheset.cc:489 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Не е намерено издание „%s“ на „%s“" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Изтегляне на файл %li от %li (остават %s)" -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/acquire.cc:904 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Не е намерена версия „%s“ на „%s“" +msgid "Retrieving file %li of %li" +msgstr "Изтегляне на файл %li от %li" -#: apt-pkg/cacheset.cc:603 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "Неуспех при намиране на задача „%s“" +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list" -#: apt-pkg/cacheset.cc:609 +#: apt-pkg/policy.cc:83 #, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“" +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/cacheset.cc:615 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“" +#: apt-pkg/policy.cc:422 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Невалиден запис във файла с настройки %s, липсва заглавна част Package" -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "Не е възможно избиране на версия за пакета „%s“ понеже е виртуален" +msgid "Did not understand pin type %s" +msgstr "Неизвестен тип за отбиване %s" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Няма указан приоритет (или е нула) на отбиването" + +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -"Не е възможно избиране на инсталирана или кандидат версия за пакета „%s“ " -"понеже той няма нито едната" +"Неуспех при незабавната настройка на „%s“. За повече информация вижте " +"информацията за APT::Immediate-Configure в „man 5 apt.conf“. (%d)" -#: apt-pkg/cacheset.cc:647 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" -"Не е възможно избиране на на последната версия за пакета „%s“, защото е " -"виртуален" +msgid "Could not configure '%s'. " +msgstr "Неуспех при конфигуриране на „%s“. " -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -"Не е възможно избиране на кандидат-версия за пакета „%s“, защото няма " -"подходящ кандидати" +"В следствие на циклични зависимости от типа „В конфликт с/Предварително " +"зависи от“, за да се продължи инсталацията трябва да се премахне необходимия " +"пакет %s. Това често е лошо, но ако наистина искате да го направите, " +"активирайте опцията APT::Force-LoopBreak." -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +#: 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 "" -"Не е възможно избиране на инсталирана версия на пакета „%s“, защото не е " -"инсталиран" - -#: 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/cdrom.cc:571 msgid "Unmounting CD-ROM...\n" @@ -2726,14 +2614,30 @@ msgstr "Запазване на новия списък с източници\n" msgid "Source list entries for this disc are:\n" msgstr "Записите в списъка с източници за този диск са:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Неуспех при получаването на атрибути на %s." - -#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 -msgid "Building dependency tree" -msgstr "Изграждане на дървото със зависимости" +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за " +"него." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е " +"причинено от задържани пакети." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "" +"Неуспех при коригирането на проблемите, имате задържани счупени пакети." + +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 +msgid "Building dependency tree" +msgstr "Изграждане на дървото със зависимости" #: apt-pkg/depcache.cc:139 msgid "Candidate versions" @@ -2757,57 +2661,75 @@ msgstr "Неуспех при отварянето на StateFile %s" msgid "Failed to write temporary StateFile %s" msgstr "Неуспех при запис на временен StateFile %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "Изпращане на сценарий към програмата за удовлетворяване на зависимости" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Неуспех при анализирането на пакетен файл %s (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Неуспех при анализирането на пакетен файл %s (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "Подготовка за приемане на решение" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Не е намерено издание „%s“ на „%s“" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" -"Външната програма за удовлетворяване на зависимости се провали без да изведе " -"съобщение за грешка" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Не е намерена версия „%s“ на „%s“" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "Изпълняване на външна програма за удовлетворяване на зависимости" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Неуспех при намиране на задача „%s“" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "Записани са %i записа.\n" +msgid "Couldn't find any package by regex '%s'" +msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Записани са %i записа с %i липсващи файла.\n" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "Не е възможно избиране на версия за пакета „%s“ понеже е виртуален" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Записани са %i записа с %i несъответстващи файла\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"Не е възможно избиране на инсталирана или кандидат версия за пакета „%s“ " +"понеже той няма нито едната" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "" +"Не е възможно избиране на на последната версия за пакета „%s“, защото е " +"виртуален" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "Не е намерен oторизационен запис за: %s" +msgid "Can't select candidate version from package %s as it has no candidate" +msgstr "" +"Не е възможно избиране на кандидат-версия за пакета „%s“, защото няма " +"подходящ кандидати" -#: apt-pkg/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:663 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Несъответствие на контролната сума за: %s" +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" +"Не е възможно избиране на инсталирана версия на пакета „%s“, защото не е " +"инсталиран" #: apt-pkg/indexrecords.cc:78 #, c-format @@ -2834,850 +2756,923 @@ msgstr "Неправилна стойност за „Valid-Until“ във фа msgid "Invalid 'Date' entry in Release file %s" msgstr "Неправилна стойност за „Date“ във файла Release %s" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Пакетната система „%s“ не е поддържана" +msgid "%lid %lih %limin %lis" +msgstr "%liд %liч %liм %liс" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Неуспех при определянето на подходяща пакетна система" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" +msgstr "%liч %liм %liс" -#: apt-pkg/install-progress.cc:57 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Progress: [%3i%%]" -msgstr "" +msgid "%limin %lis" +msgstr "%liм %liс" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "Изпълняване на dpkg" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" +msgstr "%liс" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "Selection %s not found" +msgstr "Изборът %s не е намерен" + +#: apt-pkg/contrib/fileutl.cc:190 +#, c-format +msgid "Not using locking for read only lock file %s" msgstr "" -"Неуспех при незабавната настройка на „%s“. За повече информация вижте " -"информацията за APT::Immediate-Configure в „man 5 apt.conf“. (%d)" +"Не се използва заключване за файл за заключване %s, който е само за четене" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format -msgid "Could not configure '%s'. " -msgstr "Неуспех при конфигуриране на „%s“. " +msgid "Could not open lock file %s" +msgstr "Неуспех при отварянето на файл за заключване %s" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:218 #, 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." +msgid "Not using locking for nfs mounted lock file %s" msgstr "" -"В следствие на циклични зависимости от типа „В конфликт с/Предварително " -"зависи от“, за да се продължи инсталацията трябва да се премахне необходимия " -"пакет %s. Това често е лошо, но ако наистина искате да го направите, " -"активирайте опцията APT::Force-LoopBreak." - -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Празен кеш на пакети" +"Не се използва заключване за файл за заключване %s, който е монтиран по NFS" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Файлът за кеш на пакети е повреден" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Неуспех при достъпа до заключване %s" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Файлът за кеш на пакети е несъвместима версия" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "Не може да се създаде списък от файлове, защото „%s“ не е директория" -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" -msgstr "Файлът за кеш на пакети е повреден, твърде малък е" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "Пропускане на „%s“ в директорията „%s“, понеже не е обикновен файл" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:412 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Тази версия на APT не поддържа система за версии „%s“" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "Пропускане на файла „%s“ в директорията „%s“, понеже няма разширение" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "Кешът на пакети е бил направен за различна архитектура" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" +"Пропускане на файла „%s“ в директорията „%s“, понеже разширението му е грешно" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Зависи от" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s." -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Предварително зависи от" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "Под-процесът %s получи сигнал %u." -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Предлага се" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Подпроцесът %s върна код за грешка (%u)" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Препоръчва се" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Подпроцесът %s завърши неочаквано" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "В конфликт с" +#: apt-pkg/contrib/fileutl.cc:913 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Проблем при затваряне на компресираният файл %s (gzip)" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Заменя" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Неуспех при отварянето на файла %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Изважда от употреба" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "Неуспех при отварянето на файлов манипулатор %d" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Чупи" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Неуспех при създаването на подпроцес IPC" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Подобрява" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Неуспех при изпълнението на компресиращата програма " -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "важен" +#: apt-pkg/contrib/fileutl.cc:1514 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "" +"грешка при четене, все още има %llu за четене, но няма нито един останал" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "изискван" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "грешка при запис, все още име %llu за запис, но не успя" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "стандартен" +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" +msgstr "Проблем при затваряне на файла %s" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "незадължителен" +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Проблем при преименуване на файла %s на %s" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "допълнителен" +#: apt-pkg/contrib/fileutl.cc:1938 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "Проблем при изтриване на файла %s" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Кешът има несъвместима система за версии" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Възникна грешка при обработката на %s (%s%d)" - -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "" -"Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на " -"APT." +msgid "%c%s... Error!" +msgstr "%c%s... Грешка!" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT." +#: apt-pkg/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Готово" -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." +#: apt-pkg/contrib/progress.cc:181 +msgid "..." msgstr "" -"Еха, надхвърлихте броя описания, на който е способна тази версия на APT." -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "" -"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT." +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Готово" -#: apt-pkg/pkgcachegen.cc:576 -#, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости" +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Невъзможно е да се прехвърли в паметта празен файл" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "" -"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Неуспех при дублиране на файлов манипулатор %i" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Четене на списъците с пакети" +#: apt-pkg/contrib/mmap.cc:119 +#, c-format +msgid "Couldn't make mmap of %llu bytes" +msgstr "Неуспех при прехвърлянето в паметта на %llu байта" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Събиране на информация за „Осигурява“" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Неуспех при затваряне на mmap" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Неуспех при синхронизирането на mmap" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Не се поддържа индексен файл от типа „%s“" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Неуспех при прехвърлянето в паметта на %lu байта" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Неуспех при отрязване на края на файла" + +#: apt-pkg/contrib/mmap.cc:341 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"Стойността „%s“ на APT::Default-Release не е правилна, понеже в източниците " -"няма такова издание" +"Недостатъчна памет за MMap. Увеличете стойността на променливата APT::Cache-" +"Start. Текуща стойност: %lu (man 5 apt.conf)" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Невалиден запис във файла с настройки %s, липсва заглавна част Package" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" +"Неуспех при увеличаване на паметта за MMap. Достигнато е текущото " +"ограничение от %lu байта." -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Неуспех при увеличаване на паметта за MMap. Автоматичното увеличаване е " +"забранено от потребителя." + +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "Did not understand pin type %s" -msgstr "Неизвестен тип за отбиване %s" +msgid "Unable to stat the mount point %s" +msgstr "Неуспех при намирането на атрибутите на точка за монтиране %s" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Няма указан приоритет (или е нула) на отбиването" +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Неуспех при намирането на атрибутите на cdrom" -#: apt-pkg/sourcelist.cc:127 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" +#: apt-pkg/contrib/configuration.cc:519 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Неизвестен тип на абревиатура: „%c“" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/configuration.cc:633 #, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "" -"Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])" +msgid "Opening configuration file %s" +msgstr "Отваряне на конфигурационен файл %s" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/configuration.cc:801 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "" -"Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])" +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Синтактична грешка %s:%u: В началото на блока няма име." -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/configuration.cc:820 #, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "" -"Лошо форматиран ред %lu в списъка с източници %s ([%s] не е присвояване)" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Синтактична грешка %s:%u: Лошо форматиран таг" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/configuration.cc:837 #, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "Лошо форматиран ред %lu в списъка с източници %s (липсва ключ в [%s])" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Синтактична грешка %s:%u: Излишни символи след стойността" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -"Лошо форматиран ред %lu в списъка с източници %s ([%s] ключът %s няма " -"стойност)" +"Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното " +"ниво" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)" +msgid "Syntax error %s:%u: Included from here" +msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/configuration.cc:897 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“" -#: apt-pkg/sourcelist.cc:217 +#: apt-pkg/contrib/configuration.cc:900 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -"Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)" +"Синтактична грешка %s:%u: директивата clear изисква аргумент дърво от опции" -#: apt-pkg/sourcelist.cc:224 +#: apt-pkg/contrib/configuration.cc:950 #, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "" -"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)" +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла" -#: 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 (тип)" - -#: 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/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list" - -#: apt-pkg/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Неуспех при анализирането на пакетен файл %s (1)" - -#: apt-pkg/tagfile.cc:237 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Неуспех при анализирането на пакетен файл %s (2)" - -#: 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/vendorlist.cc:85 -#, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Блокът на производителя %s не съдържа отпечатък" - -#: apt-pkg/contrib/cdromutl.cc:65 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "Неуспех при намирането на атрибутите на точка за монтиране %s" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "Неуспех при намирането на атрибутите на cdrom" +msgid "No keyring installed in %s." +msgstr "В %s няма инсталиран ключодържател." -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Неизвестна опция за команден ред „%c“ [от %s]." -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format msgid "Command line option %s is not understood" msgstr "Опцията за команден ред %s не е разпозната" -#: apt-pkg/contrib/cmndline.cc:168 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format msgid "Command line option %s is not boolean" msgstr "Опцията за команден ред %s не е булева" -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format msgid "Option %s requires an argument." msgstr "Опция %s изисква аргумент." -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Опция %s: Значението трябва да има =." -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Опция %s изисква аргумент цяло число, не „%s“" -#: apt-pkg/contrib/cmndline.cc:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "Опция „%s“ е твърде дълга" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Смисълът %s не е ясен, опитайте true или false." -#: apt-pkg/contrib/cmndline.cc:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "Невалидна операция %s" -#: apt-pkg/contrib/configuration.cc:519 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Неизвестен тип на абревиатура: „%c“" - -#: apt-pkg/contrib/configuration.cc:633 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Opening configuration file %s" -msgstr "Отваряне на конфигурационен файл %s" +msgid "Installing %s" +msgstr "Инсталиране на %s" -#: apt-pkg/contrib/configuration.cc:801 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Синтактична грешка %s:%u: В началото на блока няма име." +msgid "Configuring %s" +msgstr "Конфигуриране на %s" -#: apt-pkg/contrib/configuration.cc:820 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Синтактична грешка %s:%u: Лошо форматиран таг" +msgid "Removing %s" +msgstr "Премахване на %s" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Синтактична грешка %s:%u: Излишни символи след стойността" +msgid "Completely removing %s" +msgstr "Окончателно премахване на %s" -#: apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "" -"Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното " -"ниво" +msgid "Noting disappearance of %s" +msgstr "Отбелязване на изчезването на %s" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/deb/dpkgpm.cc:115 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“" +msgid "Running post-installation trigger %s" +msgstr "Изпълнение на тригер след инсталиране %s" -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук" +msgid "Directory '%s' missing" +msgstr "Директорията „%s“ липсва" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“" +msgid "Could not open file '%s'" +msgstr "Неуспех при отваряне на файла „%s“" -#: apt-pkg/contrib/configuration.cc:900 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Syntax error %s:%u: clear directive requires an option tree as argument" -msgstr "" -"Синтактична грешка %s:%u: директивата clear изисква аргумент дърво от опции" +msgid "Preparing %s" +msgstr "Подготвяне на %s" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:1008 #, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла" +msgid "Unpacking %s" +msgstr "Разпакетиране на %s" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "" -"Не се използва заключване за файл за заключване %s, който е само за четене" +msgid "Preparing to configure %s" +msgstr "Подготвяне на %s за конфигуриране" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Could not open lock file %s" -msgstr "Неуспех при отварянето на файл за заключване %s" +msgid "Installed %s" +msgstr "%s е инсталиран" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "" -"Не се използва заключване за файл за заключване %s, който е монтиран по NFS" +msgid "Preparing for removal of %s" +msgstr "Подготвяне за премахване на %s" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Could not get lock %s" -msgstr "Неуспех при достъпа до заключване %s" +msgid "Removed %s" +msgstr "%s е премахнат" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "Не може да се създаде списък от файлове, защото „%s“ не е директория" +msgid "Preparing to completely remove %s" +msgstr "Подготовка за пълно премахване на %s" -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "Пропускане на „%s“ в директорията „%s“, понеже не е обикновен файл" +msgid "Completely removed %s" +msgstr "%s е напълно премахнат" -#: apt-pkg/contrib/fileutl.cc:412 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "Пропускане на файла „%s“ в директорията „%s“, понеже няма разширение" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Неуспех при записа на %s" -#: apt-pkg/contrib/fileutl.cc:421 -#, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" msgstr "" -"Пропускане на файла „%s“ в директорията „%s“, понеже разширението му е грешно" - -#: apt-pkg/contrib/fileutl.cc:824 -#, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s." -#: apt-pkg/contrib/fileutl.cc:826 -#, c-format -msgid "Sub-process %s received signal %u." -msgstr "Под-процесът %s получи сигнал %u." +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "Операцията е прекъсната" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Подпроцесът %s върна код за грешка (%u)" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "" +"Поради достигане на максималния брой доклади (MaxReports) не е записан нов " +"доклад за зависимостите." -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 -#, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Подпроцесът %s завърши неочаквано" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "отлагане на настройката поради неудовлетворени зависимости" -#: apt-pkg/contrib/fileutl.cc:913 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Проблем при затваряне на компресираният файл %s (gzip)" +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" +"Доклад за зависимостите не е записан защото съобщението за грешка е породено " +"от друга грешка." -#: apt-pkg/contrib/fileutl.cc:1101 -#, c-format -msgid "Could not open file %s" -msgstr "Неуспех при отварянето на файла %s" +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" +"Доклад за зависимостите не е записан защото грешката е причинена от " +"недостатъчно дисково пространство" -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 -#, c-format -msgid "Could not open file descriptor %d" -msgstr "Неуспех при отварянето на файлов манипулатор %d" +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" +"Доклад за зависимостите не е записан защото грешката е причинена от " +"недостатъчна оперативна памет" -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Неуспех при създаването на подпроцес IPC" +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +#, fuzzy +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" +"Доклад за зависимостите не е записан защото грешката е причинена от " +"недостатъчно дисково пространство" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Неуспех при изпълнението на компресиращата програма " +#: apt-pkg/deb/dpkgpm.cc:1774 +msgid "" +"No apport report written because the error message indicates a dpkg I/O error" +msgstr "" +"Доклад за зависимостите не е записан поради входно-изходна грешка с dpkg" -#: apt-pkg/contrib/fileutl.cc:1514 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "read, still have %llu to read but none left" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" msgstr "" -"грешка при четене, все още има %llu за четене, но няма нито един останал" +"Неуспех при заключване на административната директория (%s). Може би се " +"използва от друг процес?" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#: apt-pkg/deb/debsystem.cc:94 #, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "грешка при запис, все още име %llu за запис, но не успя" +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" +"Неуспех при заключване на административната директория (%s). Може би липсват " +"административни права?" -#: apt-pkg/contrib/fileutl.cc:1915 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 #, c-format -msgid "Problem closing the file %s" -msgstr "Проблем при затваряне на файла %s" +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgstr "" +"Процесът dpkg е беше прекъснат. Проблемът трябва да се коригира чрез ръчно " +"изпълнение на „%s“." -#: apt-pkg/contrib/fileutl.cc:1927 -#, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Проблем при преименуване на файла %s на %s" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "Без заключване" -#: apt-pkg/contrib/fileutl.cc:1938 -#, c-format -msgid "Problem unlinking the file %s" -msgstr "Проблем при изтриване на файла %s" +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Употреба: apt-extracttemplates файл1 [файл2 ...]\n" +"\n" +"apt-extracttemplates е инструмент за извличане на конфигурационна " +"информация\n" +"и шаблони от дебиански пакети\n" +"\n" +"Опции:\n" +" -h Този помощен текст.\n" +" -t Настройване на временна директория\n" +" -c=? Четене на този конфигурационен файл.\n" +" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" +"tmp\n" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Проблем при синхронизиране на файла" +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "Неуспех при получаването на атрибути за %s" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 -#, c-format -msgid "No keyring installed in %s." -msgstr "В %s няма инсталиран ключодържател." +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Невъзможно е да се прехвърли в паметта празен файл" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "Списъкът с разширения на пакети и твърде дълъг" -#: apt-pkg/contrib/mmap.cc:111 +#: 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 #, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Неуспех при дублиране на файлов манипулатор %i" +msgid "Error processing directory %s" +msgstr "Грешка при обработката на директория %s" -#: apt-pkg/contrib/mmap.cc:119 +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Списъкът с разширения на източници е твърде дълъг" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Грешка при запазването на заглавната част във файла със съдържание" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Неуспех при прехвърлянето в паметта на %llu байта" +msgid "Error processing contents %s" +msgstr "Грешка при обработката на съдържание %s" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Неуспех при затваряне на mmap" +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Употреба: apt-ftparchive [опции] команда\n" +"Команди: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents път\n" +" release път\n" +" generate config [групи]\n" +" clean config\n" +"\n" +"apt-ftparchive генерира индексни файлове за архиви на Дебиан. Поддържа\n" +"много стилове на генериране от напълно автоматично до функционални\n" +"замени на dpkg-scanpackages и dpkg-scansources.\n" +"\n" +"apt-ftparchive генерира „Package“ файлове от дърво с .deb файлове. Файлът\n" +"„Package“ представлява съдържанието на всички контролни полета на всеки\n" +"пакет, както и MD5 хеш и размер на файла. Стойностите на полетата \n" +"„Priority“ и „Section“ могат да бъдат изменени с файл „override“.\n" +"\n" +"По подобен начин apt-ftparchive генерира „Sources“ файлове от дърво с .dsc \n" +"файлове. Опцията --source-override може да се използва за указване на файл\n" +"„override“ за пакети с изходен код.\n" +"\n" +"Командите „packages“ и „sources“ трябва да се изпълняват в корена на " +"дървото.\n" +"BinaryPath трябва да сочи към основата, където започва рекурсивното търсене " +"и\n" +"файла „override“ трябва да съдържа всички флагове за преназначаване. " +"Pathprefix\n" +"се прибавя към полетата на файловите имена, ако съществува. Пример за " +"употреба\n" +"от архива на Дебиан:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Опции:\n" +" -h Този помощен текст.\n" +" --md5 Управление на генерирането на MD5.\n" +" -s=? Файл „override“ за пакети с изходен код.\n" +" -q Без показване на съобщения.\n" +" -d=? Избор на допълнителна база от данни за кеширане.\n" +" --no-delink Включване на режим за премахване на връзки.\n" +" --contents Управление на генерирането на файлове със съдържание.\n" +" -c=? Четене на този конфигурационен файл.\n" +" -o=? Настройване на произволна конфигурационна опция" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Неуспех при синхронизирането на mmap" +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Няма съвпадения на избора" -#: apt-pkg/contrib/mmap.cc:290 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Неуспех при прехвърлянето в паметта на %lu байта" - -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Неуспех при отрязване на края на файла" +msgid "Some files are missing in the package file group `%s'" +msgstr "Липсват някои файлове от групата с файлови пакети „%s“" -#: apt-pkg/contrib/mmap.cc:341 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "" -"Недостатъчна памет за MMap. Увеличете стойността на променливата APT::Cache-" -"Start. Текуща стойност: %lu (man 5 apt.conf)" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "БД е повредена, файлът е преименуван на %s.old" -#: apt-pkg/contrib/mmap.cc:446 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "" -"Неуспех при увеличаване на паметта за MMap. Достигнато е текущото " -"ограничение от %lu байта." +msgid "DB is old, attempting to upgrade %s" +msgstr "БД е стара, опит за актуализиране на %s" -#: apt-pkg/contrib/mmap.cc:449 +#: ftparchive/cachedb.cc:94 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" -"Неуспех при увеличаване на паметта за MMap. Автоматичното увеличаване е " -"забранено от потребителя." +"Невалиден формат на БД. Ако сте обновили от по-стара версия на apt, " +"премахнете базата от данни и я създайте наново." -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Грешка!" +msgid "Unable to open DB file %s: %s" +msgstr "Неуспех при отварянето на файл %s от БД: %s" -#: apt-pkg/contrib/progress.cc:150 -#, c-format -msgid "%c%s... Done" -msgstr "%c%s... Готово" +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Неуспех при прочитането на връзка %s" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "" +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "В архива няма поле „control“" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Готово" +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Неуспех при получаването на курсор" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/writer.cc:91 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%liд %liч %liм %liс" +msgid "W: Unable to read directory %s\n" +msgstr "W: Неуспех при четенето на директория %s\n" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/writer.cc:96 #, c-format -msgid "%lih %limin %lis" -msgstr "%liч %liм %liс" +msgid "W: Unable to stat %s\n" +msgstr "W: Неуспех при четенето на %s\n" + +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "W: " + +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: Грешките се отнасят за файла " -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%limin %lis" -msgstr "%liм %liс" +msgid "Failed to resolve %s" +msgstr "Неуспех при превръщането на %s" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 -#, c-format -msgid "%lis" -msgstr "%liс" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Неуспех при обхода на дървото" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:219 #, c-format -msgid "Selection %s not found" -msgstr "Изборът %s не е намерен" +msgid "Failed to open %s" +msgstr "Неуспех при отварянето на %s" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:278 #, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" -"Неуспех при заключване на административната директория (%s). Може би се " -"използва от друг процес?" +msgid " DeLink %s [%s]\n" +msgstr "DeLink %s [%s]\n" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:286 #, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "" -"Неуспех при заключване на административната директория (%s). Може би липсват " -"административни права?" +msgid "Failed to readlink %s" +msgstr "Неуспех при прочитането на връзка %s" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:290 #, 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 "Failed to unlink %s" +msgstr "Неуспех при премахването на връзка %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:298 #, c-format -msgid "Installing %s" -msgstr "Инсталиране на %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Неуспех при създаването на връзка %s към %s" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:308 #, c-format -msgid "Configuring %s" -msgstr "Конфигуриране на %s" +msgid " DeLink limit of %sB hit.\n" +msgstr "Превишен лимит на DeLink от %sB.\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 -#, c-format -msgid "Removing %s" -msgstr "Премахване на %s" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Архивът няма поле „package“" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Completely removing %s" -msgstr "Окончателно премахване на %s" +msgid " %s has no override entry\n" +msgstr " %s няма запис „override“\n" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Noting disappearance of %s" -msgstr "Отбелязване на изчезването на %s" +msgid " %s maintainer is %s not %s\n" +msgstr " поддържащия пакета %s е %s, а не %s\n" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:706 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Изпълнение на тригер след инсталиране %s" +msgid " %s has no source override entry\n" +msgstr " %s няма запис „source override“\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:710 #, c-format -msgid "Directory '%s' missing" -msgstr "Директорията „%s“ липсва" +msgid " %s has no binary override entry either\n" +msgstr " %s няма също и запис „binary override“\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, c-format -msgid "Could not open file '%s'" -msgstr "Неуспех при отваряне на файла „%s“" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Неуспех при заделянето на памет" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing %s" -msgstr "Подготвяне на %s" +msgid "Unable to open %s" +msgstr "Неуспех при отварянето на %s" -#: apt-pkg/deb/dpkgpm.cc:993 -#, c-format -msgid "Unpacking %s" -msgstr "Разпакетиране на %s" +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Неправилно форматиран override %s, ред %llu #1" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing to configure %s" -msgstr "Подготвяне на %s за конфигуриране" +msgid "Failed to read the override file %s" +msgstr "Неуспех при четенето на override файл %s" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/override.cc:166 #, c-format -msgid "Installed %s" -msgstr "%s е инсталиран" +msgid "Malformed override %s line %llu #1" +msgstr "Неправилно форматиран override %s, ред %llu #1" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:178 #, c-format -msgid "Preparing for removal of %s" -msgstr "Подготвяне за премахване на %s" +msgid "Malformed override %s line %llu #2" +msgstr "Неправилно форматиран override %s, ред %llu #2" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:191 #, c-format -msgid "Removed %s" -msgstr "%s е премахнат" +msgid "Malformed override %s line %llu #3" +msgstr "Неправилно форматиран override %s, ред %llu #3" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Подготовка за пълно премахване на %s" +msgid "Unknown compression algorithm '%s'" +msgstr "Непознат алгоритъм за компресия „%s“" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:103 #, c-format -msgid "Completely removed %s" -msgstr "%s е напълно премахнат" - -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Неуспех при записа на %s" +msgid "Compressed output %s needs a compression set" +msgstr "Компресираният изход %s изисква настройка за компресирането" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Неуспех при създаването на FILE*" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Неуспех при пускането на подпроцес" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "Операцията е прекъсната" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Процес-потомък за компресиране" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" -"Поради достигане на максималния брой доклади (MaxReports) не е записан нов " -"доклад за зависимостите." +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Вътрешна грешка, неуспех при създаването на %s" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "отлагане на настройката поради неудовлетворени зависимости" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "В/И към подпроцеса/файла пропадна" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" -"Доклад за зависимостите не е записан защото съобщението за грешка е породено " -"от друга грешка." +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Неуспех при четене докато се изчислява MD5" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" -"Доклад за зависимостите не е записан защото грешката е причинена от " -"недостатъчно дисково пространство" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Неуспех при премахването на връзка на %s" -#: apt-pkg/deb/dpkgpm.cc:1707 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Доклад за зависимостите не е записан защото грешката е причинена от " -"недостатъчна оперативна памет" +"Употреба: apt-internal-solver\n" +"\n" +"apt-internal-solver е интерфейс към вградения в APT механизъм за " +"удовлетворяване на зависимости\n" +"\n" +"Опции:\n" +" -h Този помощен текст\n" +" -q Изход, подходящ за журнал — без индикатор на напредъка\n" +" -c=? Указване на файл с настройки\n" +" -o=? Указване на произволна настройка, напр. -o dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -#, fuzzy -msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" -msgstr "" -"Доклад за зависимостите не е записан защото грешката е причинена от " -"недостатъчно дисково пространство" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Непознат запис за пакет!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Доклад за зависимостите не е записан поради входно-изходна грешка с dpkg" +"Употреба: apt-sortpkgs [опции] файл1 [файл2 ...]\n" +"\n" +"apt-sortpkgs е опростен инструмент за сортиране на пакетни файлове. Опцията\n" +"„-s“ се използва, за да покаже типа на файла.\n" +"\n" +"Опции:\n" +" -h Този помощен текст.\n" +" -s Използване на сортиране по изходен код.\n" +" -c=? Четене на този конфигурационен файл.\n" +" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" +"tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/bs.po b/po/bs.po index 3cf69f0b1..8a6070107 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr "" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -319,7 +319,7 @@ msgstr "" msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "" @@ -339,151 +339,151 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1356 #, 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:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -582,7 +582,7 @@ msgstr "" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -676,16 +676,16 @@ msgstr "Ne mogu demontirati CD-ROM na %s, moguće je da se još uvijek koristi." msgid "Disk not found." msgstr "Datoteka nije pronađena" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Datoteka nije pronađena" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "" @@ -737,7 +737,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "" @@ -760,7 +760,7 @@ msgstr "" msgid "Protocol corruption" msgstr "Oštećenje protokola" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -821,7 +821,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "" @@ -830,7 +830,7 @@ msgstr "" msgid "Unable to fetch file, server said '%s'" msgstr "" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "" @@ -880,7 +880,7 @@ msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Povezujem se sa %s" @@ -1018,39 +1018,17 @@ msgstr "Povezivanje neuspješno" msgid "Internal error" msgstr "Unutrašnja greška" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "" - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "" - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "" - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" +#: apt-private/private-list.cc:129 +msgid "Listing" msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" +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:93 msgid "Correcting dependencies..." @@ -1080,34 +1058,208 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr "[Instalirano]" + +#: apt-private/private-output.cc:268 #, fuzzy -msgid "WARNING: The following packages cannot be authenticated!" +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-download.cc:40 -msgid "Authentication warning overridden.\n" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" msgstr "" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" +#: apt-private/private-output.cc:633 +msgid "The following held packages will be changed:" msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " msgstr "" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" +#: 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-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:727 #, c-format -msgid "Failed to fetch %s %s\n" +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:35 +#, 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:97 +#, 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:101 +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:82 @@ -1159,6 +1311,10 @@ msgstr "" msgid "You don't have enough free space in %s." msgstr "" +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "" + #: apt-private/private-install.cc:216 apt-private/private-install.cc:238 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" @@ -1348,254 +1504,98 @@ msgstr "" msgid "Package '%s' is not installed, so not removed\n" msgstr "" -#: apt-private/private-list.cc:129 -msgid "Listing" +#: apt-private/private-download.cc:36 +#, fuzzy +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "Slijedeći paketi će biti nadograđeni:" + +#: apt-private/private-download.cc:40 +msgid "Authentication warning overridden.\n" msgstr "" -#: apt-private/private-list.cc:159 -#, 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-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-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!" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" msgstr "" -#: apt-private/private-output.cc:727 -#, c-format -msgid "%lu upgraded, %lu newly installed, " +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" msgstr "" -#: apt-private/private-output.cc:731 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format -msgid "%lu reinstalled, " +msgid "Failed to fetch %s %s\n" msgstr "" -#: apt-private/private-output.cc:733 -#, c-format -msgid "%lu downgraded, " -msgstr "" +#: apt-private/private-sources.cc:58 +#, fuzzy, c-format +msgid "Failed to parse %s. Edit again? " +msgstr "Ne mogu otvoriti %s" -#: apt-private/private-output.cc:735 +#: apt-private/private-sources.cc:70 #, c-format -msgid "%lu to remove and %lu not upgraded.\n" +msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-output.cc:739 -#, c-format -msgid "%lu not fully installed or removed.\n" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" 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 "" +#: apt-private/private-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "Računam nadogradnju..." -#. 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 "" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "Urađeno" -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:778 -msgid "Y" +#: apt-private/acqprogress.cc:66 +msgid "Hit " msgstr "" -#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:784 -msgid "N" +#: apt-private/acqprogress.cc:90 +msgid "Get:" msgstr "" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 -#, c-format -msgid "Regex compilation error - %s" +#: apt-private/acqprogress.cc:121 +msgid "Ign " msgstr "" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" +#: apt-private/acqprogress.cc:125 +msgid "Err " msgstr "" -#: apt-private/private-show.cc:156 +#: apt-private/acqprogress.cc:146 #, 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)" +msgid "Fetched %sB in %s (%sB/s)\n" msgstr "" -#: apt-private/private-sources.cc:58 -#, fuzzy, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "Ne mogu otvoriti %s" - -#: apt-private/private-sources.cc:70 +#: apt-private/acqprogress.cc:236 #, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "" - -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" +msgid " [Working]" msgstr "" -#: apt-private/private-update.cc:90 +#: apt-private/acqprogress.cc:297 #, 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:94 -msgid "All packages are up to date." +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" msgstr "" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "Računam nadogradnju..." - -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "Urađeno" - #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format msgid "Unable to read %s" msgstr "Ne mogu čitati %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1629,7 +1629,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "" @@ -1667,533 +1667,510 @@ msgstr "" msgid "Merging available information" msgstr "Sastavljam dostupne informacije" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" msgstr "" -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Ne mogu kreirati %s" - -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "Ne mogu zapisati na %s" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" msgstr "" -"Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" +#: apt-inst/filelist.cc:506 +#, c-format +msgid "Double add of diversion %s -> %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" +#: apt-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" msgstr "" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "Error processing contents %s" +msgid "The path %s is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" +#: apt-inst/extract.cc:132 +#, c-format +msgid "Unpacking %s more than once" msgstr "" -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" msgstr "" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/extract.cc:152 #, c-format -msgid "Some files are missing in the package file group `%s'" +msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: ftparchive/cachedb.cc:65 -#, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB je bila oštećena, datoteka preimenovana u %s.old" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "DB je stara, pokušavam nadogradnju %s" - -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:99 -#, fuzzy, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Ne mogu otvoriti DB datoteku %s" +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:249 #, c-format -msgid "Failed to stat %s" +msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Ne mogu ukloniti %s" +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "" -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Arhiva nema kontrolnog zapisa" +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Putanja je preduga" -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" +#: apt-inst/extract.cc:421 +#, c-format +msgid "Overwrite package match with no version for %s" msgstr "" -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:438 #, c-format -msgid "W: Unable to read directory %s\n" +msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:498 #, c-format -msgid "W: Unable to stat %s\n" +msgid "Unable to stat %s" msgstr "" -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "" +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#, fuzzy, c-format +msgid "Failed to write file %s" +msgstr "Ne mogu ukloniti %s" -#: ftparchive/writer.cc:154 -msgid "W: " +#: apt-inst/dirstream.cc:105 +#, c-format +msgid "Failed to close file %s" msgstr "" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "Failed to resolve %s" +msgid "Internal error, could not locate member %s" msgstr "" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" msgstr "" -#: ftparchive/writer.cc:219 -#, c-format -msgid "Failed to open %s" -msgstr "Ne mogu otvoriti %s" - -#: ftparchive/writer.cc:278 -#, c-format -msgid " DeLink %s [%s]\n" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" msgstr "" -#: ftparchive/writer.cc:286 -#, c-format -msgid "Failed to readlink %s" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" msgstr "" -#: ftparchive/writer.cc:290 +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid "Failed to unlink %s" +msgid "Invalid archive member header %s" msgstr "" -#: ftparchive/writer.cc:298 -#, c-format -msgid "*** Failed to link %s to %s" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" msgstr "" -#: ftparchive/writer.cc:308 -#, c-format -msgid " DeLink limit of %sB hit.\n" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Arhiva je prekratka" + +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" msgstr "" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" msgstr "" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Ne mogu izvršiti gzip" + +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Oštećena arhiva" + +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena" + +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid " %s has no override entry\n" +msgid "Unknown TAR header type %u, member %s" msgstr "" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid " %s maintainer is %s not %s\n" +msgid "Progress: [%3i%%]" msgstr "" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" msgstr "" -#: ftparchive/writer.cc:710 +#: apt-pkg/init.cc:146 #, c-format -msgid " %s has no binary override entry either\n" +msgid "Packaging system '%s' is not supported" msgstr "" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" msgstr "" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Unable to open %s" +msgid "Wrote %i records.\n" msgstr "" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Malformed override %s line %llu (%s)" +msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "Failed to read the override file %s" +msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: ftparchive/override.cc:166 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "Malformed override %s line %llu #1" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: ftparchive/override.cc:178 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Malformed override %s line %llu #2" +msgid "Can't find authentication record for: %s" msgstr "" -#: ftparchive/override.cc:191 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "Malformed override %s line %llu #3" +msgid "Hash mismatch for: %s" msgstr "" -#: ftparchive/multicompress.cc:73 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "Unknown compression algorithm '%s'" +msgid "The method driver %s could not be found." msgstr "" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/acquire-worker.cc:118 #, c-format -msgid "Compressed output %s needs a compression set" +msgid "Is the package %s installed?" msgstr "" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" +#: apt-pkg/acquire-worker.cc:169 +#, c-format +msgid "Method %s did not start correctly" msgstr "" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" +#: apt-pkg/acquire-worker.cc:455 +#, c-format +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." msgstr "" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" msgstr "" -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "" + +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "" + +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" msgstr "" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Failed to rename %s to %s" +msgid "This APT does not support the versioning system '%s'" msgstr "" -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" msgstr "" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Nepoznat zapis paketa\"" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Zavisi" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Unaprijed zavisi" + +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Predlaže" + +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Preporučuje" + +#: apt-pkg/pkgcache.cc:322 +#, fuzzy +msgid "Conflicts" +msgstr "Sukobljava se sa" + +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Zamjenjuje" + +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Zastarijeva" + +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" msgstr "" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, fuzzy, c-format -msgid "Failed to write file %s" -msgstr "Ne mogu ukloniti %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "važno" + +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "zahtijevano" + +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "standardno" + +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "opcionalno" + +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "extra" + +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Failed to close file %s" +msgid "Index file type '%s' is not supported" msgstr "" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/sourcelist.cc:127 #, c-format -msgid "The path %s is too long" +msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" -#: apt-inst/extract.cc:132 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "Unpacking %s more than once" +msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-inst/extract.cc:142 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "The directory %s is diverted" +msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-inst/extract.cc:152 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" +#: apt-pkg/sourcelist.cc:190 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-inst/extract.cc:249 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "The directory %s is being replaced by a non-directory" +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" +#: apt-pkg/sourcelist.cc:206 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Putanja je preduga" - -#: apt-inst/extract.cc:421 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Overwrite package match with no version for %s" +msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-inst/extract.cc:438 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "File %s/%s overwrites the one in the package %s" +msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-inst/extract.cc:498 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "Unable to stat %s" +msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" +#: apt-pkg/sourcelist.cc:224 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "" +#: apt-pkg/sourcelist.cc:335 +#, c-format +msgid "Opening %s" +msgstr "Otvaram %s" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 +#, c-format +msgid "Line %u too long in source list %s." msgstr "" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" +#: apt-pkg/sourcelist.cc:371 +#, c-format +msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-inst/filelist.cc:477 +#: apt-pkg/sourcelist.cc:375 #, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-inst/filelist.cc:506 +#: apt-pkg/sourcelist.cc:416 #, c-format -msgid "Double add of diversion %s -> %s" +msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" -#: apt-inst/filelist.cc:549 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 #, c-format -msgid "Duplicate conf file %s/%s" +msgid "Clean of %s is not supported" msgstr "" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." msgstr "" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-inst/contrib/arfile.cc:96 +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format -msgid "Invalid archive member header %s" +msgid "Error occurred while processing %s (%s%d)" msgstr "" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Arhiva je prekratka" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" +#: apt-pkg/pkgcachegen.cc:263 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Ne mogu izvršiti gzip" - -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Oštećena arhiva" - -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena" - -#: apt-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Unknown TAR header type %u, member %s" +msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "Couldn't stat source package list %s" msgstr "" -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Čitam spiskove paketa" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" msgstr "" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "List directory %spartial is missing." +msgid "Unable to write to %s" +msgstr "Ne mogu zapisati na %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire.cc:91 -#, c-format -msgid "Archives directory %spartial is missing." +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" msgstr "" -#: apt-pkg/acquire.cc:99 -#, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "Ne mogu kreirati %s" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, c-format -msgid "Clean of %s is not supported" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" msgstr "" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/acquire.cc:904 -#, fuzzy, c-format -msgid "Retrieving file %li of %li" -msgstr "Čitam spisak datoteke" +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2212,35 +2189,35 @@ msgstr "" msgid "Invalid file format" msgstr "" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, 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:1589 +#: apt-pkg/acquire-item.cc:1656 #, 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:1631 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2248,132 +2225,110 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, 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:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." +msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Is the package %s installed?" +msgid "List directory %spartial is missing." msgstr "" -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Method %s did not start correctly" +msgid "Archives directory %spartial is missing." msgstr "" -#: apt-pkg/acquire-worker.cc:455 -#, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" +#: apt-pkg/acquire.cc:99 +#, fuzzy, c-format +msgid "Unable to lock directory %s" +msgstr "Ne mogu kreirati %s" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "" - -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "" +#: apt-pkg/acquire.cc:904 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Čitam spisak datoteke" -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cacheset.cc:489 +#: apt-pkg/policy.cc:83 #, c-format -msgid "Release '%s' for '%s' was not found" +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/policy.cc:422 #, c-format -msgid "Version '%s' for '%s' was not found" +msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/cacheset.cc:603 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "Ne mogu otvoriti %s" - -#: apt-pkg/cacheset.cc:609 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Couldn't find any package by regex '%s'" +msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/cacheset.cc:615 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Ne mogu otvoriti %s" - -#: apt-pkg/cacheset.cc:626 -#, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" - -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/cacheset.cc:655 -#, c-format -msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "" +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "Ne mogu otvoriti %s" -#: apt-pkg/cacheset.cc:663 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select installed version from package %s as it is not installed" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/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 @@ -2450,9 +2405,20 @@ msgstr "" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." msgstr "" #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 @@ -2482,54 +2448,66 @@ msgstr "Ne mogu otvoriti %s" msgid "Failed to write temporary StateFile %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" msgstr "" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" msgstr "" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "Ne mogu otvoriti %s" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" +msgid "Couldn't find any package by regex '%s'" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Ne mogu otvoriti %s" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" +msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:663 #, c-format -msgid "Hash mismatch for: %s" +msgid "Can't select installed version from package %s as it is not installed" msgstr "" #: apt-pkg/indexrecords.cc:78 @@ -2557,308 +2535,219 @@ msgstr "" msgid "Invalid 'Date' entry in Release file %s" msgstr "Ne mogu otvoriti DB datoteku %s" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" +msgid "%lid %lih %limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:57 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Progress: [%3i%%]" -msgstr "" - -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" +msgid "%lih %limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "%limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "Ne mogu otvoriti %s" - -#: apt-pkg/packagemanager.cc:630 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" - -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" +msgid "%lis" msgstr "" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" +#: apt-pkg/contrib/strutl.cc:1258 +#, c-format +msgid "Selection %s not found" msgstr "" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" +#: apt-pkg/contrib/fileutl.cc:190 +#, c-format +msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:218 #, c-format -msgid "This APT does not support the versioning system '%s'" +msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" msgstr "" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Zavisi" - -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Unaprijed zavisi" - -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Predlaže" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Preporučuje" - -#: apt-pkg/pkgcache.cc:322 -#, fuzzy -msgid "Conflicts" -msgstr "Sukobljava se sa" - -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Zamjenjuje" - -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Zastarijeva" - -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "važno" - -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "zahtijevano" - -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "standardno" - -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "opcionalno" - -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "extra" - -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" 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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/fileutl.cc:421 #, c-format -msgid "Error occurred while processing %s (%s%d)" +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/fileutl.cc:913 #, c-format -msgid "Package %s %s was not found while processing file dependencies" +msgid "Problem closing the gzip file %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/fileutl.cc:1101 #, c-format -msgid "Couldn't stat source package list %s" +msgid "Could not open file %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Čitam spiskove paketa" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, fuzzy, c-format +msgid "Could not open file descriptor %d" +msgstr "Ne mogu otvoriti %s" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format -msgid "Index file type '%s' is not supported" +msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/policy.cc:422 -#, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "" +#: apt-pkg/contrib/fileutl.cc:1915 +#, fuzzy, c-format +msgid "Problem closing the file %s" +msgstr "Ne mogu ukloniti %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format -msgid "Did not understand pin type %s" -msgstr "" - -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" +msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" +msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/sourcelist.cc:170 -#, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" msgstr "" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" +msgid "%c%s... Error!" msgstr "" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgid "%c%s... Done" msgstr "" -#: apt-pkg/sourcelist.cc:190 -#, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" +#: apt-pkg/contrib/progress.cc:181 +msgid "..." msgstr "" -#: apt-pkg/sourcelist.cc:193 +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 #, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgid "%c%s... %u%%" msgstr "" -#: apt-pkg/sourcelist.cc:206 -#, c-format -msgid "Malformed line %lu in source list %s (URI)" +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "Malformed line %lu in source list %s (dist)" +msgid "Couldn't duplicate file descriptor %i" msgstr "" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/mmap.cc:119 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" +msgid "Couldn't make mmap of %llu bytes" 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/contrib/mmap.cc:146 +#, fuzzy +msgid "Unable to close mmap" +msgstr "Ne mogu kreirati %s" -#: apt-pkg/sourcelist.cc:375 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" -msgstr "" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "Ne mogu kreirati %s" -#: apt-pkg/sourcelist.cc:416 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Type '%s' is not known on stanza %u in source list %s" +msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "" +#: apt-pkg/contrib/mmap.cc:322 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Ne mogu ukloniti %s" -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/mmap.cc:341 #, c-format -msgid "Unable to parse package file %s (1)" +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Unable to parse package file %s (2)" -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." +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." msgstr "" -#: apt-pkg/vendorlist.cc:85 -#, c-format -msgid "Vendor block %s contains no fingerprint" +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" #: apt-pkg/contrib/cdromutl.cc:65 @@ -2870,52 +2759,6 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/cmndline.cc:121 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "" - -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "" - -#: apt-pkg/contrib/cmndline.cc:168 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "" - -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "" - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "" - -#: apt-pkg/contrib/cmndline.cc:278 -#, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "" - -#: apt-pkg/contrib/cmndline.cc:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "" - -#: apt-pkg/contrib/cmndline.cc:341 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "" - -#: apt-pkg/contrib/cmndline.cc:391 -#, c-format -msgid "Invalid operation %s" -msgstr "" - #: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" @@ -2971,386 +2814,538 @@ msgstr "" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:190 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Odustajem od instalacije." + +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Not using locking for read only lock file %s" +msgid "Command line option '%c' [from %s] is not known." msgstr "" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Could not open lock file %s" +msgid "Command line option %s is not understood" msgstr "" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Not using locking for nfs mounted lock file %s" +msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "Could not get lock %s" +msgid "Option %s requires an argument." msgstr "" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "List of files can't be created as '%s' is not a directory" +msgid "Option %s: Configuration item specification must have an =." msgstr "" -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgid "Option '%s' is too long" msgstr "" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s received a segmentation fault." +msgid "Invalid operation %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:826 +#: apt-pkg/deb/dpkgpm.cc:110 +#, fuzzy, c-format +msgid "Installing %s" +msgstr " Instalirano:" + +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 +#, fuzzy, c-format +msgid "Configuring %s" +msgstr "Povezujem se sa %s" + +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 +#, fuzzy, c-format +msgid "Removing %s" +msgstr "Otvaram %s" + +#: apt-pkg/deb/dpkgpm.cc:113 +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "Ne mogu ukloniti %s" + +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Sub-process %s received signal %u." +msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/deb/dpkgpm.cc:115 #, c-format -msgid "Sub-process %s returned an error code (%u)" +msgid "Running post-installation trigger %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "Sub-process %s exited unexpectedly" +msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 +#, fuzzy, c-format +msgid "Could not open file '%s'" +msgstr "Ne mogu otvoriti %s" + +#: apt-pkg/deb/dpkgpm.cc:1007 +#, fuzzy, c-format +msgid "Preparing %s" +msgstr "Otvaram %s" + +#: apt-pkg/deb/dpkgpm.cc:1008 +#, fuzzy, c-format +msgid "Unpacking %s" +msgstr "Otvaram %s" + +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Problem closing the gzip file %s" +msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/dpkgpm.cc:1015 +#, fuzzy, c-format +msgid "Installed %s" +msgstr " Instalirano:" + +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "Could not open file %s" +msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/deb/dpkgpm.cc:1022 #, fuzzy, c-format -msgid "Could not open file descriptor %d" -msgstr "Ne mogu otvoriti %s" +msgid "Removed %s" +msgstr "Preporučuje" -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " +#: apt-pkg/deb/dpkgpm.cc:1028 +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Ne mogu ukloniti %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Ne mogu zapisati na %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1514 +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "" + +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "read, still have %llu to read but none left" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#: apt-pkg/deb/debsystem.cc:94 #, c-format -msgid "write, still have %llu to write but couldn't" +msgid "Unable to lock the administration directory (%s), are you root?" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1915 +#. 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 "" + +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" + +#: cmdline/apt-extracttemplates.cc:254 #, fuzzy, c-format -msgid "Problem closing the file %s" -msgstr "Ne mogu ukloniti %s" +msgid "Unable to mkstemp %s" +msgstr "Ne mogu kreirati %s" -#: apt-pkg/contrib/fileutl.cc:1927 +#: cmdline/apt-extracttemplates.cc:300 +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 +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 #, c-format -msgid "Problem renaming the file %s to %s" +msgid "Error processing directory %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1938 +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "Problem unlinking the file %s" +msgid "Error processing contents %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Odustajem od instalacije." +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" +#: ftparchive/apt-ftparchive.cc:907 +#, c-format +msgid "Some files are missing in the package file group `%s'" msgstr "" -#: apt-pkg/contrib/mmap.cc:111 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "Couldn't duplicate file descriptor %i" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB je bila oštećena, datoteka preimenovana u %s.old" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "DB je stara, pokušavam nadogradnju %s" + +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" -#: apt-pkg/contrib/mmap.cc:119 -#, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "" +#: ftparchive/cachedb.cc:99 +#, fuzzy, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Ne mogu otvoriti DB datoteku %s" -#: apt-pkg/contrib/mmap.cc:146 +#: ftparchive/cachedb.cc:332 #, fuzzy -msgid "Unable to close mmap" -msgstr "Ne mogu kreirati %s" +msgid "Failed to read .dsc" +msgstr "Ne mogu ukloniti %s" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -#, fuzzy -msgid "Unable to synchronize mmap" -msgstr "Ne mogu kreirati %s" +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Arhiva nema kontrolnog zapisa" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" msgstr "" -#: apt-pkg/contrib/mmap.cc:322 -#, fuzzy -msgid "Failed to truncate file" -msgstr "Ne mogu ukloniti %s" - -#: apt-pkg/contrib/mmap.cc:341 +#: ftparchive/writer.cc:91 #, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +msgid "W: Unable to read directory %s\n" msgstr "" -#: apt-pkg/contrib/mmap.cc:446 +#: ftparchive/writer.cc:96 #, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +msgid "W: Unable to stat %s\n" msgstr "" -#: apt-pkg/contrib/mmap.cc:449 -msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +#: ftparchive/writer.cc:152 +msgid "E: " msgstr "" -#: apt-pkg/contrib/progress.cc:148 -#, c-format -msgid "%c%s... Error!" +#: ftparchive/writer.cc:154 +msgid "W: " msgstr "" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "" + +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%c%s... Done" +msgid "Failed to resolve %s" msgstr "" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" msgstr "" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: ftparchive/writer.cc:219 #, c-format -msgid "%c%s... %u%%" -msgstr "" +msgid "Failed to open %s" +msgstr "Ne mogu otvoriti %s" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/writer.cc:278 #, c-format -msgid "%lid %lih %limin %lis" +msgid " DeLink %s [%s]\n" msgstr "" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/writer.cc:286 #, c-format -msgid "%lih %limin %lis" +msgid "Failed to readlink %s" msgstr "" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/writer.cc:290 #, c-format -msgid "%limin %lis" +msgid "Failed to unlink %s" msgstr "" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:298 #, c-format -msgid "%lis" +msgid "*** Failed to link %s to %s" msgstr "" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:308 #, c-format -msgid "Selection %s not found" +msgid " DeLink limit of %sB hit.\n" msgstr "" -#: apt-pkg/deb/debsystem.cc:91 -#, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" msgstr "" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Unable to lock the administration directory (%s), are you root?" +msgid " %s has no override entry\n" msgstr "" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgid " %s maintainer is %s not %s\n" msgstr "" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" +#: ftparchive/writer.cc:706 +#, c-format +msgid " %s has no source override entry\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:95 -#, fuzzy, c-format -msgid "Installing %s" -msgstr " Instalirano:" - -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 -#, fuzzy, c-format -msgid "Configuring %s" -msgstr "Povezujem se sa %s" - -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 -#, fuzzy, c-format -msgid "Removing %s" -msgstr "Otvaram %s" +#: ftparchive/writer.cc:710 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:98 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "Ne mogu ukloniti %s" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Noting disappearance of %s" +msgid "Unable to open %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:100 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 #, c-format -msgid "Running post-installation trigger %s" +msgid "Malformed override %s line %llu (%s)" msgstr "" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Directory '%s' missing" +msgid "Failed to read the override file %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "Ne mogu otvoriti %s" - -#: apt-pkg/deb/dpkgpm.cc:992 -#, fuzzy, c-format -msgid "Preparing %s" -msgstr "Otvaram %s" - -#: apt-pkg/deb/dpkgpm.cc:993 -#, fuzzy, c-format -msgid "Unpacking %s" -msgstr "Otvaram %s" - -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:166 #, c-format -msgid "Preparing to configure %s" +msgid "Malformed override %s line %llu #1" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1000 -#, fuzzy, c-format -msgid "Installed %s" -msgstr " Instalirano:" - -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:178 #, c-format -msgid "Preparing for removal of %s" +msgid "Malformed override %s line %llu #2" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1007 -#, fuzzy, c-format -msgid "Removed %s" -msgstr "Preporučuje" - -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:191 #, c-format -msgid "Preparing to completely remove %s" +msgid "Malformed override %s line %llu #3" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1013 -#, fuzzy, c-format -msgid "Completely removed %s" -msgstr "Ne mogu ukloniti %s" - -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Ne mogu zapisati na %s" +#: ftparchive/multicompress.cc:73 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" msgstr "" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1707 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Nepoznat zapis paketa\"" + +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" #~ msgid "%s not a valid DEB package." diff --git a/po/ca.po b/po/ca.po index 31961ecac..6ce0751e8 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2012-10-19 13:30+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Taula de versió:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -359,7 +359,7 @@ msgstr "No és possible blocar el directori de descàrrega" 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "No es pot trobar un paquet de fonts per a %s" @@ -386,81 +386,81 @@ msgstr "" "per obtenir les últimes actualitzacions (possiblement no publicades) del " "paquet.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja baixat «%s»\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita baixar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Obtén el font %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "No s'ha pogut baixar alguns arxius." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Baixada completa i en mode de només baixada" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -469,18 +469,18 @@ 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:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -489,7 +489,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:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -498,14 +498,14 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet " "%s" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -514,7 +514,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:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -523,30 +523,30 @@ msgstr "" "La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió " "candidata" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, 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:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Registre de canvis per a %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -692,7 +692,7 @@ msgstr "%s ja estava no retingut.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperava %s però no hi era" @@ -786,16 +786,16 @@ msgstr "No es pot muntar el CD-ROM en %s, potser estigui encara en ús." msgid "Disk not found." msgstr "No s'ha trobat el disc" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Fitxer no trobat" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "L'estat ha fallat" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@ -849,7 +849,7 @@ msgstr "L'ordre «%s» de l'script d'accés ha fallat, el servidor ha dit: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE ha fallat, el servidor ha dit: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Temps de connexió finalitzat" @@ -871,7 +871,7 @@ msgstr "Una resposta ha desbordat la memòria intermèdia." msgid "Protocol corruption" msgstr "Protocol corromput" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -933,7 +933,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:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@ -942,7 +942,7 @@ msgstr "Problema escollint el fitxer" msgid "Unable to fetch file, server said '%s'" msgstr "No és possible obtenir el fitxer, el servidor ha dit '%s'" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "S'ha esgotat el temps d'espera per al sòcol de dades" @@ -992,7 +992,7 @@ msgstr "No s'ha pogut connectar amb %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "S'està connectant amb %s" @@ -1136,42 +1136,17 @@ msgstr "Ha fallat la connexió" msgid "Internal error" msgstr "Error intern" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Obj " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Bai:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ign " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Err " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "S'ha baixat %sB en %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Treballant]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Canvi de medi: inseriu el disc amb l'etiqueta\n" -" «%s»\n" -"en la unitat «%s» i premeu Intro\n" +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:93 msgid "Correcting dependencies..." @@ -1201,167 +1176,351 @@ msgstr "Potser voldreu executar «apt-get -f install» per a corregir-ho." msgid "Unmet dependencies. Try using -f." msgstr "Dependències sense satisfer. Proveu-ho emprant -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "AVÍS: No es poden autenticar els següents paquets!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instaŀlat]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "S'ha descartat l'avís d'autenticació.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [Instaŀlat]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "No s'ha pogut autenticar alguns paquets" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Voleu instaŀlar aquests paquets sense verificar-los?" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Instaŀlat]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Instaŀlat]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "No s'ha pogut obtenir %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" -"S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets " -"trencats!" - -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." +msgid "[upgradable from: %s]" msgstr "" -"Els paquets necessiten ser suprimits però s'ha inhabilitat la supressió." -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "S'ha produït un error intern, l'ordenació no ha acabat" - -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" msgstr "" -"Què estrany… les mides no coincideixen, informeu 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 -#: apt-private/private-install.cc:155 +#: apt-private/private-output.cc:455 #, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "S'ha d'obtenir %sB/%sB d'arxius.\n" +msgid "but %s is installed" +msgstr "però està instaŀlat %s" -#. 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:160 +#: apt-private/private-output.cc:457 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "S'ha d'obtenir %sB d'arxius.\n" +msgid "but %s is to be installed" +msgstr "però s'instaŀlarà %s" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "" -"Després d'aquesta operació s'empraran %sB d'espai en disc addicional.\n" +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "però no és instaŀlable" -#. 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:172 -#, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "però és un paquet virtual" -#: apt-private/private-install.cc:200 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "No teniu prou espai lliure en %s." +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "però no està instaŀlat" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "S'ha especificat «Trivial Only» però aquesta operació no és trivial." +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "però no serà instaŀlat" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Sí, fes el que et dic!" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " o" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Esteu a punt de fer quelcom potencialment nociu.\n" -"Per continuar escriviu la frase «%s»\n" -" ?] " +#: 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-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Avortat." +#: 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-install.cc:243 -msgid "Do you want to continue?" -msgstr "Voleu continuar?" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "Es SUPRIMIRAN els paquets següents:" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Alguns fitxers no s'han pogut baixar" +#: 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-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"No es poden baixar alguns arxius, proveu a executar apt-get update o " -"intenteu-ho amb --fix-missing." +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "S'actualitzaran els paquets següents:" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing i els medi intercanviables actualment no estan suportats" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" +msgstr "Es DESACTUALITZARAN els paquets següents:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "No es poden corregir els paquets que falten." +#: 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-install.cc:330 -msgid "Aborting install." -msgstr "S'està avortant la instaŀlació." +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (per %s) " -#: apt-private/private-install.cc:366 +#: apt-private/private-output.cc:696 msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"El següent paquet ha desaparegut del vostre sistema ja\n" -"que tots els fitxers s'han sobreescrit per altres paquets:" -msgstr[1] "" -"Els següents paquets han desaparegut del vostre sistema ja\n" -"que tots els fitxers s'han sobreescrit per altres paquets:" +"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-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Nota: Això ho fa el dpkg automàticament i a propòsit." +#: 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-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "" -"Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor " -"automàtic" +#: apt-private/private-output.cc:731 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu reinstaŀlats, " -#: apt-private/private-install.cc:499 +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "" +"S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets " +"trencats!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "" +"Els paquets necessiten ser suprimits però s'ha inhabilitat la supressió." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "S'ha produït un error intern, l'ordenació no ha acabat" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Què estrany… les mides no coincideixen, informeu a apt@packages.debian.org" + +#. 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "S'ha d'obtenir %sB/%sB d'arxius.\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:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "S'ha d'obtenir %sB d'arxius.\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:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "" +"Després d'aquesta operació s'empraran %sB d'espai en disc addicional.\n" + +#. 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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "No teniu prou espai lliure en %s." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "S'ha especificat «Trivial Only» però aquesta operació no és 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Sí, fes el que et dic!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Esteu a punt de fer quelcom potencialment nociu.\n" +"Per continuar escriviu la frase «%s»\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Avortat." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Voleu continuar?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Alguns fitxers no s'han pogut baixar" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"No es poden baixar alguns arxius, proveu a executar apt-get update o " +"intenteu-ho amb --fix-missing." + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing i els medi intercanviables actualment no estan suportats" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "No es poden corregir els paquets que falten." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "S'està avortant la instaŀlació." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"El següent paquet ha desaparegut del vostre sistema ja\n" +"que tots els fitxers s'han sobreescrit per altres paquets:" +msgstr[1] "" +"Els següents paquets han desaparegut del vostre sistema ja\n" +"que tots els fitxers s'han sobreescrit per altres paquets:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Nota: Això ho fa el dpkg automàticament i a propòsit." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" +"Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor " +"automàtic" + +#: apt-private/private-install.cc:499 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1499,210 +1658,26 @@ 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:129 -msgid "Listing" -msgstr "" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "AVÍS: No es poden autenticar els següents paquets!" -#: apt-private/private-list.cc:159 -#, 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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "S'ha descartat l'avís d'autenticació.\n" -#: 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:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "No s'ha pogut autenticar alguns paquets" -#: 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:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "S'ha produït un error de compilació de l'expressió regular - %s" - -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Voleu instaŀlar aquests paquets sense verificar-los?" -#: apt-private/private-show.cc:156 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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 "" +msgid "Failed to fetch %s %s\n" +msgstr "No s'ha pogut obtenir %s %s\n" #: apt-private/private-sources.cc:58 #, fuzzy, c-format @@ -1714,20 +1689,8 @@ msgstr "No s'ha pogut canviar el nom de %s a %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: 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:90 -#, 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:94 -msgid "All packages are up to date." +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" #: apt-private/private-upgrade.cc:25 @@ -1738,20 +1701,57 @@ msgstr "S'està calculant l'actualització… " msgid "Done" msgstr "Fet" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Obj " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Bai:" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ign " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Err " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "S'ha baixat %sB en %s (%sB/s)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Treballant]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Canvi de medi: inseriu el disc amb l'etiqueta\n" +" «%s»\n" +"en la unitat «%s» i premeu 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-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, 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:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1785,7 +1785,7 @@ msgstr "[Rèplica: %s]" msgid "Failed to create IPC pipe to subprocess" msgstr "No s'ha pogut crear el conducte IPC al subprocés" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "La connexió s'ha tancat prematurament" @@ -1828,511 +1828,124 @@ msgstr "" msgid "Merging available information" msgstr "S'està fusionant la informació disponible" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n" -"\n" -"apt-extracttemplates és una eina per a extreure informació de\n" -"configuració i plantilles dels paquets debian\n" -"\n" -"Opcions:\n" -" -h Aquest text d'ajuda.\n" -" -t Estableix el directori temporal\n" -" -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:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "No es pot veure l'estat de %s" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode crida a un node que encara està enllaçat" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "No es pot escriure en %s" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "No s'ha trobat l'element diseminat!" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "No es pot determinar la versió de debconf. Està instaŀlat debconf?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "No s'ha pogut assignar la desviació" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "La llista de les extensions dels paquets és massa llarga" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "S'ha produït un error intern en AddDiversion" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "S'ha produït un error en processar el directori %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "La llista d'extensions de les fonts és massa llarga" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "S'ha produït un error en escriure la capçalera al fitxer de continguts" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "S'està intentant sobreescriure una desviació, %s -> %s i %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, 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 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Forma d'ús: apt-ftparchive [opcions] ordre\n" -"Ordres: packages camí_binaris [fitxer_substitucions prefix_camí]]\n" -" sources camí_fonts [fitxer_substitucions [prefix_camí]]\n" -" contents camí\n" -" release camí\n" -" generate config [grups]\n" -" clean config\n" -"\n" -"apt-ftparchive genera fitxers d'índex per als arxius de Debian.\n" -"Gestiona molts estils per a generar-los, des dels completament automàtics\n" -"als substituts funcionals per dpkg-scanpackages i dpkg-scansources.\n" -"\n" -"apt-ftparchive genera fitxers Package des d'un arbre de .deb. El\n" -"fitxer Package conté tots els camps de control de cada paquet així com\n" -"la suma MD5 i la mida del fitxer. Es suporten els fitxers de substitució\n" -"per a forçar el valor de Prioritat i Secció.\n" -"\n" -"D'un mode semblant, apt-ftparchive genera fitxers Sources des d'un arbre\n" -"de .dsc. Es pot utilitzar l'opció --source-override per a especificar un\n" -"fitxer de substitucions de src.\n" -"\n" -"L'ordre «packages» i «sources» hauria d'executar-se en l'arrel de\n" -"l'arbre. CamíBinaris hauria de ser el punt base de la recerca recursiva\n" -"i el fitxer de substitucions hauria de contenir senyaladors de substitució.\n" -"Prefixcamí s'afegeix als camps del nom de fitxer si està present.\n" -"Exemple d'ús a l'arxiu de Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Opcions:\n" -" -h Aquest text d'ajuda\n" -" --md5 Generació del control MD5\n" -" -s=? Fitxer de substitucions per a fonts\n" -" -q Silenciós\n" -" -d=? Selecciona la base de dades de memòria cau opcional\n" -" --no-delink Habilita el mode de depuració delink\n" -" --contents Genera el fitxer amb els continguts de control\n" -" -c=? Llegeix aquest fitxer de configuració\n" -" -o=? Estableix una opció de configuració arbitrària" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "No s'ha trobat cap selecció" +msgid "Double add of diversion %s -> %s" +msgstr "Afegit doble d'una desviació %s -> %s" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, 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'" +msgid "Duplicate conf file %s/%s" +msgstr "Fitxer de conf. duplicat %s/%s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "La base de dades està corrompuda, fitxer renomenat a %s.old" +msgid "The path %s is too long" +msgstr "La ruta %s és massa llarga" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "La BD és vella, s'està intentant actualitzar %s" +msgid "Unpacking %s more than once" +msgstr "S'està desempaquetant %s més d'una vegada" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"El format de la base de dades és invàlid. Si heu actualitzat des d'una " -"versió més antiga de l'apt, suprimiu i torneu a crear la base de dades." +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "El directori %s està desviat" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "No es pot obrir el fitxer de DB %s: %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "El paquet està intentant escriure en l'objectiu desviat %s/%s" + +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "La ruta de desviació és massa llarga" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "No es pot determinar l'estat de %s" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "No s'ha pogut llegir l'enllaç %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Arxiu sense registre de control" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "No es pot aconseguir un cursor" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "A: No es pot llegir el directori %s\n" +msgid "Failed to rename %s to %s" +msgstr "No s'ha pogut canviar el nom de %s a %s" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "A: No es pot veure l'estat %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "El directori %s està sent reemplaçat per un no-directori" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "A: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "No s'ha trobat el node dins de la taula" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: Els errors s'apliquen al fitxer " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "La ruta és massa llarga" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "No s'ha pogut resoldre %s" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "L'arbre està fallant" +msgid "Overwrite package match with no version for %s" +msgstr "S'està sobreescrivint el corresponent paquet sense versió per a %s" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to open %s" -msgstr "No s'ha pogut obrir %s" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s" -#: ftparchive/writer.cc:278 +#: apt-inst/extract.cc:498 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgid "Unable to stat %s" +msgstr "No es pot veure l'estat de %s" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Failed to readlink %s" -msgstr "No s'ha pogut llegir l'enllaç %s" +msgid "Failed to write file %s" +msgstr "No s'ha pogut escriure el fitxer %s" -#: ftparchive/writer.cc:290 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to unlink %s" -msgstr "No s'ha pogut alliberar %s" +msgid "Failed to close file %s" +msgstr "Ha fallat el tancament del fitxer %s" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** No s'ha pogut enllaçar %s a %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Aquest no és un arxiu DEB vàlid, falta el membre «%s»" -#: ftparchive/writer.cc:308 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " DeLink s'ha arribat al límit de %sB.\n" - -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Arxiu sense el camp paquet" - -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s no té una entrada dominant\n" - -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " el mantenidor de %s és %s, no %s\n" - -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s no té una entrada dominant de font\n" - -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s no té una entrada dominant de binari\n" - -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - No s'ha pogut assignar espai en memòria" - -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "No es pot obrir %s" - -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Línia predominant %s malformada %llu núm 1" - -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "No s'ha pogut llegir la línia predominant del fitxer %s" - -#: ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Línia predominant %s malformada %llu núm 1" - -#: ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Línia predominant %s malformada %llu núm 2" - -#: ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Línia predominant %s malformada %llu núm 3" - -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Algorisme de compressió desconegut '%s'" - -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "La sortida comprimida %s necessita un joc de compressió" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "No s'ha pogut crear FILE*" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "No s'ha pogut bifurcar" - -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Comprimeix el fil" - -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "S'ha produït un error intern, no s'ha pogut crear %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Ha fallat l'E/S del subprocés sobre el fitxer" - -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "No s'ha pogut llegir mentre es calculava la suma MD5" - -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "S'ha trobat un problema treient l'enllaç %s" - -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 -#, c-format -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 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n" -"\n" -"apt-extracttemplates és una eina per a extreure informació de\n" -"configuració i plantilles dels paquets debian\n" -"\n" -"Opcions:\n" -" -h Aquest text d'ajuda.\n" -" -t Estableix el directori temporal\n" -" -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 -msgid "Unknown package record!" -msgstr "Registre del paquet desconegut!" - -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Forma d'ús: apt-sortpkgs [opcions] fitxer1 [fitxer2 …]\n" -"\n" -"apt-sortpkgs és una eina simple per ordenar fitxers de paquets.\n" -"L'opció -s s'usa per a indicar quin tipus de fitxer és.\n" -"\n" -"Opcions:\n" -" -h Aquest text d'ajuda.\n" -" -s Empra l'ordenació de fitxers font\n" -" -c=? Llegeix aquest fitxer de configuració\n" -" -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n" - -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" -msgstr "No s'ha pogut escriure el fitxer %s" - -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "Ha fallat el tancament del fitxer %s" - -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "La ruta %s és massa llarga" - -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" -msgstr "S'està desempaquetant %s més d'una vegada" - -#: apt-inst/extract.cc:142 -#, c-format -msgid "The directory %s is diverted" -msgstr "El directori %s està desviat" - -#: apt-inst/extract.cc:152 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "El paquet està intentant escriure en l'objectiu desviat %s/%s" - -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "La ruta de desviació és massa llarga" - -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "El directori %s està sent reemplaçat per un no-directori" - -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "No s'ha trobat el node dins de la taula" - -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "La ruta és massa llarga" - -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "S'està sobreescrivint el corresponent paquet sense versió per a %s" - -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s" - -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "No es pot veure l'estat de %s" - -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "DropNode crida a un node que encara està enllaçat" - -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "No s'ha trobat l'element diseminat!" - -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "No s'ha pogut assignar la desviació" - -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "S'ha produït un error intern en AddDiversion" - -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "S'està intentant sobreescriure una desviació, %s -> %s i %s/%s" - -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Afegit doble d'una desviació %s -> %s" +msgid "Internal error, could not locate member %s" +msgstr "Error intern, no s'ha pogut localitzar al membre %s" -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Fitxer de conf. duplicat %s/%s" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "El fitxer de control no es pot analitzar" #: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" @@ -2380,141 +1993,55 @@ msgstr "La suma de comprovació de tar ha fallat, arxiu corromput" msgid "Unknown TAR header type %u, member %s" msgstr "Capçalera TAR desconeguda del tipus %u, membre %s" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 -#, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Aquest no és un arxiu DEB vàlid, falta el membre «%s»" - -#: apt-inst/deb/debfile.cc:132 -#, c-format -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 -msgid "Unparsable control file" -msgstr "El fitxer de control no es pot analitzar" - -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, c-format -msgid "List directory %spartial is missing." -msgstr "Falta el directori de llistes %spartial." - -#: apt-pkg/acquire.cc:91 -#, c-format -msgid "Archives directory %spartial is missing." -msgstr "Falta el directori d'arxius %spartial." - -#: apt-pkg/acquire.cc:99 -#, c-format -msgid "Unable to lock directory %s" -msgstr "No es pot blocar el directori %s" - -#: apt-pkg/acquire.cc:490 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" - -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, 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:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "S'està obtenint el fitxer %li de %li" - -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "La suma resum no concorda" - -#: apt-pkg/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "La mida no concorda" - -#: apt-pkg/acquire-item.cc:173 -#, fuzzy -msgid "Invalid file format" -msgstr "Operació no vàlida %s" - -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" +msgid "Progress: [%3i%%]" 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:1589 -#, 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:1631 -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/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "S'està executant dpkg" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/init.cc:146 #, c-format -msgid "" -"Release file for %s is expired (invalid since %s). Updates for this " -"repository will not be applied." -msgstr "" -"El fitxer Release per a %s ha caducat (invàlid des de %s). Les " -"actualitzacions per a aquest dipòsit no s'aplicaran." +msgid "Packaging system '%s' is not supported" +msgstr "El sistema d'empaquetament «%s» no està suportat" + +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat." -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)" +msgid "Wrote %i records.\n" +msgstr "S'han escrit %i registres.\n" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "" -"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" -msgstr "" -"S'ha produït un error durant la verificació de la signatura. El dipòsit no " -"està actualitzat i s'emprarà el fitxer d'índex anterior. Error del GPG: %s: " -"%s\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "S'han escrit %i registres, on falten %i fitxers.\n" -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "GPG error: %s: %s" -msgstr "S'ha produït un error amb el GPG: %s: %s" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, 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)" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"No ha estat possible localitzar un fitxer pel paquet %s. Això podria " -"significar que haureu d'arreglar aquest paquet manualment (segons " -"arquitectura)." +"S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no " +"coincidents\n" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/indexcopy.cc:515 #, 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»" +msgid "Can't find authentication record for: %s" +msgstr "No s'ha pogut trobar el registre d'autenticatió per a: %s" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "" -"The package index files are corrupted. No Filename: field for package %s." -msgstr "" -"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " -"per al paquet %s." +msgid "Hash mismatch for: %s" +msgstr "El resum no coincideix per a: %s" #: apt-pkg/acquire-worker.cc:116 #, c-format @@ -2536,27 +2063,6 @@ msgstr "El mètode %s no s'ha iniciat correctament" 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/algorithms.cc:265 -#, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"El paquet %s necessita ser reinstaŀlat, però no se li pot trobar un arxiu." - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat " -"causat per paquets retinguts." - -#: apt-pkg/algorithms.cc:1088 -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/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" @@ -2571,180 +2077,254 @@ msgstr "" msgid "The list of sources could not be read." msgstr "No s'ha pogut llegir la llista de les fonts." -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "No s'ha trobat la versió puntual «%s» per a «%s»" - -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "No s'ha trobat la versió «%s» per a «%s»" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Memòria cau de paquets és buida" -#: apt-pkg/cacheset.cc:603 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "No s'ha pogut trobar la tasca «%s»" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "El fitxer de memòria cau de paquets està corromput" -#: apt-pkg/cacheset.cc:609 -#, 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/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "El fitxer de memòria cau de paquets és una versió incompatible" -#: apt-pkg/cacheset.cc:615 -#, 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/pkgcache.cc:169 +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/cacheset.cc:626 +#: apt-pkg/pkgcache.cc:174 #, 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" +msgid "This APT does not support the versioning system '%s'" +msgstr "Aquest APT no suporta el sistema de versions «%s»" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 -#, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -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/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "La memòria cau de paquets fou creada per a una arquitectura diferent" -#: apt-pkg/cacheset.cc:647 -#, 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/pkgcache.cc:321 +msgid "Depends" +msgstr "Depèn" -#: apt-pkg/cacheset.cc:655 -#, 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/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Predepèn" -#: apt-pkg/cacheset.cc:663 -#, 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/pkgcache.cc:321 +msgid "Suggests" +msgstr "Suggereix" -#: 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/pkgcache.cc:322 +msgid "Recommends" +msgstr "Recomana" -#: apt-pkg/cdrom.cc:571 -msgid "Unmounting CD-ROM...\n" -msgstr "S'està desmuntant el CD-ROM…\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Entra en conflicte" -#: apt-pkg/cdrom.cc:586 -#, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "S'està utilitzant el punt de muntatge de CD-ROM %s\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Reemplaça" -#: apt-pkg/cdrom.cc:599 -msgid "Waiting for disc...\n" -msgstr "S'està esperant al disc…\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Fa obsolet" -#: apt-pkg/cdrom.cc:609 -msgid "Mounting CD-ROM...\n" -msgstr "S'està muntant el CD-ROM…\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Trenca" -#: apt-pkg/cdrom.cc:620 -msgid "Identifying... " -msgstr "S'està identificant…" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Millora" -#: apt-pkg/cdrom.cc:662 +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "important" + +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "requerit" + +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "estàndard" + +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "opcional" + +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "extra" + +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Stored label: %s\n" -msgstr "S'ha emmagatzemat l'etiqueta: %s\n" +msgid "Index file type '%s' is not supported" +msgstr "El tipus de fitxer índex «%s» no està suportat" -#: apt-pkg/cdrom.cc:680 -msgid "Scanning disc for index files...\n" -msgstr "S'està analitzant el disc per a fitxers d'índex…\n" +#: 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/cdrom.cc:734 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "" -"Found %zu package indexes, %zu source indexes, %zu translation indexes and " -"%zu signatures\n" +msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -"S'han trobat %zu índexos de paquets, %zu índexos de fonts, %zu indexos de " -"traduccions i %zu signatures\n" +"Línia %lu malformada en la llista de fonts %s ([opció] no reconeixible)" -#: apt-pkg/cdrom.cc:744 -msgid "" -"Unable to locate any package files, perhaps this is not a Debian Disc or the " -"wrong architecture?" -msgstr "" -"No s'ha trobat cap fitxer de paquets, potser no és un disc de Debian o la " -"arquitectura és incorrecta?" +#: 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/cdrom.cc:771 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "Found label '%s'\n" -msgstr "S'ha trobat l'etiqueta «%s»\n" +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/cdrom.cc:800 -msgid "That is not a valid name, try again.\n" -msgstr "Aquest no és un nom vàlid, torneu-ho a provar.\n" +#: apt-pkg/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/cdrom.cc:817 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "" -"This disc is called: \n" -"'%s'\n" +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -"El disc es diu:\n" -"«%s»\n" +"Línia %lu malformada en la llista de fonts %s ([%s] la clau %s no té valor)" -#: apt-pkg/cdrom.cc:819 -msgid "Copying package lists..." -msgstr "S'estan copiant les llistes de paquets…" +#: 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/cdrom.cc:863 -msgid "Writing new source list\n" -msgstr "S'està escrivint una nova llista de fonts\n" +#: 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/cdrom.cc:874 -msgid "Source list entries for this disc are:\n" -msgstr "Les entrades de la llista de fonts per a aquest disc són:\n" +#: apt-pkg/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:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "El tipus de fitxer índex «%s» no està suportat" #: 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:138 apt-pkg/depcache.cc:167 -msgid "Building dependency tree" -msgstr "S'està construint l'arbre de dependències" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "La memòria cau té un sistema de versions incompatible" -#: apt-pkg/depcache.cc:139 -msgid "Candidate versions" -msgstr "Versions candidates" +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, 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:168 -msgid "Dependency generation" -msgstr "Dependències que genera" +#: apt-pkg/pkgcachegen.cc:257 +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/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:260 +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/depcache.cc:250 +#: apt-pkg/pkgcachegen.cc:263 +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:266 +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:576 #, 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:1211 #, 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:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "S'està llegint la llista de paquets" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "S'estan recollint els fitxers que proveeixen" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "No es pot escriure en %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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" @@ -2766,80 +2346,153 @@ msgstr "El resoledor extern ha fallat sense un missatge d'error adient" msgid "Execute external solver" msgstr "Executa un resoledor extern" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format -msgid "Wrote %i records.\n" -msgstr "S'han escrit %i registres.\n" +msgid "rename failed, %s (%s -> %s)." +msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 -#, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "S'han escrit %i registres, on falten %i fitxers.\n" +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "La suma resum no concorda" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 -#, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n" +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "La mida no concorda" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/acquire-item.cc:173 +#, fuzzy +msgid "Invalid file format" +msgstr "Operació no vàlida %s" + +#: apt-pkg/acquire-item.cc:1640 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" msgstr "" -"S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no " -"coincidents\n" +"No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada errònia " +"al sources.list o fitxer malformat)" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/acquire-item.cc:1656 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "No s'ha pogut trobar el registre d'autenticatió per a: %s" +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/indexcopy.cc:521 +#: apt-pkg/acquire-item.cc:1698 +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:1736 #, c-format -msgid "Hash mismatch for: %s" -msgstr "El resum no coincideix per a: %s" +msgid "" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." +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/indexrecords.cc:78 +#: apt-pkg/acquire-item.cc:1758 #, c-format -msgid "Unable to parse Release file %s" -msgstr "No es pot analitzar el fitxer Release %s" +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)" -#: apt-pkg/indexrecords.cc:86 +#: apt-pkg/acquire-item.cc:1788 #, c-format -msgid "No sections in Release file %s" -msgstr "No hi ha seccions al fitxer Release %s" +msgid "" +"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" +msgstr "" +"S'ha produït un error durant la verificació de la signatura. El dipòsit no " +"està actualitzat i s'emprarà el fitxer d'índex anterior. Error del GPG: %s: " +"%s\n" -#: apt-pkg/indexrecords.cc:117 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format -msgid "No Hash entry in Release file %s" -msgstr "No hi ha una entrada Hash al fitxer Release %s" +msgid "GPG error: %s: %s" +msgstr "S'ha produït un error amb el GPG: %s: %s" -#: apt-pkg/indexrecords.cc:130 +#: apt-pkg/acquire-item.cc:1926 #, c-format -msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "El camp «Valid-Until» al fitxer Release %s és invàlid" +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 "" +"No ha estat possible localitzar un fitxer pel paquet %s. Això podria " +"significar que haureu d'arreglar aquest paquet manualment (segons " +"arquitectura)." -#: apt-pkg/indexrecords.cc:149 +#: apt-pkg/acquire-item.cc:1992 #, c-format -msgid "Invalid 'Date' entry in Release file %s" -msgstr "El camp «Date» al fitxer Release %s és invàlid" +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/init.cc:146 +#: apt-pkg/acquire-item.cc:2050 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "El sistema d'empaquetament «%s» no està suportat" +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "" +"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " +"per al paquet %s." -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat." +#: apt-pkg/vendorlist.cc:85 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "El camp del proveïdor %s no té una empremta digital" -#: apt-pkg/install-progress.cc:57 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Progress: [%3i%%]" +msgid "List directory %spartial is missing." +msgstr "Falta el directori de llistes %spartial." + +#: apt-pkg/acquire.cc:91 +#, c-format +msgid "Archives directory %spartial is missing." +msgstr "Falta el directori d'arxius %spartial." + +#: apt-pkg/acquire.cc:99 +#, 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:902 +#, 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:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "S'està obtenint el fitxer %li de %li" + +#: 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/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» és invàlid per a APT:Default-Release donat que aquest " +"llançament no és disponible a les fonts" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "S'està executant dpkg" +#: apt-pkg/policy.cc:422 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Registre no vàlid al fitxer de preferències %s, paquet sense capçalera" + +#: apt-pkg/policy.cc:444 +#, c-format +msgid "Did not understand pin type %s" +msgstr "No s'ha entès el pin de tipus %s" + +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "No hi ha prioritat especificada per al pin (o és zero)" #: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format @@ -2867,407 +2520,274 @@ msgstr "" "dolenta, però si realment desitgeu fer-la, activeu l'opció APT::Force-" "LoopBreak." -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Memòria cau de paquets és buida" - -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "El fitxer de memòria cau de paquets està corromput" - -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "El fitxer de memòria cau de paquets és una versió incompatible" +#: 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/pkgcache.cc:169 -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/cdrom.cc:571 +msgid "Unmounting CD-ROM...\n" +msgstr "S'està desmuntant el CD-ROM…\n" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/cdrom.cc:586 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Aquest APT no suporta el sistema de versions «%s»" +msgid "Using CD-ROM mount point %s\n" +msgstr "S'està utilitzant el punt de muntatge de CD-ROM %s\n" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "La memòria cau de paquets fou creada per a una arquitectura diferent" +#: apt-pkg/cdrom.cc:599 +msgid "Waiting for disc...\n" +msgstr "S'està esperant al disc…\n" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Depèn" +#: apt-pkg/cdrom.cc:609 +msgid "Mounting CD-ROM...\n" +msgstr "S'està muntant el CD-ROM…\n" -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Predepèn" +#: apt-pkg/cdrom.cc:620 +msgid "Identifying... " +msgstr "S'està identificant…" -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Suggereix" +#: apt-pkg/cdrom.cc:662 +#, c-format +msgid "Stored label: %s\n" +msgstr "S'ha emmagatzemat l'etiqueta: %s\n" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Recomana" +#: apt-pkg/cdrom.cc:680 +msgid "Scanning disc for index files...\n" +msgstr "S'està analitzant el disc per a fitxers d'índex…\n" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Entra en conflicte" +#: apt-pkg/cdrom.cc:734 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" +msgstr "" +"S'han trobat %zu índexos de paquets, %zu índexos de fonts, %zu indexos de " +"traduccions i %zu signatures\n" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Reemplaça" +#: apt-pkg/cdrom.cc:744 +msgid "" +"Unable to locate any package files, perhaps this is not a Debian Disc or the " +"wrong architecture?" +msgstr "" +"No s'ha trobat cap fitxer de paquets, potser no és un disc de Debian o la " +"arquitectura és incorrecta?" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Fa obsolet" +#: apt-pkg/cdrom.cc:771 +#, c-format +msgid "Found label '%s'\n" +msgstr "S'ha trobat l'etiqueta «%s»\n" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Trenca" +#: apt-pkg/cdrom.cc:800 +msgid "That is not a valid name, try again.\n" +msgstr "Aquest no és un nom vàlid, torneu-ho a provar.\n" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Millora" +#: apt-pkg/cdrom.cc:817 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"El disc es diu:\n" +"«%s»\n" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "important" +#: apt-pkg/cdrom.cc:819 +msgid "Copying package lists..." +msgstr "S'estan copiant les llistes de paquets…" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "requerit" +#: apt-pkg/cdrom.cc:863 +msgid "Writing new source list\n" +msgstr "S'està escrivint una nova llista de fonts\n" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "estàndard" +#: apt-pkg/cdrom.cc:874 +msgid "Source list entries for this disc are:\n" +msgstr "Les entrades de la llista de fonts per a aquest disc són:\n" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "opcional" - -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "extra" - -#: apt-pkg/pkgcachegen.cc:93 -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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/algorithms.cc:265 #, 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:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -"Uau, heu excedit el nombre de paquets que aquest APT és capaç de gestionar." +"El paquet %s necessita ser reinstaŀlat, però no se li pot trobar un arxiu." -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." msgstr "" -"Uau, heu excedit el nombre de versions que aquest APT és capaç de gestionar." +"Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat " +"causat per paquets retinguts." -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." msgstr "" -"Uau, heu excedit el nombre de descripcions que aquest APT és capaç de " -"gestionar. " +"No es poden corregir els problemes, teniu paquets retinguts que estan " +"trencats." -#: apt-pkg/pkgcachegen.cc:266 -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:138 apt-pkg/depcache.cc:167 +msgid "Building dependency tree" +msgstr "S'està construint l'arbre de dependències" -#: apt-pkg/pkgcachegen.cc:576 -#, 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/depcache.cc:139 +msgid "Candidate versions" +msgstr "Versions candidates" -#: apt-pkg/pkgcachegen.cc:1211 -#, c-format -msgid "Couldn't stat source package list %s" -msgstr "No s'ha pogut llegir la llista de paquets font %s" +#: apt-pkg/depcache.cc:168 +msgid "Dependency generation" +msgstr "Dependències que genera" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "S'està llegint la llista de paquets" +#: 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:1316 -msgid "Collecting File Provides" -msgstr "S'estan recollint els fitxers que proveeixen" +#: apt-pkg/depcache.cc:250 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "No s'ha pogut obrir el fitxer d'estat %s" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Error d'E/S en desar la memòria cau de la font" +#: apt-pkg/depcache.cc:256 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/tagfile.cc:140 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "El tipus de fitxer índex «%s» no està suportat" +msgid "Unable to parse package file %s (1)" +msgstr "No es pot analitzar el fitxer del paquet %s (1)" -#: apt-pkg/policy.cc:83 +#: apt-pkg/tagfile.cc:237 #, 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» és invàlid per a APT:Default-Release donat que aquest " -"llançament no és disponible a les fonts" +msgid "Unable to parse package file %s (2)" +msgstr "No es pot analitzar el fitxer del paquet %s (2)" -#: apt-pkg/policy.cc:422 +#: apt-pkg/cacheset.cc:489 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Registre no vàlid al fitxer de preferències %s, paquet sense capçalera" +msgid "Release '%s' for '%s' was not found" +msgstr "No s'ha trobat la versió puntual «%s» per a «%s»" -#: apt-pkg/policy.cc:444 +#: apt-pkg/cacheset.cc:492 #, c-format -msgid "Did not understand pin type %s" -msgstr "No s'ha entès el pin de tipus %s" +msgid "Version '%s' for '%s' was not found" +msgstr "No s'ha trobat la versió «%s» per a «%s»" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "No hi ha prioritat especificada per al pin (o és zero)" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "No s'ha pogut trobar la tasca «%s»" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/cacheset.cc:609 +#, 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:615 #, 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)" +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/sourcelist.cc:170 +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -"Línia %lu malformada en la llista de fonts %s ([opció] no reconeixible)" +"No s'han pogut seleccionar les versions del paquet «%s» ja que és purament " +"virtual" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, 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)" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +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/sourcelist.cc:184 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -"Línia %lu malformada en la llista de fonts %s ([%s] no és una assignació)" +"No s'ha pogut seleccionar la versió més nova del paquet «%s» ja que és " +"purament virtual" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/cacheset.cc:655 #, 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)" +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/sourcelist.cc:193 +#: apt-pkg/cacheset.cc:663 #, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgid "Can't select installed version from package %s as it is not installed" msgstr "" -"Línia %lu malformada en la llista de fonts %s ([%s] la clau %s no té valor)" +"No s'ha pogut seleccionar la versió instaŀlada del paquet %s ja que no està " +"instaŀlada" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/indexrecords.cc:78 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Línia %lu malformada en la llista de fonts %s (URI)" +msgid "Unable to parse Release file %s" +msgstr "No es pot analitzar el fitxer Release %s" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/indexrecords.cc:86 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Línia %lu malformada en la llista de fonts %s (dist)" +msgid "No sections in Release file %s" +msgstr "No hi ha seccions al fitxer Release %s" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/indexrecords.cc:117 #, 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)" +msgid "No Hash entry in Release file %s" +msgstr "No hi ha una entrada Hash al fitxer Release %s" -#: apt-pkg/sourcelist.cc:217 +#: apt-pkg/indexrecords.cc:130 #, 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)" +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "El camp «Valid-Until» al fitxer Release %s és invàlid" -#: apt-pkg/sourcelist.cc:224 +#: apt-pkg/indexrecords.cc:149 #, 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)" +msgid "Invalid 'Date' entry in Release file %s" +msgstr "El camp «Date» al fitxer Release %s és invàlid" -#: apt-pkg/sourcelist.cc:335 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Opening %s" -msgstr "S'està obrint %s" +msgid "%lid %lih %limin %lis" +msgstr "%lid %lih %limin %lis" -#: apt-pkg/sourcelist.cc:371 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, 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 "%lih %limin %lis" +msgstr "%lih %limin %lis" -#: apt-pkg/sourcelist.cc:375 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, 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" +msgid "%limin %lis" +msgstr "%limin %lis" -#: 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" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" +msgstr "%lis" -#: apt-pkg/srcrecords.cc:52 -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/contrib/strutl.cc:1258 +#, c-format +msgid "Selection %s not found" +msgstr "No s'ha trobat la selecció %s" -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "No es pot analitzar el fitxer del paquet %s (1)" +msgid "Not using locking for read only lock file %s" +msgstr "" +"No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "No es pot analitzar el fitxer del paquet %s (2)" - -#: 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/vendorlist.cc:85 -#, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "El camp del proveïdor %s no té una empremta digital" - -#: apt-pkg/contrib/cdromutl.cc:65 -#, c-format -msgid "Unable to stat the mount point %s" -msgstr "No es pot obtenir informació del punt de muntatge %s" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "No s'ha pogut fer «stat» del cdrom" - -#: apt-pkg/contrib/cmndline.cc:121 -#, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, 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:168 -#, 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:209 apt-pkg/contrib/cmndline.cc:230 -#, 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:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "Opció %s: Paràmetre de configuració ha de ser en la forma =" - -#: apt-pkg/contrib/cmndline.cc:278 -#, 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:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "L'opció '%s' és massa llarga" - -#: apt-pkg/contrib/cmndline.cc:341 -#, 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:391 -#, c-format -msgid "Invalid operation %s" -msgstr "Operació no vàlida %s" - -#: apt-pkg/contrib/configuration.cc:519 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Abreujament de tipus no reconegut: «%c»" - -#: apt-pkg/contrib/configuration.cc:633 -#, c-format -msgid "Opening configuration file %s" -msgstr "S'està obrint el fitxer de configuració %s" - -#: apt-pkg/contrib/configuration.cc:801 -#, 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:820 -#, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Error sintàctic %s:%u: Etiqueta malformada" - -#: apt-pkg/contrib/configuration.cc:837 -#, 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:877 -#, 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:884 -#, 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:888 apt-pkg/contrib/configuration.cc:893 -#, 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:897 -#, 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:900 -#, 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:950 -#, 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/fileutl.cc:190 -#, c-format -msgid "Not using locking for read only lock file %s" -msgstr "" -"No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s" - -#: apt-pkg/contrib/fileutl.cc:195 -#, c-format -msgid "Could not open lock file %s" -msgstr "No es pot resoldre el fitxer de blocat %s" +msgid "Could not open lock file %s" +msgstr "No es pot resoldre el fitxer de blocat %s" #: apt-pkg/contrib/fileutl.cc:218 #, c-format @@ -3376,11 +2896,25 @@ msgstr "Ha hagut un problema en desenllaçar el fitxer %s" msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "No keyring installed in %s." -msgstr "No s'ha instaŀlat cap clauer a %s." +msgid "%c%s... Error!" +msgstr "%c%s… Error!" + +#: apt-pkg/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s… Fet" + +#: apt-pkg/contrib/progress.cc:181 +msgid "..." +msgstr "…" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s… %u%%" #: apt-pkg/contrib/mmap.cc:79 msgid "Can't mmap an empty file" @@ -3438,230 +2972,691 @@ msgstr "" "No s'ha pogut incrementar la mida del MMap ja que el creixement automàtic " "està deshabilitat per l'usuari." -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s… Error!" +msgid "Unable to stat the mount point %s" +msgstr "No es pot obtenir informació del punt de muntatge %s" -#: apt-pkg/contrib/progress.cc:150 +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "No s'ha pogut fer «stat» del cdrom" + +#: apt-pkg/contrib/configuration.cc:519 #, c-format -msgid "%c%s... Done" -msgstr "%c%s… Fet" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Abreujament de tipus no reconegut: «%c»" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "…" +#: apt-pkg/contrib/configuration.cc:633 +#, c-format +msgid "Opening configuration file %s" +msgstr "S'està obrint el fitxer de configuració %s" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: apt-pkg/contrib/configuration.cc:801 #, c-format -msgid "%c%s... %u%%" -msgstr "%c%s… %u%%" +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Error sintàctic %s:%u: No comença el camp amb un nom." -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: apt-pkg/contrib/configuration.cc:820 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%lid %lih %limin %lis" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Error sintàctic %s:%u: Etiqueta malformada" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: apt-pkg/contrib/configuration.cc:837 #, c-format -msgid "%lih %limin %lis" -msgstr "%lih %limin %lis" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Error sintàctic %s:%u Text extra després del valor" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "%limin %lis" -msgstr "%limin %lis" +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" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "%lis" -msgstr "%lis" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats" -#: apt-pkg/contrib/strutl.cc:1258 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format -msgid "Selection %s not found" -msgstr "No s'ha trobat la selecció %s" +msgid "Syntax error %s:%u: Included from here" +msgstr "Error sintàctic %s:%u: Inclusió des d'aquí" + +#: apt-pkg/contrib/configuration.cc:897 +#, 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:900 +#, 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:950 +#, 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" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, c-format +msgid "No keyring installed in %s." +msgstr "No s'ha instaŀlat cap clauer a %s." + +#: apt-pkg/contrib/cmndline.cc:124 +#, 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 +#, 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 +#, 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 +#, 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 +#, c-format +msgid "Option %s: Configuration item specification must have an =." +msgstr "Opció %s: Paràmetre de configuració ha de ser en la forma =" + +#: apt-pkg/contrib/cmndline.cc:281 +#, 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 +#, c-format +msgid "Option '%s' is too long" +msgstr "L'opció '%s' és massa llarga" + +#: apt-pkg/contrib/cmndline.cc:344 +#, 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 +#, c-format +msgid "Invalid operation %s" +msgstr "Operació no vàlida %s" + +#: apt-pkg/deb/dpkgpm.cc:110 +#, c-format +msgid "Installing %s" +msgstr "S'està instaŀlant %s" + +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 +#, c-format +msgid "Configuring %s" +msgstr "S'està configurant el paquet %s" + +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 +#, c-format +msgid "Removing %s" +msgstr "S'està suprimint el paquet %s" + +#: apt-pkg/deb/dpkgpm.cc:113 +#, c-format +msgid "Completely removing %s" +msgstr "S'ha suprimit completament %s" + +#: apt-pkg/deb/dpkgpm.cc:114 +#, c-format +msgid "Noting disappearance of %s" +msgstr "S'està anotant la desaparició de %s" + +#: apt-pkg/deb/dpkgpm.cc:115 +#, 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:845 +#, c-format +msgid "Directory '%s' missing" +msgstr "Manca el directori «%s»" + +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 +#, c-format +msgid "Could not open file '%s'" +msgstr "No s'ha pogut obrir el fitxer «%s»" + +#: apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Preparing %s" +msgstr "S'està preparant el paquet %s" + +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr "S'està desempaquetant %s" + +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing to configure %s" +msgstr "S'està preparant per a configurar el paquet %s" + +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr "S'ha instaŀlat el paquet %s" + +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "S'està preparant per a la supressió del paquet %s" + +#: apt-pkg/deb/dpkgpm.cc:1022 +#, c-format +msgid "Removed %s" +msgstr "S'ha suprimit el paquet %s" + +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "S'està preparant per a suprimir completament el paquet %s" + +#: apt-pkg/deb/dpkgpm.cc:1028 +#, c-format +msgid "Completely removed %s" +msgstr "S'ha suprimit completament el paquet %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "No es pot escriure en %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "S'ha interromput l'operació abans que pogués finalitzar" + +#: apt-pkg/deb/dpkgpm.cc:1719 +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:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "S'han produït problemes de depències, es deixa sense configurar" + +#: apt-pkg/deb/dpkgpm.cc:1726 +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:1732 +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:1739 +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:1746 apt-pkg/deb/dpkgpm.cc:1752 +#, 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:1774 +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" + +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n" +"\n" +"apt-extracttemplates és una eina per a extreure informació de\n" +"configuració i plantilles dels paquets debian\n" +"\n" +"Opcions:\n" +" -h Aquest text d'ajuda.\n" +" -t Estableix el directori temporal\n" +" -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:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "No es pot veure l'estat de %s" + +#: cmdline/apt-extracttemplates.cc:300 +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 +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 +#, c-format +msgid "Error processing directory %s" +msgstr "S'ha produït un error en processar el directori %s" + +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "La llista d'extensions de les fonts és massa llarga" + +#: ftparchive/apt-ftparchive.cc:401 +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 +#, 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 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Forma d'ús: apt-ftparchive [opcions] ordre\n" +"Ordres: packages camí_binaris [fitxer_substitucions prefix_camí]]\n" +" sources camí_fonts [fitxer_substitucions [prefix_camí]]\n" +" contents camí\n" +" release camí\n" +" generate config [grups]\n" +" clean config\n" +"\n" +"apt-ftparchive genera fitxers d'índex per als arxius de Debian.\n" +"Gestiona molts estils per a generar-los, des dels completament automàtics\n" +"als substituts funcionals per dpkg-scanpackages i dpkg-scansources.\n" +"\n" +"apt-ftparchive genera fitxers Package des d'un arbre de .deb. El\n" +"fitxer Package conté tots els camps de control de cada paquet així com\n" +"la suma MD5 i la mida del fitxer. Es suporten els fitxers de substitució\n" +"per a forçar el valor de Prioritat i Secció.\n" +"\n" +"D'un mode semblant, apt-ftparchive genera fitxers Sources des d'un arbre\n" +"de .dsc. Es pot utilitzar l'opció --source-override per a especificar un\n" +"fitxer de substitucions de src.\n" +"\n" +"L'ordre «packages» i «sources» hauria d'executar-se en l'arrel de\n" +"l'arbre. CamíBinaris hauria de ser el punt base de la recerca recursiva\n" +"i el fitxer de substitucions hauria de contenir senyaladors de substitució.\n" +"Prefixcamí s'afegeix als camps del nom de fitxer si està present.\n" +"Exemple d'ús a l'arxiu de Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Opcions:\n" +" -h Aquest text d'ajuda\n" +" --md5 Generació del control MD5\n" +" -s=? Fitxer de substitucions per a fonts\n" +" -q Silenciós\n" +" -d=? Selecciona la base de dades de memòria cau opcional\n" +" --no-delink Habilita el mode de depuració delink\n" +" --contents Genera el fitxer amb els continguts de control\n" +" -c=? Llegeix aquest fitxer de configuració\n" +" -o=? Estableix una opció de configuració arbitrària" + +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "No s'ha trobat cap selecció" + +#: ftparchive/apt-ftparchive.cc:907 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "No es troben alguns fitxers dins del grup de fitxers del paquet `%s'" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "La base de dades està corrompuda, fitxer renomenat a %s.old" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "La BD és vella, s'està intentant actualitzar %s" + +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"El format de la base de dades és invàlid. Si heu actualitzat des d'una " +"versió més antiga de l'apt, suprimiu i torneu a crear la base de dades." + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "No es pot obrir el fitxer de DB %s: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "No s'ha pogut llegir l'enllaç %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Arxiu sense registre de control" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "No es pot aconseguir un cursor" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.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?" +msgid "W: Unable to read directory %s\n" +msgstr "A: No es pot llegir el directori %s\n" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:96 #, 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 "W: Unable to stat %s\n" +msgstr "A: No es pot veure l'estat %s\n" -#. 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." +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "No blocat" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "A: " + +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: Els errors s'apliquen al fitxer " -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "Installing %s" -msgstr "S'està instaŀlant %s" +msgid "Failed to resolve %s" +msgstr "No s'ha pogut resoldre %s" + +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "L'arbre està fallant" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:219 #, c-format -msgid "Configuring %s" -msgstr "S'està configurant el paquet %s" +msgid "Failed to open %s" +msgstr "No s'ha pogut obrir %s" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:278 #, c-format -msgid "Removing %s" -msgstr "S'està suprimint el paquet %s" +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:286 #, c-format -msgid "Completely removing %s" -msgstr "S'ha suprimit completament %s" +msgid "Failed to readlink %s" +msgstr "No s'ha pogut llegir l'enllaç %s" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:290 #, c-format -msgid "Noting disappearance of %s" -msgstr "S'està anotant la desaparició de %s" +msgid "Failed to unlink %s" +msgstr "No s'ha pogut alliberar %s" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:298 #, c-format -msgid "Running post-installation trigger %s" -msgstr "S'està executant l'activador de postinstaŀlació %s" +msgid "*** Failed to link %s to %s" +msgstr "*** No s'ha pogut enllaçar %s a %s" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:308 #, c-format -msgid "Directory '%s' missing" -msgstr "Manca el directori «%s»" +msgid " DeLink limit of %sB hit.\n" +msgstr " DeLink s'ha arribat al límit de %sB.\n" + +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Arxiu sense el camp paquet" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Could not open file '%s'" -msgstr "No s'ha pogut obrir el fitxer «%s»" +msgid " %s has no override entry\n" +msgstr " %s no té una entrada dominant\n" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Preparing %s" -msgstr "S'està preparant el paquet %s" +msgid " %s maintainer is %s not %s\n" +msgstr " el mantenidor de %s és %s, no %s\n" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:706 #, c-format -msgid "Unpacking %s" -msgstr "S'està desempaquetant %s" +msgid " %s has no source override entry\n" +msgstr " %s no té una entrada dominant de font\n" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/writer.cc:710 #, c-format -msgid "Preparing to configure %s" -msgstr "S'està preparant per a configurar el paquet %s" +msgid " %s has no binary override entry either\n" +msgstr " %s no té una entrada dominant de binari\n" + +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - No s'ha pogut assignar espai en memòria" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Installed %s" -msgstr "S'ha instaŀlat el paquet %s" +msgid "Unable to open %s" +msgstr "No es pot obrir %s" -#: apt-pkg/deb/dpkgpm.cc:1005 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Línia predominant %s malformada %llu núm 1" + +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing for removal of %s" -msgstr "S'està preparant per a la supressió del paquet %s" +msgid "Failed to read the override file %s" +msgstr "No s'ha pogut llegir la línia predominant del fitxer %s" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:166 #, c-format -msgid "Removed %s" -msgstr "S'ha suprimit el paquet %s" +msgid "Malformed override %s line %llu #1" +msgstr "Línia predominant %s malformada %llu núm 1" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:178 #, c-format -msgid "Preparing to completely remove %s" -msgstr "S'està preparant per a suprimir completament el paquet %s" +msgid "Malformed override %s line %llu #2" +msgstr "Línia predominant %s malformada %llu núm 2" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/override.cc:191 #, c-format -msgid "Completely removed %s" -msgstr "S'ha suprimit completament el paquet %s" +msgid "Malformed override %s line %llu #3" +msgstr "Línia predominant %s malformada %llu núm 3" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "No es pot escriure en %s" +#: ftparchive/multicompress.cc:73 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Algorisme de compressió desconegut '%s'" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "La sortida comprimida %s necessita un joc de compressió" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "No s'ha pogut crear FILE*" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "S'ha interromput l'operació abans que pogués finalitzar" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "No s'ha pogut bifurcar" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Comprimeix el fil" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "S'han produït problemes de depències, es deixa sense configurar" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "S'ha produït un error intern, no s'ha pogut crear %s" -#: apt-pkg/deb/dpkgpm.cc:1694 -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." +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "Ha fallat l'E/S del subprocés sobre el fitxer" -#: apt-pkg/deb/dpkgpm.cc:1700 -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" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "No s'ha pogut llegir mentre es calculava la suma MD5" -#: apt-pkg/deb/dpkgpm.cc:1707 -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" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "S'ha trobat un problema treient l'enllaç %s" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-internal-solver.cc:49 #, fuzzy msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per " -"disc ple" +"Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n" +"\n" +"apt-extracttemplates és una eina per a extreure informació de\n" +"configuració i plantilles dels paquets debian\n" +"\n" +"Opcions:\n" +" -h Aquest text d'ajuda.\n" +" -t Estableix el directori temporal\n" +" -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 +msgid "Unknown package record!" +msgstr "Registre del paquet desconegut!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"No s'ha escrit cap informe perquè el missatge d'error indica d'una fallida " -"d'E/S del dpkg" +"Forma d'ús: apt-sortpkgs [opcions] fitxer1 [fitxer2 …]\n" +"\n" +"apt-sortpkgs és una eina simple per ordenar fitxers de paquets.\n" +"L'opció -s s'usa per a indicar quin tipus de fitxer és.\n" +"\n" +"Opcions:\n" +" -h Aquest text d'ajuda.\n" +" -s Empra l'ordenació de fitxers font\n" +" -c=? Llegeix aquest fitxer de configuració\n" +" -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/cs.po b/po/cs.po index be22ecd09..74d2d31a4 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2014-10-05 06:09+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -155,7 +155,7 @@ msgid " Version table:" msgstr " Tabulka verzí:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -353,7 +353,7 @@ msgstr "Nelze zamknout adresář pro stahování" 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Nelze najít zdrojový balík pro %s" @@ -378,80 +378,80 @@ msgstr "" "použijte:\n" "bzr branch %s\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Přeskakuje se dříve stažený soubor „%s“\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nelze určit volné místo v %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Nutno stáhnout %sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Stažení zdroje %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení „%s“ selhal.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení „%s“ selhal.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -460,17 +460,17 @@ 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:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nelze získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -479,20 +479,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:1290 +#: cmdline/apt-get.cc:1294 #, 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:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -501,7 +501,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:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -510,30 +510,30 @@ 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:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, 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:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Seznam změn %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -683,7 +683,7 @@ msgstr "%s již nebyl držen v aktuální verzi.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čekali jsme na %s, ale nebyl tam" @@ -817,16 +817,16 @@ msgstr "Nelze odpojit CD-ROM v %s - možná se stále používá." msgid "Disk not found." msgstr "Disk nebyl nalezen." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Soubor nebyl nalezen" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@ -880,7 +880,7 @@ msgstr "Příkaz „%s“ přihlašovacího skriptu selhal, server řekl: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE selhal, server řekl: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Čas spojení vypršel" @@ -902,7 +902,7 @@ msgstr "Odpověď přeplnila buffer." msgid "Protocol corruption" msgstr "Porušení protokolu" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -963,7 +963,7 @@ msgstr "Spojení datového socketu vypršelo" msgid "Unable to accept connection" msgstr "Nelze přijmout spojení" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Problém s kontrolním součtem souboru" @@ -972,7 +972,7 @@ msgstr "Problém s kontrolním součtem souboru" msgid "Unable to fetch file, server said '%s'" msgstr "Nelze stáhnout soubor, server řekl „%s“" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Datový socket vypršel" @@ -1022,7 +1022,7 @@ msgstr "Nelze se připojit k %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Připojování k %s" @@ -1163,42 +1163,18 @@ msgstr "Spojení selhalo" msgid "Internal error" msgstr "Vnitřní chyba" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Cíl " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Mám:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ign " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Err " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Staženo %sB za %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Pracuji]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "Vypisuje se" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Výměna média: Vložte disk nazvaný\n" -" „%s“\n" -"do mechaniky „%s“ a stiskněte enter\n" +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:93 msgid "Correcting dependencies..." @@ -1228,173 +1204,359 @@ msgstr "Pro opravení můžete spustit „apt-get -f install“." msgid "Unmet dependencies. Try using -f." msgstr "Nesplněné závislosti. Zkuste použít -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" -msgstr "Řadí se" - -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!" - -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Autentizační varování potlačeno.\n" - -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Některé balíky nemohly být autentizovány" - -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Instalovat tyto balíky bez ověření?" - -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes" +#: 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-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:265 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Selhalo stažení %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!" +msgid "[installed,upgradable to: %s]" +msgstr "[instalovaný,aktualizovatelný na: %s]" -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." +#: apt-private/private-output.cc:268 +msgid "[installed,local]" +msgstr "[instalovaný,lokální]" -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Vnitřní chyba, třídění nedoběhlo do konce" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "[instalovaný,automaticky-odstranitelný]" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" -msgstr "" -"Jak podivné… velikosti nesouhlasí, ohlaste to na apt@packages.debian.org" +#: apt-private/private-output.cc:272 +msgid "[installed,automatic]" +msgstr "[instalovaný,automaticky]" -#. 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 -#: apt-private/private-install.cc:155 -#, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "Nutno stáhnout %sB/%sB archivů.\n" +#: apt-private/private-output.cc:274 +msgid "[installed]" +msgstr "[instalovaný]" -#. 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:160 +#: apt-private/private-output.cc:277 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "Nutno stáhnout %sB archivů.\n" +msgid "[upgradable from: %s]" +msgstr "[aktualizovatelný z: %s]" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Po této operaci bude na disku použito dalších %sB.\n" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" +msgstr "[zbytkové-konfigurační-coubory]" -#. 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:172 +#: apt-private/private-output.cc:455 #, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Po této operaci bude na disku uvolněno %sB.\n" +msgid "but %s is installed" +msgstr "ale %s je nainstalován" -#: apt-private/private-install.cc:200 +#: apt-private/private-output.cc:457 #, c-format -msgid "You don't have enough free space in %s." -msgstr "V %s nemáte dostatek volného místa." +msgid "but %s is to be installed" +msgstr "ale %s se bude instalovat" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Udáno „pouze triviální“, ovšem toto není triviální operace." +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "ale nedá se nainstalovat" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Ano, udělej to tak, jak říkám!" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "ale je to virtuální balík" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Chystáte se vykonat něco potenciálně škodlivého.\n" -"Pro pokračování opište frázi „%s“\n" -" ?] " +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "ale není nainstalovaný" -#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Přerušeno." +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "ale nebude se instalovat" -#: apt-private/private-install.cc:243 -msgid "Do you want to continue?" -msgstr "Chcete pokračovat?" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " nebo" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Některé soubory nemohly být staženy" +#: 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-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Nelze stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --" -"fix-missing?" +#: 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-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing a výměna média nejsou momentálně podporová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-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Nelze opravit chybějící balíky." +#: 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-install.cc:330 -msgid "Aborting install." -msgstr "Instalace se přerušuje." +#: 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-install.cc:366 -msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"Následující balík z tohoto systému zmizel, protože\n" -"všechny jeho soubory byly přepsány jinými balíky:" -msgstr[1] "" -"Následující balíky z tohoto systému zmizely, protože\n" -"všechny jejich soubory byly přepsány jinými balíky:" -msgstr[2] "" -"Následující balíky z tohoto systému zmizely, protože\n" -"všechny jejich soubory byly přepsány jinými balíky:" +#: 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-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Poznámka: Toto má svůj důvod a děje se automaticky v dpkg." +#: 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-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "Neměli bychom mazat věci, nelze spustit AutoRemover" +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (kvůli %s) " -#: apt-private/private-install.cc:499 +#: apt-private/private-output.cc:696 msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" msgstr "" -"Hmm, zdá se, že AutoRemover zničil něco, co neměl.\n" -"Nahlaste prosím chybu v apt." +"VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n" +"Pokud přesně nevíte, co děláte, NEDĚLEJTE to!" -#. -#. if (Packages == 1) +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Vnitřní chyba, třídění nedoběhlo do konce" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Jak podivné… velikosti nesouhlasí, ohlaste to na apt@packages.debian.org" + +#. 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Nutno stáhnout %sB/%sB 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 +#: apt-private/private-install.cc:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Nutno stáhnout %sB 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 +#: apt-private/private-install.cc:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Po této operaci bude na disku použito dalších %sB.\n" + +#. 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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Po této operaci bude na disku uvolněno %sB.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "V %s nemáte dostatek volného místa." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "Udáno „pouze triviální“, ovšem toto není triviální operace." + +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Ano, udělej to tak, jak říkám!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Chystáte se vykonat něco potenciálně škodlivého.\n" +"Pro pokračování opište frázi „%s“\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Přerušeno." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Chcete pokračovat?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Některé soubory nemohly být staženy" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Nelze stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --" +"fix-missing?" + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing a výměna média nejsou momentálně podporovány" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Nelze opravit chybějící balíky." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Instalace se přerušuje." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"Následující balík z tohoto systému zmizel, protože\n" +"všechny jeho soubory byly přepsány jinými balíky:" +msgstr[1] "" +"Následující balíky z tohoto systému zmizely, protože\n" +"všechny jejich soubory byly přepsány jinými balíky:" +msgstr[2] "" +"Následující balíky z tohoto systému zmizely, protože\n" +"všechny jejich soubory byly přepsány jinými balíky:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Poznámka: Toto má svůj důvod a děje se automaticky v dpkg." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Neměli bychom mazat věci, nelze spustit AutoRemover" + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"Hmm, zdá se, že AutoRemover zničil něco, co neměl.\n" +"Nahlaste prosím chybu v apt." + +#. +#. if (Packages == 1) #. { #. c1out << std::endl; #. c1out << @@ -1522,927 +1684,675 @@ 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:129 -msgid "Listing" -msgstr "Vypisuje se" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!" -#: apt-private/private-list.cc:159 -#, 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-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-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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Autentizační varování potlačeno.\n" -#: apt-private/private-output.cc:272 -msgid "[installed,automatic]" -msgstr "[instalovaný,automaticky]" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Některé balíky nemohly být autentizovány" -#: apt-private/private-output.cc:274 -msgid "[installed]" -msgstr "[instalovaný]" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Instalovat tyto balíky bez ověření?" -#: apt-private/private-output.cc:277 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format -msgid "[upgradable from: %s]" -msgstr "[aktualizovatelný z: %s]" - -#: apt-private/private-output.cc:281 -msgid "[residual-config]" -msgstr "[zbytkové-konfigurační-coubory]" +msgid "Failed to fetch %s %s\n" +msgstr "Selhalo stažení %s %s\n" -#: apt-private/private-output.cc:455 +#: apt-private/private-sources.cc:58 #, c-format -msgid "but %s is installed" -msgstr "ale %s je nainstalován" +msgid "Failed to parse %s. Edit again? " +msgstr "Nepodařilo se zpracovat %s. Zkusit znovu upravit?" -#: apt-private/private-output.cc:457 +#: apt-private/private-sources.cc:70 #, 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" +msgid "Your '%s' file changed, please run 'apt-get update'." +msgstr "Soubor „%s“ se změnil, spusťte prosím „apt-get update“." -#: apt-private/private-output.cc:474 -msgid " or" -msgstr " nebo" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" +msgstr "Fulltextové hledání" -#: 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-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "Propočítává se aktualizace… " -#: 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-upgrade.cc:28 +msgid "Done" +msgstr "Hotovo" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "Následující balíky budou ODSTRANĚNY:" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Cíl " -#: 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/acqprogress.cc:90 +msgid "Get:" +msgstr "Mám:" -#: apt-private/private-output.cc:592 -msgid "The following packages will be upgraded:" -msgstr "Následující balíky budou aktualizovány:" +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ign " -#: apt-private/private-output.cc:613 -msgid "The following packages will be DOWNGRADED:" -msgstr "Následující balíky budou DEGRADOVÁNY:" +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Err " -#: 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/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Staženo %sB za %s (%sB/s)\n" -#: apt-private/private-output.cc:688 +#: apt-private/acqprogress.cc:236 #, c-format -msgid "%s (due to %s) " -msgstr "%s (kvůli %s) " +msgid " [Working]" +msgstr " [Pracuji]" -#: apt-private/private-output.cc:696 +#: apt-private/acqprogress.cc:297 +#, c-format msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" 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!" +"Výměna média: Vložte disk nazvaný\n" +" „%s“\n" +"do mechaniky „%s“ a stiskněte enter\n" -#: apt-private/private-output.cc:727 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu aktualizováno, %lu nově instalováno, " +msgid "Unable to read %s" +msgstr "Nelze číst %s" -#: apt-private/private-output.cc:731 +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 #, c-format -msgid "%lu reinstalled, " -msgstr "%lu přeinstalováno, " +msgid "Unable to change to %s" +msgstr "Nelze přejít do %s" -#: apt-private/private-output.cc:733 +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 #, c-format -msgid "%lu downgraded, " -msgstr "%lu degradováno, " +msgid "No mirror file '%s' found " +msgstr "Soubor se zrcadly „%s“ nebyl nalezen " -#: apt-private/private-output.cc:735 +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 #, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu k odstranění a %lu neaktualizováno.\n" +msgid "Can not read mirror file '%s'" +msgstr "Nelze číst soubor se zrcadly „%s“" -#: apt-private/private-output.cc:739 +#: methods/mirror.cc:315 #, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" +msgid "No entry found in mirror file '%s'" +msgstr "V souboru se zrcadly „%s“ nebyl nalezen žádný záznam" -#. 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]" +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" +msgstr "[Zrcadlo: %s]" -#. 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]" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Selhalo vytvoření meziprocesové roury k podprocesu" -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:778 -msgid "Y" -msgstr "Y" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "Spojení bylo předčasně ukončeno" -#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:784 -msgid "N" -msgstr "N" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "Chybné standardní nastavení!" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Chyba při kompilaci regulárního výrazu - %s" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "Pro pokračování stiskněte enter." -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "Fulltextové hledání" +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Chcete smazat všechny dříve stažené .deb soubory?" -#: 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“." +#: dselect/install:102 +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "Během rozbalování se vyskytly chyby. Balíky, které se nainstalovaly" -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" -msgstr "není skutečný balík (virtuální)" +#: dselect/install:103 +msgid "will be configured. This may result in duplicate errors" +msgstr "budou zkonfigurovány. To může způsobit duplicitní chybové hlášky" -#: apt-private/private-sources.cc:58 -#, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "Nepodařilo se zpracovat %s. Zkusit znovu upravit?" +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "o nesplněných závislostech. To je v pořádku, důležité jsou pouze" -#: apt-private/private-sources.cc:70 -#, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "Soubor „%s“ se změnil, spusťte prosím „apt-get update“." +#: dselect/install:105 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "chyby nad touto hláškou. Opravte je a poté znovu spusťte [I]nstalovat" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Příkaz update neakceptuje žádné argumenty" +#: dselect/update:30 +msgid "Merging available information" +msgstr "Slučují se dostupné informace" -#: apt-private/private-update.cc:90 -#, 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-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "Pokus o uvolnění uzlu (DropNode) na stále propojeném uzlu" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." -msgstr "Všechny balíky jsou aktuální." +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Nelze lokalizovat hashovací prvek!" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "Propočítává se aktualizace… " +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Nelze alokovat diverzi" -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "Hotovo" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Vnitřní chyba při AddDiversion" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Unable to read %s" -msgstr "Nelze číst %s" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Pokus o přepsání diverze, %s -> %s a %s/%s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Unable to change to %s" -msgstr "Nelze přejít do %s" +msgid "Double add of diversion %s -> %s" +msgstr "Dvojí přidání diverze %s -> %s" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 +#: apt-inst/filelist.cc:549 #, c-format -msgid "No mirror file '%s' found " -msgstr "Soubor se zrcadly „%s“ nebyl nalezen " +msgid "Duplicate conf file %s/%s" +msgstr "Duplicitní konfigurační soubor %s/%s" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:287 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "Can not read mirror file '%s'" -msgstr "Nelze číst soubor se zrcadly „%s“" +msgid "The path %s is too long" +msgstr "Cesta %s je příliš dlouhá" -#: methods/mirror.cc:315 +#: apt-inst/extract.cc:132 #, c-format -msgid "No entry found in mirror file '%s'" -msgstr "V souboru se zrcadly „%s“ nebyl nalezen žádný záznam" +msgid "Unpacking %s more than once" +msgstr "%s se rozbaluje vícekrát" -#: methods/mirror.cc:445 +#: apt-inst/extract.cc:142 #, c-format -msgid "[Mirror: %s]" -msgstr "[Zrcadlo: %s]" +msgid "The directory %s is diverted" +msgstr "Adresář %s je odkloněn" -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "Selhalo vytvoření meziprocesové roury k podprocesu" +#: apt-inst/extract.cc:152 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Balík se pokouší zapisovat do diverzního cíle %s/%s" -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" -msgstr "Spojení bylo předčasně ukončeno" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Diverzní cesta je příliš dlouhá" -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "Chybné standardní nastavení!" +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 +#, c-format +msgid "Failed to stat %s" +msgstr "Nelze vyhodnotit %s" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "Pro pokračování stiskněte enter." +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "Selhalo přejmenování %s na %s" -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "Chcete smazat všechny dříve stažené .deb soubory?" +#: apt-inst/extract.cc:249 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "Adresář %s bude nahrazen neadresářem" -#: dselect/install:102 -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "Během rozbalování se vyskytly chyby. Balíky, které se nainstalovaly" +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Nelze nalézt uzel v jeho hashovacím kbelíku" -#: dselect/install:103 -msgid "will be configured. This may result in duplicate errors" -msgstr "budou zkonfigurovány. To může způsobit duplicitní chybové hlášky" +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Cesta je příliš dlouhá" -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "o nesplněných závislostech. To je v pořádku, důležité jsou pouze" +#: apt-inst/extract.cc:421 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "Přepsat vyhovující balík bez udání verze pro %s" -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" -msgstr "chyby nad touto hláškou. Opravte je a poté znovu spusťte [I]nstalovat" +#: apt-inst/extract.cc:438 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Soubor %s/%s přepisuje ten z balíku %s" -#: dselect/update:30 -msgid "Merging available information" -msgstr "Slučují se dostupné informace" +#: apt-inst/extract.cc:498 +#, c-format +msgid "Unable to stat %s" +msgstr "Nelze vyhodnotit %s" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Použití: apt-extracttemplates soubor1 [soubor2 …]\n" -"\n" -"apt-extracttemplates umí z balíků vytáhnout konfigurační skripty a šablony\n" -"\n" -"Volby:\n" -" -h Tato nápověda.\n" -" -t Nastaví dočasný adresář\n" -" -c=? Načte tento konfigurační soubor\n" -" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#, c-format +msgid "Failed to write file %s" +msgstr "Selhal zápis souboru %s" -#: cmdline/apt-extracttemplates.cc:254 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Unable to mkstemp %s" -msgstr "Nelze zavolat mkstemp %s" +msgid "Failed to close file %s" +msgstr "Selhalo zavření souboru %s" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "Unable to write to %s" -msgstr "Nelze zapsat do %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Toto není platný DEB archiv, chybí část „%s“" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Nelze určit verzi programu debconf. Je debconf nainstalován?" +#: apt-inst/deb/debfile.cc:132 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "Vnitřní chyba, nelze najít část %s" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Seznam rozšíření balíku je příliš dlouhý" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Nezpracovatelný kontrolní soubor" -#: 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 +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Neplatný podpis archivu" + +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Chyba při čtení záhlaví prvku archivu" + +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid "Error processing directory %s" -msgstr "Chyba zpracování adresáře %s" +msgid "Invalid archive member header %s" +msgstr "Neplatné záhlaví prvku archivu %s" -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Seznam zdrojových rozšíření je příliš dlouhý" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Neplatné záhlaví prvku archivu" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Chyba při zapisování hlavičky do souboru" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Archiv je příliš krátký" -#: ftparchive/apt-ftparchive.cc:431 -#, c-format -msgid "Error processing contents %s" -msgstr "Chyba při zpracovávání obsahu %s" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Chyba při čtení hlaviček archivu" -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Použití: apt-ftparchive [volby] příkaz\n" -"Příkazy: packages binárnícesta [souboroverride [prefixcesty]]\n" -" sources zdrojovácesta [souboroverride [prefixcesty]]\n" -" contents cesta\n" -" release cesta\n" -" generate konfiguračnísoubor [skupiny]\n" -" clean konfiguračnísoubor\n" -"\n" -"apt-ftparchive generuje indexové soubory debianích archivů. Podporuje\n" -"několik režimů vytváření - od plně automatického až po funkční ekvivalent\n" -"příkazů dpkg-scanpackages a dpkg-scansources.\n" -"\n" -"apt-ftparchive vytvoří ze stromu .deb souborů soubory Packages. Soubor\n" -"Packages obsahuje kromě všech kontrolních polí každého balíku také jeho\n" -"velikost a MD5 součet. Podporován je také soubor override, kterým můžete \n" -"vynutit hodnoty polí Priority a Section.\n" -"\n" -"Podobně umí apt-ftparchive vygenerovat ze stromu souborů .dsc soubory\n" -"Sources. Volbou --source-override můžete zadat zdrojový soubor override.\n" -"\n" -"Příkazy „packages“ a „sources“ by se měly spouštět z kořene stromu.\n" -"BinárníCesta by měla ukazovat na začátek rekurzivního hledání a soubor \n" -"override by měl obsahovat příznaky pro přepis. PrefixCesty, pokud je\n" -"přítomen, je přidán do polí Filename.\n" -"Reálný příklad na archivu Debianu:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Volby:\n" -" -h Tato nápověda\n" -" --md5 Vygeneruje kontrolní MD5\n" -" -s=? Zdrojový soubor override\n" -" -q Tichý režim\n" -" -d=? Vybere volitelnou databázi pro vyrovnávací paměť\n" -" --no-delink Povolí ladicí režim\n" -" --contents Vygeneruje soubor Contents\n" -" -c=? Načte tento konfigurační soubor\n" -" -o=? Nastaví libovolnou volbu" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Žádný výběr nevyhověl" - -#: ftparchive/apt-ftparchive.cc:907 -#, 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" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Selhalo vytvoření roury" -#: ftparchive/cachedb.cc:65 -#, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB je porušená, soubor přejmenován na %s.old" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Selhalo spuštění gzipu " -#: ftparchive/cachedb.cc:83 -#, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "DB je stará, zkouším aktualizovat %s" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Porušený archiv" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"Formát databáze je neplatný. Pokud jste přešli ze starší verze apt, databázi " -"prosím odstraňte a poté ji znovu vytvořte." +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Kontrolní součet taru selhal, archiv je poškozený" -#: ftparchive/cachedb.cc:99 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Nelze otevřít DB soubor %s: %s" +msgid "Unknown TAR header type %u, member %s" +msgstr "Neznámá hlavička TARu typ %u, člen %s" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Failed to stat %s" -msgstr "Nelze vyhodnotit %s" +msgid "Progress: [%3i%%]" +msgstr "Postup: [%3i%%]" -#: ftparchive/cachedb.cc:332 -msgid "Failed to read .dsc" -msgstr "Nelze přečíst .dsc" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "Spouští se dpkg" -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Archiv nemá kontrolní záznam" +#: apt-pkg/init.cc:146 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "Balíčkovací systém „%s“ není podporován" -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Nelze získat kurzor" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Nebylo možno určit vhodný typ balíčkovacího systému" -#: ftparchive/writer.cc:91 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: Nelze číst adresář %s\n" +msgid "Wrote %i records.\n" +msgstr "Zapsáno %i záznamů.\n" -#: ftparchive/writer.cc:96 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "W: Nelze vyhodnotit %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " - -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "W: " - -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: Chyby se týkají souboru " +msgid "Wrote %i records with %i missing files.\n" +msgstr "Zapsáno %i záznamů s chybějícími soubory (%i).\n" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "Failed to resolve %s" -msgstr "Chyba při zjišťování %s" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Zapsáno %i záznamů s nesouhlasícími soubory (%i).\n" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Průchod stromem selhal" +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "Zapsáno %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n" -#: ftparchive/writer.cc:219 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Failed to open %s" -msgstr "Nelze otevřít %s" +msgid "Can't find authentication record for: %s" +msgstr "Nelze najít autentizační záznam pro: %s" -#: ftparchive/writer.cc:278 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid " DeLink %s [%s]\n" -msgstr "Odlinkování %s [%s]\n" +msgid "Hash mismatch for: %s" +msgstr "Neshoda kontrolních součtů pro: %s" -#: ftparchive/writer.cc:286 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "Failed to readlink %s" -msgstr "Nelze přečíst link %s" +msgid "The method driver %s could not be found." +msgstr "Ovladač metody %s nemohl být nalezen." -#: ftparchive/writer.cc:290 +#: apt-pkg/acquire-worker.cc:118 #, c-format -msgid "Failed to unlink %s" -msgstr "Nelze odlinkovat %s" +msgid "Is the package %s installed?" +msgstr "Je balík %s nainstalován?" -#: ftparchive/writer.cc:298 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Nezdařilo se slinkovat %s s %s" +msgid "Method %s did not start correctly" +msgstr "Metoda %s nebyla spuštěna správně" -#: ftparchive/writer.cc:308 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Odlinkovací limit %sB dosažen.\n" +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." -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Archiv nemá pole Package" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "" +"Seznamy balíků nebo stavový soubor nemohly být zpracovány nebo otevřeny." -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s nemá žádnou položku pro override\n" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " správce %s je %s, ne %s\n" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Nelze přečíst seznam zdrojů." -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s nemá žádnou zdrojovou položku pro override\n" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Cache balíků je prázdná" -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s nemá ani žádnou binární položku pro override\n" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Cache soubor balíků je poškozen" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Selhal pokus o přidělení paměti" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Cache soubor balíků má nekompatibilní verzi" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Nelze otevřít %s" +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" +msgstr "Cache soubor balíků je poškozen, je příliš malý" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Zkomolený override soubor %s, řádek %llu (%s)" +msgid "This APT does not support the versioning system '%s'" +msgstr "Tato APT nepodporuje systém pro správu verzí „%s“" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Nezdařilo se přečíst override soubor %s" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Cache balíků byla vytvořena pro jinou architekturu" -#: ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Zkomolený override soubor %s, řádek %llu #1" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Závisí na" -#: ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Zkomolený override soubor %s, řádek %llu #2" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Předzávisí na" -#: ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Zkomolený override soubor %s, řádek %llu #3" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Navrhuje" -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Neznámý kompresní algoritmus „%s“" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Doporučuje" -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Komprimovaný výstup %s potřebuje kompresní sadu" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Koliduje s" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Selhalo vytvoření FILE*" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Nahrazuje" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Volání fork() se nezdařilo" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Zastarává" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Komprimovat potomka" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Porušuje" -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "Interní chyba, nezdařilo se vytvořit %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Rozšiřuje" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "V/V operace s podprocesem/souborem selhala" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "důležitý" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Chyba čtení při výpočtu MD5" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "vyžadovaný" -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "Problém s odlinkováním %s" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "standardní" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "Selhalo přejmenování %s na %s" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "volitelný" -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Použití: apt-internal-solver\n" -"\n" -"apt-internal-solver je rozhraní k aktuálnímu internímu řešiteli\n" -"závislostí, jako by šlo o externí nástroj - vhodné pro ladění\n" -"\n" -"Volby:\n" -" -h Tato nápověda.\n" -" -q Nezobrazí indikátor postupu - vhodné pro záznam\n" -" -c=? Načte daný konfigurační soubor\n" -" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "extra" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Neznámý záznam o balíku!" +#: apt-pkg/pkgrecords.cc:38 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "Indexový typ souboru „%s“ není podporován" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Použití: apt-sortpkgs [volby] soubor1 [soubor2 …]\n" -"\n" -"apt-sortpkgs je jednoduchý nástroj pro setřídění souborů Packages.\n" -"Volbou -s volíte typ souboru.\n" -"\n" -"Volby:\n" -" -h Tato nápověda\n" -" -s Setřídí zdrojový soubor\n" -" -c=? Načte tento konfigurační soubor\n" -" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" +#: 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-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "Failed to write file %s" -msgstr "Selhal zápis souboru %s" +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (nezpracovatelná [volba])" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "Failed to close file %s" -msgstr "Selhalo zavření souboru %s" +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-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "The path %s is too long" -msgstr "Cesta %s je příliš dlouhá" +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-inst/extract.cc:132 +#: apt-pkg/sourcelist.cc:190 #, c-format -msgid "Unpacking %s more than once" -msgstr "%s se rozbaluje vícekrát" +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] nemá klíč)" -#: apt-inst/extract.cc:142 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "The directory %s is diverted" -msgstr "Adresář %s je odkloněn" +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-inst/extract.cc:152 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Balík se pokouší zapisovat do diverzního cíle %s/%s" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Diverzní cesta je příliš dlouhá" +#: 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-inst/extract.cc:249 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Adresář %s bude nahrazen neadresářem" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Nelze nalézt uzel v jeho hashovacím kbelíku" +#: 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-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Cesta je příliš dlouhá" +#: 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-inst/extract.cc:421 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Přepsat vyhovující balík bez udání verze pro %s" +msgid "Opening %s" +msgstr "Otevírá se %s" -#: apt-inst/extract.cc:438 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Soubor %s/%s přepisuje ten z balíku %s" +msgid "Line %u too long in source list %s." +msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý." -#: apt-inst/extract.cc:498 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "Unable to stat %s" -msgstr "Nelze vyhodnotit %s" +msgid "Malformed line %u in source list %s (type)" +msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "Pokus o uvolnění uzlu (DropNode) na stále propojeném uzlu" +#: apt-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-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Nelze lokalizovat hashovací prvek!" +#: 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-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Nelze alokovat diverzi" +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 +#, c-format +msgid "Clean of %s is not supported" +msgstr "Vyčištění %s není podporováno" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Vnitřní chyba při AddDiversion" - -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Pokus o přepsání diverze, %s -> %s a %s/%s" - -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Dvojí přidání diverze %s -> %s" - -#: apt-inst/filelist.cc:549 +#: apt-pkg/clean.cc:64 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Duplicitní konfigurační soubor %s/%s" - -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Neplatný podpis archivu" +msgid "Unable to stat %s." +msgstr "Nebylo možno vyhodnotit %s." -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Chyba při čtení záhlaví prvku archivu" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "Cache má nekompatibilní systém správy verzí" -#: apt-inst/contrib/arfile.cc:96 +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format -msgid "Invalid archive member header %s" -msgstr "Neplatné záhlaví prvku archivu %s" - -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Neplatné záhlaví prvku archivu" - -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Archiv je příliš krátký" - -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Chyba při čtení hlaviček archivu" +msgid "Error occurred while processing %s (%s%d)" +msgstr "Chyba při zpracování %s (%s%d)" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Selhalo vytvoření roury" +#: apt-pkg/pkgcachegen.cc:257 +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-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Selhalo spuštění gzipu " +#: apt-pkg/pkgcachegen.cc:260 +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-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Porušený archiv" +#: apt-pkg/pkgcachegen.cc:263 +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-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Kontrolní součet taru selhal, archiv je poškozený" +#: apt-pkg/pkgcachegen.cc:266 +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-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Neznámá hlavička TARu typ %u, člen %s" +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-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Toto není platný DEB archiv, chybí část „%s“" +msgid "Couldn't stat source package list %s" +msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s" -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "Vnitřní chyba, nelze najít část %s" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Načítají se seznamy balíků" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Nezpracovatelný kontrolní soubor" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Collecting File poskytuje" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "List directory %spartial is missing." -msgstr "Adresář seznamů %spartial chybí." +msgid "Unable to write to %s" +msgstr "Nelze zapsat do %s" -#: apt-pkg/acquire.cc:91 -#, c-format -msgid "Archives directory %spartial is missing." -msgstr "Archivní adresář %spartial chybí." +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "Chyba IO při ukládání zdrojové cache" -#: apt-pkg/acquire.cc:99 -#, c-format -msgid "Unable to lock directory %s" -msgstr "Nelze uzamknout adresář %s" +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "Scénář odeslán řešiteli" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, c-format -msgid "Clean of %s is not supported" -msgstr "Vyčištění %s není podporováno" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "Požadavek odeslán řešiteli" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Stahuje se soubor %li z %li (zbývá %s)" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "Příprava na obdržení řešení" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "Stahuje se soubor %li z %li" +#: apt-pkg/edsp.cc:327 +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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "Spuštění externího řešitele" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2461,7 +2371,7 @@ msgstr "Velikosti nesouhlasí" msgid "Invalid file format" msgstr "Neplatná formát souboru" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2470,16 +2380,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:1589 +#: apt-pkg/acquire-item.cc:1656 #, 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:1631 +#: apt-pkg/acquire-item.cc:1698 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:1669 +#: apt-pkg/acquire-item.cc:1736 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2488,12 +2398,12 @@ msgstr "" "Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto " "repositáře se nepoužijí." -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/acquire-item.cc:1758 #, 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:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2503,12 +2413,12 @@ 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:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "Chyba GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2517,127 +2427,109 @@ 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:1925 +#: apt-pkg/acquire-item.cc:1992 #, 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:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Ovladač metody %s nemohl být nalezen." +msgid "Vendor block %s contains no fingerprint" +msgstr "Blok výrobce %s neobsahuje otisk klíče" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Is the package %s installed?" -msgstr "Je balík %s nainstalován?" +msgid "List directory %spartial is missing." +msgstr "Adresář seznamů %spartial chybí." -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Method %s did not start correctly" -msgstr "Metoda %s nebyla spuštěna správně" +msgid "Archives directory %spartial is missing." +msgstr "Archivní adresář %spartial chybí." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 #, 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 "Unable to lock directory %s" +msgstr "Nelze uzamknout adresář %s" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archiv." +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Stahuje se soubor %li z %li (zbývá %s)" -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno " -"podrženými balíky." +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Stahuje se soubor %li z %li" -#: apt-pkg/algorithms.cc:1088 -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/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/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." +#: 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 "" -"Seznamy balíků nebo stavový soubor nemohly být zpracovány nebo otevřeny." - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Nelze přečíst seznam zdrojů." +"Hodnota „%s“ není v APT::Default-Release platná, protože toto vydání není " +"dostupné v sources.list" -#: apt-pkg/cacheset.cc:489 +#: apt-pkg/policy.cc:422 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Neplatný záznam v souboru preferencí %s, chybí hlavička Package" -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Verze „%s“ pro „%s“ nebyla nalezena" +msgid "Did not understand pin type %s" +msgstr "Nerozumím vypíchnutí typu %s" -#: apt-pkg/cacheset.cc:603 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "Nelze najít úlohu „%s“" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita" -#: apt-pkg/cacheset.cc:609 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, 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“" +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" +"Nelze spustit okamžitou konfiguraci balíku „%s“. Podrobnosti naleznete v man " +"5 apt.conf v části APT::Immediate-Configure. (%d)" -#: apt-pkg/cacheset.cc:615 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Nelze najít balík vyhovující masce „%s“" +msgid "Could not configure '%s'. " +msgstr "Nelze nastavit „%s“." -#: apt-pkg/cacheset.cc:626 -#, 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:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:630 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"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 "" -"Nelze vybrat nainstalovanou ani kandidátskou verzi balíku „%s“, protože " -"žádné takové verze nemá" - -#: apt-pkg/cacheset.cc:647 -#, 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:655 -#, 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:663 -#, 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" +"Tento běh instalace si vyžádá dočasné odstranění klíčového balíku %s kvůli " +"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" @@ -2716,10 +2608,23 @@ msgstr "Zapisuje se nový seznam balíků\n" msgid "Source list entries for this disc are:\n" msgstr "Seznamy zdrojů na tomto disku jsou:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Nebylo možno vyhodnotit %s." +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:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno " +"podrženými balíky." + +#: apt-pkg/algorithms.cc:1088 +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/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2747,55 +2652,69 @@ msgstr "Nelze otevřít stavový soubor %s" msgid "Failed to write temporary StateFile %s" msgstr "Nelze zapsat dočasný stavový soubor %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "Scénář odeslán řešiteli" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Nelze zpracovat soubor %s (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "Požadavek odeslán řešiteli" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Nelze zpracovat soubor %s (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "Příprava na obdržení řešení" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Verze „%s“ pro „%s“ nebyla nalezena" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "Spuštění externího řešitele" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Nelze najít úlohu „%s“" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "Zapsáno %i záznamů.\n" +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/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Zapsáno %i záznamů s chybějícími soubory (%i).\n" +msgid "Couldn't find any package by glob '%s'" +msgstr "Nelze najít balík vyhovující masce „%s“" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Zapsáno %i záznamů s nesouhlasícími soubory (%i).\n" +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/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "Zapsáno %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"Nelze vybrat nainstalovanou ani kandidátskou verzi balíku „%s“, protože " +"žádné takové verze nemá" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "Nelze najít autentizační záznam pro: %s" +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/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Neshoda kontrolních součtů pro: %s" +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:663 +#, 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/indexrecords.cc:78 #, c-format @@ -2822,824 +2741,903 @@ msgstr "Neplatná položka „Valid-Until“ v Release souboru %s" msgid "Invalid 'Date' entry in Release file %s" msgstr "Neplatná položka „Date“ v Release souboru %s" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Balíčkovací systém „%s“ není podporován" +msgid "%lid %lih %limin %lis" +msgstr "%lid %lih %limin %lis" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Nebylo možno určit vhodný typ balíčkovacího systému" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" +msgstr "%lih %limin %lis" -#: apt-pkg/install-progress.cc:57 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Progress: [%3i%%]" -msgstr "Postup: [%3i%%]" +msgid "%limin %lis" +msgstr "%limin %lis" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "Spouští se dpkg" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" +msgstr "%lis" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" -"Nelze spustit okamžitou konfiguraci balíku „%s“. Podrobnosti naleznete v man " -"5 apt.conf v části APT::Immediate-Configure. (%d)" +msgid "Selection %s not found" +msgstr "Výběr %s nenalezen" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "Could not configure '%s'. " -msgstr "Nelze nastavit „%s“." +msgid "Not using locking for read only lock file %s" +msgstr "Nepoužívá se zamykání pro zámkový soubor %s, který je pouze pro čtení" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:195 #, 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 "" -"Tento běh instalace si vyžádá dočasné odstranění klíčového balíku %s kvůli " -"smyčce v Conflicts/Pre-Depends. To je často špatné, ale pokud to skutečně " -"chcete udělat, aktivujte možnost APT::Force-LoopBreak." +msgid "Could not open lock file %s" +msgstr "Nešlo otevřít zámkový soubor %s" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Cache balíků je prázdná" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Nepoužívá se zamykání pro zámkový soubor %s připojený přes nfs" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Cache soubor balíků je poškozen" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Nelze získat zámek %s" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Cache soubor balíků má nekompatibilní verzi" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "Seznam souborů nelze vytvořit, jelikož „%s“ není adresář" -#: apt-pkg/pkgcache.cc:169 -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/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "Ignoruji „%s“ v adresáři „%s“, jelikož to není obyčejný soubor" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:412 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Tato APT nepodporuje systém pro správu verzí „%s“" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož nemá příponu" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "Cache balíků byla vytvořena pro jinou architekturu" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož má neplatnou příponu" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Závisí na" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Podproces %s obdržel chybu segmentace." -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Předzávisí na" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "Podproces %s obdržel signál %u." -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Navrhuje" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Podproces %s vrátil chybový kód (%u)" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Doporučuje" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Podproces %s neočekávaně skončil" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Koliduje s" +#: apt-pkg/contrib/fileutl.cc:913 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problém při zavírání gzip souboru %s" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Nahrazuje" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Nelze otevřít soubor %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Zastarává" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "Nelze otevřít popisovač souboru %d" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Porušuje" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Nelze vytvořit podproces IPC" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Rozšiřuje" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Nezdařilo se spustit kompresor " -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "důležitý" +#: apt-pkg/contrib/fileutl.cc:1514 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "čtení, stále se má přečíst %llu, ale už nic nezbývá" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "vyžadovaný" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "zápis, stále se má zapsat %llu, ale nejde to" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "standardní" +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" +msgstr "Problém při zavírání souboru %s" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "volitelný" +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Problém při přejmenování souboru %s na %s" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "extra" +#: apt-pkg/contrib/fileutl.cc:1938 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "Problém při odstraňování souboru %s" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Cache má nekompatibilní systém správy verzí" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Problém při synchronizování souboru" -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Chyba při zpracování %s (%s%d)" +msgid "%c%s... Error!" +msgstr "%c%s… Chyba!" -#: apt-pkg/pkgcachegen.cc:257 -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/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s… Hotovo" -#: apt-pkg/pkgcachegen.cc:260 -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/contrib/progress.cc:181 +msgid "..." +msgstr "…" -#: apt-pkg/pkgcachegen.cc:263 -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." +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s… %u%%" -#: apt-pkg/pkgcachegen.cc:266 -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/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Nelze provést mmap prázdného souboru" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/mmap.cc:111 #, 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" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Nelze duplikovat popisovač souboru %i" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/mmap.cc:119 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s" - -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Načítají se seznamy balíků" +msgid "Couldn't make mmap of %llu bytes" +msgstr "Nešlo mmapovat %llu bajtů" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Collecting File poskytuje" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Nelze zavřít mmap" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Chyba IO při ukládání zdrojové cache" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Nelze synchronizovat mmap" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Indexový typ souboru „%s“ není podporován" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Nešlo mmapovat %lu bajtů" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Nelze zmenšit soubor" + +#: apt-pkg/contrib/mmap.cc:341 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"Hodnota „%s“ není v APT::Default-Release platná, protože toto vydání není " -"dostupné v sources.list" +"Dynamickému MMapu došlo místo. Zvyšte prosím hodnotu APT::Cache-Start. " +"Současná hodnota: %lu. (man 5 apt.conf)" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Neplatný záznam v souboru preferencí %s, chybí hlavička Package" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "Nelze zvýšit velikost MMapu, protože limit %lu bajtů již byl dosažen." -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Nelze zvýšit velikost MMapu, protože automatické zvětšování bylo uživatelem " +"zakázáno." + +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "Did not understand pin type %s" -msgstr "Nerozumím vypíchnutí typu %s" +msgid "Unable to stat the mount point %s" +msgstr "Nelze vyhodnotit přípojný bod %s" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita" +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Nezdařilo se vyhodnotit cdrom" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/configuration.cc:519 #, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Zkomolená část %u v seznamu zdrojů %s (zpracování URI)" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Nerozpoznaná zkratka typu: „%c“" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/configuration.cc:633 #, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (nezpracovatelná [volba])" +msgid "Opening configuration file %s" +msgstr "Otevírá se konfigurační soubor %s" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/configuration.cc:801 #, 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])" +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Syntaktická chyba %s:%u: Blok nezačíná jménem." -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/configuration.cc:820 #, 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í)" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Syntaktická chyba %s:%u: Zkomolená značka" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/configuration.cc:837 #, 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íč)" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Syntaktická chyba %s:%u: Za hodnotou následuje zbytečné smetí" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/configuration.cc:877 #, 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)" +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/sourcelist.cc:206 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Syntaktická chyba %s:%u: Příliš mnoho vnořených propojení (include)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)" +msgid "Syntax error %s:%u: Included from here" +msgstr "Syntaktická chyba %s:%u: Zahrnuto odtud" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/configuration.cc:897 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" - -#: apt-pkg/sourcelist.cc: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/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: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/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "Do sources.list musíte zadat „zdrojové“ URI" - -#: apt-pkg/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Nelze zpracovat soubor %s (1)" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva „%s“" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/configuration.cc:900 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Nelze zpracovat soubor %s (2)" - -#: 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." +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -"Některé indexové soubory se nepodařilo stáhnout. Jsou ignorovány, nebo jsou " -"použity starší verze." +"Syntaktická chyba %s:%u: Direktiva clear vyžaduje jako argument strom " +"možností" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/configuration.cc:950 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Blok výrobce %s neobsahuje otisk klíče" +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/cdromutl.cc:65 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "Nelze vyhodnotit přípojný bod %s" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "Nezdařilo se vyhodnotit cdrom" +msgid "No keyring installed in %s." +msgstr "V %s není nainstalována žádná klíčenka." -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format msgid "Command line option %s is not understood" msgstr "Nerozumím parametru %s příkazové řádky" -#: apt-pkg/contrib/cmndline.cc:168 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format msgid "Command line option %s is not boolean" msgstr "Parametr příkazové řádky %s není pravdivostní hodnota" -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format msgid "Option %s requires an argument." msgstr "Volba %s vyžaduje argument." -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Parametr %s: Zadání konfigurační položky musí obsahovat =." -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, 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:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "Volba „%s“ je příliš dlouhá" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, 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:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "Neplatná operace %s" -#: apt-pkg/contrib/configuration.cc:519 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Nerozpoznaná zkratka typu: „%c“" - -#: apt-pkg/contrib/configuration.cc:633 -#, c-format -msgid "Opening configuration file %s" -msgstr "Otevírá se konfigurační soubor %s" - -#: apt-pkg/contrib/configuration.cc:801 -#, 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:820 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Syntaktická chyba %s:%u: Zkomolená značka" +msgid "Installing %s" +msgstr "Instaluje se %s" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Syntaktická chyba %s:%u: Za hodnotou následuje zbytečné smetí" +msgid "Configuring %s" +msgstr "Nastavuje se %s" -#: apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, 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" +msgid "Removing %s" +msgstr "Odstraňuje se %s" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Syntaktická chyba %s:%u: Příliš mnoho vnořených propojení (include)" +msgid "Completely removing %s" +msgstr "Kompletně se odstraňuje %s" -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Syntaktická chyba %s:%u: Zahrnuto odtud" +msgid "Noting disappearance of %s" +msgstr "Značím si zmizení %s" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:115 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva „%s“" +msgid "Running post-installation trigger %s" +msgstr "Spouští se poinstalační spouštěč %s" -#: apt-pkg/contrib/configuration.cc:900 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, 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í" +msgid "Directory '%s' missing" +msgstr "Adresář „%s“ chybí" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, 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í" +msgid "Could not open file '%s'" +msgstr "Nelze otevřít soubor „%s“" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Nepoužívá se zamykání pro zámkový soubor %s, který je pouze pro čtení" +msgid "Preparing %s" +msgstr "Připravuje se %s" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1008 #, c-format -msgid "Could not open lock file %s" -msgstr "Nešlo otevřít zámkový soubor %s" +msgid "Unpacking %s" +msgstr "Rozbaluje se %s" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Nepoužívá se zamykání pro zámkový soubor %s připojený přes nfs" +msgid "Preparing to configure %s" +msgstr "Připravuje se nastavení %s" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Could not get lock %s" -msgstr "Nelze získat zámek %s" +msgid "Installed %s" +msgstr "Nainstalován %s" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "Seznam souborů nelze vytvořit, jelikož „%s“ není adresář" +msgid "Preparing for removal of %s" +msgstr "Připravuje se odstranění %s" -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "Ignoruji „%s“ v adresáři „%s“, jelikož to není obyčejný soubor" +msgid "Removed %s" +msgstr "Odstraněn %s" -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož nemá příponu" +msgid "Preparing to completely remove %s" +msgstr "Připravuje se úplné odstranění %s" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož má neplatnou příponu" +msgid "Completely removed %s" +msgstr "Kompletně odstraněn %s" -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Podproces %s obdržel chybu segmentace." +msgid "Can not write log (%s)" +msgstr "Nelze zapsat log (%s)" -#: apt-pkg/contrib/fileutl.cc:826 -#, c-format -msgid "Sub-process %s received signal %u." -msgstr "Podproces %s obdržel signál %u." +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "Je /dev/pts připojeno?" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Podproces %s vrátil chybový kód (%u)" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "Operace byla přerušena dříve, než mohla skončit" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 -#, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Podproces %s neočekávaně skončil" +#: apt-pkg/deb/dpkgpm.cc:1719 +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" -#: apt-pkg/contrib/fileutl.cc:913 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problém při zavírání gzip souboru %s" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "problémy se závislostmi - ponechávám nezkonfigurované" -#: apt-pkg/contrib/fileutl.cc:1101 -#, c-format -msgid "Could not open file %s" -msgstr "Nelze otevřít soubor %s" +#: apt-pkg/deb/dpkgpm.cc:1726 +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/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 -#, c-format -msgid "Could not open file descriptor %d" -msgstr "Nelze otevřít popisovač souboru %d" +#: apt-pkg/deb/dpkgpm.cc:1732 +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/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Nelze vytvořit podproces IPC" +#: apt-pkg/deb/dpkgpm.cc:1739 +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/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Nezdařilo se spustit kompresor " +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +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/contrib/fileutl.cc:1514 -#, c-format -msgid "read, still have %llu to read but none left" -msgstr "čtení, stále se má přečíst %llu, ale už nic nezbývá" +#: apt-pkg/deb/dpkgpm.cc:1774 +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/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "zápis, stále se má zapsat %llu, ale nejde to" +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/contrib/fileutl.cc:1915 +#: apt-pkg/deb/debsystem.cc:94 #, c-format -msgid "Problem closing the file %s" -msgstr "Problém při zavírání souboru %s" +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Nelze uzamknout administrační adresář (%s). Jste root?" -#: apt-pkg/contrib/fileutl.cc:1927 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 #, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Problém při přejmenování souboru %s na %s" +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/contrib/fileutl.cc:1938 -#, c-format -msgid "Problem unlinking the file %s" -msgstr "Problém při odstraňování souboru %s" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "Není uzamčen" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Problém při synchronizování souboru" +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Použití: apt-extracttemplates soubor1 [soubor2 …]\n" +"\n" +"apt-extracttemplates umí z balíků vytáhnout konfigurační skripty a šablony\n" +"\n" +"Volby:\n" +" -h Tato nápověda.\n" +" -t Nastaví dočasný adresář\n" +" -c=? Načte tento konfigurační soubor\n" +" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: cmdline/apt-extracttemplates.cc:254 #, c-format -msgid "No keyring installed in %s." -msgstr "V %s není nainstalována žádná klíčenka." +msgid "Unable to mkstemp %s" +msgstr "Nelze zavolat mkstemp %s" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Nelze provést mmap prázdného souboru" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Nelze určit verzi programu debconf. Je debconf nainstalován?" -#: apt-pkg/contrib/mmap.cc:111 -#, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Nelze duplikovat popisovač souboru %i" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "Seznam rozšíření balíku je příliš dlouhý" -#: apt-pkg/contrib/mmap.cc:119 +#: 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 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Nešlo mmapovat %llu bajtů" +msgid "Error processing directory %s" +msgstr "Chyba zpracování adresáře %s" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Nelze zavřít mmap" +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Seznam zdrojových rozšíření je příliš dlouhý" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Nelze synchronizovat mmap" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Chyba při zapisování hlavičky do souboru" -#: apt-pkg/contrib/mmap.cc:290 +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Nešlo mmapovat %lu bajtů" - -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Nelze zmenšit soubor" +msgid "Error processing contents %s" +msgstr "Chyba při zpracovávání obsahu %s" -#: apt-pkg/contrib/mmap.cc:341 -#, c-format +#: ftparchive/apt-ftparchive.cc:626 msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" -"Dynamickému MMapu došlo místo. Zvyšte prosím hodnotu APT::Cache-Start. " -"Současná hodnota: %lu. (man 5 apt.conf)" +"Použití: apt-ftparchive [volby] příkaz\n" +"Příkazy: packages binárnícesta [souboroverride [prefixcesty]]\n" +" sources zdrojovácesta [souboroverride [prefixcesty]]\n" +" contents cesta\n" +" release cesta\n" +" generate konfiguračnísoubor [skupiny]\n" +" clean konfiguračnísoubor\n" +"\n" +"apt-ftparchive generuje indexové soubory debianích archivů. Podporuje\n" +"několik režimů vytváření - od plně automatického až po funkční ekvivalent\n" +"příkazů dpkg-scanpackages a dpkg-scansources.\n" +"\n" +"apt-ftparchive vytvoří ze stromu .deb souborů soubory Packages. Soubor\n" +"Packages obsahuje kromě všech kontrolních polí každého balíku také jeho\n" +"velikost a MD5 součet. Podporován je také soubor override, kterým můžete \n" +"vynutit hodnoty polí Priority a Section.\n" +"\n" +"Podobně umí apt-ftparchive vygenerovat ze stromu souborů .dsc soubory\n" +"Sources. Volbou --source-override můžete zadat zdrojový soubor override.\n" +"\n" +"Příkazy „packages“ a „sources“ by se měly spouštět z kořene stromu.\n" +"BinárníCesta by měla ukazovat na začátek rekurzivního hledání a soubor \n" +"override by měl obsahovat příznaky pro přepis. PrefixCesty, pokud je\n" +"přítomen, je přidán do polí Filename.\n" +"Reálný příklad na archivu Debianu:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Volby:\n" +" -h Tato nápověda\n" +" --md5 Vygeneruje kontrolní MD5\n" +" -s=? Zdrojový soubor override\n" +" -q Tichý režim\n" +" -d=? Vybere volitelnou databázi pro vyrovnávací paměť\n" +" --no-delink Povolí ladicí režim\n" +" --contents Vygeneruje soubor Contents\n" +" -c=? Načte tento konfigurační soubor\n" +" -o=? Nastaví libovolnou volbu" -#: apt-pkg/contrib/mmap.cc:446 -#, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "Nelze zvýšit velikost MMapu, protože limit %lu bajtů již byl dosažen." +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Žádný výběr nevyhověl" -#: apt-pkg/contrib/mmap.cc:449 -msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." -msgstr "" -"Nelze zvýšit velikost MMapu, protože automatické zvětšování bylo uživatelem " -"zakázáno." +#: ftparchive/apt-ftparchive.cc:907 +#, 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" -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s… Chyba!" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB je porušená, soubor přejmenován na %s.old" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "%c%s... Done" -msgstr "%c%s… Hotovo" +msgid "DB is old, attempting to upgrade %s" +msgstr "DB je stará, zkouším aktualizovat %s" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "…" +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"Formát databáze je neplatný. Pokud jste přešli ze starší verze apt, databázi " +"prosím odstraňte a poté ji znovu vytvořte." -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "%c%s... %u%%" -msgstr "%c%s… %u%%" +msgid "Unable to open DB file %s: %s" +msgstr "Nelze otevřít DB soubor %s: %s" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "%lid %lih %limin %lis" +#: ftparchive/cachedb.cc:332 +msgid "Failed to read .dsc" +msgstr "Nelze přečíst .dsc" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" -msgstr "%lih %limin %lis" +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Archiv nemá kontrolní záznam" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 -#, c-format -msgid "%limin %lis" -msgstr "%limin %lis" +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Nelze získat kurzor" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:91 #, c-format -msgid "%lis" -msgstr "%lis" +msgid "W: Unable to read directory %s\n" +msgstr "W: Nelze číst adresář %s\n" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:96 #, c-format -msgid "Selection %s not found" -msgstr "Výběr %s nenalezen" +msgid "W: Unable to stat %s\n" +msgstr "W: Nelze vyhodnotit %s\n" -#: 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?" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " -#: 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?" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "W: " -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: Chyby se týkají souboru " + +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, 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“." +msgid "Failed to resolve %s" +msgstr "Chyba při zjišťování %s" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "Není uzamčen" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Průchod stromem selhal" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:219 #, c-format -msgid "Installing %s" -msgstr "Instaluje se %s" +msgid "Failed to open %s" +msgstr "Nelze otevřít %s" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:278 #, c-format -msgid "Configuring %s" -msgstr "Nastavuje se %s" +msgid " DeLink %s [%s]\n" +msgstr "Odlinkování %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:286 #, c-format -msgid "Removing %s" -msgstr "Odstraňuje se %s" +msgid "Failed to readlink %s" +msgstr "Nelze přečíst link %s" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:290 #, c-format -msgid "Completely removing %s" -msgstr "Kompletně se odstraňuje %s" +msgid "Failed to unlink %s" +msgstr "Nelze odlinkovat %s" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:298 #, c-format -msgid "Noting disappearance of %s" -msgstr "Značím si zmizení %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Nezdařilo se slinkovat %s s %s" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:308 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Spouští se poinstalační spouštěč %s" +msgid " DeLink limit of %sB hit.\n" +msgstr " Odlinkovací limit %sB dosažen.\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Archiv nemá pole Package" + +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Directory '%s' missing" -msgstr "Adresář „%s“ chybí" +msgid " %s has no override entry\n" +msgstr " %s nemá žádnou položku pro override\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Could not open file '%s'" -msgstr "Nelze otevřít soubor „%s“" +msgid " %s maintainer is %s not %s\n" +msgstr " správce %s je %s, ne %s\n" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing %s" -msgstr "Připravuje se %s" +msgid " %s has no source override entry\n" +msgstr " %s nemá žádnou zdrojovou položku pro override\n" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:710 #, c-format -msgid "Unpacking %s" -msgstr "Rozbaluje se %s" +msgid " %s has no binary override entry either\n" +msgstr " %s nemá ani žádnou binární položku pro override\n" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Selhal pokus o přidělení paměti" + +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing to configure %s" -msgstr "Připravuje se nastavení %s" +msgid "Unable to open %s" +msgstr "Nelze otevřít %s" -#: apt-pkg/deb/dpkgpm.cc:1000 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 #, c-format -msgid "Installed %s" -msgstr "Nainstalován %s" +msgid "Malformed override %s line %llu (%s)" +msgstr "Zkomolený override soubor %s, řádek %llu (%s)" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing for removal of %s" -msgstr "Připravuje se odstranění %s" +msgid "Failed to read the override file %s" +msgstr "Nezdařilo se přečíst override soubor %s" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:166 #, c-format -msgid "Removed %s" -msgstr "Odstraněn %s" +msgid "Malformed override %s line %llu #1" +msgstr "Zkomolený override soubor %s, řádek %llu #1" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:178 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Připravuje se úplné odstranění %s" +msgid "Malformed override %s line %llu #2" +msgstr "Zkomolený override soubor %s, řádek %llu #2" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/override.cc:191 #, c-format -msgid "Completely removed %s" -msgstr "Kompletně odstraněn %s" +msgid "Malformed override %s line %llu #3" +msgstr "Zkomolený override soubor %s, řádek %llu #3" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Can not write log (%s)" -msgstr "Nelze zapsat log (%s)" +msgid "Unknown compression algorithm '%s'" +msgstr "Neznámý kompresní algoritmus „%s“" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "Je /dev/pts připojeno?" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Komprimovaný výstup %s potřebuje kompresní sadu" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "Je standardní výstup terminál?" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Selhalo vytvoření FILE*" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "Operace byla přerušena dříve, než mohla skončit" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Volání fork() se nezdařilo" -#: apt-pkg/deb/dpkgpm.cc:1687 -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" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Komprimovat potomka" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "problémy se závislostmi - ponechávám nezkonfigurované" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Interní chyba, nezdařilo se vytvořit %s" -#: apt-pkg/deb/dpkgpm.cc:1694 -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." +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "V/V operace s podprocesem/souborem selhala" -#: apt-pkg/deb/dpkgpm.cc:1700 -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." +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Chyba čtení při výpočtu MD5" -#: apt-pkg/deb/dpkgpm.cc:1707 -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í." +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Problém s odlinkováním %s" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že " -"je chyba na lokálním systému." +"Použití: apt-internal-solver\n" +"\n" +"apt-internal-solver je rozhraní k aktuálnímu internímu řešiteli\n" +"závislostí, jako by šlo o externí nástroj - vhodné pro ladění\n" +"\n" +"Volby:\n" +" -h Tato nápověda.\n" +" -q Nezobrazí indikátor postupu - vhodné pro záznam\n" +" -c=? Načte daný konfigurační soubor\n" +" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Neznámý záznam o balíku!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje V/V " -"chybu dpkg." +"Použití: apt-sortpkgs [volby] soubor1 [soubor2 …]\n" +"\n" +"apt-sortpkgs je jednoduchý nástroj pro setřídění souborů Packages.\n" +"Volbou -s volíte typ souboru.\n" +"\n" +"Volby:\n" +" -h Tato nápověda\n" +" -s Setřídí zdrojový soubor\n" +" -c=? Načte tento konfigurační soubor\n" +" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" + +#~ 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 dbf4bfba9..d8be6d0b2 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -174,7 +174,7 @@ msgid " Version table:" msgstr " Tabl Fersiynnau:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -377,7 +377,7 @@ msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" @@ -397,96 +397,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -495,7 +495,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -504,14 +504,14 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -520,7 +520,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:1358 +#: cmdline/apt-get.cc:1362 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -529,32 +529,32 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -695,7 +695,7 @@ msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" @@ -793,16 +793,16 @@ msgstr "" msgid "Disk not found." msgstr "Ffeil heb ei ganfod" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -857,7 +857,7 @@ msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s" msgid "TYPE failed, server said: %s" msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Goramser cysylltu" @@ -879,7 +879,7 @@ msgstr "Gorlifodd ateb y byffer." msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -942,7 +942,7 @@ msgstr "Goramserodd cysylltiad y soced data" msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" @@ -951,7 +951,7 @@ msgstr "Problem wrth stwnshio ffeil" msgid "Unable to fetch file, server said '%s'" msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Goramserodd soced data" @@ -1002,7 +1002,7 @@ msgstr "Methwyd cysylltu i %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Yn cysylltu i %s" @@ -1146,42 +1146,17 @@ msgstr "Methodd y cysylltiad" msgid "Internal error" msgstr "Gwall mewnol" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Presennol " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Cyrchu:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Anwybyddu " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Gwall " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Cyrchwyd %sB yn %s (%sB/s)\n" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:236 +#: apt-private/private-list.cc:159 #, c-format -msgid " [Working]" -msgstr " [Gweithio]" - -#: apt-private/acqprogress.cc:297 -#, fuzzy, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n" -" '%s'\n" -"yn y gyrriant '%s' a gwasgwch Enter\n" +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:93 msgid "Correcting dependencies..." @@ -1211,36 +1186,215 @@ msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain." msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Sefydliwyd]" + +#: apt-private/private-output.cc:268 #, fuzzy -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" +msgid "[installed,local]" +msgstr " [Sefydliwyd]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +#: apt-private/private-output.cc:272 #, fuzzy -msgid "Some packages could not be authenticated" -msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" +msgid "[installed,automatic]" +msgstr " [Sefydliwyd]" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" +#: 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-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Mae problemau a defnyddwyd -y heb --force-yes" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" +msgstr "" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:455 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Methwyd cyrchu %s %s\n" +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:35 +#, 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:97 +#, 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:101 +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:82 msgid "Internal error, InstallPackages was called with broken packages!" @@ -1293,7 +1447,11 @@ msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" msgid "You don't have enough free space in %s." msgstr "Does dim digon o le rhydd gennych yn %s." -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Mae problemau a defnyddwyd -y heb --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml." @@ -1497,947 +1655,703 @@ 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:129 -msgid "Listing" +#: apt-private/private-download.cc:36 +#, fuzzy +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" + +#: apt-private/private-download.cc:40 +msgid "Authentication warning overridden.\n" msgstr "" -#: apt-private/private-list.cc:159 -#, 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-download.cc:45 apt-private/private-download.cc:52 +#, fuzzy +msgid "Some packages could not be authenticated" +msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: 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!" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" 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-download.cc:91 apt-pkg/update.cc:77 +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "Methwyd cyrchu %s %s\n" -#: apt-private/private-output.cc:265 +#: apt-private/private-sources.cc:58 #, fuzzy, c-format -msgid "[installed,upgradable to: %s]" -msgstr " [Sefydliwyd]" +msgid "Failed to parse %s. Edit again? " +msgstr "Methwyd ailenwi %s at %s" -#: apt-private/private-output.cc:268 -#, fuzzy -msgid "[installed,local]" -msgstr " [Sefydliwyd]" +#: apt-private/private-sources.cc:70 +#, c-format +msgid "Your '%s' file changed, please run 'apt-get update'." +msgstr "" -#: apt-private/private-output.cc:270 -msgid "[installed,auto-removable]" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" -#: apt-private/private-output.cc:272 +#: apt-private/private-upgrade.cc:25 #, fuzzy -msgid "[installed,automatic]" -msgstr " [Sefydliwyd]" +msgid "Calculating upgrade... " +msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: apt-private/private-output.cc:274 -#, fuzzy -msgid "[installed]" -msgstr " [Sefydliwyd]" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "Wedi Gorffen" -#: apt-private/private-output.cc:277 +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Presennol " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Cyrchu:" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Anwybyddu " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Gwall " + +#: apt-private/acqprogress.cc:146 #, c-format -msgid "[upgradable from: %s]" -msgstr "" +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Cyrchwyd %sB yn %s (%sB/s)\n" -#: apt-private/private-output.cc:281 -msgid "[residual-config]" +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Gweithio]" + +#: apt-private/acqprogress.cc:297 +#, fuzzy, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" 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-private/private-output.cc:455 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "but %s is installed" -msgstr "ond mae %s wedi ei sefydlu" +msgid "Unable to read %s" +msgstr "Ni ellir darllen %s" -#: apt-private/private-output.cc:457 +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 #, c-format -msgid "but %s is to be installed" -msgstr "ond mae %s yn mynd i gael ei sefydlu" +msgid "Unable to change to %s" +msgstr "Ni ellir newid i %s" -#: apt-private/private-output.cc:464 -msgid "but it is not installable" -msgstr "ond ni ellir ei sefydlu" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" -#: apt-private/private-output.cc:466 -msgid "but it is a virtual package" -msgstr "ond mae'n becyn rhithwir" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 +#, fuzzy, c-format +msgid "Can not read mirror file '%s'" +msgstr "Methwyd agor ffeil %s" -#: apt-private/private-output.cc:469 -msgid "but it is not installed" -msgstr "ond nid yw wedi ei sefydlu" +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Methwyd agor ffeil %s" -#: 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" +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" +msgstr "" -#: apt-private/private-output.cc:474 -msgid " or" -msgstr " neu" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Methwyd creu pibell cyfathrebu at isbroses" -#: 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:" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "Caewyd y cysylltiad yn gynnar" -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "Rhagosodiad gwael!" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "Caiff y pecynnau canlynol eu TYNNU:" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "Gwasgwch Enter er mwyn mynd ymlaen." -#: apt-private/private-output.cc:571 +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:102 #, fuzzy -msgid "The following packages have been kept back:" -msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r" -#: apt-private/private-output.cc:592 +#: dselect/install:103 #, fuzzy -msgid "The following packages will be upgraded:" -msgstr "Caiff y pecynnau canlynol eu uwchraddio" +msgid "will be configured. This may result in duplicate errors" +msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu" -#: apt-private/private-output.cc:613 +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "wallau a achosir gan ddibyniaethau coll. Mae hyn yn iawn, dim ond y" + +#: dselect/install:105 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "" +"gwallau uwchben y neges hwn sy'n bwysig. Trwsiwch nhw a rhedwch [S]efydlu " +"eto." + +#: dselect/update:30 #, fuzzy -msgid "The following packages will be DOWNGRADED:" -msgstr "Caiff y pecynnau canlynol eu ISRADDIO" +msgid "Merging available information" +msgstr "Yn cyfuno manylion Ar Gael" -#: 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-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu" -#: apt-private/private-output.cc:688 -#, c-format -msgid "%s (due to %s) " -msgstr "%s (oherwydd %s) " +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Methyd lleoli yr elfen !" -#: apt-private/private-output.cc:696 +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Methwyd neilltuo dargyfeiriad" + +#: apt-inst/filelist.cc:464 #, 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!" +msgid "Internal error in AddDiversion" +msgstr "Gwall Mewnol yn AddDiversion" -#: apt-private/private-output.cc:727 +#: apt-inst/filelist.cc:477 #, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s" -#: apt-private/private-output.cc:731 +# FIXME: "the" +#: apt-inst/filelist.cc:506 #, c-format -msgid "%lu reinstalled, " -msgstr "%lu wedi ailsefydlu, " +msgid "Double add of diversion %s -> %s" +msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" -#: apt-private/private-output.cc:733 +#: apt-inst/filelist.cc:549 #, c-format -msgid "%lu downgraded, " -msgstr "%lu wedi eu israddio, " +msgid "Duplicate conf file %s/%s" +msgstr "Ffeil cyfluniad dyblyg %s/%s" -#: apt-private/private-output.cc:735 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" +msgid "The path %s is too long" +msgstr "Mae'r llwybr %s yn rhy hir" -#: apt-private/private-output.cc:739 +#: apt-inst/extract.cc:132 #, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" +msgid "Unpacking %s more than once" +msgstr "Yn dadbacio %s mwy nag unwaith" -#. 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 "" +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" -#. 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 "" +#: apt-inst/extract.cc:152 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s" -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:778 -msgid "Y" -msgstr "I" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Mae llwybr y dargyfeiriad yn rhy hir" -#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:784 -msgid "N" -msgstr "" +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 +#, c-format +msgid "Failed to stat %s" +msgstr "Methodd stat() o %s" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "Regex compilation error - %s" -msgstr "Gwall crynhoi patrwm - %s" +msgid "Failed to rename %s to %s" +msgstr "Methwyd ailenwi %s at %s" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" +#: apt-inst/extract.cc:249 +#, c-format +msgid "The directory %s is being replaced by a non-directory" msgstr "" +"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" -#: apt-private/private-show.cc:156 +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Methwyd lleoli nôd yn ei fwced stwnsh" + +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Mae'r llwybr yn rhy hir" + +# FIXME: wtf? +#: apt-inst/extract.cc:421 #, 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] "" +msgid "Overwrite package match with no version for %s" +msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" -msgstr "" +#: apt-inst/extract.cc:438 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" -#: apt-private/private-sources.cc:58 +#: apt-inst/extract.cc:498 +#, c-format +msgid "Unable to stat %s" +msgstr "Ni ellir gwneud stat() o %s" + +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, fuzzy, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "Methwyd ailenwi %s at %s" +msgid "Failed to write file %s" +msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-private/private-sources.cc:70 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "" - -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" +msgid "Failed to close file %s" +msgstr "Methwyd cau ffeil %s" -#: apt-private/private-update.cc:90 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, 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] "" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." -msgstr "" +#: apt-inst/deb/debfile.cc:132 +#, fuzzy, c-format +msgid "Internal error, could not locate member %s" +msgstr "Gwall Mewnol, methwyd lleoli aelod %s" -#: apt-private/private-upgrade.cc:25 +#: apt-inst/deb/debfile.cc:227 #, fuzzy -msgid "Calculating upgrade... " -msgstr "Yn Cyfrifo'r Uwchraddiad... " +msgid "Unparsable control file" +msgstr "Ffeil rheoli ni ellir ei ramadegu" -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "Wedi Gorffen" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Llofnod archif annilys" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 -#, c-format -msgid "Unable to read %s" -msgstr "Ni ellir darllen %s" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Gwall wrth ddarllen pennawd aelod archif" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 -#, c-format -msgid "Unable to change to %s" -msgstr "Ni ellir newid i %s" +#: apt-inst/contrib/arfile.cc:96 +#, fuzzy, c-format +msgid "Invalid archive member header %s" +msgstr "Pennawd aelod archif annilys" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 -#, c-format -msgid "No mirror file '%s' found " -msgstr "" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Pennawd aelod archif annilys" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:287 -#, fuzzy, c-format -msgid "Can not read mirror file '%s'" -msgstr "Methwyd agor ffeil %s" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Mae'r archif yn rhy fyr" -#: methods/mirror.cc:315 -#, fuzzy, c-format -msgid "No entry found in mirror file '%s'" -msgstr "Methwyd agor ffeil %s" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Methwyd darllen pennawdau'r archif" -#: methods/mirror.cc:445 -#, c-format -msgid "[Mirror: %s]" -msgstr "" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Methwyd creu pibau" -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "Methwyd creu pibell cyfathrebu at isbroses" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Methwyd gweithredu gzip" -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" -msgstr "Caewyd y cysylltiad yn gynnar" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Archif llygredig" -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "Rhagosodiad gwael!" +#: apt-inst/contrib/extracttar.cc:203 +#, fuzzy +msgid "Tar checksum failed, archive corrupted" +msgstr "Methodd swm gwirio Tar, archif llygredig" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "Gwasgwch Enter er mwyn mynd ymlaen." +#: apt-inst/contrib/extracttar.cc:308 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "Math pennawd TAR anhysbys %u, aelod %s" -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" +#: apt-pkg/install-progress.cc:57 +#, c-format +msgid "Progress: [%3i%%]" msgstr "" -#: dselect/install:102 -#, fuzzy -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "" -#: dselect/install:103 +#: apt-pkg/init.cc:146 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "Ni chynhelir y system pecynnu '%s'" + +#: apt-pkg/init.cc:162 #, fuzzy -msgid "will be configured. This may result in duplicate errors" -msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu" +msgid "Unable to determine a suitable packaging system type" +msgstr "Ni ellir canfod math system addas" -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "wallau a achosir gan ddibyniaethau coll. Mae hyn yn iawn, dim ond y" +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#, c-format +msgid "Wrote %i records.\n" +msgstr "" -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#, c-format +msgid "Wrote %i records with %i missing files.\n" msgstr "" -"gwallau uwchben y neges hwn sy'n bwysig. Trwsiwch nhw a rhedwch [S]efydlu " -"eto." -#: dselect/update:30 -#, fuzzy -msgid "Merging available information" -msgstr "Yn cyfuno manylion Ar Gael" +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "" -# FIXME: "debian" -#: cmdline/apt-extracttemplates.cc:224 -#, fuzzy -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" -"\n" -"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n" -"templed o becynnau Debian.\n" -"\n" -"Opsiynnau:\n" -" -h Dangos y testun cymorth hwn\n" -" -t Gosod y cyfeiriadur dros dro\n" -" -c=? Darllen y ffeil cyfluniad hwn\n" -" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" - -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Ni ellir gwneud stat() o %s" - -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "Unable to write to %s" -msgstr "Ni ellir ysgrifennu i %s" - -#: cmdline/apt-extracttemplates.cc:300 -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 -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 -#, fuzzy, c-format -msgid "Error processing directory %s" -msgstr "Gwall wrth brosesu'r cyfeiriadur %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" - -#: ftparchive/apt-ftparchive.cc:431 -#, fuzzy, c-format -msgid "Error processing contents %s" -msgstr "Gwall wrth Brosesu Cynnwys %s" - -# FIXME: full stops -#: ftparchive/apt-ftparchive.cc:626 -#, fuzzy -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n" -"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n" -" sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n" -" contents llwybr\n" -" release llwybr\n" -" generate cyfluniad [grŵpiau]\n" -" clean cyfluniad\n" -"\n" -"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n" -"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n" -"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n" -"\n" -"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n" -"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n" -"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n" -"gorfodi'r gwerthoedd Priority a Section.\n" -"\n" -"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n" -".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n" -"gwrthwneud ffynhonell.\n" -"\n" -"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n" -"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n" -"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n" -"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n" -"defnydd o'r archif Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Opsiynnau:\n" -" -h Y testun cymorth hwn\n" -" --md5 Rheoli cynhyrchiad stwnch MD5\n" -" -s=? Ffeil gwrthwneud ffynhonell\n" -" -q Tawel\n" -" -d=? Dewis cronda data storfa opsiynnol\n" -" --no-delink Galluogi'r modd datgysylltu datnamu\n" -" --contents Rheoli cynhyrchiad ffeil cynnwys\n" -" -c=? Darllen y ffeil cyfluniad hwn\n" -" -o=? Gosod opsiwn cyfluniad mympwyol" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Dim dewisiadau'n cyfateb" -#: ftparchive/apt-ftparchive.cc:907 -#, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'" - -#: ftparchive/cachedb.cc:65 -#, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old" - -#: ftparchive/cachedb.cc:83 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Hen gronfa data, yn ceisio uwchraddio %s" - -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +msgid "Can't find authentication record for: %s" msgstr "" -#: ftparchive/cachedb.cc:99 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Ni ellir agor y ffeil DB2 %s: %s" - -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 -#, c-format -msgid "Failed to stat %s" -msgstr "Methodd stat() o %s" - -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Methwyd darllen y cyswllt %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Does dim cofnod rheoli gan yr archif" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Ni ellir cael cyrchydd" - -#: ftparchive/writer.cc:91 -#, c-format -msgid "W: Unable to read directory %s\n" -msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" - -#: ftparchive/writer.cc:96 -#, c-format -msgid "W: Unable to stat %s\n" -msgstr "Rh: Ni ellir gwneud stat() o %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "G: " - -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "Rh: " - -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " +#: apt-pkg/indexcopy.cc:521 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Camgyfatebiaeth swm MD5" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "Failed to resolve %s" -msgstr "Methwyd datrys %s" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Methwyd cerdded y goeden" +msgid "The method driver %s could not be found." +msgstr "Methwyd canfod y gyrrydd dull %s." -#: ftparchive/writer.cc:219 +#: apt-pkg/acquire-worker.cc:118 #, c-format -msgid "Failed to open %s" -msgstr "Methwyd agor %s" +msgid "Is the package %s installed?" +msgstr "" -# FIXME -#: ftparchive/writer.cc:278 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " DatGysylltu %s [%s]\n" +msgid "Method %s did not start correctly" +msgstr "Ni gychwynodd y dull %s yn gywir" -#: ftparchive/writer.cc:286 -#, c-format -msgid "Failed to readlink %s" -msgstr "Methwyd darllen y cyswllt %s" +#: apt-pkg/acquire-worker.cc:455 +#, 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" -#: ftparchive/writer.cc:290 -#, c-format -msgid "Failed to unlink %s" -msgstr "Methwyd datgysylltu %s" +#: 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." -#: ftparchive/writer.cc:298 -#, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Methwyd cysylltu %s at %s" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn." -#: ftparchive/writer.cc:308 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Tarwyd y terfyn cyswllt %sB.\n" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Methwyd darllen y rhestr ffynhonellau." -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Doedd dim maes pecyn gan yr archif" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Storfa pecyn gwag" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " Does dim cofnod gwrthwneud gan %s\n" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Mae'r ffeil storfa pecyn yn llygredig" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " Cynaliwr %s yw %s nid %s\n" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" -#: ftparchive/writer.cc:706 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " Does dim cofnod gwrthwneud gan %s\n" +#: apt-pkg/pkgcache.cc:169 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "Mae'r ffeil storfa pecyn yn llygredig" -#: ftparchive/writer.cc:710 +# FIXME: capitalisation? +#: apt-pkg/pkgcache.cc:174 #, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " Does dim cofnod gwrthwneud gan %s\n" +msgid "This APT does not support the versioning system '%s'" +msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Methwyd neilltuo cof" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Ni ellir agor %s" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Dibynnu" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "CynDdibynnu" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Methwydd darllen y ffeil dargyfeirio %s" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Awgrymu" -#: ftparchive/override.cc:166 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Argymell" -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Gwrthdaro" -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Amnewid" -#: ftparchive/multicompress.cc:73 -#, fuzzy, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Dull Cywasgu Anhysbys '%s'" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Darfodi" -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Methwyd creu FILE*" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Methodd fork()" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "pwysig" -#: ftparchive/multicompress.cc:209 -#, fuzzy -msgid "Compress child" -msgstr "Plentyn Cywasgu" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "angenrheidiol" -#: ftparchive/multicompress.cc:232 -#, fuzzy, c-format -msgid "Internal error, failed to create %s" -msgstr "Gwall Mewnol, Methwyd creu %s" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "safonnol" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Methodd MA i isbroses/ffeil" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "opsiynnol" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Methwyd darllen wrth gyfrifo MD5" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "ychwanegol" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Problem unlinking %s" -msgstr "Gwall wrth datgysylltu %s" +msgid "Index file type '%s' is not supported" +msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "Methwyd ailenwi %s at %s" +#: 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)" -# FIXME: "debian" -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/sourcelist.cc:170 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" -"\n" -"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n" -"templed o becynnau Debian.\n" -"\n" -"Opsiynnau:\n" -" -h Dangos y testun cymorth hwn\n" -" -t Gosod y cyfeiriadur dros dro\n" -" -c=? Darllen y ffeil cyfluniad hwn\n" -" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" +"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Cofnod pecyn anhysbys!" +#: 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)" -#: cmdline/apt-sortpkgs.cc:153 -#, fuzzy -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/sourcelist.cc:184 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n" -"\n" -"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n" -"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n" -"\n" -"Opsiynnau:\n" -" -h Y testun cymorth hwn\n" -" -s Defnyddio trefnu ffeil ffynhonell\n" -" -c=? Darllen y ffeil cyfluniad hwn\n" -" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" +"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format -msgid "Failed to write file %s" -msgstr "Methwyd ysgrifennu ffeil %s" - -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "Methwyd cau ffeil %s" +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "" +"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "Mae'r llwybr %s yn rhy hir" +#: 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-inst/extract.cc:132 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Unpacking %s more than once" -msgstr "Yn dadbacio %s mwy nag unwaith" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)" -#: apt-inst/extract.cc:142 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "The directory %s is diverted" -msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-inst/extract.cc:152 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Mae llwybr y dargyfeiriad yn rhy hir" +#: apt-pkg/sourcelist.cc:217 +#, 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-inst/extract.cc:249 +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "The directory %s is being replaced by a non-directory" +msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" - -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Methwyd lleoli nôd yn ei fwced stwnsh" - -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Mae'r llwybr yn rhy hir" +"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -# FIXME: wtf? -#: apt-inst/extract.cc:421 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" +msgid "Opening %s" +msgstr "Yn agor %s" -#: apt-inst/extract.cc:438 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" +msgid "Line %u too long in source list %s." +msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-inst/extract.cc:498 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "Unable to stat %s" -msgstr "Ni ellir gwneud stat() o %s" - -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu" - -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Methyd lleoli yr elfen !" - -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Methwyd neilltuo dargyfeiriad" +msgid "Malformed line %u in source list %s (type)" +msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" -#: apt-inst/filelist.cc:464 -#, fuzzy -msgid "Internal error in AddDiversion" -msgstr "Gwall Mewnol yn AddDiversion" +#: 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-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s" +#: 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" -# FIXME: "the" -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-inst/filelist.cc:549 +#: apt-pkg/clean.cc:64 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Ffeil cyfluniad dyblyg %s/%s" - -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Llofnod archif annilys" +msgid "Unable to stat %s." +msgstr "Ni ellir gwneud stat() o %s." -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Gwall wrth ddarllen pennawd aelod archif" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "Mae can y storfa system fersiwn anghyfaddas" -#: apt-inst/contrib/arfile.cc:96 +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "Pennawd aelod archif annilys" +msgid "Error occurred while processing %s (%s%d)" +msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Pennawd aelod archif annilys" +#: apt-pkg/pkgcachegen.cc:257 +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-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Mae'r archif yn rhy fyr" +#: apt-pkg/pkgcachegen.cc:260 +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-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Methwyd darllen pennawdau'r archif" +#: apt-pkg/pkgcachegen.cc:263 +#, 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-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Methwyd creu pibau" +#: apt-pkg/pkgcachegen.cc:266 +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-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Methwyd gweithredu gzip" +#: apt-pkg/pkgcachegen.cc:576 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Archif llygredig" +#: apt-pkg/pkgcachegen.cc:1211 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-inst/contrib/extracttar.cc:203 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 #, fuzzy -msgid "Tar checksum failed, archive corrupted" -msgstr "Methodd swm gwirio Tar, archif llygredig" +msgid "Reading package lists" +msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-inst/contrib/extracttar.cc:308 -#, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Math pennawd TAR anhysbys %u, aelod %s" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" - -#: apt-inst/deb/debfile.cc:132 -#, fuzzy, c-format -msgid "Internal error, could not locate member %s" -msgstr "Gwall Mewnol, methwyd lleoli aelod %s" - -#: apt-inst/deb/debfile.cc:227 -#, fuzzy -msgid "Unparsable control file" -msgstr "Ffeil rheoli ni ellir ei ramadegu" +msgid "Unable to write to %s" +msgstr "Ni ellir ysgrifennu i %s" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, fuzzy, c-format -msgid "List directory %spartial is missing." -msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" -#: apt-pkg/acquire.cc:91 -#, fuzzy, c-format -msgid "Archives directory %spartial is missing." -msgstr "Mae'r cyfeiriadur archif %spartial ar goll." +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "" -#: apt-pkg/acquire.cc:99 -#, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "Ni ellir cloi'r cyfeiriadur rhestr" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "Ni chynhelir y math ffeil mynegai '%s'" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/acquire.cc:904 -#, fuzzy, c-format -msgid "Retrieving file %li of %li" -msgstr "Yn Darllen Rhestr Ffeiliau" +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2458,7 +2372,7 @@ msgstr "Camgyfatebiaeth maint" msgid "Invalid file format" msgstr "Gweithred annilys %s" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2466,28 +2380,28 @@ msgid "" msgstr "" # FIXME: number? -#: apt-pkg/acquire-item.cc:1589 +#: apt-pkg/acquire-item.cc:1656 #, 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:1631 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2495,13 +2409,13 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2510,130 +2424,110 @@ 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:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Methwyd canfod y gyrrydd dull %s." +msgid "Vendor block %s contains no fingerprint" +msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: apt-pkg/acquire-worker.cc:118 -#, c-format -msgid "Is the package %s installed?" -msgstr "" +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#, fuzzy, c-format +msgid "List directory %spartial is missing." +msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/acquire-worker.cc:169 -#, c-format -msgid "Method %s did not start correctly" -msgstr "Ni gychwynodd y dull %s yn gywir" +#: apt-pkg/acquire.cc:91 +#, fuzzy, c-format +msgid "Archives directory %spartial is missing." +msgstr "Mae'r cyfeiriadur archif %spartial ar goll." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 #, 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" +msgid "Unable to lock directory %s" +msgstr "Ni ellir cloi'r cyfeiriadur rhestr" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " -"ei gyfer." - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " -"ei achosi gan pecynnau wedi eu dal." - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." - -#: 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." - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn." -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Methwyd darllen y rhestr ffynhonellau." +#: apt-pkg/acquire.cc:904 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Yn Darllen Rhestr Ffeiliau" -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" +# FIXME: ...file +#: 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/cacheset.cc:492 +#: apt-pkg/policy.cc:83 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " - -#: apt-pkg/cacheset.cc:603 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "Methwyd canfod pecyn %s" - -#: apt-pkg/cacheset.cc:609 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Methwyd canfod pecyn %s" +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" +msgstr "" -#: apt-pkg/cacheset.cc:615 +# FIXME: literal +#: apt-pkg/policy.cc:422 #, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Methwyd canfod pecyn %s" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'" -#: apt-pkg/cacheset.cc:626 +# FIXME: tense +#: apt-pkg/policy.cc:444 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "" +msgid "Did not understand pin type %s" +msgstr "Methwyd daeall y math pin %s" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 -#, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" -#: apt-pkg/cacheset.cc:647 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/cacheset.cc:655 -#, c-format -msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "" +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "Methwyd agor ffeil %s" -#: apt-pkg/cacheset.cc:663 +# FIXME: %s may have an arbirrary length +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select installed version from package %s as it is not installed" +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 "" +"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s " +"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 @@ -2710,10 +2604,26 @@ msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Ni ellir gwneud stat() o %s." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " +"ei gyfer." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " +"ei achosi gan pecynnau wedi eu dal." + +#: apt-pkg/algorithms.cc:1088 +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/depcache.cc:138 apt-pkg/depcache.cc:167 #, fuzzy @@ -2745,56 +2655,69 @@ msgstr "Methwyd agor %s" msgid "Failed to write temporary StateFile %s" msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" +# FIXME: number? +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "Methwyd canfod pecyn %s" + +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Methwyd canfod pecyn %s" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records.\n" +msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i missing files.\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i mismatched files\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:663 #, c-format -msgid "Can't find authentication record for: %s" +msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "Camgyfatebiaeth swm MD5" - # FIXME: number? #: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format @@ -2818,335 +2741,227 @@ msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" # FIXME: number? #: apt-pkg/indexrecords.cc:149 -#, fuzzy, c-format -msgid "Invalid 'Date' entry in Release file %s" -msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" - -#: apt-pkg/init.cc:146 -#, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Ni chynhelir y system pecynnu '%s'" - -#: apt-pkg/init.cc:162 -#, fuzzy -msgid "Unable to determine a suitable packaging system type" -msgstr "Ni ellir canfod math system addas" - -#: apt-pkg/install-progress.cc:57 -#, c-format -msgid "Progress: [%3i%%]" -msgstr "" - -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "" - -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 -#, 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:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "Methwyd agor ffeil %s" - -# FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:630 -#, 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 "" -"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s " -"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/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Storfa pecyn gwag" - -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Mae'r ffeil storfa pecyn yn llygredig" - -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" - -#: apt-pkg/pkgcache.cc:169 -#, 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:174 -#, 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:179 -msgid "The package cache was built for a different architecture" -msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" - -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Dibynnu" - -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "CynDdibynnu" - -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Awgrymu" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Argymell" - -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Gwrthdaro" - -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Amnewid" - -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Darfodi" - -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "" - -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "" - -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "pwysig" - -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "angenrheidiol" - -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "safonnol" - -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "opsiynnol" - -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "ychwanegol" - -#: apt-pkg/pkgcachegen.cc:93 -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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 -#, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" +#, fuzzy, c-format +msgid "Invalid 'Date' entry in Release file %s" +msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 +#, c-format +msgid "%lid %lih %limin %lis" msgstr "" -"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:260 -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." +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" +msgstr "" -#: apt-pkg/pkgcachegen.cc:263 -#, 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." +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 +#, c-format +msgid "%limin %lis" +msgstr "" -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" msgstr "" -"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" +msgid "Selection %s not found" +msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" +msgid "Not using locking for read only lock file %s" +msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -#, fuzzy -msgid "Reading package lists" -msgstr "Yn Darllen Rhestrau Pecynnau" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Yn Casglu Darpariaethau Ffeil" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Ddim yn cloi'r ffeil clo ar NFS %s" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Methwyd cael y clo %s" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Ni chynhelir y math ffeil mynegai '%s'" +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:421 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -# FIXME: literal -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Derbyniodd is-broses %s wall segmentu." + +#: apt-pkg/contrib/fileutl.cc:826 #, fuzzy, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'" +msgid "Sub-process %s received signal %u." +msgstr "Derbyniodd is-broses %s wall segmentu." -# FIXME: tense -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 #, c-format -msgid "Did not understand pin type %s" -msgstr "Methwyd daeall y math pin %s" +msgid "Sub-process %s returned an error code (%u)" +msgstr "Dychwelodd is-broses %s gôd gwall (%u)" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/fileutl.cc:913 #, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" +msgid "Problem closing the gzip file %s" +msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Methwyd agor ffeil %s" + +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "" -"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" +msgid "Could not open file descriptor %d" +msgstr "Methwyd agor pibell ar gyfer %s" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Methwyd creu isbroses IPC" + +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Methwyd gweithredu cywasgydd " + +# FIXME +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" +msgid "read, still have %llu to read but none left" +msgstr "o hyd %lu i ddarllen ond dim ar ôl" -#: apt-pkg/sourcelist.cc:184 +# FIXME +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, 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)" +msgid "write, still have %llu to write but couldn't" +msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/fileutl.cc:1915 #, 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)" +msgid "Problem closing the file %s" +msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/fileutl.cc:1927 #, 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)" +msgid "Problem renaming the file %s to %s" +msgstr "Gwall wrth gyfamseru'r ffeil" -#: 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/contrib/fileutl.cc:1938 +#, fuzzy, c-format +msgid "Problem unlinking the file %s" +msgstr "Gwall wrth dadgysylltu'r ffeil" -#: 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/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/progress.cc:148 #, 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 "Malformed line %lu in source list %s (absolute dist)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" +msgid "%c%s... Error!" +msgstr "%c%s... Gwall!" -#: apt-pkg/sourcelist.cc:224 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "Malformed line %lu in source list %s (dist parse)" +msgid "%c%s... Done" +msgstr "%c%s... Wedi Gorffen" + +#: apt-pkg/contrib/progress.cc:181 +msgid "..." msgstr "" -"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:335 -#, c-format -msgid "Opening %s" -msgstr "Yn agor %s" +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Wedi Gorffen" -#: 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/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" -#: apt-pkg/sourcelist.cc:375 +#: apt-pkg/contrib/mmap.cc:111 #, 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" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Methwyd agor pibell ar gyfer %s" -#: apt-pkg/sourcelist.cc:416 +#: apt-pkg/contrib/mmap.cc:119 #, 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 "Couldn't make mmap of %llu bytes" +msgstr "Methwyd gwneud mmap() efo %lu beit" -# FIXME: ...file -#: apt-pkg/srcrecords.cc:52 -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/contrib/mmap.cc:146 +#, fuzzy +msgid "Unable to close mmap" +msgstr "Ni ellir agor %s" -# FIXME: number? -#: apt-pkg/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" +# FIXME +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "Methwyd gweithredu " -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Methwyd gwneud mmap() efo %lu beit" -#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 +#: apt-pkg/contrib/mmap.cc:322 #, fuzzy +msgid "Failed to truncate file" +msgstr "Methwyd ysgrifennu ffeil %s" + +#: apt-pkg/contrib/mmap.cc:341 +#, c-format msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " -"rai eu defnyddio yn lle." -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" + +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" #: apt-pkg/contrib/cdromutl.cc:65 #, c-format @@ -3157,54 +2972,6 @@ msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" msgid "Failed to stat the cdrom" msgstr "Methwyd gwneud stat() o'r CD-ROM" -# FIXME -#: apt-pkg/contrib/cmndline.cc:121 -#, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s" - -#: apt-pkg/contrib/cmndline.cc:168 -#, 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:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "Mae'r opsiwn %s yn mynnu ymresymiad." - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =." - -#: apt-pkg/contrib/cmndline.cc:278 -#, 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:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "Opsiwn '%s' yn rhy hir" - -# FIXME: 'Sense'? -#: apt-pkg/contrib/cmndline.cc:341 -#, 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:391 -#, c-format -msgid "Invalid operation %s" -msgstr "Gweithred annilys %s" - #: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" @@ -3263,390 +3030,618 @@ msgstr "" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" -#: apt-pkg/contrib/fileutl.cc:190 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Yn Erthylu'r Sefydliad." + +# FIXME +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s" +msgid "Command line option '%c' [from %s] is not known." +msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)." -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Could not open lock file %s" -msgstr "Methwyd agor y ffeil clo %s" +msgid "Command line option %s is not understood" +msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Ddim yn cloi'r ffeil clo ar NFS %s" +msgid "Command line option %s is not boolean" +msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "Could not get lock %s" -msgstr "Methwyd cael y clo %s" +msgid "Option %s requires an argument." +msgstr "Mae'r opsiwn %s yn mynnu ymresymiad." -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "" +msgid "Option %s: Configuration item specification must have an =." +msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =." -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'" -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" +msgid "Option '%s' is too long" +msgstr "Opsiwn '%s' yn rhy hir" -#: apt-pkg/contrib/fileutl.cc:421 +# FIXME: 'Sense'? +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" +msgid "Sense %s is not understood, try true or false." +msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'." -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Derbyniodd is-broses %s wall segmentu." +msgid "Invalid operation %s" +msgstr "Gweithred annilys %s" -#: apt-pkg/contrib/fileutl.cc:826 +#: apt-pkg/deb/dpkgpm.cc:110 #, fuzzy, c-format -msgid "Sub-process %s received signal %u." -msgstr "Derbyniodd is-broses %s wall segmentu." +msgid "Installing %s" +msgstr " Wedi Sefydlu: " -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 +#, fuzzy, c-format +msgid "Configuring %s" +msgstr "Yn cysylltu i %s" + +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 +#, fuzzy, c-format +msgid "Removing %s" +msgstr "Yn agor %s" + +#: apt-pkg/deb/dpkgpm.cc:113 +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "Methwyd dileu %s" + +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Dychwelodd is-broses %s gôd gwall (%u)" +msgid "Noting disappearance of %s" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/dpkgpm.cc:115 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Gorffenodd is-broses %s yn annisgwyl" +msgid "Running post-installation trigger %s" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:913 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Gwall wrth gau'r ffeil" +msgid "Directory '%s' missing" +msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/contrib/fileutl.cc:1101 -#, c-format -msgid "Could not open file %s" +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 +#, fuzzy, c-format +msgid "Could not open file '%s'" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/deb/dpkgpm.cc:1007 #, fuzzy, c-format -msgid "Could not open file descriptor %d" -msgstr "Methwyd agor pibell ar gyfer %s" +msgid "Preparing %s" +msgstr "Yn agor %s" -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Methwyd creu isbroses IPC" +#: apt-pkg/deb/dpkgpm.cc:1008 +#, fuzzy, c-format +msgid "Unpacking %s" +msgstr "Yn agor %s" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Methwyd gweithredu cywasgydd " +#: apt-pkg/deb/dpkgpm.cc:1013 +#, fuzzy, c-format +msgid "Preparing to configure %s" +msgstr "Yn agor y ffeil cyfluniad %s" -# FIXME -#: apt-pkg/contrib/fileutl.cc:1514 +#: apt-pkg/deb/dpkgpm.cc:1015 #, fuzzy, c-format -msgid "read, still have %llu to read but none left" -msgstr "o hyd %lu i ddarllen ond dim ar ôl" +msgid "Installed %s" +msgstr " Wedi Sefydlu: " + +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1022 +#, fuzzy, c-format +msgid "Removed %s" +msgstr "Argymell" + +#: apt-pkg/deb/dpkgpm.cc:1027 +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Yn agor y ffeil cyfluniad %s" + +#: apt-pkg/deb/dpkgpm.cc:1028 +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Methwyd dileu %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Ni ellir ysgrifennu i %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "" + +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "" -# FIXME -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, fuzzy, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "o hyd %lu i ysgrifennu ond methwyd" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1915 -#, fuzzy, c-format -msgid "Problem closing the file %s" -msgstr "Gwall wrth gau'r ffeil" +# FIXME: "debian" +#: cmdline/apt-extracttemplates.cc:224 +#, fuzzy +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" +"\n" +"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n" +"templed o becynnau Debian.\n" +"\n" +"Opsiynnau:\n" +" -h Dangos y testun cymorth hwn\n" +" -t Gosod y cyfeiriadur dros dro\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" -#: apt-pkg/contrib/fileutl.cc:1927 +#: cmdline/apt-extracttemplates.cc:254 #, fuzzy, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Gwall wrth gyfamseru'r ffeil" +msgid "Unable to mkstemp %s" +msgstr "Ni ellir gwneud stat() o %s" -#: apt-pkg/contrib/fileutl.cc:1938 -#, fuzzy, c-format -msgid "Problem unlinking the file %s" -msgstr "Gwall wrth dadgysylltu'r ffeil" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Gwall wrth gyfamseru'r ffeil" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: 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 #, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Yn Erthylu'r Sefydliad." +msgid "Error processing directory %s" +msgstr "Gwall wrth brosesu'r cyfeiriadur %s" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" -#: apt-pkg/contrib/mmap.cc:111 -#, fuzzy, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Methwyd agor pibell ar gyfer %s" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" -#: apt-pkg/contrib/mmap.cc:119 +#: ftparchive/apt-ftparchive.cc:431 #, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Methwyd gwneud mmap() efo %lu beit" +msgid "Error processing contents %s" +msgstr "Gwall wrth Brosesu Cynnwys %s" -#: apt-pkg/contrib/mmap.cc:146 +# FIXME: full stops +#: ftparchive/apt-ftparchive.cc:626 #, fuzzy -msgid "Unable to close mmap" -msgstr "Ni ellir agor %s" +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n" +"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n" +" sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n" +" contents llwybr\n" +" release llwybr\n" +" generate cyfluniad [grŵpiau]\n" +" clean cyfluniad\n" +"\n" +"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n" +"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n" +"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n" +"\n" +"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n" +"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n" +"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n" +"gorfodi'r gwerthoedd Priority a Section.\n" +"\n" +"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n" +".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n" +"gwrthwneud ffynhonell.\n" +"\n" +"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n" +"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n" +"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n" +"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n" +"defnydd o'r archif Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Opsiynnau:\n" +" -h Y testun cymorth hwn\n" +" --md5 Rheoli cynhyrchiad stwnch MD5\n" +" -s=? Ffeil gwrthwneud ffynhonell\n" +" -q Tawel\n" +" -d=? Dewis cronda data storfa opsiynnol\n" +" --no-delink Galluogi'r modd datgysylltu datnamu\n" +" --contents Rheoli cynhyrchiad ffeil cynnwys\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol" -# FIXME -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -#, fuzzy -msgid "Unable to synchronize mmap" -msgstr "Methwyd gweithredu " +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Dim dewisiadau'n cyfateb" -#: apt-pkg/contrib/mmap.cc:290 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Methwyd gwneud mmap() efo %lu beit" +msgid "Some files are missing in the package file group `%s'" +msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'" -#: apt-pkg/contrib/mmap.cc:322 -#, fuzzy -msgid "Failed to truncate file" -msgstr "Methwyd ysgrifennu ffeil %s" +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old" -#: apt-pkg/contrib/mmap.cc:341 +#: ftparchive/cachedb.cc:83 #, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "Hen gronfa data, yn ceisio uwchraddio %s" + +#: ftparchive/cachedb.cc:94 msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" -#: apt-pkg/contrib/mmap.cc:446 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "" +msgid "Unable to open DB file %s: %s" +msgstr "Ni ellir agor y ffeil DB2 %s: %s" -#: apt-pkg/contrib/mmap.cc:449 -msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." -msgstr "" +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Methwyd darllen y cyswllt %s" -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Does dim cofnod rheoli gan yr archif" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Ni ellir cael cyrchydd" + +#: ftparchive/writer.cc:91 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Gwall!" +msgid "W: Unable to read directory %s\n" +msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/writer.cc:96 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Wedi Gorffen" +msgid "W: Unable to stat %s\n" +msgstr "Rh: Ni ellir gwneud stat() o %s\n" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "G: " -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Wedi Gorffen" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "Rh: " + +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "" +msgid "Failed to resolve %s" +msgstr "Methwyd datrys %s" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" -msgstr "" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Methwyd cerdded y goeden" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/writer.cc:219 #, c-format -msgid "%limin %lis" -msgstr "" +msgid "Failed to open %s" +msgstr "Methwyd agor %s" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +# FIXME +#: ftparchive/writer.cc:278 #, c-format -msgid "%lis" -msgstr "" +msgid " DeLink %s [%s]\n" +msgstr " DatGysylltu %s [%s]\n" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:286 #, c-format -msgid "Selection %s not found" -msgstr "Ni chanfuwyd y dewis %s" +msgid "Failed to readlink %s" +msgstr "Methwyd darllen y cyswllt %s" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:290 #, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" +msgid "Failed to unlink %s" +msgstr "Methwyd datgysylltu %s" -#: 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" +#: ftparchive/writer.cc:298 +#, c-format +msgid "*** Failed to link %s to %s" +msgstr "*** Methwyd cysylltu %s at %s" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:308 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "" +msgid " DeLink limit of %sB hit.\n" +msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Doedd dim maes pecyn gan yr archif" -#: apt-pkg/deb/dpkgpm.cc:95 -#, fuzzy, c-format -msgid "Installing %s" -msgstr " Wedi Sefydlu: " +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 +#, c-format +msgid " %s has no override entry\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 -#, fuzzy, c-format -msgid "Configuring %s" -msgstr "Yn cysylltu i %s" +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 +#, c-format +msgid " %s maintainer is %s not %s\n" +msgstr " Cynaliwr %s yw %s nid %s\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:706 #, fuzzy, c-format -msgid "Removing %s" -msgstr "Yn agor %s" +msgid " %s has no source override entry\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:710 #, fuzzy, c-format -msgid "Completely removing %s" -msgstr "Methwyd dileu %s" +msgid " %s has no binary override entry either\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: apt-pkg/deb/dpkgpm.cc:99 -#, c-format -msgid "Noting disappearance of %s" -msgstr "" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Methwyd neilltuo cof" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Running post-installation trigger %s" -msgstr "" +msgid "Unable to open %s" +msgstr "Ni ellir agor %s" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 #, fuzzy, c-format -msgid "Directory '%s' missing" -msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." +msgid "Malformed override %s line %llu (%s)" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "Methwyd agor ffeil %s" +#: ftparchive/override.cc:127 ftparchive/override.cc:201 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Methwydd darllen y ffeil dargyfeirio %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/override.cc:166 #, fuzzy, c-format -msgid "Preparing %s" -msgstr "Yn agor %s" +msgid "Malformed override %s line %llu #1" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/override.cc:178 #, fuzzy, c-format -msgid "Unpacking %s" -msgstr "Yn agor %s" +msgid "Malformed override %s line %llu #2" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:191 #, fuzzy, c-format -msgid "Preparing to configure %s" -msgstr "Yn agor y ffeil cyfluniad %s" +msgid "Malformed override %s line %llu #3" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/multicompress.cc:73 #, fuzzy, c-format -msgid "Installed %s" -msgstr " Wedi Sefydlu: " +msgid "Unknown compression algorithm '%s'" +msgstr "Dull Cywasgu Anhysbys '%s'" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/multicompress.cc:103 #, c-format -msgid "Preparing for removal of %s" -msgstr "" +msgid "Compressed output %s needs a compression set" +msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod" -#: apt-pkg/deb/dpkgpm.cc:1007 -#, fuzzy, c-format -msgid "Removed %s" -msgstr "Argymell" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Methwyd creu FILE*" -#: apt-pkg/deb/dpkgpm.cc:1012 -#, fuzzy, c-format -msgid "Preparing to completely remove %s" -msgstr "Yn agor y ffeil cyfluniad %s" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Methodd fork()" -#: apt-pkg/deb/dpkgpm.cc:1013 -#, fuzzy, c-format -msgid "Completely removed %s" -msgstr "Methwyd dileu %s" +#: ftparchive/multicompress.cc:209 +#, fuzzy +msgid "Compress child" +msgstr "Plentyn Cywasgu" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/multicompress.cc:232 #, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Ni ellir ysgrifennu i %s" - -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" +msgid "Internal error, failed to create %s" +msgstr "Gwall Mewnol, Methwyd creu %s" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "Methodd MA i isbroses/ffeil" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Methwyd darllen wrth gyfrifo MD5" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Gwall wrth datgysylltu %s" -#: apt-pkg/deb/dpkgpm.cc:1707 +# FIXME: "debian" +#: cmdline/apt-internal-solver.cc:49 +#, fuzzy msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" +"\n" +"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n" +"templed o becynnau Debian.\n" +"\n" +"Opsiynnau:\n" +" -h Dangos y testun cymorth hwn\n" +" -t Gosod y cyfeiriadur dros dro\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" -msgstr "" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Cofnod pecyn anhysbys!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 +#, fuzzy msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n" +"\n" +"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n" +"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n" +"\n" +"Opsiynnau:\n" +" -h Y testun cymorth hwn\n" +" -s Defnyddio trefnu ffeil ffynhonell\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/da.po b/po/da.po index 11ef78a5e..8ae5fdbb3 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2014-07-06 23:51+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -161,7 +161,7 @@ msgid " Version table:" msgstr " Versionstabel:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -362,7 +362,7 @@ msgstr "Kunne ikke låse nedhentningsmappen" 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" @@ -387,78 +387,78 @@ msgstr "" "bzr branch %s\n" "for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil »%s«\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i »hent-kun«-tilstand" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen »%s« fejlede.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen »%s« fejlede.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -467,17 +467,17 @@ msgstr "" "Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::" "Architectures for opsætning" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhængigheder.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -485,7 +485,7 @@ msgid "" msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på »%s«" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -493,14 +493,14 @@ msgid "" msgstr "" "Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -509,7 +509,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:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -518,30 +518,30 @@ msgstr "" "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en " "kandidatversion" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhængighederne" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Ændringslog for %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Understøttede moduler:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -692,7 +692,7 @@ msgstr "%s var allerede ikke i bero.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventede på %s, men den var der ikke" @@ -829,16 +829,16 @@ msgstr "Kunne ikke afmontere cdrommen i %s, den er muligvis stadig i brug." msgid "Disk not found." msgstr "Disk blev ikke fundet." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Fil blev ikke fundet" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Kunne ikke finde" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Kunne ikke angive ændringstidspunkt" @@ -892,7 +892,7 @@ msgstr "Logpå-skriptets kommando »%s« mislykkedes. Serveren sagde: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE mislykkedes. Serveren sagde: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Tidsudløb på forbindelsen" @@ -914,7 +914,7 @@ msgstr "Mellemlageret blev overfyldt af et svar." msgid "Protocol corruption" msgstr "Protokolfejl" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -975,7 +975,7 @@ msgstr "Tidsudløb på datasokkel-forbindelse" msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@ -984,7 +984,7 @@ msgstr "Problem ved \"hashing\" af fil" msgid "Unable to fetch file, server said '%s'" msgstr "Kunne ikke hente fil. Serveren sagde »%s«" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Tidsudløb ved datasokkel" @@ -1034,7 +1034,7 @@ msgstr "Kunne ikke forbinde til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Forbinder til %s" @@ -1178,42 +1178,20 @@ msgstr "Forbindelsen mislykkedes" msgid "Internal error" msgstr "Intern fejl" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Havde " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Henter:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ignorerer " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Fejl " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Hentede %sB på %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Arbejder]" +# måske visning, kategorisering +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "Listing" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Medieskift: Indsæt disken med navnet\n" -" »%s«\n" -"i drevet »%s« og tryk retur\n" +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:93 msgid "Correcting dependencies..." @@ -1243,171 +1221,356 @@ msgstr "Du kan muligvis rette dette ved at køre »apt-get -f install«." msgid "Unmet dependencies. Try using -f." msgstr "Uopfyldte afhængigheder. Prøv med -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" -msgstr "Sortering" - -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "ADVARSEL: Følgende pakkers autenticitet kunne ikke verificeres!" - -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Autentifikationsadvarsel tilsidesat.\n" - -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Nogle pakker kunne ikke autentificeres" - -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Installér disse pakker uden verifikation?" - -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Der er problemer og -y blev brugt uden --force-yes" +#: 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-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:265 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Kunne ikke hente %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!" +msgid "[installed,upgradable to: %s]" +msgstr "[installeret,kan opgraderes til: %s]" -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." +#: apt-private/private-output.cc:268 +msgid "[installed,local]" +msgstr "[Installeret,lokalt]" -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Intern fejl. Sortering blev ikke fuldført" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "[installeret,kan auto-fjernes]" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" -msgstr "" -"Mystisk... Størrelserne passede ikke, skriv til apt@packages.debian.org" +#: apt-private/private-output.cc:272 +msgid "[installed,automatic]" +msgstr "[Installeret,automatisk]" -#. 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 -#: apt-private/private-install.cc:155 -#, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "%sB/%sB skal hentes fra arkiverne.\n" +#: apt-private/private-output.cc:274 +msgid "[installed]" +msgstr "[Installeret]" -#. 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:160 +#: apt-private/private-output.cc:277 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "%sB skal hentes fra arkiverne.\n" +msgid "[upgradable from: %s]" +msgstr "[kan opgraderes fra: %s]" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Efter denne handling, vil %sB yderligere diskplads være brugt.\n" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" +msgstr "[residual-konfig]" -#. 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:172 +#: apt-private/private-output.cc:455 #, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Efter denne handling, vil %sB diskplads blive frigjort.\n" +msgid "but %s is installed" +msgstr "men %s er installeret" -#: apt-private/private-install.cc:200 +#: apt-private/private-output.cc:457 #, c-format -msgid "You don't have enough free space in %s." -msgstr "Du har ikke nok ledig plads i %s." +msgid "but %s is to be installed" +msgstr "men %s forventes installeret" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "»Trivial Only« angivet, men dette er ikke en triviel handling." +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "men den kan ikke installeres" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Ja, gør som jeg siger!" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "men det er en virtuel pakke" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Du er ved at gøre noget, der kan være skadeligt\n" -"For at fortsætte, skal du skrive »%s«\n" -" ?] " +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "men den er ikke installeret" -#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Afbryder." +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "men den bliver ikke installeret" -#: apt-private/private-install.cc:243 -msgid "Do you want to continue?" -msgstr "Vil du fortsætte?" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " eller" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Nedhentningen af filer mislykkedes" +#: 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-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Kunne ikke hente nogle af arkiverne. Prøv evt. at køre »apt-get update« " -"eller prøv med --fix-missing." +#: 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-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing og medieskift understøttes endnu ikke" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "Følgende pakker vil blive AFINSTALLERET:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Kunne ikke rette manglende pakker." +#: 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-install.cc:330 -msgid "Aborting install." -msgstr "Afbryder installationen." +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "Følgende pakker vil blive opgraderet:" -#: apt-private/private-install.cc:366 -msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"Den følgende pakke forsvandt fra dit system, da\n" -"alle filer er blevet overskrevet af andre pakker:" -msgstr[1] "" -"De følgende pakker forsvandt fra dit system, da\n" -"alle filer er blevet overskrevet af andre pakker:" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" +msgstr "Følgende pakker vil blive NEDGRADERET:" -#: apt-private/private-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Bemærk: Dette sker automatisk og med vilje af dpkg." +#: 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-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "" -"Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte " -"AutoRemover" +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (grundet %s) " -#: apt-private/private-install.cc:499 +#: apt-private/private-output.cc:696 msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" msgstr "" -"Hmm, det lader til at AutoRemover smadrede noget, der virkelig ikke\n" -"burde kunne ske. Indsend venligst en fejlrapport om apt." +"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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Intern fejl. Sortering blev ikke fuldført" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Mystisk... Størrelserne passede ikke, skriv til 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "%sB/%sB skal hentes fra 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 +#: apt-private/private-install.cc:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "%sB skal hentes fra 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 +#: apt-private/private-install.cc:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Efter denne handling, vil %sB yderligere diskplads være brugt.\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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Efter denne handling, vil %sB diskplads blive frigjort.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Du har ikke nok ledig plads i %s." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Der er problemer og -y blev brugt uden --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "»Trivial Only« angivet, men dette er ikke en triviel handling." + +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Ja, gør som jeg siger!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Du er ved at gøre noget, der kan være skadeligt\n" +"For at fortsætte, skal du skrive »%s«\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Afbryder." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Vil du fortsætte?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Nedhentningen af filer mislykkedes" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Kunne ikke hente nogle af arkiverne. Prøv evt. at køre »apt-get update« " +"eller prøv med --fix-missing." + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing og medieskift understøttes endnu ikke" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Kunne ikke rette manglende pakker." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Afbryder installationen." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"Den følgende pakke forsvandt fra dit system, da\n" +"alle filer er blevet overskrevet af andre pakker:" +msgstr[1] "" +"De følgende pakker forsvandt fra dit system, da\n" +"alle filer er blevet overskrevet af andre pakker:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Bemærk: Dette sker automatisk og med vilje af dpkg." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" +"Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte " +"AutoRemover" + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"Hmm, det lader til at AutoRemover smadrede noget, der virkelig ikke\n" +"burde kunne ske. Indsend venligst en fejlrapport om apt." + +#. #. if (Packages == 1) #. { #. c1out << std::endl; @@ -1535,212 +1698,26 @@ 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:129 -msgid "Listing" -msgstr "Listing" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "ADVARSEL: Følgende pakkers autenticitet kunne ikke verificeres!" -#: apt-private/private-list.cc:159 -#, 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-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-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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Autentifikationsadvarsel tilsidesat.\n" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Fejl ved tolkning af regulært udtryk - %s" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Nogle pakker kunne ikke autentificeres" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "Fuldtekst-søgning" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Installér disse pakker uden verifikation?" -#: apt-private/private-show.cc:156 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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)" +msgid "Failed to fetch %s %s\n" +msgstr "Kunne ikke hente %s %s\n" #: apt-private/private-sources.cc:58 #, c-format @@ -1752,23 +1729,9 @@ msgstr "Kunne ikke fortolke %s. Rediger igen? " msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "Din »%s« fil blev ændret, kør venligst »apt-get update«." -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "»update«-kommandoen benytter ingen parametre" - -#: apt-private/private-update.cc:90 -#, 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:94 -msgid "All packages are up to date." -msgstr "Alle pakker er opdateret." +#: apt-private/private-search.cc:69 +msgid "Full Text Search" +msgstr "Fuldtekst-søgning" #: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " @@ -1778,20 +1741,57 @@ msgstr "Beregner opgraderingen ... " msgid "Done" msgstr "Færdig" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Havde " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Henter:" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ignorerer " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Fejl " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Hentede %sB på %s (%sB/s)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Arbejder]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Medieskift: Indsæt disken med navnet\n" +" »%s«\n" +"i drevet »%s« og tryk retur\n" + #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, 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:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1825,7 +1825,7 @@ msgstr "[Spejl: %s]" msgid "Failed to create IPC pipe to subprocess" msgstr "Kunne ikke oprette IPC-videreførsel til underproces" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "Forbindelsen lukkedes for hurtigt" @@ -1868,641 +1868,549 @@ msgstr "" msgid "Merging available information" msgstr "Sammenfletter tilgængelighedsoplysninger" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Brug: apt-extracttemplates fil1 [fil2 ...]\n" -"\n" -"apt-extracttemplates er et værktøj til at uddrage opsætnings- og skabelon-" -"oplysninger fra Debianpakker\n" -"\n" -"Tilvalg:\n" -" -h Denne hjælpetekst\n" -" -t Angiv temp-mappe\n" -" -c=? Læs denne opsætningsfil\n" -" -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" - -#: cmdline/apt-extracttemplates.cc:254 -#, c-format -msgid "Unable to mkstemp %s" -msgstr "Kunne ikke mkstemp %s" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode kaldt med endnu forbundet knude" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "Kunne ikke skrive til %s" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Kunne ikke finde hash-element!" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Kan ikke finde debconfs version. Er debconf installeret?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Kunne ikke allokere omrokering" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Pakkeudvidelseslisten er for lang" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Intern fejl i AddDiversion" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "Fejl under behandling af mappen %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Kildeudvidelseslisten er for lang" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Fejl under skrivning af hovedet til indholdsfil" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Forsøger at overskrive en omrokering, %s -> %s og %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "Fejl under behandling af indhold %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Brug: apt-ftparchive [tilvalg] kommando\n" -"Kommandoer: packges binærsti [tvangsfil [sti]]\n" -" sources kildesti [tvangsfil [sti]]\n" -" contents sti\n" -" release sti\n" -" generate config [grupper]\n" -" clean config\n" -"\n" -"apt-ftparchive laver indeksfiler til Debianarkiver. Det understøtter \n" -"mange former for generering, lige fra fuldautomatiske til funktionelle\n" -"erstatninger for dpkg-scanpackages og dpkg-scansources\n" -"\n" -"apt-ftparchive genererer Package-filer ud fra træer af .deb'er.\n" -"Package-filen indeholder alle styrefelterne fra hver pakke såvel\n" -"som MD5-mønstre og filstørrelser. En tvangsfil understøttes til at\n" -"gennemtvinge indholdet af Priority og Section.\n" -"\n" -"På samme måde genererer apt-ftparchive Sources-filer ud fra træer\n" -"med .dsc'er. Tvangstilvalget --source-override kan bruges til at\n" -"angive en src-tvangsfil.\n" -"\n" -"Kommandoerne »packages« og »sources« skal køres i roden af træet.\n" -"binærsti skal pege på basen af rekursive søgninger og tvangsfilen\n" -"skal indeholde tvangsflagene. Sti foranstilles eventuelle\n" -"filnavnfelter. Et eksempel på brug fra Debianarkivet:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Tilvalg:\n" -" -h Denne hjælpetekst\n" -" --md5 Styr generering af MD5\n" -" -s=? Kilde-tvangsfil\n" -" -q Stille\n" -" -d=? Vælg den valgfrie mellemlager-database\n" -" --no-delink Aktivér \"delinking\"-fejlsporingstilstand\n" -" --contents Bestem generering af indholdsfil\n" -" -c=? Læs denne opsætningsfil\n" -" -o=? Sæt en opsætnings-indstilling" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Ingen valg passede" +msgid "Double add of diversion %s -> %s" +msgstr "Dobbelt tilføjelse af omrokering %s -> %s" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Visse filer mangler i pakkefilgruppen »%s«" +msgid "Duplicate conf file %s/%s" +msgstr "Dobbelt opsætningsfil %s/%s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB var ødelagt, filen omdøbt til %s.old" +msgid "The path %s is too long" +msgstr "Stien %s er for lang" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "DB er gammel, forsøger at opgradere %s" +msgid "Unpacking %s more than once" +msgstr "Pakkede %s ud flere gange" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"Databaseformatet er ugyldigt. Hvis du har opgraderet fra en ældre version af " -"apt, så fjern og genskab databasen." +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "Mappen %s er omrokeret" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Kunne ikke åbne DB-filen %s: %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Pakken forsøger at skrive til omrokeret mål %s/%s" + +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Omrokeringsstien er for lang" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Kunne ikke finde %s" -#: ftparchive/cachedb.cc:332 -msgid "Failed to read .dsc" -msgstr "Kunne ikke læse .dsc" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Arkivet har ingen kontrolindgang" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Kunne skaffe en markør" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "A: Kunne ikke læse mappen %s\n" +msgid "Failed to rename %s to %s" +msgstr "Kunne ikke omdøbe %s til %s" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "W: Kunne ikke finde %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "F: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "Mappen %s bliver erstattet af en ikke-mappe" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "A: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Kunne ikke finde knuden i sin hash-bucket" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "F: Fejlene vedrører filen " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Stien er for lang" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "Kunne ikke omsætte navnet %s" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Trævandring mislykkedes" +msgid "Overwrite package match with no version for %s" +msgstr "Overskriv pakkematch uden version for %s" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to open %s" -msgstr "Kunne ikke åbne %s" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "File %s/%s overskriver filen i pakken %s" -#: ftparchive/writer.cc:278 +#: apt-inst/extract.cc:498 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgid "Unable to stat %s" +msgstr "Kunne ikke finde %s" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Failed to readlink %s" -msgstr "Kunne ikke »readlink« %s" +msgid "Failed to write file %s" +msgstr "Kunne ikke skrive filen %s" -#: ftparchive/writer.cc:290 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to unlink %s" -msgstr "Kunne ikke frigøre %s" +msgid "Failed to close file %s" +msgstr "Kunne ikke lukke filen %s" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Kunne ikke lænke %s til %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler »%s«-elementet" -#: ftparchive/writer.cc:308 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Nåede DeLink-begrænsningen på %sB.\n" - -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Arkivet havde intet package-felt" +msgid "Internal error, could not locate member %s" +msgstr "Intern fejl, kunne ikke finde elementet %s" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s har ingen tvangs-post\n" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Ikke-tolkbar kontrolfil" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " pakkeansvarlig for %s er %s, ikke %s\n" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Ugyldig arkivsignatur" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s har ingen linje med tilsidesættelse af standard for kildefiler\n" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Fejl under læsning af arkivelements hoved" -#: ftparchive/writer.cc:710 +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid " %s has no binary override entry either\n" -msgstr "" -" %s har ingen linje med tilsidesættelse af standard for binøre filer\n" +msgid "Invalid archive member header %s" +msgstr "Ugyldigt arkivelementhoved %s" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Kunne ikke allokere hukommelse" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Ugyldigt arkivelementhoved" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Kunne ikke åbne %s" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Arkivet er for kort" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Ugyldig overskrivning af %s-linjen %llu (%s)" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Kunne ikke læse arkivhovederne" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Kunne ikke læse gennemtvangsfilen %s" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Kunne ikke oprette videreførsler" -#: ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Ugyldig gennemtvangs %s-linje %llu #1" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Kunne ikke udføre gzip " -#: ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Ugyldig gennemtvangs %s-linje %llu #2" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Ødelagt arkiv" -#: ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Ugyldig gennemtvangs %s-linje %llu #3" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Tar-tjeksum fejlede, arkivet er ødelagt" -#: ftparchive/multicompress.cc:73 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Ukendt komprimeringsalgoritme »%s«" +msgid "Unknown TAR header type %u, member %s" +msgstr "Ukendt TAR-hovedtype %u, element %s" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Komprimerede uddata %s kræver et komprimeringssæt" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Kunne ikke oprette FILE*" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Kunne ikke spalte" +msgid "Progress: [%3i%%]" +msgstr "Status: [%3i%%]" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Komprimer barn" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "Kører dpkg" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/init.cc:146 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Intern fejl. Kunne ikke oprette %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "IO til underproces/fil mislykkedes" +msgid "Packaging system '%s' is not supported" +msgstr "Pakkesystemet »%s« understøttes ikke" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Kunne ikke læse under beregning af MD5" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Kunne ikke bestemme en passende pakkesystemtype" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Problem unlinking %s" -msgstr "Problem under aflænkning af %s" +msgid "Wrote %i records.\n" +msgstr "Skrev %i poster.\n" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Kunne ikke omdøbe %s til %s" - -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Brug: apt-internal-solver\n" -"\n" -"apt-internal-solver er en grænseflade, der skal bruge den aktuelle\n" -"interne som en ekstern problemløser for APT-familien for fejlsøgning\n" -"eller lignende\n" -"\n" -"Tilvalg:\n" -" -h Denne hjælpetekst.\n" -" -q Logbare uddata - ingen statusindikator\n" -" -c=? Læs denne konfigurationsfil\n" -" -o=? Angiv et arbitrærtkonfigurationstilvalg, f.eks. -o dir::cache=/tmp\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Skrev %i poster med %i manglende filer.\n" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Ukendt pakkeindgang!" +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Skrev %i poster med %i ikke-trufne filer\n" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Brug: apt-sortpkgs [tilvalg] fil1 [fil2 ...]\n" -"\n" -"apt-sortpkgs er et simpelt værktøj til at sortere pakkefiler. Tilvalget -s\n" -"bruges til at angive filens type.\n" -"\n" -"Tilvalg:\n" -" -h Denne hjælpetekst\n" -" -s Benyt kildefils-sortering\n" -" -c=? Læs denne opsætningsfil\n" -" -o=? Angiv en opsætningsindstilling. F.eks. -o dir::cache=/tmp\n" +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Failed to write file %s" -msgstr "Kunne ikke skrive filen %s" +msgid "Can't find authentication record for: %s" +msgstr "Kan ikke finde godkendelsesregistrering for: %s" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "Failed to close file %s" -msgstr "Kunne ikke lukke filen %s" +msgid "Hash mismatch for: %s" +msgstr "Hashsum stemmer ikke: %s" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "The path %s is too long" -msgstr "Stien %s er for lang" +msgid "The method driver %s could not be found." +msgstr "Metodedriveren %s blev ikke fundet." -#: apt-inst/extract.cc:132 +#: apt-pkg/acquire-worker.cc:118 #, c-format -msgid "Unpacking %s more than once" -msgstr "Pakkede %s ud flere gange" +msgid "Is the package %s installed?" +msgstr "Er pakken %s installeret?" -#: apt-inst/extract.cc:142 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "The directory %s is diverted" -msgstr "Mappen %s er omrokeret" +msgid "Method %s did not start correctly" +msgstr "Metoden %s startede ikke korrekt" -#: apt-inst/extract.cc:152 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Pakken forsøger at skrive til omrokeret mål %s/%s" +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-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Omrokeringsstien er for lang" - -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Mappen %s bliver erstattet af en ikke-mappe" +#: 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." -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Kunne ikke finde knuden i sin hash-bucket" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Du kan muligvis rette problemet ved at køre »apt-get update«" -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Stien er for lang" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Listen med kilder kunne ikke læses." -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Overskriv pakkematch uden version for %s" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Tomt pakke-mellemlager" -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "File %s/%s overskriver filen i pakken %s" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Pakke-mellemlagerets fil er ødelagt" -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "Kunne ikke finde %s" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Pakke-mellemlagerets fil er af en inkompatibel version" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "DropNode kaldt med endnu forbundet knude" +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" +msgstr "Pakke-mellemlagerets fil er ødelagt, den er for lille" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Kunne ikke finde hash-element!" +#: apt-pkg/pkgcache.cc:174 +#, c-format +msgid "This APT does not support the versioning system '%s'" +msgstr "Denne APT understøtter ikke versionssystemet »%s«" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Kunne ikke allokere omrokering" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Pakke-mellemlageret er lavet til en anden arkitektur" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Intern fejl i AddDiversion" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Afhængigheder" -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Forsøger at overskrive en omrokering, %s -> %s og %s/%s" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Præ-afhængigheder" -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Dobbelt tilføjelse af omrokering %s -> %s" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Foreslåede" -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Dobbelt opsætningsfil %s/%s" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Anbefalede" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Ugyldig arkivsignatur" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Konflikter" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Fejl under læsning af arkivelements hoved" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Erstatter" -#: apt-inst/contrib/arfile.cc:96 -#, c-format -msgid "Invalid archive member header %s" -msgstr "Ugyldigt arkivelementhoved %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Overflødiggør" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Ugyldigt arkivelementhoved" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Ødelægger" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Arkivet er for kort" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Forbedringer" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Kunne ikke læse arkivhovederne" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "vigtig" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Kunne ikke oprette videreførsler" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "krævet" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Kunne ikke udføre gzip " +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "standard" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Ødelagt arkiv" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "frivillig" -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Tar-tjeksum fejlede, arkivet er ødelagt" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "ekstra" -#: apt-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Ukendt TAR-hovedtype %u, element %s" +msgid "Index file type '%s' is not supported" +msgstr "Indeksfiler af typen »%s« understøttes ikke" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/sourcelist.cc:127 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler »%s«-elementet" +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Ugyldig stanza %u i kildelisten %s (tolkning af URI)" -#: apt-inst/deb/debfile.cc:132 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "Intern fejl, kunne ikke finde elementet %s" - -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Ikke-tolkbar kontrolfil" +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] kunne ikke fortolkes)" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "List directory %spartial is missing." -msgstr "Listemappen %spartial mangler." +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] for kort)" -#: apt-pkg/acquire.cc:91 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "Archives directory %spartial is missing." -msgstr "Arkivmappen %spartial mangler." +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/acquire.cc:99 +#: apt-pkg/sourcelist.cc:190 #, c-format -msgid "Unable to lock directory %s" -msgstr "Kunne ikke låse mappen %s" - -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "Indeksfiler af typen »%s« understøttes ikke" +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "Ugyldig linje %lu i kildelisten %s ([%s] har ingen nøgle)" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Henter fil %li ud af %li (%s tilbage)" +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/acquire.cc:904 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Retrieving file %li of %li" -msgstr "Henter fil %li ud af %li" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Ugyldig linje %lu i kildelisten %s (URI)" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "omdøbning mislykkedes, %s (%s -> %s)." +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Ugyldig linje %lu i kildelisten %s (dist)" -#: apt-pkg/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "Hashsum stemmer ikke" +#: 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/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "Størrelsen stemmer ikke" +#: 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/acquire-item.cc:173 -msgid "Invalid file format" -msgstr "Ugyldigt filformat" +#: 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/acquire-item.cc:1573 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" -msgstr "" -"Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-" -"punkt eller forkert udformet fil)" +msgid "Opening %s" +msgstr "Åbner %s" -#: apt-pkg/acquire-item.cc:1589 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "Unable to find hash sum for '%s' in Release file" -msgstr "Kunne ikke finde hashsum for »%s« i udgivelsesfilen" +msgid "Line %u too long in source list %s." +msgstr "Linjen %u er for lang i kildelisten %s." -#: apt-pkg/acquire-item.cc:1631 -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/sourcelist.cc:371 +#, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "Ugyldig linje %u i kildelisten %s (type)" -#: apt-pkg/acquire-item.cc:1669 +#: 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:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Indeksfiler af typen »%s« understøttes ikke" + +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." +msgstr "Kunne ikke finde %s." + +#: apt-pkg/pkgcachegen.cc:93 +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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, 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:257 +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:260 +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:263 +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:266 +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:576 +#, 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:1211 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "Kunne ikke finde kildepakkelisten %s" + +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Indlæser pakkelisterne" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Samler filudbud" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Kunne ikke skrive til %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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:241 +msgid "Send request to solver" +msgstr "Send forespørgsel til problemløser" + +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "Forbered for modtagelse af løsning" + +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "Kør ekstern problemløser" + +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "omdøbning mislykkedes, %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "Hashsum stemmer ikke" + +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "Størrelsen stemmer ikke" + +#: apt-pkg/acquire-item.cc:173 +msgid "Invalid file format" +msgstr "Ugyldigt filformat" + +#: apt-pkg/acquire-item.cc:1640 +#, c-format +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +msgstr "" +"Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-" +"punkt eller forkert udformet fil)" + +#: apt-pkg/acquire-item.cc:1656 +#, 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:1698 +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:1736 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2511,12 +2419,12 @@ msgstr "" "Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette " "arkiv vil ikke blive anvendt." -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Konfliktdistribution: %s (forventede %s men fik %s)" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2526,12 +2434,12 @@ 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:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fejl: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2540,129 +2448,109 @@ 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:1925 +#: apt-pkg/acquire-item.cc:1992 #, 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:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Pakkeindeksfilerne er i stykker. Intet »Filename:«-felt for pakken %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Metodedriveren %s blev ikke fundet." +msgid "Vendor block %s contains no fingerprint" +msgstr "Leverandørblok %s inderholder intet fingeraftryk" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Is the package %s installed?" -msgstr "Er pakken %s installeret?" +msgid "List directory %spartial is missing." +msgstr "Listemappen %spartial mangler." -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Method %s did not start correctly" -msgstr "Metoden %s startede ikke korrekt" +msgid "Archives directory %spartial is missing." +msgstr "Arkivmappen %spartial mangler." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 #, 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 "Unable to lock directory %s" +msgstr "Kunne ikke låse mappen %s" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den." - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes " -"tilbageholdte pakker." - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "" -"Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker." - -#: 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." - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Du kan muligvis rette problemet ved at køre »apt-get update«" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Listen med kilder kunne ikke læses." +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Henter fil %li ud af %li (%s tilbage)" -#: apt-pkg/cacheset.cc:489 +#: apt-pkg/acquire.cc:904 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Udgaven »%s« for »%s« blev ikke fundet" +msgid "Retrieving file %li of %li" +msgstr "Henter fil %li ud af %li" -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Versionen »%s« for »%s« blev ikke fundet" +#: 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/cacheset.cc:603 +#: apt-pkg/policy.cc:83 #, c-format -msgid "Couldn't find task '%s'" -msgstr "Kunne ikke finde opgaven »%s«" +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" +msgstr "" +"Værdien »%s« er ugyldig for APT::Default-Release da sådan en udgivelse ikke " +"er tilgængelig i kilderne" -#: apt-pkg/cacheset.cc:609 +#: apt-pkg/policy.cc:422 #, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Kunne ikke finde nogle pakker med regulært udtryk »%s«" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Ugyldig indgang i indstillingsfilen %s, pakkehovedet mangler" -#: apt-pkg/cacheset.cc:615 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Kunne ikke finde nogle pakker med glob »%s«" +msgid "Did not understand pin type %s" +msgstr "Kunne ikke forstå pin-type %s" -#: apt-pkg/cacheset.cc:626 -#, 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/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -"Kan ikke vælge installeret eller kandidatversion fra pakke »%s« da den ikke " -"har nogen af dem" +"Kunne ikke udføre øjeblikkelig konfiguration på »%s«. Se venligst man 5 apt." +"conf under APT:Immediate-Cinfigure for detaljer. (%d)" -#: apt-pkg/cacheset.cc:647 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, 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" +msgid "Could not configure '%s'. " +msgstr "Kunne ikke åbne filen »%s«. " -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:630 #, 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:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +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 "" -"Kan ikke vælge installeret version fra pakke %s da den ikke er installeret" +"Kørsel af denne installation kræver midlertidig afinstallation af den " +"essentielle pakke %s grundet en afhængighedsløkke. Det er ofte en dårlig " +"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" @@ -2741,10 +2629,25 @@ msgstr "Skriver ny kildeliste\n" msgid "Source list entries for this disc are:\n" msgstr "Denne disk har følgende kildeliste-indgange:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Kunne ikke finde %s." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes " +"tilbageholdte pakker." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "" +"Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker." #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2772,55 +2675,71 @@ msgstr "Kunne ikke åbne StateFile %s" msgid "Failed to write temporary StateFile %s" msgstr "Kunne ikke skrive den midlertidige StateFile %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "Send scenarie til problemløser" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Kunne ikke tolke pakkefilen %s (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "Send forespørgsel til problemløser" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Kunne ikke tolke pakkefilen %s (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "Forbered for modtagelse af løsning" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Udgaven »%s« for »%s« blev ikke fundet" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Versionen »%s« for »%s« blev ikke fundet" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "Kør ekstern problemløser" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Kunne ikke finde opgaven »%s«" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "Skrev %i poster.\n" +msgid "Couldn't find any package by regex '%s'" +msgstr "Kunne ikke finde nogle pakker med regulært udtryk »%s«" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Skrev %i poster med %i manglende filer.\n" +msgid "Couldn't find any package by glob '%s'" +msgstr "Kunne ikke finde nogle pakker med glob »%s«" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Skrev %i poster med %i ikke-trufne filer\n" +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/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"Kan ikke vælge installeret eller kandidatversion fra pakke »%s« da den ikke " +"har nogen af dem" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "Kan ikke finde godkendelsesregistrering for: %s" +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/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Hashsum stemmer ikke: %s" +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:663 +#, 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/indexrecords.cc:78 #, c-format @@ -2847,824 +2766,903 @@ msgstr "Ugyldigt punkt »Valid-Until« i udgivelsesfil %s" msgid "Invalid 'Date' entry in Release file %s" msgstr "Ugyldigt punkt »Date« i udgivelsesfil %s" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Pakkesystemet »%s« understøttes ikke" +msgid "%lid %lih %limin %lis" +msgstr "%lid %lih %limin %lis" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Kunne ikke bestemme en passende pakkesystemtype" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" +msgstr "%lih %limin %lis" -#: apt-pkg/install-progress.cc:57 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Progress: [%3i%%]" -msgstr "Status: [%3i%%]" +msgid "%limin %lis" +msgstr "%limin %lis" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "Kører dpkg" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" +msgstr "%lis" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" -"Kunne ikke udføre øjeblikkelig konfiguration på »%s«. Se venligst man 5 apt." -"conf under APT:Immediate-Cinfigure for detaljer. (%d)" +msgid "Selection %s not found" +msgstr "Det valgte %s blev ikke fundet" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "Could not configure '%s'. " -msgstr "Kunne ikke åbne filen »%s«. " +msgid "Not using locking for read only lock file %s" +msgstr "Benytter ikke låsning for skrivebeskyttet låsefil %s" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:195 #, 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 "" -"Kørsel af denne installation kræver midlertidig afinstallation af den " -"essentielle pakke %s grundet en afhængighedsløkke. Det er ofte en dårlig " -"ide, men hvis du virkelig vil gøre det, kan du aktivere valget »APT::Force-" -"LoopBreak«." +msgid "Could not open lock file %s" +msgstr "Kunne ikke åbne låsefilen %s" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Tomt pakke-mellemlager" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Benytter ikke låsning for nfs-monteret låsefil %s" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Pakke-mellemlagerets fil er ødelagt" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Kunne ikke opnå låsen %s" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Pakke-mellemlagerets fil er af en inkompatibel version" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "Liste over filer kan ikke oprettes da »%s« ikke er en mappe" -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" -msgstr "Pakke-mellemlagerets fil er ødelagt, den er for lille" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "Ignorerer »%s« i mappe »%s« da det ikke er en regulær fil" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:412 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Denne APT understøtter ikke versionssystemet »%s«" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "Ignorerer fil »%s« i mappe »%s« da den ikke har en filendelse" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "Pakke-mellemlageret er lavet til en anden arkitektur" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "Ignorerer fil »%s« i mappe »%s« da den har en ugyldig filendelse" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Afhængigheder" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Underprocessen %s modtog en segmenteringsfejl." -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Præ-afhængigheder" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "Underprocessen %s modtog en signal %u." -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Foreslåede" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Underprocessen %s returnerede en fejlkode (%u)" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Anbefalede" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Underprocessen %s afsluttedes uventet" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Konflikter" +#: apt-pkg/contrib/fileutl.cc:913 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problem under lukning af gzip-filen %s" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Erstatter" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Kunne ikke åbne filen %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Overflødiggør" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "Kunne ikke åbne filbeskrivelse %d" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Ødelægger" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Kunne ikke oprette underproces IPC" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Forbedringer" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Kunne ikke udføre komprimeringsprogram " -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "vigtig" +#: apt-pkg/contrib/fileutl.cc:1514 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "læs, mangler stadig at læse %llu men der er ikke flere" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "krævet" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "skriv, mangler stadig at skrive %llu men kunne ikke" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "standard" +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" +msgstr "Problem under lukning af filen %s" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "frivillig" +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Problem under omdøbning af filen %s til %s" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "ekstra" +#: apt-pkg/contrib/fileutl.cc:1938 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "Fejl ved frigivelse af filen %s" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Mellemlageret benytter en inkompatibel versionsstyring" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Problem under synkronisering af fil" -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Der opstod en fejl under behandlingen af %s (%s%d)" +msgid "%c%s... Error!" +msgstr "%c%s... Fejl!" -#: apt-pkg/pkgcachegen.cc:257 -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/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Færdig" -#: apt-pkg/pkgcachegen.cc:260 -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/contrib/progress.cc:181 +msgid "..." +msgstr "..." -#: apt-pkg/pkgcachegen.cc:263 -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." +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... %u%%" -#: apt-pkg/pkgcachegen.cc:266 -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/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Kan ikke udføre mmap for en tom fil" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/mmap.cc:111 #, 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" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Kunne ikke duplikere filbeskrivelse %i" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/mmap.cc:119 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Kunne ikke finde kildepakkelisten %s" - -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Indlæser pakkelisterne" +msgid "Couldn't make mmap of %llu bytes" +msgstr "Kunne ikke udføre mmap for %llu byte" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Samler filudbud" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Kunne ikke lukke mmap" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "IO-fejl ved gemning af kilde-mellemlageret" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Kunne ikke synkronisere mmap" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Indeksfiler af typen »%s« understøttes ikke" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Kunne ikke udføre mmap for %lu byte" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Kunne ikke afkorte filen" + +#: apt-pkg/contrib/mmap.cc:341 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"Værdien »%s« er ugyldig for APT::Default-Release da sådan en udgivelse ikke " -"er tilgængelig i kilderne" +"Dynamisk MMap løb tør for plads. Øg venligst størrelsen på APT::Cache-Start. " +"Aktuel værdi: %lu. (man 5 apt.conf)" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Ugyldig indgang i indstillingsfilen %s, pakkehovedet mangler" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" +"Kunne ikke øge størrelsen på MMap da begrænsningen på %lu byte allerede er " +"nået." -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Kunne ikke øge størrelsen på MMap da automatisk øgning er deaktiveret af " +"bruger." + +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "Did not understand pin type %s" -msgstr "Kunne ikke forstå pin-type %s" +msgid "Unable to stat the mount point %s" +msgstr "Kunne ikke finde monteringspunktet %s" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin" +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Kunne ikke finde cdrommen" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/configuration.cc:519 #, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Ugyldig stanza %u i kildelisten %s (tolkning af URI)" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Ukendt type-forkortelse: »%c«" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/configuration.cc:633 #, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] kunne ikke fortolkes)" +msgid "Opening configuration file %s" +msgstr "Åbner konfigurationsfilen %s" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/configuration.cc:801 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] for kort)" +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Syntaksfejl %s:%u: Blokken starter uden navn." -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/configuration.cc:820 #, 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)" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Syntaksfejl %s:%u: Forkert udformet mærke" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/configuration.cc:837 #, 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)" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Syntaksfejl %s:%u: Overskydende affald efter værdien" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/configuration.cc:877 #, 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)" +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/sourcelist.cc:206 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Ugyldig linje %lu i kildelisten %s (URI)" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Syntaksfejl %s:%u: For mange sammenkædede inkluderinger" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Ugyldig linje %lu i kildelisten %s (dist)" +msgid "Syntax error %s:%u: Included from here" +msgstr "Syntaksfejl %s:%u: Inkluderet herfra" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/configuration.cc:897 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Syntaksfejl %s:%u: Ikke-understøttet direktiv »%s«" -#: apt-pkg/sourcelist.cc:217 +#: apt-pkg/contrib/configuration.cc:900 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)" +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/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: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/srcrecords.cc:52 -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/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Kunne ikke tolke pakkefilen %s (1)" - -#: apt-pkg/tagfile.cc:237 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Kunne ikke tolke pakkefilen %s (2)" - -#: 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/vendorlist.cc:85 +#: apt-pkg/contrib/configuration.cc:950 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Leverandørblok %s inderholder intet fingeraftryk" +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen" -#: apt-pkg/contrib/cdromutl.cc:65 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "Kunne ikke finde monteringspunktet %s" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "Kunne ikke finde cdrommen" +msgid "No keyring installed in %s." +msgstr "Ingen nøglering installeret i %s." -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Kommandolinjetilvalget »%c« [fra %s] kendes ikke." -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format msgid "Command line option %s is not understood" msgstr "Kommandolinjetilvalget %s blev ikke forstået" -#: apt-pkg/contrib/cmndline.cc:168 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format msgid "Command line option %s is not boolean" msgstr "Kommandolinjetilvalget %s er ikke boolsk" -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format msgid "Option %s requires an argument." msgstr "Tilvalget %s kræver et parameter." -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Tilvalg %s: Opsætningspostens specifikation skal have en =." -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, 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:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "Tilvalget »%s« er for langt" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, 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:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "Ugyldig handling %s" -#: apt-pkg/contrib/configuration.cc:519 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Ukendt type-forkortelse: »%c«" - -#: apt-pkg/contrib/configuration.cc:633 -#, c-format -msgid "Opening configuration file %s" -msgstr "Åbner konfigurationsfilen %s" - -#: apt-pkg/contrib/configuration.cc:801 -#, 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:820 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Syntaksfejl %s:%u: Forkert udformet mærke" +msgid "Installing %s" +msgstr "Installerer %s" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Syntaksfejl %s:%u: Overskydende affald efter værdien" +msgid "Configuring %s" +msgstr "Sætter %s op" -#: apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, 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" +msgid "Removing %s" +msgstr "Fjerner %s" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Syntaksfejl %s:%u: For mange sammenkædede inkluderinger" +msgid "Completely removing %s" +msgstr "Fjerner %s helt" -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Syntaksfejl %s:%u: Inkluderet herfra" +msgid "Noting disappearance of %s" +msgstr "Bemærker forsvinding af %s" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:115 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Syntaksfejl %s:%u: Ikke-understøttet direktiv »%s«" +msgid "Running post-installation trigger %s" +msgstr "Kører førinstallationsudløser %s" -#: apt-pkg/contrib/configuration.cc:900 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, 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" +msgid "Directory '%s' missing" +msgstr "Mappe »%s« mangler" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen" +msgid "Could not open file '%s'" +msgstr "Kunne ikke åbne filen »%s«" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Benytter ikke låsning for skrivebeskyttet låsefil %s" +msgid "Preparing %s" +msgstr "Klargør %s" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1008 #, c-format -msgid "Could not open lock file %s" -msgstr "Kunne ikke åbne låsefilen %s" +msgid "Unpacking %s" +msgstr "Pakker %s ud" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Benytter ikke låsning for nfs-monteret låsefil %s" +msgid "Preparing to configure %s" +msgstr "Gør klar til at sætte %s op" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Could not get lock %s" -msgstr "Kunne ikke opnå låsen %s" +msgid "Installed %s" +msgstr "Installerede %s" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "Liste over filer kan ikke oprettes da »%s« ikke er en mappe" +msgid "Preparing for removal of %s" +msgstr "Gør klar til afinstallation af %s" -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "Ignorerer »%s« i mappe »%s« da det ikke er en regulær fil" +msgid "Removed %s" +msgstr "Fjernede %s" -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "Ignorerer fil »%s« i mappe »%s« da den ikke har en filendelse" +msgid "Preparing to completely remove %s" +msgstr "Gør klar til at fjerne %s helt" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "Ignorerer fil »%s« i mappe »%s« da den har en ugyldig filendelse" +msgid "Completely removed %s" +msgstr "Fjernede %s helt" -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Underprocessen %s modtog en segmenteringsfejl." +msgid "Can not write log (%s)" +msgstr "Kan ikke skrive log (%s)" -#: apt-pkg/contrib/fileutl.cc:826 -#, c-format -msgid "Sub-process %s received signal %u." -msgstr "Underprocessen %s modtog en signal %u." +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "Er /dev/pts monteret?" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Underprocessen %s returnerede en fejlkode (%u)" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "Handling blev afbrudt før den kunne afsluttes" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 -#, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Underprocessen %s afsluttedes uventet" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "" +"Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået" -#: apt-pkg/contrib/fileutl.cc:913 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problem under lukning af gzip-filen %s" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "afhængighedsproblemer - efterlader ukonfigureret" -#: apt-pkg/contrib/fileutl.cc:1101 -#, c-format -msgid "Could not open file %s" -msgstr "Kunne ikke åbne filen %s" +#: apt-pkg/deb/dpkgpm.cc:1726 +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/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 -#, c-format -msgid "Could not open file descriptor %d" -msgstr "Kunne ikke åbne filbeskrivelse %d" +#: apt-pkg/deb/dpkgpm.cc:1732 +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/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Kunne ikke oprette underproces IPC" +#: apt-pkg/deb/dpkgpm.cc:1739 +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/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Kunne ikke udføre komprimeringsprogram " +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +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/contrib/fileutl.cc:1514 -#, c-format -msgid "read, still have %llu to read but none left" -msgstr "læs, mangler stadig at læse %llu men der er ikke flere" +#: apt-pkg/deb/dpkgpm.cc:1774 +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/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "skriv, mangler stadig at skrive %llu men kunne ikke" +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/contrib/fileutl.cc:1915 +#: apt-pkg/deb/debsystem.cc:94 #, c-format -msgid "Problem closing the file %s" -msgstr "Problem under lukning af filen %s" +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Kunne ikke låse administrationsmappen (%s), er du rod (root)?" -#: apt-pkg/contrib/fileutl.cc:1927 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 #, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Problem under omdøbning af filen %s til %s" +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/contrib/fileutl.cc:1938 -#, c-format -msgid "Problem unlinking the file %s" -msgstr "Fejl ved frigivelse af filen %s" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "Ikke låst" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Problem under synkronisering af fil" +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Brug: apt-extracttemplates fil1 [fil2 ...]\n" +"\n" +"apt-extracttemplates er et værktøj til at uddrage opsætnings- og skabelon-" +"oplysninger fra Debianpakker\n" +"\n" +"Tilvalg:\n" +" -h Denne hjælpetekst\n" +" -t Angiv temp-mappe\n" +" -c=? Læs denne opsætningsfil\n" +" -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: cmdline/apt-extracttemplates.cc:254 #, c-format -msgid "No keyring installed in %s." -msgstr "Ingen nøglering installeret i %s." +msgid "Unable to mkstemp %s" +msgstr "Kunne ikke mkstemp %s" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Kan ikke udføre mmap for en tom fil" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Kan ikke finde debconfs version. Er debconf installeret?" -#: apt-pkg/contrib/mmap.cc:111 -#, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Kunne ikke duplikere filbeskrivelse %i" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "Pakkeudvidelseslisten er for lang" -#: apt-pkg/contrib/mmap.cc:119 +#: 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 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Kunne ikke udføre mmap for %llu byte" +msgid "Error processing directory %s" +msgstr "Fejl under behandling af mappen %s" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Kunne ikke lukke mmap" +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Kildeudvidelseslisten er for lang" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Kunne ikke synkronisere mmap" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Fejl under skrivning af hovedet til indholdsfil" -#: apt-pkg/contrib/mmap.cc:290 +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Kunne ikke udføre mmap for %lu byte" - -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Kunne ikke afkorte filen" +msgid "Error processing contents %s" +msgstr "Fejl under behandling af indhold %s" -#: apt-pkg/contrib/mmap.cc:341 -#, c-format +#: ftparchive/apt-ftparchive.cc:626 msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" -"Dynamisk MMap løb tør for plads. Øg venligst størrelsen på APT::Cache-Start. " -"Aktuel værdi: %lu. (man 5 apt.conf)" +"Brug: apt-ftparchive [tilvalg] kommando\n" +"Kommandoer: packges binærsti [tvangsfil [sti]]\n" +" sources kildesti [tvangsfil [sti]]\n" +" contents sti\n" +" release sti\n" +" generate config [grupper]\n" +" clean config\n" +"\n" +"apt-ftparchive laver indeksfiler til Debianarkiver. Det understøtter \n" +"mange former for generering, lige fra fuldautomatiske til funktionelle\n" +"erstatninger for dpkg-scanpackages og dpkg-scansources\n" +"\n" +"apt-ftparchive genererer Package-filer ud fra træer af .deb'er.\n" +"Package-filen indeholder alle styrefelterne fra hver pakke såvel\n" +"som MD5-mønstre og filstørrelser. En tvangsfil understøttes til at\n" +"gennemtvinge indholdet af Priority og Section.\n" +"\n" +"På samme måde genererer apt-ftparchive Sources-filer ud fra træer\n" +"med .dsc'er. Tvangstilvalget --source-override kan bruges til at\n" +"angive en src-tvangsfil.\n" +"\n" +"Kommandoerne »packages« og »sources« skal køres i roden af træet.\n" +"binærsti skal pege på basen af rekursive søgninger og tvangsfilen\n" +"skal indeholde tvangsflagene. Sti foranstilles eventuelle\n" +"filnavnfelter. Et eksempel på brug fra Debianarkivet:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Tilvalg:\n" +" -h Denne hjælpetekst\n" +" --md5 Styr generering af MD5\n" +" -s=? Kilde-tvangsfil\n" +" -q Stille\n" +" -d=? Vælg den valgfrie mellemlager-database\n" +" --no-delink Aktivér \"delinking\"-fejlsporingstilstand\n" +" --contents Bestem generering af indholdsfil\n" +" -c=? Læs denne opsætningsfil\n" +" -o=? Sæt en opsætnings-indstilling" -#: apt-pkg/contrib/mmap.cc:446 -#, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "" -"Kunne ikke øge størrelsen på MMap da begrænsningen på %lu byte allerede er " -"nået." +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Ingen valg passede" -#: apt-pkg/contrib/mmap.cc:449 -msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." -msgstr "" -"Kunne ikke øge størrelsen på MMap da automatisk øgning er deaktiveret af " -"bruger." +#: ftparchive/apt-ftparchive.cc:907 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "Visse filer mangler i pakkefilgruppen »%s«" -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Fejl!" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB var ødelagt, filen omdøbt til %s.old" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Færdig" +msgid "DB is old, attempting to upgrade %s" +msgstr "DB er gammel, forsøger at opgradere %s" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "..." +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"Databaseformatet er ugyldigt. Hvis du har opgraderet fra en ældre version af " +"apt, så fjern og genskab databasen." -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... %u%%" +msgid "Unable to open DB file %s: %s" +msgstr "Kunne ikke åbne DB-filen %s: %s" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "%lid %lih %limin %lis" +#: ftparchive/cachedb.cc:332 +msgid "Failed to read .dsc" +msgstr "Kunne ikke læse .dsc" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" -msgstr "%lih %limin %lis" +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Arkivet har ingen kontrolindgang" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 -#, c-format -msgid "%limin %lis" -msgstr "%limin %lis" +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Kunne skaffe en markør" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:91 #, c-format -msgid "%lis" -msgstr "%lis" +msgid "W: Unable to read directory %s\n" +msgstr "A: Kunne ikke læse mappen %s\n" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:96 #, c-format -msgid "Selection %s not found" -msgstr "Det valgte %s blev ikke fundet" +msgid "W: Unable to stat %s\n" +msgstr "W: Kunne ikke finde %s\n" -#: 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?" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "F: " -#: 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)?" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "A: " -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "F: Fejlene vedrører filen " + +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, 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." +msgid "Failed to resolve %s" +msgstr "Kunne ikke omsætte navnet %s" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "Ikke låst" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Trævandring mislykkedes" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:219 #, c-format -msgid "Installing %s" -msgstr "Installerer %s" +msgid "Failed to open %s" +msgstr "Kunne ikke åbne %s" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:278 #, c-format -msgid "Configuring %s" -msgstr "Sætter %s op" +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:286 #, c-format -msgid "Removing %s" -msgstr "Fjerner %s" +msgid "Failed to readlink %s" +msgstr "Kunne ikke »readlink« %s" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:290 #, c-format -msgid "Completely removing %s" -msgstr "Fjerner %s helt" +msgid "Failed to unlink %s" +msgstr "Kunne ikke frigøre %s" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:298 #, c-format -msgid "Noting disappearance of %s" -msgstr "Bemærker forsvinding af %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Kunne ikke lænke %s til %s" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:308 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Kører førinstallationsudløser %s" +msgid " DeLink limit of %sB hit.\n" +msgstr " Nåede DeLink-begrænsningen på %sB.\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Arkivet havde intet package-felt" + +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Directory '%s' missing" -msgstr "Mappe »%s« mangler" +msgid " %s has no override entry\n" +msgstr " %s har ingen tvangs-post\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Could not open file '%s'" -msgstr "Kunne ikke åbne filen »%s«" +msgid " %s maintainer is %s not %s\n" +msgstr " pakkeansvarlig for %s er %s, ikke %s\n" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing %s" -msgstr "Klargør %s" +msgid " %s has no source override entry\n" +msgstr " %s har ingen linje med tilsidesættelse af standard for kildefiler\n" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:710 #, c-format -msgid "Unpacking %s" -msgstr "Pakker %s ud" +msgid " %s has no binary override entry either\n" +msgstr "" +" %s har ingen linje med tilsidesættelse af standard for binøre filer\n" + +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Kunne ikke allokere hukommelse" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing to configure %s" -msgstr "Gør klar til at sætte %s op" +msgid "Unable to open %s" +msgstr "Kunne ikke åbne %s" -#: apt-pkg/deb/dpkgpm.cc:1000 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 #, c-format -msgid "Installed %s" -msgstr "Installerede %s" +msgid "Malformed override %s line %llu (%s)" +msgstr "Ugyldig overskrivning af %s-linjen %llu (%s)" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing for removal of %s" -msgstr "Gør klar til afinstallation af %s" +msgid "Failed to read the override file %s" +msgstr "Kunne ikke læse gennemtvangsfilen %s" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:166 #, c-format -msgid "Removed %s" -msgstr "Fjernede %s" +msgid "Malformed override %s line %llu #1" +msgstr "Ugyldig gennemtvangs %s-linje %llu #1" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:178 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Gør klar til at fjerne %s helt" +msgid "Malformed override %s line %llu #2" +msgstr "Ugyldig gennemtvangs %s-linje %llu #2" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/override.cc:191 #, c-format -msgid "Completely removed %s" -msgstr "Fjernede %s helt" +msgid "Malformed override %s line %llu #3" +msgstr "Ugyldig gennemtvangs %s-linje %llu #3" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Can not write log (%s)" -msgstr "Kan ikke skrive log (%s)" +msgid "Unknown compression algorithm '%s'" +msgstr "Ukendt komprimeringsalgoritme »%s«" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "Er /dev/pts monteret?" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Komprimerede uddata %s kræver et komprimeringssæt" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "Er standardud en terminal?" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Kunne ikke oprette FILE*" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "Handling blev afbrudt før den kunne afsluttes" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Kunne ikke spalte" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" -"Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Komprimer barn" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "afhængighedsproblemer - efterlader ukonfigureret" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Intern fejl. Kunne ikke oprette %s" -#: apt-pkg/deb/dpkgpm.cc:1694 -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." +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "IO til underproces/fil mislykkedes" -#: apt-pkg/deb/dpkgpm.cc:1700 -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" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Kunne ikke læse under beregning af MD5" + +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Problem under aflænkning af %s" -#: apt-pkg/deb/dpkgpm.cc:1707 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok " -"hukommelsesfejl" +"Brug: apt-internal-solver\n" +"\n" +"apt-internal-solver er en grænseflade, der skal bruge den aktuelle\n" +"interne som en ekstern problemløser for APT-familien for fejlsøgning\n" +"eller lignende\n" +"\n" +"Tilvalg:\n" +" -h Denne hjælpetekst.\n" +" -q Logbare uddata - ingen statusindikator\n" +" -c=? Læs denne konfigurationsfil\n" +" -o=? Angiv et arbitrærtkonfigurationstilvalg, f.eks. -o dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Ukendt pakkeindgang!" + +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Ingen apportrapport skrevet da fejlbeskeden indikerer en fejl på det lokale " -"system" +"Brug: apt-sortpkgs [tilvalg] fil1 [fil2 ...]\n" +"\n" +"apt-sortpkgs er et simpelt værktøj til at sortere pakkefiler. Tilvalget -s\n" +"bruges til at angive filens type.\n" +"\n" +"Tilvalg:\n" +" -h Denne hjælpetekst\n" +" -s Benyt kildefils-sortering\n" +" -c=? Læs denne opsætningsfil\n" +" -o=? Angiv en opsætningsindstilling. F.eks. -o dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1742 -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 "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 ae3b15d41..2c9815571 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2014-09-19 13:04+0100\n" "Last-Translator: Holger Wansing \n" "Language-Team: Debian German \n" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " Versionstabelle:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -374,7 +374,7 @@ msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden " "sollen." -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Quellpaket für %s kann nicht gefunden werden." @@ -401,80 +401,80 @@ msgstr "" "um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n" "für das Paket abzurufen.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Freier Platz in %s konnte nicht bestimmt werden." -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genügend freien Speicherplatz in %s." #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, 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:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Quelle %s wird heruntergeladen.\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Einige Archive konnten nicht heruntergeladen werden." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpackbefehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -483,18 +483,18 @@ msgstr "" "Keine Architekturinformation für %s verfügbar. Weiteres zur Einrichtung " "finden Sie unter apt.conf(5) APT::Architectures." -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Bauabhängigkeiten.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -503,7 +503,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:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -512,14 +512,14 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -529,7 +529,7 @@ msgstr "" "Installationskandidaten für das Paket %s die Versionsanforderungen nicht " "erfüllen kann." -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -538,30 +538,30 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da für Paket %s kein " "Installationskandidat existiert." -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, 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:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Änderungsprotokoll (Changelog) für %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -720,7 +720,7 @@ msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden" @@ -861,17 +861,17 @@ msgstr "" msgid "Disk not found." msgstr "Medium nicht gefunden" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Datei nicht gefunden" # looks like someone hardcoded English grammar -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Abfrage mit »stat« fehlgeschlagen" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Änderungszeitpunkt kann nicht gesetzt werden." @@ -925,7 +925,7 @@ msgstr "Befehl »%s« des Login-Skriptes fehlgeschlagen, Server meldet: %s" msgid "TYPE failed, server said: %s" msgstr "Befehl TYPE fehlgeschlagen: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Zeitüberschreitung der Verbindung" @@ -947,7 +947,7 @@ msgstr "Durch eine Antwort wurde der Puffer zum Überlaufen gebracht." msgid "Protocol corruption" msgstr "Protokoll beschädigt" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -1010,7 +1010,7 @@ msgstr "Zeitüberschreitung bei Datenverbindungsaufbau" msgid "Unable to accept connection" msgstr "Verbindung konnte nicht angenommen werden." -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Problem bei Bestimmung des Hashwertes einer Datei" @@ -1019,7 +1019,7 @@ msgstr "Problem bei Bestimmung des Hashwertes einer Datei" msgid "Unable to fetch file, server said '%s'" msgstr "Datei konnte nicht heruntergeladen werden; Server meldet: »%s«" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Zeitüberschreitung bei Datenverbindung" @@ -1071,7 +1071,7 @@ msgstr "Verbindung mit %s:%s nicht möglich (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Verbindung mit %s" @@ -1222,42 +1222,21 @@ msgstr "Verbindung fehlgeschlagen" msgid "Internal error" msgstr "Interner Fehler" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "OK " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Holen: " - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ign " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Fehl " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Es wurden %sB in %s geholt (%sB/s).\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Wird verarbeitet]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "Auflistung" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Medienwechsel: Bitte legen Sie das Medium mit dem Namen\n" -" »%s«\n" -"in Laufwerk »%s« ein und drücken Sie die Eingabetaste (Enter).\n" +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:93 msgid "Correcting dependencies..." @@ -1287,170 +1266,361 @@ msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren." msgid "Unmet dependencies. Try using -f." msgstr "Unerfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" -msgstr "Sortierung" - -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!" - -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Authentifizierungswarnung überstimmt.\n" - -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Einige Pakete konnten nicht authentifiziert werden." - -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Diese Pakete ohne Überprüfung installieren?" - -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet." +#: 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-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:265 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Fehlschlag beim Holen von %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!" +msgid "[installed,upgradable to: %s]" +msgstr " [Installiert,aktualisierbar auf: %s]" -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." +#: apt-private/private-output.cc:268 +msgid "[installed,local]" +msgstr " [Installiert,lokal]" -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Interner Fehler, Anordnung beendete nicht" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "[installiert,automatisch-entfernbar]" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" -msgstr "" -"Wie merkwürdig ... die Größen haben nicht übereingestimmt; schreiben Sie " -"eine E-Mail an apt@packages.debian.org (auf Englisch bitte)." +#: apt-private/private-output.cc:272 +msgid "[installed,automatic]" +msgstr " [Installiert,automatisch]" -#. 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 -#: apt-private/private-install.cc:155 -#, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "Es müssen noch %sB von %sB an Archiven heruntergeladen werden.\n" +#: apt-private/private-output.cc:274 +msgid "[installed]" +msgstr " [installiert]" -#. 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:160 +#: apt-private/private-output.cc:277 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "Es müssen %sB an Archiven heruntergeladen werden.\n" +msgid "[upgradable from: %s]" +msgstr "[aktualisierbar von: %s]" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" +msgstr "[Konfiguration-verbleibend]" -#. 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:172 +#: apt-private/private-output.cc:455 #, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n" +msgid "but %s is installed" +msgstr "aber %s ist installiert" -#: apt-private/private-install.cc:200 +#: apt-private/private-output.cc:457 #, c-format -msgid "You don't have enough free space in %s." -msgstr "Sie haben nicht genug Platz in %s." +msgid "but %s is to be installed" +msgstr "aber %s soll installiert werden" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "»Nur triviale« angegeben, aber dies ist keine triviale Operation." +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "ist aber nicht installierbar" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Ja, tue was ich sage!" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "ist aber ein virtuelles Paket" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Sie sind im Begriff, etwas potentiell Schädliches zu tun.\n" -"Zum Fortfahren geben Sie bitte »%s« ein.\n" -" ?] " +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "ist aber nicht installiert" -#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Abbruch." +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "soll aber nicht installiert werden" -#: apt-private/private-install.cc:243 -msgid "Do you want to continue?" -msgstr "Möchten Sie fortfahren?" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " oder" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Einige Dateien konnten nicht heruntergeladen werden." +#: 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-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Einige Archive konnten nicht heruntergeladen werden; vielleicht »apt-get " -"update« ausführen oder mit »--fix-missing« probieren?" +#: apt-private/private-output.cc:523 +msgid "The following NEW packages will be installed:" +msgstr "Die folgenden NEUEN Pakete werden installiert:" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing und Wechselmedien werden derzeit nicht unterstützt." +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "Die folgenden Pakete werden ENTFERNT:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Fehlende Pakete konnten nicht korrigiert werden." +#: 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-install.cc:330 -msgid "Aborting install." -msgstr "Installation abgebrochen." +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):" -#: apt-private/private-install.cc:366 -msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"Das folgende Paket verschwand von Ihrem System, da alle\n" -"Dateien von anderen Paketen überschrieben wurden:" -msgstr[1] "" -"Die folgenden Pakete verschwanden von Ihrem System, da alle\n" -"Dateien von anderen Paketen überschrieben wurden:" +#: 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-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Hinweis: Dies wird automatisch und absichtlich von dpkg durchgeführt." +#: 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-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "" -"Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden." +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (wegen %s) " -#: apt-private/private-install.cc:499 +#: apt-private/private-output.cc:696 msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" msgstr "" -"Hmm, es sieht so aus, als ob der AutoRemover etwas beschädigt hat, was\n" -"wirklich nicht geschehen sollte. Bitte erstellen Sie einen Fehlerbericht\n" -"über apt." +"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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Interner Fehler, Anordnung beendete nicht" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Wie merkwürdig ... die Größen haben nicht übereingestimmt; schreiben Sie " +"eine E-Mail an apt@packages.debian.org (auf Englisch bitte)." + +#. 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Es müssen noch %sB von %sB an Archiven 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 +#: apt-private/private-install.cc:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Es müssen %sB an Archiven 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 +#: apt-private/private-install.cc:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n" + +#. 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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Sie haben nicht genug Platz in %s." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet." + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "»Nur triviale« angegeben, aber dies ist keine triviale Operation." + +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Ja, tue was ich sage!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Sie sind im Begriff, etwas potentiell Schädliches zu tun.\n" +"Zum Fortfahren geben Sie bitte »%s« ein.\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Abbruch." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Möchten Sie fortfahren?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Einige Dateien konnten nicht heruntergeladen werden." + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Einige Archive konnten nicht heruntergeladen werden; vielleicht »apt-get " +"update« ausführen oder mit »--fix-missing« probieren?" + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing und Wechselmedien werden derzeit nicht unterstützt." + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Fehlende Pakete konnten nicht korrigiert werden." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Installation abgebrochen." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"Das folgende Paket verschwand von Ihrem System, da alle\n" +"Dateien von anderen Paketen überschrieben wurden:" +msgstr[1] "" +"Die folgenden Pakete verschwanden von Ihrem System, da alle\n" +"Dateien von anderen Paketen überschrieben wurden:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Hinweis: Dies wird automatisch und absichtlich von dpkg durchgeführt." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" +"Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden." + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"Hmm, es sieht so aus, als ob der AutoRemover etwas beschädigt hat, was\n" +"wirklich nicht geschehen sollte. Bitte erstellen Sie einen Fehlerbericht\n" +"über apt." #. #. if (Packages == 1) @@ -1589,953 +1759,698 @@ 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:129 -msgid "Listing" -msgstr "Auflistung" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!" -#: apt-private/private-list.cc:159 -#, 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-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-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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Authentifizierungswarnung überstimmt.\n" -#: apt-private/private-output.cc:272 -msgid "[installed,automatic]" -msgstr " [Installiert,automatisch]" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Einige Pakete konnten nicht authentifiziert werden." -#: apt-private/private-output.cc:274 -msgid "[installed]" -msgstr " [installiert]" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Diese Pakete ohne Überprüfung installieren?" -#: apt-private/private-output.cc:277 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format -msgid "[upgradable from: %s]" -msgstr "[aktualisierbar von: %s]" - -#: apt-private/private-output.cc:281 -msgid "[residual-config]" -msgstr "[Konfiguration-verbleibend]" +msgid "Failed to fetch %s %s\n" +msgstr "Fehlschlag beim Holen von %s %s\n" -#: apt-private/private-output.cc:455 +#: apt-private/private-sources.cc:58 #, c-format -msgid "but %s is installed" -msgstr "aber %s ist installiert" +msgid "Failed to parse %s. Edit again? " +msgstr "Verarbeitung von %s fehlgeschlagen. Erneut bearbeiten?" -#: apt-private/private-output.cc:457 +#: apt-private/private-sources.cc:70 #, 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" +msgid "Your '%s' file changed, please run 'apt-get update'." +msgstr "" +"Ihre »%s«-Datei wurde verändert, bitte führen Sie »apt-get update« aus." -#: apt-private/private-output.cc:474 -msgid " or" -msgstr " oder" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" +msgstr "Volltextsuche" -#: 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-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "Paketaktualisierung (Upgrade) wird berechnet... " -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "Die folgenden NEUEN Pakete werden installiert:" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "Fertig" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "Die folgenden Pakete werden ENTFERNT:" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "OK " -#: apt-private/private-output.cc:571 -msgid "The following packages have been kept back:" -msgstr "Die folgenden Pakete sind zurückgehalten worden:" +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Holen: " -#: apt-private/private-output.cc:592 -msgid "The following packages will be upgraded:" -msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):" +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ign " -#: 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/acqprogress.cc:125 +msgid "Err " +msgstr "Fehl " -#: 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/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Es wurden %sB in %s geholt (%sB/s).\n" -#: apt-private/private-output.cc:688 +#: apt-private/acqprogress.cc:236 #, c-format -msgid "%s (due to %s) " -msgstr "%s (wegen %s) " +msgid " [Working]" +msgstr " [Wird verarbeitet]" -#: apt-private/private-output.cc:696 +#: apt-private/acqprogress.cc:297 +#, c-format msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" msgstr "" -"WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" -"Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!" +"Medienwechsel: Bitte legen Sie das Medium mit dem Namen\n" +" »%s«\n" +"in Laufwerk »%s« ein und drücken Sie die Eingabetaste (Enter).\n" -#: apt-private/private-output.cc:727 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu aktualisiert, %lu neu installiert, " +msgid "Unable to read %s" +msgstr "%s kann nicht gelesen werden." -#: apt-private/private-output.cc:731 +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 #, c-format -msgid "%lu reinstalled, " -msgstr "%lu erneut installiert, " +msgid "Unable to change to %s" +msgstr "Es konnte nicht nach %s gewechselt werden." -#: apt-private/private-output.cc:733 +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 #, c-format -msgid "%lu downgraded, " -msgstr "%lu durch eine ältere Version ersetzt, " +msgid "No mirror file '%s' found " +msgstr "Keine Datei von Spiegelserver »%s« gefunden" -#: apt-private/private-output.cc:735 +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 #, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" +msgid "Can not read mirror file '%s'" +msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden." -#: apt-private/private-output.cc:739 +#: methods/mirror.cc:315 #, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu nicht vollständig installiert oder entfernt.\n" +msgid "No entry found in mirror file '%s'" +msgstr "Kein Eintrag in Spiegeldatei »%s« gefunden" -#. 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]" +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" +msgstr "[Spiegelserver: %s]" -#. 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]" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "" +"Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden." -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:778 -msgid "Y" -msgstr "J" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "Verbindung vorzeitig beendet" -#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:784 -msgid "N" -msgstr "N" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "Fehlerhafte Voreinstellung!" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "Zum Fortfahren die Eingabetaste (Enter) drücken." -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "Volltextsuche" +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Möchten Sie alle bisher heruntergeladenen .deb-Dateien löschen?" -#: 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." +#: dselect/install:102 +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "Einige Fehler traten während des Entpackens auf. Installierte Pakete" -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" -msgstr "kein reales Paket (virtuell)" +#: dselect/install:103 +msgid "will be configured. This may result in duplicate errors" +msgstr "" +"werden konfiguriert. Dies kann zu doppelten Fehlermeldungen oder Fehlern " +"durch" -#: apt-private/private-sources.cc:58 -#, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "Verarbeitung von %s fehlgeschlagen. Erneut bearbeiten?" +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "fehlende Abhängigkeiten führen. Das ist in Ordnung, nur die Fehler" -#: apt-private/private-sources.cc:70 -#, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." +#: dselect/install:105 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" -"Ihre »%s«-Datei wurde verändert, bitte führen Sie »apt-get update« aus." +"oberhalb dieser Meldung sind wichtig. Bitte beseitigen Sie sie und " +"[I]nstallieren Sie erneut." -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Der Befehl »update« akzeptiert keine Argumente." +#: dselect/update:30 +msgid "Merging available information" +msgstr "Verfügbare Informationen werden zusammengeführt." -#: apt-private/private-update.cc:90 -#, 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-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "»DropNode« auf noch verknüpften Knoten aufgerufen" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." -msgstr "Alle Pakete sind aktuell." +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Hash-Element konnte nicht gefunden werden!" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "Paketaktualisierung (Upgrade) wird berechnet... " +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Umleitung konnte nicht reserviert werden." -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "Fertig" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Interner Fehler in »AddDiversion«" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Unable to read %s" -msgstr "%s kann nicht gelesen werden." +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Es wird versucht, eine Umleitung zu überschreiben: %s -> %s und %s/%s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Unable to change to %s" -msgstr "Es konnte nicht nach %s gewechselt werden." +msgid "Double add of diversion %s -> %s" +msgstr "Doppelte Hinzufügung der Umleitung %s -> %s" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 +#: apt-inst/filelist.cc:549 #, c-format -msgid "No mirror file '%s' found " -msgstr "Keine Datei von Spiegelserver »%s« gefunden" +msgid "Duplicate conf file %s/%s" +msgstr "Doppelte Konfigurationsdatei %s/%s" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:287 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "Can not read mirror file '%s'" -msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden." +msgid "The path %s is too long" +msgstr "Der Pfad %s ist zu lang." -#: methods/mirror.cc:315 +#: apt-inst/extract.cc:132 #, c-format -msgid "No entry found in mirror file '%s'" -msgstr "Kein Eintrag in Spiegeldatei »%s« gefunden" +msgid "Unpacking %s more than once" +msgstr "%s mehr als einmal entpackt" -#: methods/mirror.cc:445 +#: apt-inst/extract.cc:142 #, c-format -msgid "[Mirror: %s]" -msgstr "[Spiegelserver: %s]" - -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "" -"Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden." - -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" -msgstr "Verbindung vorzeitig beendet" +msgid "The directory %s is diverted" +msgstr "Das Verzeichnis %s ist umgeleitet." -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "Fehlerhafte Voreinstellung!" +#: apt-inst/extract.cc:152 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Schreibversuch vom Paket auf das Umleitungsziel %s/%s" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "Zum Fortfahren die Eingabetaste (Enter) drücken." +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Der Umleitungspfad ist zu lang." -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "Möchten Sie alle bisher heruntergeladenen .deb-Dateien löschen?" +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 +#, c-format +msgid "Failed to stat %s" +msgstr "%s mit »stat« abfragen fehlgeschlagen" -#: dselect/install:102 -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "Einige Fehler traten während des Entpackens auf. Installierte Pakete" +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "%s konnte nicht in %s umbenannt werden." -#: dselect/install:103 -msgid "will be configured. This may result in duplicate errors" -msgstr "" -"werden konfiguriert. Dies kann zu doppelten Fehlermeldungen oder Fehlern " -"durch" +#: apt-inst/extract.cc:249 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "Das Verzeichnis %s wird durch ein Nicht-Verzeichnis ersetzt." -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "fehlende Abhängigkeiten führen. Das ist in Ordnung, nur die Fehler" +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Knoten konnte nicht in seinem Hash gefunden werden." -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" -msgstr "" -"oberhalb dieser Meldung sind wichtig. Bitte beseitigen Sie sie und " -"[I]nstallieren Sie erneut." +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Der Pfad ist zu lang." -#: dselect/update:30 -msgid "Merging available information" -msgstr "Verfügbare Informationen werden zusammengeführt." +#: apt-inst/extract.cc:421 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "Pakettreffer ohne Version für %s wird überschrieben." -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Aufruf: apt-extracttemplates datei1 [datei2 ...]\n" -"\n" -"apt-extracttemplates ist ein Werkzeug, um Informationen zu Konfiguration\n" -"und Vorlagen (Templates) aus Debian-Paketen zu extrahieren.\n" -"\n" -"Optionen:\n" -" -h Dieser Hilfetext\n" -" -t Das temporäre Verzeichnis setzen\n" -" -c=? Diese Konfigurationsdatei lesen\n" -" -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" +#: apt-inst/extract.cc:438 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben." -#: cmdline/apt-extracttemplates.cc:254 +#: apt-inst/extract.cc:498 #, c-format -msgid "Unable to mkstemp %s" -msgstr "mkstemp %s nicht möglich" +msgid "Unable to stat %s" +msgstr "%s mit »stat« abfragen nicht möglich" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Unable to write to %s" -msgstr "Schreiben nach %s nicht möglich" +msgid "Failed to write file %s" +msgstr "Datei %s konnte nicht geschrieben werden." -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "" -"Debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?" +#: apt-inst/dirstream.cc:105 +#, c-format +msgid "Failed to close file %s" +msgstr "Datei %s konnte nicht geschlossen werden." -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Paketerweiterungsliste ist zu lang." +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Dies ist kein gültiges DEB-Archiv, da es »%s« nicht enthält." -#: 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 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "Error processing directory %s" -msgstr "Fehler beim Verarbeiten von Verzeichnis %s" +msgid "Internal error, could not locate member %s" +msgstr "Interner Fehler, Bestandteil %s konnte nicht gefunden werden" -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Quellerweiterungsliste ist zu lang." +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Auswerten der »control«-Datei nicht möglich" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Fehler beim Schreiben der Kopfzeilen in die Inhaltsdatei" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Ungültige Archiv-Signatur" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Fehler beim Lesen der Archivdatei-Kopfzeilen" + +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid "Error processing contents %s" -msgstr "Fehler beim Verarbeiten der Inhalte %s" +msgid "Invalid archive member header %s" +msgstr "Ungültige Archivbestandteil-Kopfzeile %s" -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Aufruf: apt-ftparchive [optionen] befehl\n" -"Befehle: packages Binärpfad [Override-Datei [Pfadpräfix]]\n" -" sources Quellpfad [Override-Datei [Pfadpräfix]]\n" -" contents Pfad\n" -" release Pfad\n" -" generate Konfigurationsdatei [Gruppen]\n" -" clean Konfigurationsdatei\n" -"\n" -"apt-ftparchive erstellt Indexdateien für Debian-Archive. Es unterstützt " -"viele\n" -"verschiedene Arten der Erstellung, von vollautomatisch bis hin zu den\n" -"funktionalen Äquivalenten von dpkg-scanpackages und dpkg-scansources.\n" -"\n" -"apt-ftparchive erstellt Package-Dateien aus einem Baum von .debs. Die " -"Package-\n" -"Datei enthält den Inhalt aller Steuerfelder aus jedem Paket sowie einen " -"MD5-\n" -"Hashwert und die Dateigröße. Eine Override-Datei wird unterstützt, um Werte " -"für\n" -"Priorität und Bereich (Section) zu erzwingen.\n" -"\n" -"Auf ganz ähnliche Weise erstellt apt-ftparchive Sources-Dateien aus einem " -"Baum\n" -"von .dscs. Die Option --source-override kann benutzt werden, um eine " -"Override-\n" -"Datei für Quellen anzugeben.\n" -"\n" -"Die Befehle »packages« und »source« sollten von der Wurzel des Baums aus\n" -"aufgerufen werden. Binärpfad sollte auf die Basis der rekursiven Suche " -"zeigen\n" -"und Override-Datei sollte die Override-Flags enthalten. Pfadpräfix wird, so\n" -"vorhanden, jedem Dateinamen vorangestellt. Beispielaufruf im Debian-Archiv:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Optionen:\n" -" -h dieser Hilfe-Text\n" -" --md5 MD5-Hashes erzeugen\n" -" -s=? Override-Datei für Quellen\n" -" -q ruhig\n" -" -d=? optionale Zwischenspeicher-Datenbank auswählen\n" -" --no-delink Debug-Modus für Delinking aktivieren\n" -" --contents Inhaltsdatei erzeugen\n" -" -c=? diese Konfigurationsdatei lesen\n" -" -o=? eine beliebige Konfigurationsoption setzen" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Keine Auswahl traf zu" - -#: ftparchive/apt-ftparchive.cc:907 -#, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«." - -#: ftparchive/cachedb.cc:65 -#, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Datenbank wurde beschädigt, Datei umbenannt in %s.old" - -#: ftparchive/cachedb.cc:83 -#, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Datenbank ist veraltet; es wird versucht, %s zu erneuern." +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Ungültige Archivdatei-Kopfzeilen" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"Datenbankformat ist ungültig. Wenn Sie ein Upgrade (Paketaktualisierung) von " -"einer älteren apt-Version gemacht haben, entfernen Sie bitte die Datenbank " -"und erstellen Sie sie neu." +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Archiv ist zu kurz." -#: ftparchive/cachedb.cc:99 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Datenbankdatei %s kann nicht geöffnet werden: %s" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Archiv-Kopfzeilen konnten nicht gelesen werden." -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 -#, c-format -msgid "Failed to stat %s" -msgstr "%s mit »stat« abfragen fehlgeschlagen" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Pipes (Weiterleitungen) konnten nicht erzeugt werden." -#: ftparchive/cachedb.cc:332 -msgid "Failed to read .dsc" -msgstr "Lesen von .dsc fehlgeschlagen" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "gzip konnte nicht ausgeführt werden." -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Archiv hat keinen Steuerungsdatensatz." +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Beschädigtes Archiv" -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Unmöglich, einen Cursor zu bekommen" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv beschädigt" -#: ftparchive/writer.cc:91 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: Verzeichnis %s kann nicht gelesen werden.\n" +msgid "Unknown TAR header type %u, member %s" +msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s" -#: ftparchive/writer.cc:96 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "W: %s mit »stat« abfragen nicht möglich.\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "F: " - -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "W: " +msgid "Progress: [%3i%%]" +msgstr "Fortschritt: [%3i%%]" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "F: Fehler gehören zu Datei " +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "Ausführen von dpkg" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-pkg/init.cc:146 #, c-format -msgid "Failed to resolve %s" -msgstr "%s konnte nicht aufgelöst werden." +msgid "Packaging system '%s' is not supported" +msgstr "Paketierungssystem »%s« wird nicht unterstützt." -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Durchlaufen des Verzeichnisbaums fehlgeschlagen" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Bestimmung eines passenden Paketierungssystemtyps nicht möglich" -#: ftparchive/writer.cc:219 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Failed to open %s" -msgstr "Öffnen von %s fehlgeschlagen" +msgid "Wrote %i records.\n" +msgstr "Es wurden %i Datensätze geschrieben.\n" -#: ftparchive/writer.cc:278 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n" -#: ftparchive/writer.cc:286 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "Failed to readlink %s" -msgstr "readlink von %s fehlgeschlagen" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n" -#: ftparchive/writer.cc:290 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "Failed to unlink %s" -msgstr "Entfernen (unlink) von %s fehlgeschlagen" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "" +"Es wurden %i Datensätze mit %i fehlenden und %i nicht passenden Dateien " +"geschrieben.\n" -#: ftparchive/writer.cc:298 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen" +msgid "Can't find authentication record for: %s" +msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden für: %s" -#: ftparchive/writer.cc:308 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " DeLink-Limit von %sB erreicht\n" - -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Archiv hatte kein Feld »package«" +msgid "Hash mismatch for: %s" +msgstr "Hash-Summe stimmt nicht überein für: %s" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid " %s has no override entry\n" -msgstr " %s hat keinen Eintrag in der Override-Liste.\n" +msgid "The method driver %s could not be found." +msgstr "Der Treiber für Methode %s konnte nicht gefunden werden." -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 +#: apt-pkg/acquire-worker.cc:118 #, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " %s-Betreuer ist %s und nicht %s.\n" +msgid "Is the package %s installed?" +msgstr "Ist das Paket %s installiert?" -#: ftparchive/writer.cc:706 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid " %s has no source override entry\n" -msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n" +msgid "Method %s did not start correctly" +msgstr "Methode %s ist nicht korrekt gestartet." -#: ftparchive/writer.cc:710 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n" +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)." -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Speicheranforderung fehlgeschlagen" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "" +"Die Paketliste oder die Statusdatei konnte nicht eingelesen oder geöffnet " +"werden." -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "%s konnte nicht geöffnet werden." +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren." -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Missgestaltetes Override %s Zeile %llu (%s)" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Die Liste der Quellen konnte nicht gelesen werden." -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Override-Datei %s konnte nicht gelesen werden." +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Leerer Paketzwischenspeicher" -#: ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Missgestaltetes Override %s Zeile %llu #1" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Die Paketzwischenspeicher-Datei ist beschädigt." -#: ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Missgestaltetes Override %s Zeile %llu #2" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "" +"Die Paketzwischenspeicher-Datei liegt in einer inkompatiblen Version vor." -#: ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Missgestaltetes Override %s Zeile %llu #3" +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" +msgstr "Die Paketzwischenspeicher-Datei ist beschädigt, sie ist zu klein." -#: ftparchive/multicompress.cc:73 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Unbekannter Komprimierungsalgorithmus »%s«" +msgid "This APT does not support the versioning system '%s'" +msgstr "Das Versionssystem »%s« wird durch dieses APT nicht unterstützt." -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Komprimierte Ausgabe %s benötigt einen Komprimierungssatz." +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Der Paketzwischenspeicher wurde für eine andere Architektur aufgebaut." -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "FILE* konnte nicht erzeugt werden." +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Hängt ab von" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Fork fehlgeschlagen" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Hängt ab von (vorher)" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Komprimierungs-Kindprozess" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Schlägt vor" -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "Interner Fehler, %s konnte nicht erzeugt werden." +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Empfiehlt" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "E/A zu Kindprozess/Datei fehlgeschlagen" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Kollidiert mit" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Ersetzt" -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "Problem beim Entfernen (unlink) von %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Löst ab" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "%s konnte nicht in %s umbenannt werden." +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Beschädigt" -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Aufruf: apt-internal-solver\n" -"\n" -"apt-internal-solver ist eine Schnittstelle, um den derzeitigen internen\n" -"Problemlöser für die APT-Familie wie einen externen zu verwenden, zwecks\n" -"Fehlersuche oder ähnlichem.\n" -"\n" -"Optionen:\n" -" -h dieser Hilfetext\n" -" -q protokollierbare Ausgabe – keine Fortschrittsanzeige\n" -" -c=? Diese Konfigurationsdatei benutzen\n" -" -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Wertet auf" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Unbekannter Paketeintrag!" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "wichtig" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Aufruf: apt-sortpkgs [optionen] datei1 [datei2 ...]\n" -"\n" -"apt-sortpkgs ist ein einfaches Werkzeug, um Paketdateien zu sortieren. Die\n" -"Option -s wird benutzt, um anzuzeigen, um was für eine Datei es sich " -"handelt.\n" -"\n" -"Optionen:\n" -" -h Dieser Hilfetext\n" -" -s Quelldateisortierung benutzen\n" -" -c=? Diese Konfigurationsdatei lesen\n" -" -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "erforderlich" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" -msgstr "Datei %s konnte nicht geschrieben werden." +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "standard" -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "Datei %s konnte nicht geschlossen werden." +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "optional" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "Der Pfad %s ist zu lang." +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "extra" -#: apt-inst/extract.cc:132 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Unpacking %s more than once" -msgstr "%s mehr als einmal entpackt" +msgid "Index file type '%s' is not supported" +msgstr "Indexdateityp »%s« wird nicht unterstützt." -#: apt-inst/extract.cc:142 +#: apt-pkg/sourcelist.cc:127 #, c-format -msgid "The directory %s is diverted" -msgstr "Das Verzeichnis %s ist umgeleitet." +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Missgestalteter Absatz %u in Quellliste %s (»URI parse«)" -#: apt-inst/extract.cc:152 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Schreibversuch vom Paket auf das Umleitungsziel %s/%s" +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] nicht auswertbar)" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Der Umleitungspfad ist zu lang." +#: 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-inst/extract.cc:249 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Das Verzeichnis %s wird durch ein Nicht-Verzeichnis ersetzt." +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-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Knoten konnte nicht in seinem Hash gefunden werden." +#: 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-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Der Pfad ist zu lang." +#: 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-inst/extract.cc:421 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Pakettreffer ohne Version für %s wird überschrieben." +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" -#: apt-inst/extract.cc:438 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben." +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" -#: apt-inst/extract.cc:498 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Unable to stat %s" -msgstr "%s mit »stat« abfragen nicht möglich" - -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "»DropNode« auf noch verknüpften Knoten aufgerufen" - -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Hash-Element konnte nicht gefunden werden!" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Umleitung konnte nicht reserviert werden." +#: 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-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Interner Fehler in »AddDiversion«" +#: 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-inst/filelist.cc:477 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Es wird versucht, eine Umleitung zu überschreiben: %s -> %s und %s/%s" +msgid "Opening %s" +msgstr "%s wird geöffnet." -#: apt-inst/filelist.cc:506 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Doppelte Hinzufügung der Umleitung %s -> %s" +msgid "Line %u too long in source list %s." +msgstr "Zeile %u in Quellliste %s zu lang." -#: apt-inst/filelist.cc:549 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Doppelte Konfigurationsdatei %s/%s" +msgid "Malformed line %u in source list %s (type)" +msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Ungültige Archiv-Signatur" +#: 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-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Fehler beim Lesen der Archivdatei-Kopfzeilen" +#: 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-inst/contrib/arfile.cc:96 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 #, c-format -msgid "Invalid archive member header %s" -msgstr "Ungültige Archivbestandteil-Kopfzeile %s" +msgid "Clean of %s is not supported" +msgstr "Leeren von %s wird nicht unterstützt." -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Ungültige Archivdatei-Kopfzeilen" +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." +msgstr "%s mit stat abfragen nicht möglich" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Archiv ist zu kurz." +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem." -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Archiv-Kopfzeilen konnten nicht gelesen werden." +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Fehler aufgetreten beim Verarbeiten von %s (%s%d)" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Pipes (Weiterleitungen) konnten nicht erzeugt werden." +#: apt-pkg/pkgcachegen.cc:257 +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-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "gzip konnte nicht ausgeführt werden." +#: apt-pkg/pkgcachegen.cc:260 +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-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Beschädigtes Archiv" +#: apt-pkg/pkgcachegen.cc:263 +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-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv beschädigt" +#: apt-pkg/pkgcachegen.cc:266 +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-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s" +msgid "Package %s %s was not found while processing file dependencies" +msgstr "" +"Paket %s %s wurde beim Verarbeiten der Dateiabhängigkeiten nicht gefunden." -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Dies ist kein gültiges DEB-Archiv, da es »%s« nicht enthält." +msgid "Couldn't stat source package list %s" +msgstr "Die Quellpaket-Liste %s konnte nicht mit »stat« abgefragt werden" -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "Interner Fehler, Bestandteil %s konnte nicht gefunden werden" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Paketlisten werden gelesen" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Auswerten der »control«-Datei nicht möglich" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "List directory %spartial is missing." -msgstr "Listenverzeichnis %spartial fehlt." +msgid "Unable to write to %s" +msgstr "Schreiben nach %s nicht möglich" -#: apt-pkg/acquire.cc:91 -#, c-format -msgid "Archives directory %spartial is missing." -msgstr "Archivverzeichnis %spartial fehlt." +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers" -#: apt-pkg/acquire.cc:99 -#, c-format -msgid "Unable to lock directory %s" -msgstr "Das Verzeichnis %s kann nicht gesperrt werden." +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "Szenario an Problemlöser senden" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, c-format -msgid "Clean of %s is not supported" -msgstr "Leeren von %s wird nicht unterstützt." +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "Anfrage an Problemlöser senden" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Holen der Datei %li von %li (noch %s)" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "Vorbereiten, eine Lösung zu erhalten" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "Holen der Datei %li von %li" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" +"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen." + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "Externen Problemlöser ausführen" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2554,7 +2469,7 @@ msgstr "Größe stimmt nicht überein" msgid "Invalid file format" msgstr "Ungültiges Dateiformat" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2563,17 +2478,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:1589 +#: apt-pkg/acquire-item.cc:1656 #, 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:1631 +#: apt-pkg/acquire-item.cc:1698 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:1669 +#: apt-pkg/acquire-item.cc:1736 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2582,12 +2497,12 @@ 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, 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:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2598,12 +2513,12 @@ msgstr "" "GPG-Fehler: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-Fehler: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2613,144 +2528,115 @@ msgstr "" "Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender " "Architektur)." -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/acquire-item.cc:1992 #, 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:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Der Treiber für Methode %s konnte nicht gefunden werden." +msgid "Vendor block %s contains no fingerprint" +msgstr "Herstellerblock %s enthält keinen Fingerabdruck." -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Is the package %s installed?" -msgstr "Ist das Paket %s installiert?" +msgid "List directory %spartial is missing." +msgstr "Listenverzeichnis %spartial fehlt." -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Method %s did not start correctly" -msgstr "Methode %s ist nicht korrekt gestartet." +msgid "Archives directory %spartial is missing." +msgstr "Archivverzeichnis %spartial fehlt." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 #, 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)." +msgid "Unable to lock directory %s" +msgstr "Das Verzeichnis %s kann nicht gesperrt werden." -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Holen der Datei %li von %li (noch %s)" + +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Holen der Datei %li von %li" + +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" msgstr "" -"Das Paket %s muss neu installiert werden, es kann jedoch kein Archiv dafür " -"gefunden werden." +"Sie müssen einige »source«-URIs für Quellpakete in die sources.list-Datei " +"eintragen." -#: apt-pkg/algorithms.cc:1086 +#: apt-pkg/policy.cc:83 +#, c-format msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -"Fehler: Unterbrechungen durch pkgProblemResolver::Resolve hervorgerufen; " -"dies könnte durch zurückgehaltene Pakete verursacht worden sein." +"Der Wert »%s« ist für APT::Default-Release ungültig, da solch eine " +"Veröffentlichung in den Paketquellen nicht verfügbar ist." -#: apt-pkg/algorithms.cc:1088 -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/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." -msgstr "" -"Die Paketliste oder die Statusdatei konnte nicht eingelesen oder geöffnet " -"werden." - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren." - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Die Liste der Quellen konnte nicht gelesen werden." - -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden." - -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Version »%s« für »%s« konnte nicht gefunden werden." - -#: apt-pkg/cacheset.cc:603 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "Task »%s« konnte nicht gefunden werden." - -#: apt-pkg/cacheset.cc:609 +#: apt-pkg/policy.cc:422 #, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden." +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "" +"Ungültiger Eintrag in Einstellungsdatei %s, keine »Package«-Kopfzeile(n)" -#: apt-pkg/cacheset.cc:615 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Mittels des Musters »%s« konnte kein Paket gefunden werden." +msgid "Did not understand pin type %s" +msgstr "Pinning-Typ %s kann nicht interpretiert werden." -#: apt-pkg/cacheset.cc:626 -#, 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/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Keine Priorität (oder Null) für Pin angegeben" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -"Es kann weder eine installierte Version noch ein Installationskandidat von " -"Paket »%s« ausgewählt werden, da beide nicht existieren." +"»%s« konnte nicht unmittelbar konfiguriert werden. Lesen Sie »man 5 apt." +"conf« unter APT::Immediate-Configure bezüglich weiterer Details. (%d)" -#: apt-pkg/cacheset.cc:647 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, 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." +msgid "Could not configure '%s'. " +msgstr "»%s« konnte nicht konfiguriert werden. " -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +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 "" -"Es kann kein Installationskandidat von Paket »%s« ausgewählt werden, da kein " -"solcher existiert." +"Dieser Installationslauf erfordert, dass vorübergehend das essentielle Paket " +"%s aufgrund einer Konflikt-/Vor-Abhängigkeits-Schleife entfernt wird. Das " +"ist oft schlimm, aber wenn Sie es wirklich tun wollen, aktivieren Sie bitte " +"die Option APT::Force-LoopBreak." -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +#: 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 "" -"Die installierte Version von Paket »%s« kann nicht ausgewählt werden, da es " -"nicht installiert ist." - -#: 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." +"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" @@ -2829,10 +2715,27 @@ msgstr "Schreiben der neuen Quellliste\n" msgid "Source list entries for this disc are:\n" msgstr "Quelllisteneinträge für dieses Medium sind:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "%s mit stat abfragen nicht möglich" +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Das Paket %s muss neu installiert werden, es kann jedoch kein Archiv dafür " +"gefunden werden." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Fehler: Unterbrechungen durch pkgProblemResolver::Resolve hervorgerufen; " +"dies könnte durch zurückgehaltene Pakete verursacht worden sein." + +#: apt-pkg/algorithms.cc:1088 +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/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2860,58 +2763,77 @@ msgstr "StateFile %s konnte nicht geöffnet werden." msgid "Failed to write temporary StateFile %s" msgstr "Temporäres StateFile %s konnte nicht geschrieben werden." -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "Szenario an Problemlöser senden" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)." -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "Anfrage an Problemlöser senden" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)." -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "Vorbereiten, eine Lösung zu erhalten" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden." -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" -"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen." +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Version »%s« für »%s« konnte nicht gefunden werden." -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "Externen Problemlöser ausführen" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Task »%s« konnte nicht gefunden werden." -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "Es wurden %i Datensätze geschrieben.\n" +msgid "Couldn't find any package by regex '%s'" +msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden." -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n" +msgid "Couldn't find any package by glob '%s'" +msgstr "Mittels des Musters »%s« konnte kein Paket gefunden werden." -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n" +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/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" -"Es wurden %i Datensätze mit %i fehlenden und %i nicht passenden Dateien " -"geschrieben.\n" +"Es kann weder eine installierte Version noch ein Installationskandidat von " +"Paket »%s« ausgewählt werden, da beide nicht existieren." -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden für: %s" +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/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Hash-Summe stimmt nicht überein für: %s" +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:663 +#, 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/indexrecords.cc:78 #, c-format @@ -2938,332 +2860,232 @@ msgstr "Ungültiger »Valid-Until«-Eintrag in Release-Datei %s" msgid "Invalid 'Date' entry in Release file %s" msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Paketierungssystem »%s« wird nicht unterstützt." - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Bestimmung eines passenden Paketierungssystemtyps nicht möglich" +msgid "%lid %lih %limin %lis" +msgstr "%li d %li h %li min %li s" -#: apt-pkg/install-progress.cc:57 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Progress: [%3i%%]" -msgstr "Fortschritt: [%3i%%]" - -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "Ausführen von dpkg" +msgid "%lih %limin %lis" +msgstr "%li h %li min %li s" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" -"»%s« konnte nicht unmittelbar konfiguriert werden. Lesen Sie »man 5 apt." -"conf« unter APT::Immediate-Configure bezüglich weiterer Details. (%d)" +msgid "%limin %lis" +msgstr "%li min %li s" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "Could not configure '%s'. " -msgstr "»%s« konnte nicht konfiguriert werden. " +msgid "%lis" +msgstr "%li s" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/strutl.cc:1258 #, 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 "" -"Dieser Installationslauf erfordert, dass vorübergehend das essentielle Paket " -"%s aufgrund einer Konflikt-/Vor-Abhängigkeits-Schleife entfernt wird. Das " -"ist oft schlimm, aber wenn Sie es wirklich tun wollen, aktivieren Sie bitte " -"die Option APT::Force-LoopBreak." - -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Leerer Paketzwischenspeicher" - -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Die Paketzwischenspeicher-Datei ist beschädigt." - -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "" -"Die Paketzwischenspeicher-Datei liegt in einer inkompatiblen Version vor." - -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" -msgstr "Die Paketzwischenspeicher-Datei ist beschädigt, sie ist zu klein." +msgid "Selection %s not found" +msgstr "Auswahl %s nicht gefunden" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:190 #, 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:179 -msgid "The package cache was built for a different architecture" -msgstr "Der Paketzwischenspeicher wurde für eine andere Architektur aufgebaut." - -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Hängt ab von" - -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Hängt ab von (vorher)" - -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Schlägt vor" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Empfiehlt" - -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Kollidiert mit" - -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Ersetzt" - -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Löst ab" - -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Beschädigt" - -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Wertet auf" - -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "wichtig" - -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "erforderlich" - -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "standard" - -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "optional" - -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "extra" +msgid "Not using locking for read only lock file %s" +msgstr "Es wird keine Sperre für schreibgeschützte Sperrdatei %s verwendet." -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem." +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "Sperrdatei %s konnte nicht geöffnet werden." -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/fileutl.cc:218 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Fehler aufgetreten beim Verarbeiten von %s (%s%d)" +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Es wird keine Sperre für per NFS eingebundene Sperrdatei %s verwendet." -#: apt-pkg/pkgcachegen.cc:257 -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/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Konnte Sperre %s nicht bekommen" -#: apt-pkg/pkgcachegen.cc:260 -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/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "Dateiliste kann nicht erstellt werden, da »%s« kein Verzeichnis ist." -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -"Na so was, Sie haben die Anzahl an Beschreibungen überschritten, mit denen " -"diese APT-Version umgehen kann." +"»%s« in Verzeichnis »%s« wird ignoriert, da es keine reguläre Datei ist." -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -"Na so was, Sie haben die Anzahl an Abhängigkeiten überschritten, mit denen " -"diese APT-Version umgehen kann." +"Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie keine Dateinamen-" +"Erweiterung hat." -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/fileutl.cc:421 #, c-format -msgid "Package %s %s was not found while processing file dependencies" +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -"Paket %s %s wurde beim Verarbeiten der Dateiabhängigkeiten nicht gefunden." +"Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie eine ungültige " +"Dateinamen-Erweiterung hat." -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/fileutl.cc:824 #, 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:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Paketlisten werden gelesen" +msgid "Sub-process %s received a segmentation fault." +msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen." -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "Unterprozess %s hat das Signal %u empfangen." -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Indexdateityp »%s« wird nicht unterstützt." +msgid "Sub-process %s exited unexpectedly" +msgstr "Unterprozess %s unerwartet beendet" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/fileutl.cc:913 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" -msgstr "" -"Der Wert »%s« ist für APT::Default-Release ungültig, da solch eine " -"Veröffentlichung in den Paketquellen nicht verfügbar ist." +msgid "Problem closing the gzip file %s" +msgstr "Problem beim Schließen der gzip-Datei %s" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/fileutl.cc:1101 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "" -"Ungültiger Eintrag in Einstellungsdatei %s, keine »Package«-Kopfzeile(n)" +msgid "Could not open file %s" +msgstr "Datei %s konnte nicht geöffnet werden." -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 #, c-format -msgid "Did not understand pin type %s" -msgstr "Pinning-Typ %s kann nicht interpretiert werden." +msgid "Could not open file descriptor %d" +msgstr "Datei-Deskriptor %d konnte nicht geöffnet werden." -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Keine Priorität (oder Null) für Pin angegeben" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "" +"Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden." -#: 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/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Fehler beim Ausführen von Komprimierer " -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] nicht auswertbar)" +msgid "read, still have %llu to read but none left" +msgstr "" +"Lesevorgang: es verbleiben noch %llu zu lesen, jedoch ist nichts mehr übrig." -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] zu kurz)" +msgid "write, still have %llu to write but couldn't" +msgstr "" +"Schreibvorgang: es verbleiben noch %llu zu schreiben, Schreiben ist jedoch " +"nicht möglich." -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/fileutl.cc:1915 #, 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)" +msgid "Problem closing the file %s" +msgstr "Problem beim Schließen der Datei %s" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/fileutl.cc:1927 #, 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)" +msgid "Problem renaming the file %s to %s" +msgstr "Problem beim Umbenennen der Datei %s nach %s" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/fileutl.cc:1938 #, 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)" +msgid "Problem unlinking the file %s" +msgstr "Problem beim Entfernen (unlink) der Datei %s" -#: 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/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Problem beim Synchronisieren der Datei" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" +msgid "%c%s... Error!" +msgstr "%c%s... Fehler!" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" +msgid "%c%s... Done" +msgstr "%c%s... Fertig" -#: 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/contrib/progress.cc:181 +msgid "..." +msgstr "..." -#: apt-pkg/sourcelist.cc:224 +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 #, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)" +msgid "%c%s... %u%%" +msgstr "%c%s... %u%%" -#: apt-pkg/sourcelist.cc:335 -#, c-format -msgid "Opening %s" -msgstr "%s wird geöffnet." +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Eine leere Datei kann nicht mit mmap abgebildet werden." -#: apt-pkg/sourcelist.cc:371 +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Datei-Deskriptor %i konnte nicht dupliziert werden." -#: apt-pkg/sourcelist.cc:375 +#: apt-pkg/contrib/mmap.cc:119 #, 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 "Couldn't make mmap of %llu bytes" +msgstr "mmap mit %llu Byte Größe konnte nicht erzeugt werden." -#: 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/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "mmap konnte nicht geschlossen werden." -#: apt-pkg/srcrecords.cc:52 -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/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "mmap konnte nicht synchronisiert werden." -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)." +msgid "Couldn't make mmap of %lu bytes" +msgstr "mmap mit %lu Byte Größe konnte nicht erzeugt werden." -#: apt-pkg/tagfile.cc:237 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)." +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Datei konnte nicht eingekürzt werden." -#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 +#: apt-pkg/contrib/mmap.cc:341 +#, c-format msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"Einige Indexdateien konnten nicht heruntergeladen werden. Sie wurden " -"ignoriert oder alte an ihrer Stelle benutzt." +"Nicht genügend Platz für »Dynamic MMap«. Bitte erhöhen Sie den Wert von APT::" +"Cache-Start. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Herstellerblock %s enthält keinen Fingerabdruck." +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" +"Unmöglich, die Größe der MMap zu erhöhen, da das Limit von %lu Byte bereits " +"erreicht ist." + +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Unmöglich, die Größe der MMap zu erhöhen, da das automatische Anwachsen der " +"MMap vom Benutzer deaktiviert ist." #: apt-pkg/contrib/cdromutl.cc:65 #, c-format @@ -3274,53 +3096,6 @@ 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/cmndline.cc:121 -#, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "Befehlszeilenoption %s konnte nicht ausgewertet werden." - -#: apt-pkg/contrib/cmndline.cc:168 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "Befehlszeilenoption %s ist nicht Bool'sch." - -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "Option %s erfordert ein Argument." - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "Option %s: Konfigurationswertspezifikation benötigt ein »=«." - -#: apt-pkg/contrib/cmndline.cc:278 -#, 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:309 -#, 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:341 -#, 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:391 -#, c-format -msgid "Invalid operation %s" -msgstr "Ungültige Operation %s" - #: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" @@ -3378,416 +3153,639 @@ msgstr "" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfehler %s:%u: Zusätzlicher Unsinn am Dateiende" -#: apt-pkg/contrib/fileutl.cc:190 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Es wird keine Sperre für schreibgeschützte Sperrdatei %s verwendet." +msgid "No keyring installed in %s." +msgstr "Kein Schlüsselring in %s installiert" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Could not open lock file %s" -msgstr "Sperrdatei %s konnte nicht geöffnet werden." +msgid "Command line option '%c' [from %s] is not known." +msgstr "Befehlszeilenoption »%c« [aus %s] ist nicht bekannt." -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Es wird keine Sperre für per NFS eingebundene Sperrdatei %s verwendet." +msgid "Command line option %s is not understood" +msgstr "Befehlszeilenoption %s konnte nicht ausgewertet werden." -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Could not get lock %s" -msgstr "Konnte Sperre %s nicht bekommen" +msgid "Command line option %s is not boolean" +msgstr "Befehlszeilenoption %s ist nicht Bool'sch." -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "Dateiliste kann nicht erstellt werden, da »%s« kein Verzeichnis ist." +msgid "Option %s requires an argument." +msgstr "Option %s erfordert ein Argument." -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" -"»%s« in Verzeichnis »%s« wird ignoriert, da es keine reguläre Datei ist." +msgid "Option %s: Configuration item specification must have an =." +msgstr "Option %s: Konfigurationswertspezifikation benötigt ein »=«." -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" -"Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie keine Dateinamen-" -"Erweiterung hat." +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht »%s«." -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" -"Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie eine ungültige " -"Dateinamen-Erweiterung hat." +msgid "Option '%s' is too long" +msgstr "Option »%s« ist zu lang." -#: apt-pkg/contrib/fileutl.cc:824 +# Check for boolean; -1 is unspecified, 0 is yes 1 is no +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen." +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/fileutl.cc:826 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s received signal %u." -msgstr "Unterprozess %s hat das Signal %u empfangen." +msgid "Invalid operation %s" +msgstr "Ungültige Operation %s" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)" +msgid "Installing %s" +msgstr "%s wird installiert." -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Unterprozess %s unerwartet beendet" +msgid "Configuring %s" +msgstr "%s wird konfiguriert." -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problem beim Schließen der gzip-Datei %s" +msgid "Removing %s" +msgstr "%s wird entfernt." -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Could not open file %s" -msgstr "Datei %s konnte nicht geöffnet werden." +msgid "Completely removing %s" +msgstr "%s wird vollständig entfernt." -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Could not open file descriptor %d" -msgstr "Datei-Deskriptor %d konnte nicht geöffnet werden." +msgid "Noting disappearance of %s" +msgstr "Verschwinden von %s festgestellt" -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "" -"Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden." +#: apt-pkg/deb/dpkgpm.cc:115 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Aufruf des Nach-Installations-Triggers %s" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Fehler beim Ausführen von Komprimierer " +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 +#, c-format +msgid "Directory '%s' missing" +msgstr "Verzeichnis »%s« fehlt" -#: apt-pkg/contrib/fileutl.cc:1514 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, c-format -msgid "read, still have %llu to read but none left" -msgstr "" -"Lesevorgang: es verbleiben noch %llu zu lesen, jedoch ist nichts mehr übrig." +msgid "Could not open file '%s'" +msgstr "Datei »%s« konnte nicht geöffnet werden." -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "" -"Schreibvorgang: es verbleiben noch %llu zu schreiben, Schreiben ist jedoch " -"nicht möglich." +msgid "Preparing %s" +msgstr "%s wird vorbereitet." -#: apt-pkg/contrib/fileutl.cc:1915 +#: apt-pkg/deb/dpkgpm.cc:1008 #, c-format -msgid "Problem closing the file %s" -msgstr "Problem beim Schließen der Datei %s" +msgid "Unpacking %s" +msgstr "%s wird entpackt." -#: apt-pkg/contrib/fileutl.cc:1927 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Problem beim Umbenennen der Datei %s nach %s" +msgid "Preparing to configure %s" +msgstr "Konfiguration von %s wird vorbereitet." -#: apt-pkg/contrib/fileutl.cc:1938 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Problem unlinking the file %s" -msgstr "Problem beim Entfernen (unlink) der Datei %s" +msgid "Installed %s" +msgstr "%s installiert" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Problem beim Synchronisieren der Datei" +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "Entfernen von %s wird vorbereitet." -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "No keyring installed in %s." -msgstr "Kein Schlüsselring in %s installiert" +msgid "Removed %s" +msgstr "%s entfernt" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Eine leere Datei kann nicht mit mmap abgebildet werden." +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Vollständiges Entfernen von %s wird vorbereitet." -#: apt-pkg/contrib/mmap.cc:111 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Datei-Deskriptor %i konnte nicht dupliziert werden." +msgid "Completely removed %s" +msgstr "%s vollständig entfernt" -#: apt-pkg/contrib/mmap.cc:119 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "mmap mit %llu Byte Größe konnte nicht erzeugt werden." +msgid "Can not write log (%s)" +msgstr "Schreiben des Protokolls nicht möglich (%s)" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "mmap konnte nicht geschlossen werden." +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "Ist /dev/pts eingebunden?" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "mmap konnte nicht synchronisiert werden." +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte." -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "mmap mit %lu Byte Größe konnte nicht erzeugt werden." +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "" +"Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits " +"erreicht ist." -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Datei konnte nicht eingekürzt werden." +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert" -#: apt-pkg/contrib/mmap.cc:341 +#: apt-pkg/deb/dpkgpm.cc:1726 +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:1732 +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:1739 +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:1746 apt-pkg/deb/dpkgpm.cc:1752 +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:1774 +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 "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"Unable to lock the administration directory (%s), is another process using " +"it?" msgstr "" -"Nicht genügend Platz für »Dynamic MMap«. Bitte erhöhen Sie den Wert von APT::" -"Cache-Start. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)" +"Sperren des Administrationsverzeichnisses (%s) nicht möglich, wird es von " +"einem anderen Prozess verwendet?" -#: apt-pkg/contrib/mmap.cc:446 +#: 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 "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +"dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -"Unmöglich, die Größe der MMap zu erhöhen, da das Limit von %lu Byte bereits " -"erreicht ist." +"Der dpkg-Prozess wurde unterbrochen; Sie müssen manuell »%s« ausführen, um " +"das Problem zu beheben." -#: apt-pkg/contrib/mmap.cc:449 +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "Nicht gesperrt" + +#: cmdline/apt-extracttemplates.cc:224 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Unmöglich, die Größe der MMap zu erhöhen, da das automatische Anwachsen der " -"MMap vom Benutzer deaktiviert ist." +"Aufruf: apt-extracttemplates datei1 [datei2 ...]\n" +"\n" +"apt-extracttemplates ist ein Werkzeug, um Informationen zu Konfiguration\n" +"und Vorlagen (Templates) aus Debian-Paketen zu extrahieren.\n" +"\n" +"Optionen:\n" +" -h Dieser Hilfetext\n" +" -t Das temporäre Verzeichnis setzen\n" +" -c=? Diese Konfigurationsdatei lesen\n" +" -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" -#: apt-pkg/contrib/progress.cc:148 +#: cmdline/apt-extracttemplates.cc:254 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Fehler!" +msgid "Unable to mkstemp %s" +msgstr "mkstemp %s nicht möglich" -#: apt-pkg/contrib/progress.cc:150 +#: cmdline/apt-extracttemplates.cc:300 +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 +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 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Fertig" +msgid "Error processing directory %s" +msgstr "Fehler beim Verarbeiten von Verzeichnis %s" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "..." +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Quellerweiterungsliste ist zu lang." -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Fehler beim Schreiben der Kopfzeilen in die Inhaltsdatei" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... %u%%" +msgid "Error processing contents %s" +msgstr "Fehler beim Verarbeiten der Inhalte %s" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Aufruf: apt-ftparchive [optionen] befehl\n" +"Befehle: packages Binärpfad [Override-Datei [Pfadpräfix]]\n" +" sources Quellpfad [Override-Datei [Pfadpräfix]]\n" +" contents Pfad\n" +" release Pfad\n" +" generate Konfigurationsdatei [Gruppen]\n" +" clean Konfigurationsdatei\n" +"\n" +"apt-ftparchive erstellt Indexdateien für Debian-Archive. Es unterstützt " +"viele\n" +"verschiedene Arten der Erstellung, von vollautomatisch bis hin zu den\n" +"funktionalen Äquivalenten von dpkg-scanpackages und dpkg-scansources.\n" +"\n" +"apt-ftparchive erstellt Package-Dateien aus einem Baum von .debs. Die " +"Package-\n" +"Datei enthält den Inhalt aller Steuerfelder aus jedem Paket sowie einen " +"MD5-\n" +"Hashwert und die Dateigröße. Eine Override-Datei wird unterstützt, um Werte " +"für\n" +"Priorität und Bereich (Section) zu erzwingen.\n" +"\n" +"Auf ganz ähnliche Weise erstellt apt-ftparchive Sources-Dateien aus einem " +"Baum\n" +"von .dscs. Die Option --source-override kann benutzt werden, um eine " +"Override-\n" +"Datei für Quellen anzugeben.\n" +"\n" +"Die Befehle »packages« und »source« sollten von der Wurzel des Baums aus\n" +"aufgerufen werden. Binärpfad sollte auf die Basis der rekursiven Suche " +"zeigen\n" +"und Override-Datei sollte die Override-Flags enthalten. Pfadpräfix wird, so\n" +"vorhanden, jedem Dateinamen vorangestellt. Beispielaufruf im Debian-Archiv:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Optionen:\n" +" -h dieser Hilfe-Text\n" +" --md5 MD5-Hashes erzeugen\n" +" -s=? Override-Datei für Quellen\n" +" -q ruhig\n" +" -d=? optionale Zwischenspeicher-Datenbank auswählen\n" +" --no-delink Debug-Modus für Delinking aktivieren\n" +" --contents Inhaltsdatei erzeugen\n" +" -c=? diese Konfigurationsdatei lesen\n" +" -o=? eine beliebige Konfigurationsoption setzen" + +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Keine Auswahl traf zu" + +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%li d %li h %li min %li s" +msgid "Some files are missing in the package file group `%s'" +msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«." -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "%lih %limin %lis" -msgstr "%li h %li min %li s" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Datenbank wurde beschädigt, Datei umbenannt in %s.old" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "Datenbank ist veraltet; es wird versucht, %s zu erneuern." + +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"Datenbankformat ist ungültig. Wenn Sie ein Upgrade (Paketaktualisierung) von " +"einer älteren apt-Version gemacht haben, entfernen Sie bitte die Datenbank " +"und erstellen Sie sie neu." + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Datenbankdatei %s kann nicht geöffnet werden: %s" + +#: ftparchive/cachedb.cc:332 +msgid "Failed to read .dsc" +msgstr "Lesen von .dsc fehlgeschlagen" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Archiv hat keinen Steuerungsdatensatz." + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Unmöglich, einen Cursor zu bekommen" + +#: ftparchive/writer.cc:91 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "W: Verzeichnis %s kann nicht gelesen werden.\n" + +#: ftparchive/writer.cc:96 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "W: %s mit »stat« abfragen nicht möglich.\n" + +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "F: " + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "W: " -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 -#, c-format -msgid "%limin %lis" -msgstr "%li min %li s" +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "F: Fehler gehören zu Datei " -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%lis" -msgstr "%li s" +msgid "Failed to resolve %s" +msgstr "%s konnte nicht aufgelöst werden." -#: apt-pkg/contrib/strutl.cc:1258 -#, c-format -msgid "Selection %s not found" -msgstr "Auswahl %s nicht gefunden" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Durchlaufen des Verzeichnisbaums fehlgeschlagen" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:219 #, 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 "Failed to open %s" +msgstr "Öffnen von %s fehlgeschlagen" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:278 #, 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 " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:286 #, 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 "Failed to readlink %s" +msgstr "readlink von %s fehlgeschlagen" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:290 #, c-format -msgid "Installing %s" -msgstr "%s wird installiert." +msgid "Failed to unlink %s" +msgstr "Entfernen (unlink) von %s fehlgeschlagen" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:298 #, c-format -msgid "Configuring %s" -msgstr "%s wird konfiguriert." +msgid "*** Failed to link %s to %s" +msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:308 #, c-format -msgid "Removing %s" -msgstr "%s wird entfernt." +msgid " DeLink limit of %sB hit.\n" +msgstr " DeLink-Limit von %sB erreicht\n" -#: apt-pkg/deb/dpkgpm.cc:98 -#, c-format -msgid "Completely removing %s" -msgstr "%s wird vollständig entfernt." +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Archiv hatte kein Feld »package«" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Noting disappearance of %s" -msgstr "Verschwinden von %s festgestellt" +msgid " %s has no override entry\n" +msgstr " %s hat keinen Eintrag in der Override-Liste.\n" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Aufruf des Nach-Installations-Triggers %s" +msgid " %s maintainer is %s not %s\n" +msgstr " %s-Betreuer ist %s und nicht %s.\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:706 #, c-format -msgid "Directory '%s' missing" -msgstr "Verzeichnis »%s« fehlt" +msgid " %s has no source override entry\n" +msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:710 #, c-format -msgid "Could not open file '%s'" -msgstr "Datei »%s« konnte nicht geöffnet werden." +msgid " %s has no binary override entry either\n" +msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n" -#: apt-pkg/deb/dpkgpm.cc:992 -#, c-format -msgid "Preparing %s" -msgstr "%s wird vorbereitet." +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Speicheranforderung fehlgeschlagen" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Unpacking %s" -msgstr "%s wird entpackt." +msgid "Unable to open %s" +msgstr "%s konnte nicht geöffnet werden." -#: apt-pkg/deb/dpkgpm.cc:998 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 #, c-format -msgid "Preparing to configure %s" -msgstr "Konfiguration von %s wird vorbereitet." +msgid "Malformed override %s line %llu (%s)" +msgstr "Missgestaltetes Override %s Zeile %llu (%s)" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Installed %s" -msgstr "%s installiert" +msgid "Failed to read the override file %s" +msgstr "Override-Datei %s konnte nicht gelesen werden." -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:166 #, c-format -msgid "Preparing for removal of %s" -msgstr "Entfernen von %s wird vorbereitet." +msgid "Malformed override %s line %llu #1" +msgstr "Missgestaltetes Override %s Zeile %llu #1" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:178 #, c-format -msgid "Removed %s" -msgstr "%s entfernt" +msgid "Malformed override %s line %llu #2" +msgstr "Missgestaltetes Override %s Zeile %llu #2" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:191 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Vollständiges Entfernen von %s wird vorbereitet." +msgid "Malformed override %s line %llu #3" +msgstr "Missgestaltetes Override %s Zeile %llu #3" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Completely removed %s" -msgstr "%s vollständig entfernt" +msgid "Unknown compression algorithm '%s'" +msgstr "Unbekannter Komprimierungsalgorithmus »%s«" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/multicompress.cc:103 #, c-format -msgid "Can not write log (%s)" -msgstr "Schreiben des Protokolls nicht möglich (%s)" +msgid "Compressed output %s needs a compression set" +msgstr "Komprimierte Ausgabe %s benötigt einen Komprimierungssatz." -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "Ist /dev/pts eingebunden?" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "FILE* konnte nicht erzeugt werden." -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "Ist stdout ein Terminal?" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Fork fehlgeschlagen" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte." +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Komprimierungs-Kindprozess" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" -"Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits " -"erreicht ist." +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Interner Fehler, %s konnte nicht erzeugt werden." -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "E/A zu Kindprozess/Datei fehlgeschlagen" -#: apt-pkg/deb/dpkgpm.cc:1694 -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." +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen" -#: apt-pkg/deb/dpkgpm.cc:1700 -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." +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Problem beim Entfernen (unlink) von %s" -#: apt-pkg/deb/dpkgpm.cc:1707 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler " -"wegen erschöpftem Arbeitsspeicher hindeutet." +"Aufruf: apt-internal-solver\n" +"\n" +"apt-internal-solver ist eine Schnittstelle, um den derzeitigen internen\n" +"Problemlöser für die APT-Familie wie einen externen zu verwenden, zwecks\n" +"Fehlersuche oder ähnlichem.\n" +"\n" +"Optionen:\n" +" -h dieser Hilfetext\n" +" -q protokollierbare Ausgabe – keine Fortschrittsanzeige\n" +" -c=? Diese Konfigurationsdatei benutzen\n" +" -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -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." +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Unbekannter Paketeintrag!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Ein-/" -"Ausgabe-Fehler von Dpkg hindeutet." +"Aufruf: apt-sortpkgs [optionen] datei1 [datei2 ...]\n" +"\n" +"apt-sortpkgs ist ein einfaches Werkzeug, um Paketdateien zu sortieren. Die\n" +"Option -s wird benutzt, um anzuzeigen, um was für eine Datei es sich " +"handelt.\n" +"\n" +"Optionen:\n" +" -h Dieser Hilfetext\n" +" -s Quelldateisortierung benutzen\n" +" -c=? Diese Konfigurationsdatei lesen\n" +" -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" + +#~ 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 3ed665f94..6dcd58cd9 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -362,7 +362,7 @@ msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག msgid "Must specify at least one package to fetch source for" msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ" @@ -382,116 +382,116 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s་ནང་བར་སྟོང་" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "%s་འབྱུང་ཁུངས་ལེན།\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n" -#: cmdline/apt-get.cc:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, 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:1290 +#: cmdline/apt-get.cc:1294 #, 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:1313 +#: cmdline/apt-get.cc:1317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་" "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1356 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -500,37 +500,37 @@ msgstr "" "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་" "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1362 #, 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:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s)་ལུ་མཐུད་དོ།" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -673,7 +673,7 @@ msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རི #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག" @@ -768,16 +768,16 @@ msgstr "" msgid "Disk not found." msgstr "ཌིཀསི་དེ་འཚོལ་མ་ཐོབ།" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -831,7 +831,7 @@ msgstr "ནང་བསྐྱོད་ཡིག་ཚུགས་ བརྡ་ msgid "TYPE failed, server said: %s" msgstr "ཡིག་དཔར་རྐྱབ་མ་བཏུབ་སར་བར་གྱིས་སླབ་མས། %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "མཐུད་ལམ་ངལ་མཚམས" @@ -853,7 +853,7 @@ msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས msgid "Protocol corruption" msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -914,7 +914,7 @@ msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ན msgid "Unable to accept connection" msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།" @@ -923,7 +923,7 @@ msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀ msgid "Unable to fetch file, server said '%s'" msgstr "ཡིག་སྣོད་ལེན་མ་ཚུགས་ སར་བར་'%s'གིས་སླབ་མས" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "གནད་སྡུད་སོ་ཀེཊི་ངལ་མཚམས།" @@ -973,7 +973,7 @@ msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས།" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "%s་ལུ་མཐུད་དོ།" @@ -1115,42 +1115,17 @@ msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོ msgid "Internal error" msgstr "ནང་འཁོད་འཛོལ་བ།" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "ཨེབ།" - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "ལེན:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "ཨེལ་ཇི་ཨེན:" - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "ཨི་ཨར་ཨར།" - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "%s (%sB/s)་ནང་ལུ་%sB་དེ་ལེན་ཡོདཔ་ཨིན།\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [ལཱ་འབད་དོ།]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"བརྡ་ལམ་བསྒྱུར་བཅོས:ཁ་ཡིག་བཀོད་ཡོད་པའི་ཌིསིཀ་འདི་\n" -" '%s'\n" -"འདྲེན་འཕྲུལ་'%s'ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབ།\n" +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:93 msgid "Correcting dependencies..." @@ -1180,35 +1155,210 @@ msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད msgid "Unmet dependencies. Try using -f." msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།" -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "ཉེན་བརྡ:འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་བདེན་བཤད་འབད་མི་བཏུབ་པས།" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "བདེན་བཤད་ཉེན་བརྡ་འདི་ཟུར་འབད་ཡོད།\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས།" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 +#: apt-private/private-output.cc:272 #, fuzzy -msgid "Install these packages without verification?" -msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་ཐུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་" +msgid "[installed,automatic]" +msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" +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:35 +#, 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:97 +#, 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:101 +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:82 msgid "Internal error, InstallPackages was called with broken packages!" @@ -1263,7 +1413,11 @@ msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི msgid "You don't have enough free space in %s." msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 msgid "Trivial Only specified but this is not a trivial operation." msgstr "གལ་ཆུང་རྐྱངམ་ཅིག་ཁསལ་བཀོད་འབད་ནུག་ འདི་འབདཝ་ད་འ་ནི་འདི་གལ་ཆུང་གི་བཀོལ་སྤྱོད་མེན།" @@ -1468,936 +1622,685 @@ msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུག msgid "Package '%s' is not installed, so not removed\n" msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་ འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n" -#: apt-private/private-list.cc:129 -msgid "Listing" -msgstr "" - -#: apt-private/private-list.cc:159 -#, 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-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:36 +msgid "WARNING: The following packages cannot be authenticated!" +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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "བདེན་བཤད་ཉེན་བརྡ་འདི་ཟུར་འབད་ཡོད།\n" -#: apt-private/private-output.cc:265 -#, fuzzy, c-format -msgid "[installed,upgradable to: %s]" -msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས།" -#: apt-private/private-output.cc:268 +#: apt-private/private-download.cc:50 #, fuzzy -msgid "[installed,local]" -msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" - -#: apt-private/private-output.cc:270 -msgid "[installed,auto-removable]" -msgstr "" +msgid "Install these packages without verification?" +msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་ཐུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་" -#: apt-private/private-output.cc:272 -#, fuzzy -msgid "[installed,automatic]" -msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: apt-private/private-output.cc:274 -#, fuzzy -msgid "[installed]" -msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" +#: apt-private/private-sources.cc:58 +#, fuzzy, c-format +msgid "Failed to parse %s. Edit again? " +msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-private/private-output.cc:277 +#: apt-private/private-sources.cc:70 #, c-format -msgid "[upgradable from: %s]" +msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-output.cc:281 -msgid "[residual-config]" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" 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-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... " -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "འབད་ཚར་ཡི།" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "ཨེབ།" -#: apt-private/private-output.cc:571 -msgid "The following packages have been kept back:" -msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:" +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "ལེན:" -#: apt-private/private-output.cc:592 -msgid "The following packages will be upgraded:" -msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:" +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "ཨེལ་ཇི་ཨེན:" -#: apt-private/private-output.cc:613 -msgid "The following packages will be DOWNGRADED:" -msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:" +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "ཨི་ཨར་ཨར།" -#: apt-private/private-output.cc:633 -msgid "The following held packages will be changed:" -msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:" +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "%s (%sB/s)་ནང་ལུ་%sB་དེ་ལེན་ཡོདཔ་ཨིན།\n" -#: apt-private/private-output.cc:688 +#: apt-private/acqprogress.cc:236 #, c-format -msgid "%s (due to %s) " -msgstr "%s( %s་གིས་སྦེ)" +msgid " [Working]" +msgstr " [ལཱ་འབད་དོ།]" -#: apt-private/private-output.cc:696 +#: apt-private/acqprogress.cc:297 +#, c-format msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" msgstr "" -"ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n" -"ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!" +"བརྡ་ལམ་བསྒྱུར་བཅོས:ཁ་ཡིག་བཀོད་ཡོད་པའི་ཌིསིཀ་འདི་\n" +" '%s'\n" +"འདྲེན་འཕྲུལ་'%s'ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབ།\n" -#: apt-private/private-output.cc:727 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།" +msgid "Unable to read %s" +msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།" -#: apt-private/private-output.cc:731 +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 #, c-format -msgid "%lu reinstalled, " -msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།" +msgid "Unable to change to %s" +msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགས།" -#: apt-private/private-output.cc:733 +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 #, c-format -msgid "%lu downgraded, " -msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།" +msgid "No mirror file '%s' found " +msgstr "" -#: apt-private/private-output.cc:735 -#, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 +#, fuzzy, c-format +msgid "Can not read mirror file '%s'" +msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-private/private-output.cc:739 -#, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n" +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#. 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]" +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" 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 "" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་ཨའི་པི་སི་རྒྱུད་དུང་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:778 -msgid "Y" -msgstr "ཝའི།" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལམ་འདི་ག་བསྡམས་ཡོད།" -#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:784 -msgid "N" -msgstr "" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "སྔོན་སྒྲིག་བྱང་ཉེས་གཞི་སྒྲིག་འབད་དོ་!" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་ལོག་ལྡེ་འདི་ཨེབ།" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" 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] "" +#: dselect/install:102 +#, fuzzy +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "སྦུང་ཚན་བཟོ་བཤོལ་འབད་བའི་བར་ན་ འཛོལ་བ་དག་པ་ཅིག་བྱུང་ནུག་ ང་གི་" -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" -msgstr "" +#: dselect/install:103 +#, fuzzy +msgid "will be configured. This may result in duplicate errors" +msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་རིམ་སྒྲིག་འབད་ནི་ཨིན།་འ་ནི་འདི་གིས་ ངོ་བཤུས་རྫུན་མ་" -#: apt-private/private-sources.cc:58 -#, fuzzy, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" +"ཡང་ན་བརླག་སྟོར་ཞུགས་ཡོད་པའི་རྟེན་འབྲེལ་གི་རྒྱུ་རྐྱེན་ལས་བརྟེན་པའི་འཛོལ་བ་ཚུ་ནང་ལུ་གྲུབ་འབྲས་འཐོན་འོང་། " +"འདི་དེ་བཏུབ་པས་" -#: apt-private/private-sources.cc:70 -#, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." +#: dselect/install:105 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" +"འ་ནི་འཕྲིན་དོན་གྱི་ལྟག་ལས་ཡོད་པའི་འཛོལ་བ་དེ་ཚུ་གལ་ཅན་ཅིག་ཨིན། འདི་ཚུ་གི་དཀའ་ངལ་སེལ་བཞིནམ་ལས་ " +"[I] གཞི་བཙུགས་དེ་ལོག་སྟེ་རང་གཡོག་བཀོལ།" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།" +#: dselect/update:30 +msgid "Merging available information" +msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།" -#: apt-private/private-update.cc:90 -#, 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-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "ད་ལྟོ་ཡང་འབྲེལ་ལམ་ཡོད་པའི་མཐུད་མཚམས་གུར་བཀོག་བཞག་མཐུད་མཚམས་དེ་བོད་བརྡ་འབད་འདི་ཡོད།" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." -msgstr "" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "དྲྭ་རྟགས་རྒྱུ་རྫས་འདི་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད!" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... " +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "ཁ་ཕྱོགས་སྤྲོད་བཞག་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "འབད་ཚར་ཡི།" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "ཁ་ཕྱོགས་ཁ་སྐོང་རྐྱབ་ནི་ནང་ ནང་འཁོད་ཀྱི་འཛོལ་བ།" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Unable to read %s" -msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "%s -> %s ་དང་ %s/%s་ཁ་ཕྱོགས་ཅིག་ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Unable to change to %s" -msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགས།" +msgid "Double add of diversion %s -> %s" +msgstr "%s -> %s་ཁ་ཕྱོགས་ཀྱི་ལོག་བལྟབ་ཁ་སྐོང་།" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 +#: apt-inst/filelist.cc:549 #, c-format -msgid "No mirror file '%s' found " -msgstr "" - -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:287 -#, fuzzy, c-format -msgid "Can not read mirror file '%s'" -msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" - -#: methods/mirror.cc:315 -#, fuzzy, c-format -msgid "No entry found in mirror file '%s'" -msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" +msgid "Duplicate conf file %s/%s" +msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s/%s་འདི་ངོ་བཤུས་བཟོ།" -#: methods/mirror.cc:445 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "[Mirror: %s]" -msgstr "" +msgid "The path %s is too long" +msgstr "%s་འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག" -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་ཨའི་པི་སི་རྒྱུད་དུང་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" +#: apt-inst/extract.cc:132 +#, c-format +msgid "Unpacking %s more than once" +msgstr "སྦུང་ཚན་བཟོ་བཤོལ་%s་གཅིག་ལས་ལྷག་སྟེ་འདུག" -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" -msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལམ་འདི་ག་བསྡམས་ཡོད།" +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "སྣོད་ཐོ་%s་འདི་ཁ་ཕྱོགས་སྒྱུར་དེ་ཡོད།" -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "སྔོན་སྒྲིག་བྱང་ཉེས་གཞི་སྒྲིག་འབད་དོ་!" +#: apt-inst/extract.cc:152 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "ཐུམ་སྒྲིལ་འདི་གིས་ག་སྒྱུར་དམིགས་གཏད་%s/%s་ལུ་འབྲི་ནིའི་འབད་རྩོལ་བསྐྱེདཔ་དེ་ཡོད།" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་ལོག་ལྡེ་འདི་ཨེབ།" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "ཁ་སྒྱུར་འགྲུལ་ལམ་འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པས།" -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "" +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 +#, c-format +msgid "Failed to stat %s" +msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: dselect/install:102 -#, fuzzy -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "སྦུང་ཚན་བཟོ་བཤོལ་འབད་བའི་བར་ན་ འཛོལ་བ་དག་པ་ཅིག་བྱུང་ནུག་ ང་གི་" +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: dselect/install:103 -#, fuzzy -msgid "will be configured. This may result in duplicate errors" -msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་རིམ་སྒྲིག་འབད་ནི་ཨིན།་འ་ནི་འདི་གིས་ ངོ་བཤུས་རྫུན་མ་" +#: apt-inst/extract.cc:249 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "སྣོད་ཡིག་%s་འདི་སྣོད་ཡིག་མེན་མི་ཅིག་གིས་ཚབ་བཙུག་དེ་ཡོདཔ་ཨིན།" -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "" -"ཡང་ན་བརླག་སྟོར་ཞུགས་ཡོད་པའི་རྟེན་འབྲེལ་གི་རྒྱུ་རྐྱེན་ལས་བརྟེན་པའི་འཛོལ་བ་ཚུ་ནང་ལུ་གྲུབ་འབྲས་འཐོན་འོང་། " -"འདི་དེ་བཏུབ་པས་" +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "ཁོང་རའི་དྲྭ་རྟགས། (#)རྡོབ་ནང་ལུ་མཐུད་མཚམས་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" -msgstr "" -"འ་ནི་འཕྲིན་དོན་གྱི་ལྟག་ལས་ཡོད་པའི་འཛོལ་བ་དེ་ཚུ་གལ་ཅན་ཅིག་ཨིན། འདི་ཚུ་གི་དཀའ་ངལ་སེལ་བཞིནམ་ལས་ " -"[I] གཞི་བཙུགས་དེ་ལོག་སྟེ་རང་གཡོག་བཀོལ།" +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་ཅིག་ཨིན་པས།" -#: dselect/update:30 -msgid "Merging available information" -msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།" +#: apt-inst/extract.cc:421 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "%s་གི་དོན་ལུ་ཚབ་སྲུང་འབད་བའི་ཐུམ་སྒྲིལ་དེ་གིས་འཐོན་རིམ་གཅིག་ད་ཡང་མཐུན་སྒྲིག་མི་འབད་བས།" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ ཐུམ་སྒྲིལ་ཚུ་ནང་ལས་\n" -"རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིན།\n" -"གདམ་ཁ་ཚུ།\n" -" -h འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདཝ་ཨིན།\n" -" -t འདི་གིས་temp་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།\n" -" -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n" -" -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་" -"བཟུམ།\n" +#: apt-inst/extract.cc:438 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་སྣོད་%s/%sགིས་གཅིག་ཚབ་སྲུང་འབདཝ་ཨིན།" -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" +#: apt-inst/extract.cc:498 +#, c-format +msgid "Unable to stat %s" msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Unable to write to %s" -msgstr " %sལུ་འབྲི་མ་ཚུགས།" +msgid "Failed to write file %s" +msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "debconf ་་འཐོན་རིམ་འདི་ལེན་མ་ཚུགས། debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?" +#: apt-inst/dirstream.cc:105 +#, c-format +msgid "Failed to close file %s" +msgstr "%s་ཡིག་སྣོད་འདི་ཁ་བསྡམས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "ཐུམ་སྒྲིལ་རྒྱ་བསྐྱེད་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག" +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "འ་ནི་འདི་ ཌི་ཨི་བི་ཡིག་མཛོད་ནུས་ཅན་ཅིག་མེན་པས་ '%s'འཐུས་མི་བརླག་སྟོར་ཞུགས་དོ།" -#: 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 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "Error processing directory %s" -msgstr "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།" +msgid "Internal error, could not locate member %s" +msgstr "ནང་འཁོད་འཛོལ་བ་གིས་འཐུས་མི་%sའདི་ག་ཡོད་འཚོལ་མ་འཐོབ།" -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "འབྱུང་ཁུངས་རྒྱ་བསྐྱེད་ཀྱི་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིང་པས།" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "མིང་དཔྱད་འབད་མ་བཏུབ་པའི་ཚད་འཛིན་ཡིག་སྣོད།" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "ནང་དོན་ཡིག་སྣོད་ལུ་མགོ་ཡིག་འཛོལ་བ་འབྲི་ནིའི་མགོ་ཡིག" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "ནུས་མེད་ཡིག་མཛོད་ཀྱི་མིང་རྟགས།" -#: ftparchive/apt-ftparchive.cc:431 -#, c-format -msgid "Error processing contents %s" -msgstr "%sའཛོལ་བ་ལས་སྦྱོར་འབད་ནིའི་ནང་དོན།" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "ཡིག་མཛོད་འཐུས་མི་མགོ་ཡིག་ལྷག་ནིའི་འཛོལ་བ།" -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"ལག་ལེན:apt-ftparchive [options] command\n" -"བརྡ་བཀོད་ཚུ:packages binarypath [overridefile [pathprefix]]\n" -"sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive་འདི་གིས་ ཌི་བི་ཡཱན་ཡིག་མཛོད་ཚུ་གི་དོན་ལུ་ ཚིག་ཡིག་གི་ཡིག་སྣོད་ཚུ་བཟོ་བཏོན་འབདཝ་" -"ཨིན། dpkg-scanpackages དང་ dpkg-scansources་གི་དོན་ལུ་ལས་འགན་ཚབ་མ་ཚུ་ལུ་ཆ་ཚང་སྦེ་ " -"རང་བཞིན་གྱི་སྦེ་བཟོ་བཟོཝ་་ནང་ལས་བཟོ་བཏོན་གྱི་བཟོ་རྣམ་ཚུ་ལྷམ་པ་མ་འདྲཝ་སྦེ་ཡོད་མི་ལུ་རྒྱབ་སྐྱོར་འབདཝ་" -"ཨིན།\n" -"\n" -"apt-ftparchive་ འདི་གིས་.debs་གི་རྩ་འབྲེལ་ཅིག་ནང་ལས་ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད་ཚུ་བཟོ་བཏོན་འབདཝ་ཨིན། " -"ཐུམ་སྒྲིལ་\n" -" ཡིག་སྣོད་འདི་གི་ནང་ན་ ཐུམ་སྒྲིལ་རེ་རེ་བཞིན་ནང་གི་ཚད་འཛིན་ས་སྒོ་ཚུ་ཆ་མཉམ་གི་ནང་དོན་དང་ ཨེམ་ཌི་༥་དྲྭ་" -"རྟགས། (#)་དང་ཡིག་སྣོད་ཀྱི་ཚད་ཚུ་ཡང་ཡོདཔ་ཨིན། ཟུར་བཞག་ཡིག་སྣོད་འདི་\n" -"གཙོ་རིམ་དང་དབྱེ་ཚན་གྱི་གནས་གོང་དེ་བང་བཙོང་འབད་ནི་ལུ་རྒྱབ་སྐྱོར་འབད་ཡོདཔ་ཨིན།\n" -"\n" -"འདི་དང་ཆ་འདྲཝ་སྦེ་ apt-ftparchive་ འདི་གིས་.dscs་གི་རྩ་འབྲེལ་ཅིག་ནང་ལས་འབྱུང་ཁུངས་ཡིག་སྣོད་ཚུ་" -"བཟོ་བཏོན་འབདཝ་ཨིན།\n" -" --source-ཟུར་བཞག་གི་གདམ་ཁ་འདི་ ཨེསི་ཨར་སི་ ཟུར་བཞག་ཡིག་སྣོད་ཅིག་གསལ་བཀོད་འབད་ནི་ལུ་ལག་ལེན་" -"འཐབ་བཐུབ་ཨིན།\n" -"\n" -"'ཐུམ་སྒྲིལ་ཚུ་'་དང་'འབྱུང་ཁུངས་་' བརྡ་བཀོད་ཚུ་རྩ་འབྲེལ་འདི་གི་་རྩ་བ་ནང་ལུ་སྦེ་གཡོག་བཀོལ་དགོཔ་ཨིན། ཟུང་" -"ལྡན་འགྲུལ་ལམ་འདི་གིས་ལོག་རིམ་འཚོལ་ཞིབ་འདི་གི་གཞི་རྟེན་ལུ་དཔག་དགོཔ་ཨིནམ་དང་\n" -"ཟུར་བཞག་ཡིག་སྣོད་འདི་ལུ་ཟུར་བཞག་གི་ཟུར་རྟགས་འོང་དགོཔ་ཨིན། འགྲུལ་ལམ་སྔོན་ཚིག་འདི་\n" -"ཡོད་པ་ཅིན་ཡིག་སྣོད་མིང་གི་ས་སྒོ་ཚུ་ལུ་འཇུག་སྣོན་འབད་དེ་ཡོདཔ་ཨིན། དཔེར་ན་ ཌི་བི་ཡཱན་ཡིག་མཛོད་ལས་ལག་" -"ལེན་བཟུམ:\n" -"apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"གདམ་ཁ་ཚུ:\n" -" -h འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདཝ་ཨིན།\n" -" --md5 ཨེམ་ཌི་༥་ བཟོ་བཏོན་འདི་ཚད་འཛིན་འབདཝ་ཨིན།\n" -" -s=? འབྱུང་ཁུངས་ཟུར་བཞག་གི་ཡིག་སྣོད།\n" -" -q ཁུ་སིམ་སིམ།\n" -" -d=? གདམ་ཁ་ཅན་གྱི་འདྲ་མཛོད་གནད་སྡུད་གཞི་རྟེན་འདི་སེལ་འཐུ་འབད།\n" -" --no-delink འབྲེལ་ལམ་མེད་སྦེ་བཟོ་་ནིའི་རྐྱེན་སེལ་ཐབས་ལམ་འདི་ལྕོགས་ཅན་བཟོ།\n" -" --contents ནང་དོན་གི་ཡིག་སྣོད་བཟོ་བཏོན་འདི་ཚད་འཛིན་འབད།\n" -" -c=? འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷག\n" -" -o=? མཐུན་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབད།" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "སེལ་འཐུ་ཚུ་མཐུན་སྒྲིག་མིན་འདུག" - -#: ftparchive/apt-ftparchive.cc:907 -#, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཐུམ་སྒྲིལ་ཡིག་སྣོད་སྡེ་ཚན་`%s'ནང་བརླག་སྟོར་ཞུགས་ནུག" - -#: ftparchive/cachedb.cc:65 -#, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "ཌི་བི་ངན་ཅན་བྱུང་ནུག་ %s.རྒསཔ་ལུ་ཡིག་སྣོད་འདི་བསྐྱར་མིང་བཏགས་ཡི།" +#: apt-inst/contrib/arfile.cc:96 +#, fuzzy, c-format +msgid "Invalid archive member header %s" +msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་" -#: ftparchive/cachedb.cc:83 -#, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་ %s་ཡར་བསྐྱེད་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོ།" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་" -#: ftparchive/cachedb.cc:94 -#, fuzzy -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"ཌི་བི་རྩ་སྒྲིག་འདི་ ནུས་མེད་ཨིན་པས། ཁྱོད་ཀྱི་ apt་ གྱི་འཐོན་རིམ་རྙིངམ་ཅིག་ནང་ལས་ ཡར་བསྐྱེད་འབད་ཡོད་" -"པ་ཅིན་ རྩ་བསྐྲད་གཏང་ཞིནམ་ལས་ གནད་སྡུད་གཞི་རྟེན་འདི་ ལོག་དེ་གསར་བསྐྲུན་འབད། " +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "ཡིག་མཛོད་འདི་གནམ་མེད་ས་མེད་ཐུང་ཀུ་འདུག" -#: ftparchive/cachedb.cc:99 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "ཡིག་མཛོད་མགོ་ཡིག་ཚུ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 -#, c-format -msgid "Failed to stat %s" -msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "རྒྱུད་དུང་ཚུ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "ཇི་ཛིཔ་འདི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་ཐོ་མིན་འདུག" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "ངན་ཅན་གྱི་ཡིག་མཛོད།" -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "ཊར་ཅེག་སམ་དེ་འཐུས་ཤོར་བྱུང་ཡོད་ ཡིག་མཛོད་ངན་ཅན་བྱུང་ནུག" -#: ftparchive/writer.cc:91 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "ཌབ་ལུ:%sསྣོད་ཐོ་འདི་ལྷག་མ་ཚུགས།\n" +msgid "Unknown TAR header type %u, member %s" +msgstr "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འཐུས་མི་ %s།" -#: ftparchive/writer.cc:96 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "ཌབ་ལུ་ %s སིཊེཊི་འབད་མ་ཚུགས།\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "ཨི:" - -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "ཌབ་ལུ:" +msgid "Progress: [%3i%%]" +msgstr "" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབད།" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-pkg/init.cc:146 #, c-format -msgid "Failed to resolve %s" -msgstr "%s་མོས་མཐུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "རྩ་འབྲེལ་ཕྱིར་བགྲོད་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོདཔ།" +msgid "Packaging system '%s' is not supported" +msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་སྐྱོར་མ་འབད་བས།" -#: ftparchive/writer.cc:219 -#, c-format -msgid "Failed to open %s" -msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་གཏན་འབེབས་བཟོ་མི་ཚུགས་པས།" -#: ftparchive/writer.cc:278 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgid "Wrote %i records.\n" +msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n" -#: ftparchive/writer.cc:286 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Failed to readlink %s" -msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" +msgid "Wrote %i records with %i missing files.\n" +msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་ཡོད།\n" -#: ftparchive/writer.cc:290 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "Failed to unlink %s" -msgstr "%s་འབྲེལ་ལམ་མེད་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "%i་མཐུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i་དྲན་ཐོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན།\n" -#: ftparchive/writer.cc:298 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "" +"%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་ %iམཐུན་སྒྲིག་མེད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་" +"ཡོདཔ་ཨིན།\n" -#: ftparchive/writer.cc:308 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n" +msgid "Can't find authentication record for: %s" +msgstr "" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།" +#: apt-pkg/indexcopy.cc:521 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid " %s has no override entry\n" -msgstr " %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n" +msgid "The method driver %s could not be found." +msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " %s ་རྒྱུན་སྐྱོང་པ་འདི་ %s ཨིན་ %s མེན།\n" +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n" -#: ftparchive/writer.cc:706 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid " %s has no source override entry\n" -msgstr " %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n" +msgid "Method %s did not start correctly" +msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།" -#: ftparchive/writer.cc:710 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid " %s has no binary override entry either\n" -msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n" +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "དྲན་ཚད་སྤྲོད་ནིའི་དོན་ལུ་ རི་ཨེ་ལོཀ་ འཐུས་ཤོར་བྱུང་ཡོད།" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་ན་གནས་ཚད་ཡིག་སྣོད་ཚུ་ མིང་དཔྱད་ཡང་ན་ཁ་ཕྱེ་མ་ཚུགས།" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ ཁྱོད་ཀྱི་ apt-get update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་།" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "ཟུར་བཞག་ཡིག་སྣོད་%sའདི་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་སྟོངམ།" -#: ftparchive/override.cc:166 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།" -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #2" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "ཐུམ་སྒྲིས་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ མི་མཐུན་པའི་འཐོན་རིམ་ཅིག་ཨིན་པས།" -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #3" +#: apt-pkg/pkgcache.cc:169 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།" -#: ftparchive/multicompress.cc:73 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr " མ་ཤེས་ཨེབ་བཙུགས་ཨཱལ་གོ་རི་དམ'%s'" +msgid "This APT does not support the versioning system '%s'" +msgstr "འ་ནི་ཨེ་པི་ཊི་ འདི་གིས་ '%s'འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་དེ་ལུ་རྒྱབ་སྐྱོར་མི་འབད་བས།" -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "ཨེབ་བཙུགས་འབད་ཡོད་པའི་ཨའུཊི་པུཊི་%sལུ་ཨེབ་བཙུགས་ཆ་ཚན་ཅིག་དགོཔ་འདུག" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་འདི་བཟོ་བཀོད་སོ་སོ་ཅིག་གི་དོན་ལུ་བཟོ་བརྩིགས་འབད་འབདཝ་ཨིནཔས།" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "ཡིག་སྣོད་*་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "རྟེནམ་ཨིན།" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "ཁ་སྤེལ་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོད།" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "སྔོན་གོང་མ་རྟེནམ་ཨིན།" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "ཆ་ལག་ཨེབ་བཙུགས་འབད།" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "བསམ་འཆར་བཀོདཔ་ཨིན།" -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "ནང་འཁོད་འཛོལ་བ་ %s་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "འོས་སྦྱོར་འབདཝ་ཨིན།" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་IO/ཡིག་སྣོད་འཐུས་ཤོར་བྱུང་ཡོད།" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "མི་མཐུནམ་ཨིན།" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "ཨེམ་ཌི་༥་གློག་རིག་རྐྱབ་པའི་སྐབས་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "ཚབ་བཙུགསཔ་ཨིན།" -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ།" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "ཕན་མེདཔ་བཟོཝ་ཨིན།" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "" -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" msgstr "" -"ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ ཐུམ་སྒྲིལ་ཚུ་ནང་ལས་\n" -"རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིན།\n" -"གདམ་ཁ་ཚུ།\n" -" -h འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདཝ་ཨིན།\n" -" -t འདི་གིས་temp་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།\n" -" -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n" -" -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་" -"བཟུམ།\n" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "མ་ཤེས་པའི་ཐུམ་སྒྲིལ་གི་དྲན་ཐོ།" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "གལ་ཅན།" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"ལག་ལེན: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs་ འདི་ཐུམ་སྒྲིལ་གི་ཡིག་སྣོད་ཚུ་དབྱེ་སེལ་འབད་ནི་ལུ་ འཇམ་སམ་གྱི་ལག་ཆས་ཅིག་ཨིན། -s " -"གདམ་ཁ་འདི་ ཡིག་སྣོད་ཀྱི་དབྱེ་ཁག་ག་ཅི་བཟུམ་ཅིག་ཨིན་ན\n" -"་བརྡ་སྟོན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་སྟེ་ཡོདཔ་ཨིན།\n" -"\n" -"གདམ་ཁ་ཚུ:\n" -" -h འ་ནི་འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདཝ་ཨིན།\n" -" -s འདི་གིས་འབྱུང་ཁུངས་ ཡིག་སྣོད་གསོག་འཇོག་འབད་དོན་ལུ་ལག་ལེན་འཐབ་ཨིན།\n" -" -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n" -" -o=? འདི་གིས་ མཐུན་སྒྲིག་ རིམ་སྒྲིག་གི་གདམ་ཁ་ཚུ་ཁཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/" -"tmp\n" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "དགོས་མཁོ་ཡོདཔ།" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" -msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "ཚད་ལྡན།" -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "%s་ཡིག་སྣོད་འདི་ཁ་བསྡམས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "གདམ་ཁ་ཅན།" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "%s་འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "ཐེབས།" -#: apt-inst/extract.cc:132 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Unpacking %s more than once" -msgstr "སྦུང་ཚན་བཟོ་བཤོལ་%s་གཅིག་ལས་ལྷག་སྟེ་འདུག" +msgid "Index file type '%s' is not supported" +msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།" -#: apt-inst/extract.cc:142 -#, c-format -msgid "The directory %s is diverted" -msgstr "སྣོད་ཐོ་%s་འདི་ཁ་ཕྱོགས་སྒྱུར་དེ་ཡོད།" +#: apt-pkg/sourcelist.cc:127 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" -#: apt-inst/extract.cc:152 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "ཐུམ་སྒྲིལ་འདི་གིས་ག་སྒྱུར་དམིགས་གཏད་%s/%s་ལུ་འབྲི་ནིའི་འབད་རྩོལ་བསྐྱེདཔ་དེ་ཡོད།" +#: apt-pkg/sourcelist.cc:170 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -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-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "སྣོད་ཡིག་%s་འདི་སྣོད་ཡིག་མེན་མི་ཅིག་གིས་ཚབ་བཙུག་དེ་ཡོདཔ་ཨིན།" +#: 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-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "ཁོང་རའི་དྲྭ་རྟགས། (#)རྡོབ་ནང་ལུ་མཐུད་མཚམས་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" +#: 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-inst/extract.cc:293 -msgid "The path is too long" -msgstr "འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་ཅིག་ཨིན་པས།" +#: 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-inst/extract.cc:421 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Overwrite package match with no version for %s" -msgstr "%s་གི་དོན་ལུ་ཚབ་སྲུང་འབད་བའི་ཐུམ་སྒྲིལ་དེ་གིས་འཐོན་རིམ་གཅིག་ད་ཡང་མཐུན་སྒྲིག་མི་འབད་བས།" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།" -#: apt-inst/extract.cc:438 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་སྣོད་%s/%sགིས་གཅིག་ཚབ་སྲུང་འབདཝ་ཨིན།" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།" -#: apt-inst/extract.cc:498 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Unable to stat %s" -msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས།" - -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "ད་ལྟོ་ཡང་འབྲེལ་ལམ་ཡོད་པའི་མཐུད་མཚམས་གུར་བཀོག་བཞག་མཐུད་མཚམས་དེ་བོད་བརྡ་འབད་འདི་ཡོད།" - -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "དྲྭ་རྟགས་རྒྱུ་རྫས་འདི་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད!" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "ཁ་ཕྱོགས་སྤྲོད་བཞག་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" +#: apt-pkg/sourcelist.cc:217 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "ཁ་ཕྱོགས་ཁ་སྐོང་རྐྱབ་ནི་ནང་ ནང་འཁོད་ཀྱི་འཛོལ་བ།" +#: apt-pkg/sourcelist.cc:224 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-inst/filelist.cc:477 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "%s -> %s ་དང་ %s/%s་ཁ་ཕྱོགས་ཅིག་ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།" +msgid "Opening %s" +msgstr "%s་ཁ་ཕྱེ་དོ།" -#: apt-inst/filelist.cc:506 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "%s -> %s་ཁ་ཕྱོགས་ཀྱི་ལོག་བལྟབ་ཁ་སྐོང་།" +msgid "Line %u too long in source list %s." +msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག" -#: apt-inst/filelist.cc:549 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s/%s་འདི་ངོ་བཤུས་བཟོ།" +msgid "Malformed line %u in source list %s (type)" +msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "ནུས་མེད་ཡིག་མཛོད་ཀྱི་མིང་རྟགས།" +#: 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-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "ཡིག་མཛོད་འཐུས་མི་མགོ་ཡིག་ལྷག་ནིའི་འཛོལ་བ།" +#: 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-inst/contrib/arfile.cc:96 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 #, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་" +msgid "Clean of %s is not supported" +msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་" +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." +msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགས།" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "ཡིག་མཛོད་འདི་གནམ་མེད་ས་མེད་ཐུང་ཀུ་འདུག" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "འདྲ་མཛོད་ལུ་མཐུན་འགྱུར་མེན་པའི་འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་ཅིག་འདུག" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "རྒྱུད་དུང་ཚུ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "ཇི་ཛིཔ་འདི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "ངན་ཅན་གྱི་ཡིག་མཛོད།" +#: apt-pkg/pkgcachegen.cc:263 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག" -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "ཊར་ཅེག་སམ་དེ་འཐུས་ཤོར་བྱུང་ཡོད་ ཡིག་མཛོད་ངན་ཅན་བྱུང་ནུག" +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག" -#: apt-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འཐུས་མི་ %s།" +msgid "Package %s %s was not found while processing file dependencies" +msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "འ་ནི་འདི་ ཌི་ཨི་བི་ཡིག་མཛོད་ནུས་ཅན་ཅིག་མེན་པས་ '%s'འཐུས་མི་བརླག་སྟོར་ཞུགས་དོ།" +msgid "Couldn't stat source package list %s" +msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "ནང་འཁོད་འཛོལ་བ་གིས་འཐུས་མི་%sའདི་ག་ཡོད་འཚོལ་མ་འཐོབ།" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "མིང་དཔྱད་འབད་མ་བཏུབ་པའི་ཚད་འཛིན་ཡིག་སྣོད།" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, fuzzy, c-format -msgid "List directory %spartial is missing." -msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག" +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr " %sལུ་འབྲི་མ་ཚུགས།" -#: apt-pkg/acquire.cc:91 -#, fuzzy, c-format -msgid "Archives directory %spartial is missing." -msgstr "ཡིག་མཛོད་སྣོད་ཐོ་ %s་ ཆ་ཤས་འདི་བརླག་སྟོར་ཞུགས་ཏེ་འདུག" +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།" -#: apt-pkg/acquire.cc:99 -#, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།" +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི་ཡིག་སྣོད་%li (%s ལྷག་ལུས་དོ།)" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr " %li་གི་བརླག་སྟོར་ཟུགསཔའི་ཡིག་སྣོད་ %li" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2418,35 +2321,35 @@ msgstr "ཚད་མ་མཐུན།" msgid "Invalid file format" msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, 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:1589 +#: apt-pkg/acquire-item.cc:1656 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/acquire-item.cc:1631 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2454,12 +2357,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2468,126 +2371,108 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།" -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།" +msgid "Vendor block %s contains no fingerprint" +msgstr "%sསིལ་ཚོང་པ་སྡེབ་ཚན་གྱི་ནང་ན་མཛུབ་རྗེས་མིན་འདུག" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n" +msgid "List directory %spartial is missing." +msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག" -#: apt-pkg/acquire-worker.cc:169 -#, c-format -msgid "Method %s did not start correctly" -msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།" +#: apt-pkg/acquire.cc:91 +#, fuzzy, c-format +msgid "Archives directory %spartial is missing." +msgstr "ཡིག་མཛོད་སྣོད་ཐོ་ %s་ ཆ་ཤས་འདི་བརླག་སྟོར་ཞུགས་ཏེ་འདུག" -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 +#, fuzzy, c-format +msgid "Unable to lock directory %s" +msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།" + +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི་ཡིག་སྣོད་%li (%s ལྷག་ལུས་དོ།)" -#: apt-pkg/algorithms.cc:265 +#: apt-pkg/acquire.cc:904 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." +msgid "Retrieving file %li of %li" +msgstr " %li་གི་བརླག་སྟོར་ཟུགསཔའི་ཡིག་སྣོད་ %li" + +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" msgstr "" -"ཐུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབདཝ་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་" -"མ་ཐོབ།" +"ཁྱོད་རའི་sources.listགི་ཐོ་ཡིག་ནང་ལུ་ཁྱོད་ཀྱི་ 'འབྱུང་ཁུངས་' ཡུ་ཨར་ཨའི་ཚུ་་ལ་ལུ་ཅིག་བཙུགས་དགོ" -#: apt-pkg/algorithms.cc:1086 +#: apt-pkg/policy.cc:83 +#, c-format msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -"འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བཏོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མཐུན་བཟོཝ་ཨིན འ་ནི་ཐུམ་" -"སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རྐྱེན་ལས་བརྟེན་ཨིན་པས།" - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག" -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." -msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་ན་གནས་ཚད་ཡིག་སྣོད་ཚུ་ མིང་དཔྱད་ཡང་ན་ཁ་ཕྱེ་མ་ཚུགས།" +#: apt-pkg/policy.cc:422 +#, fuzzy, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "དགའ་གདམ་ཡིག་སྣོད་ནང་ལུ་ནུས་མེད་ཀྱི་དྲན་ཐོ་ ཐུམ་སྒྲིལ་མགོ་ཡིག་མིན་འདུག" -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ ཁྱོད་ཀྱི་ apt-get update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་།" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།" - -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།" - -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།" - -#: apt-pkg/cacheset.cc:603 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" - -#: apt-pkg/cacheset.cc:609 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" - -#: apt-pkg/cacheset.cc:615 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" +msgid "Did not understand pin type %s" +msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འདི་ཧ་གོ་མ་ཚུགས།" -#: apt-pkg/cacheset.cc:626 -#, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" +"མི་མཐུན་/སྔོན་རྟེན་འཕྲལ་བཀོལ་ལས་བརྟེན་ འ་ནི་གཞི་བཙུགས་གཡོག་བཀོལ་འདི་ལུ་ མེད་དུ་མི་རུང་བའི་%sཐུམ་" +"སྒྲིལ་ གནས་སྐབས་ཀྱི་རྩ་བསྐྲད་གཏང་ནི་འདི་དགོས་མཁོ་ཡོདཔ་ཨིན། འདི་འཕྲལ་འཕྲལ་རང་བྱང་ཉེས་ཅིག་ཨིན་པས་ " +"འདི་འབདཝ་ད་ཁྱོད་ཀྱི་ཐད་རི་འབའ་རི་འབད་དགོཔ་ཨིན་པ་ཅིན་ APT::Force-LoopBreak གདམ་ཁ་འདི་ཤུགས་" +"ལྡན་བཟོ།" -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +#: 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:497 apt-pkg/sourcelist.cc:347 -#, c-format -msgid "Line %u too long in source list %s." -msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག" +"ཟུར་ཐོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག་ འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་" +"རྙིངམ་འདི་ཚུ་ལག་ལེན་འཐབ་ནུག" #: apt-pkg/cdrom.cc:571 #, fuzzy @@ -2663,10 +2548,25 @@ msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་གས msgid "Source list entries for this disc are:\n" msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགས།" +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"ཐུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབདཝ་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་" +"མ་ཐོབ།" + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བཏོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མཐུན་བཟོཝ་ཨིན འ་ནི་ཐུམ་" +"སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རྐྱེན་ལས་བརྟེན་ཨིན་པས།" + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག" #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2695,57 +2595,67 @@ msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བ msgid "Failed to write temporary StateFile %s" msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 -#, c-format -msgid "Wrote %i records.\n" -msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n" +#: apt-pkg/cacheset.cc:609 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་ཡོད།\n" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "%i་མཐུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i་དྲན་ཐོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན།\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -"%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་ %iམཐུན་སྒྲིག་མེད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་" -"ཡོདཔ་ཨིན།\n" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" +#: apt-pkg/cacheset.cc:663 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" #: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format @@ -2772,318 +2682,221 @@ msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུ msgid "Invalid 'Date' entry in Release file %s" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་སྐྱོར་མ་འབད་བས།" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་གཏན་འབེབས་བཟོ་མི་ཚུགས་པས།" +msgid "%lid %lih %limin %lis" +msgstr "" -#: apt-pkg/install-progress.cc:57 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Progress: [%3i%%]" +msgid "%lih %limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 +#, c-format +msgid "%limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "%lis" msgstr "" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" +#: apt-pkg/contrib/strutl.cc:1258 +#, c-format +msgid "Selection %s not found" +msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" -"མི་མཐུན་/སྔོན་རྟེན་འཕྲལ་བཀོལ་ལས་བརྟེན་ འ་ནི་གཞི་བཙུགས་གཡོག་བཀོལ་འདི་ལུ་ མེད་དུ་མི་རུང་བའི་%sཐུམ་" -"སྒྲིལ་ གནས་སྐབས་ཀྱི་རྩ་བསྐྲད་གཏང་ནི་འདི་དགོས་མཁོ་ཡོདཔ་ཨིན། འདི་འཕྲལ་འཕྲལ་རང་བྱང་ཉེས་ཅིག་ཨིན་པས་ " -"འདི་འབདཝ་ད་ཁྱོད་ཀྱི་ཐད་རི་འབའ་རི་འབད་དགོཔ་ཨིན་པ་ཅིན་ APT::Force-LoopBreak གདམ་ཁ་འདི་ཤུགས་" -"ལྡན་བཟོ།" +msgid "Not using locking for read only lock file %s" +msgstr "%s ལྷག་ནི་རྐྱངམ་ཅིག་འབད་མི་ལྡེ་མིག་ཡིག་སྣོད་འདི་གི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་སྟོངམ།" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "ལྡེ་མིག་རྐྱབས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "" +"ཨེན་ཨེཕ་ཨེསི་ %s སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "ཐུམ་སྒྲིས་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ མི་མཐུན་པའི་འཐོན་རིམ་ཅིག་ཨིན་པས།" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚུགས།" -#: apt-pkg/pkgcache.cc:169 -#, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།" - -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "འ་ནི་ཨེ་པི་ཊི་ འདི་གིས་ '%s'འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་དེ་ལུ་རྒྱབ་སྐྱོར་མི་འབད་བས།" - -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་འདི་བཟོ་བཀོད་སོ་སོ་ཅིག་གི་དོན་ལུ་བཟོ་བརྩིགས་འབད་འབདཝ་ཨིནཔས།" - -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "རྟེནམ་ཨིན།" - -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "སྔོན་གོང་མ་རྟེནམ་ཨིན།" - -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "བསམ་འཆར་བཀོདཔ་ཨིན།" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "འོས་སྦྱོར་འབདཝ་ཨིན།" - -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "མི་མཐུནམ་ཨིན།" - -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "ཚབ་བཙུགསཔ་ཨིན།" - -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "ཕན་མེདཔ་བཟོཝ་ཨིན།" - -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" +msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "གལ་ཅན།" - -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "དགོས་མཁོ་ཡོདཔ།" - -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "ཚད་ལྡན།" - -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "གདམ་ཁ་ཅན།" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "ཐེབས།" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "འདྲ་མཛོད་ལུ་མཐུན་འགྱུར་མེན་པའི་འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་ཅིག་འདུག" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "ཡན་ལག་ལས་སྦྱོར་%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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/fileutl.cc:826 #, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག" - -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག" - -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག" - -#: apt-pkg/pkgcachegen.cc:263 -#, fuzzy -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག" - -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག" +msgid "Sub-process %s received signal %u." +msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 #, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།" +msgid "Sub-process %s returned an error code (%u)" +msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།" - -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།" - -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།" - -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།" +msgid "Sub-process %s exited unexpectedly" +msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།" -#: apt-pkg/pkgrecords.cc:38 -#, c-format -msgid "Index file type '%s' is not supported" -msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།" +#: apt-pkg/contrib/fileutl.cc:913 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/fileutl.cc:1101 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" -msgstr "" +msgid "Could not open file %s" +msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 #, fuzzy, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "དགའ་གདམ་ཡིག་སྣོད་ནང་ལུ་ནུས་མེད་ཀྱི་དྲན་ཐོ་ ཐུམ་སྒྲིལ་མགོ་ཡིག་མིན་འདུག" +msgid "Could not open file descriptor %d" +msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/policy.cc:444 -#, c-format -msgid "Did not understand pin type %s" -msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འདི་ཧ་གོ་མ་ཚུགས།" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "ཡན་ལག་ལས་སྦྱོར་ ཨའི་པི་སི་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "ཨེབ་འཕྲུལ་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" +msgid "read, still have %llu to read but none left" +msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" +msgid "write, still have %llu to write but couldn't" +msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།" +msgid "Problem closing the file %s" +msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" +msgid "Problem renaming the file %s to %s" +msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" +msgid "Problem unlinking the file %s" +msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།" -#: 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/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།" +msgid "%c%s... Error!" +msgstr "%c%s... འཛོལ་བ་!" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།" +msgid "%c%s... Done" +msgstr "%c%s... འབད་ཚར་ཡོད།" -#: apt-pkg/sourcelist.cc:211 -#, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" +#: apt-pkg/contrib/progress.cc:181 +msgid "..." +msgstr "" -#: apt-pkg/sourcelist.cc:217 -#, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།" +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... འབད་ཚར་ཡོད།" -#: apt-pkg/sourcelist.cc:224 -#, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབད་མ་ཚུགས།" -#: apt-pkg/sourcelist.cc:335 -#, c-format -msgid "Opening %s" -msgstr "%s་ཁ་ཕྱེ་དོ།" +#: apt-pkg/contrib/mmap.cc:111 +#, fuzzy, c-format +msgid "Couldn't duplicate file descriptor %i" +msgstr "%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 +#: apt-pkg/contrib/mmap.cc:119 #, fuzzy, c-format -msgid "Type '%s' is not known on stanza %u in source list %s" -msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" +msgid "Couldn't make mmap of %llu bytes" +msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།" -#: apt-pkg/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "" -"ཁྱོད་རའི་sources.listགི་ཐོ་ཡིག་ནང་ལུ་ཁྱོད་ཀྱི་ 'འབྱུང་ཁུངས་' ཡུ་ཨར་ཨའི་ཚུ་་ལ་ལུ་ཅིག་བཙུགས་དགོ" +#: apt-pkg/contrib/mmap.cc:146 +#, fuzzy +msgid "Unable to close mmap" +msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" +msgid "Couldn't make mmap of %lu bytes" +msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།" -#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 +#: apt-pkg/contrib/mmap.cc:322 #, fuzzy +msgid "Failed to truncate file" +msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" + +#: apt-pkg/contrib/mmap.cc:341 +#, c-format msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"ཟུར་ཐོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག་ འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་" -"རྙིངམ་འདི་ཚུ་ལག་ལེན་འཐབ་ནུག" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "%sསིལ་ཚོང་པ་སྡེབ་ཚན་གྱི་ནང་ན་མཛུབ་རྗེས་མིན་འདུག" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" + +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" #: apt-pkg/contrib/cdromutl.cc:65 #, c-format @@ -3094,52 +2907,6 @@ msgstr "སྦྱར་བརྩེགས་ས་ཚིགས་%s་འདི msgid "Failed to stat the cdrom" msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/contrib/cmndline.cc:121 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "བརྡ་བཀོད་གྲལ་ཐིག་གྱི་གདམ་ཁ་'%c'[%s་ནང་ལས་]འདི་མ་ཤེས་པས།" - -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "བ་རྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%s་འདི་ཧ་མ་གོ་བས།" - -#: apt-pkg/contrib/cmndline.cc:168 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "བརྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%s་འདི་བུ་ལིན་མེན་པས།" - -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "གདམ་ཁ་%s་ལུ་སྒྲུབ་རྟགས་ཅིག་དགོ་པས།" - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "གདམ་ཁ་%s:རིམ་སྒྲིག་གི་རྣམ་གྲངས་གསལ་བཀོད་ལུ་ = ་ཅིག་དགོཔ་ཨིན།" - -#: apt-pkg/contrib/cmndline.cc:278 -#, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "གདམ་ཁ་ %s ་ལུ་'%s'་མེན་པར་ ཧྲིལ་ཨང་སྒྲུབ་རྟགས་ཅིག་དགོས་མཁོ་ཡོདཔ་ཨིན" - -#: apt-pkg/contrib/cmndline.cc:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "གདམ་ཁ་'%s'འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག" - -#: apt-pkg/contrib/cmndline.cc:341 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "དྲན་ཤེས་ %s་འདི་ཧ་གོ་མ་ཚུགས་པས་ བདེན་པ་ཡང་ན་རྫུན་པ་ལུ་འབད་རྩོལ་བསྐྱེདཔ།" - -#: apt-pkg/contrib/cmndline.cc:391 -#, c-format -msgid "Invalid operation %s" -msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s" - #: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" @@ -3195,388 +2962,616 @@ msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་ msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ཡིག་སྣོད་ཀྱི་མཇུག་ལུ་མཁོ་མེད་ཐེབས།" -#: apt-pkg/contrib/fileutl.cc:190 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།" + +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "%s ལྷག་ནི་རྐྱངམ་ཅིག་འབད་མི་ལྡེ་མིག་ཡིག་སྣོད་འདི་གི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" +msgid "Command line option '%c' [from %s] is not known." +msgstr "བརྡ་བཀོད་གྲལ་ཐིག་གྱི་གདམ་ཁ་'%c'[%s་ནང་ལས་]འདི་མ་ཤེས་པས།" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Could not open lock file %s" -msgstr "ལྡེ་མིག་རྐྱབས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་མ་ཚུགས།" +msgid "Command line option %s is not understood" +msgstr "བ་རྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%s་འདི་ཧ་མ་གོ་བས།" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "" -"ཨེན་ཨེཕ་ཨེསི་ %s སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" +msgid "Command line option %s is not boolean" +msgstr "བརྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%s་འདི་བུ་ལིན་མེན་པས།" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "Could not get lock %s" -msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚུགས།" +msgid "Option %s requires an argument." +msgstr "གདམ་ཁ་%s་ལུ་སྒྲུབ་རྟགས་ཅིག་དགོ་པས།" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "" +msgid "Option %s: Configuration item specification must have an =." +msgstr "གདམ་ཁ་%s:རིམ་སྒྲིག་གི་རྣམ་གྲངས་གསལ་བཀོད་ལུ་ = ་ཅིག་དགོཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "གདམ་ཁ་ %s ་ལུ་'%s'་མེན་པར་ ཧྲིལ་ཨང་སྒྲུབ་རྟགས་ཅིག་དགོས་མཁོ་ཡོདཔ་ཨིན" -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" +msgid "Option '%s' is too long" +msgstr "གདམ་ཁ་'%s'འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" +msgid "Sense %s is not understood, try true or false." +msgstr "དྲན་ཤེས་ %s་འདི་ཧ་གོ་མ་ཚུགས་པས་ བདེན་པ་ཡང་ན་རྫུན་པ་ལུ་འབད་རྩོལ་བསྐྱེདཔ།" -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།" +msgid "Invalid operation %s" +msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s" -#: apt-pkg/contrib/fileutl.cc:826 +#: apt-pkg/deb/dpkgpm.cc:110 #, fuzzy, c-format -msgid "Sub-process %s received signal %u." -msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།" +msgid "Installing %s" +msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།" +msgid "Configuring %s" +msgstr "%s་རིམ་སྒྲིག་འབད་དོ།" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།" +msgid "Removing %s" +msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/dpkgpm.cc:113 #, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" +msgid "Completely removing %s" +msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Could not open file %s" -msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" - -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 -#, fuzzy, c-format -msgid "Could not open file descriptor %d" -msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "ཡན་ལག་ལས་སྦྱོར་ ཨའི་པི་སི་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" +msgid "Noting disappearance of %s" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "ཨེབ་འཕྲུལ་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" +#: apt-pkg/deb/dpkgpm.cc:115 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1514 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format -msgid "read, still have %llu to read but none left" -msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག" +msgid "Directory '%s' missing" +msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, fuzzy, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།" +msgid "Could not open file '%s'" +msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:1915 -#, fuzzy, c-format -msgid "Problem closing the file %s" -msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" +#: apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Preparing %s" +msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/contrib/fileutl.cc:1927 -#, fuzzy, c-format -msgid "Problem renaming the file %s to %s" -msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།" -#: apt-pkg/contrib/fileutl.cc:1938 -#, fuzzy, c-format -msgid "Problem unlinking the file %s" -msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།" +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing to configure %s" +msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།" +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབད་མ་ཚུགས།" +#: apt-pkg/deb/dpkgpm.cc:1022 +#, c-format +msgid "Removed %s" +msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s" -#: apt-pkg/contrib/mmap.cc:111 -#, fuzzy, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།" +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/contrib/mmap.cc:119 +#: apt-pkg/deb/dpkgpm.cc:1028 +#, c-format +msgid "Completely removed %s" +msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།" +msgid "Can not write log (%s)" +msgstr " %sལུ་འབྲི་མ་ཚུགས།" -#: apt-pkg/contrib/mmap.cc:146 -#, fuzzy -msgid "Unable to close mmap" -msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -#, fuzzy -msgid "Unable to synchronize mmap" -msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "" -#: apt-pkg/contrib/mmap.cc:322 -#, fuzzy -msgid "Failed to truncate file" -msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "" -#: apt-pkg/contrib/mmap.cc:341 +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"Unable to lock the administration directory (%s), is another process using " +"it?" msgstr "" -#: apt-pkg/contrib/mmap.cc:446 +#: 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 "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +"dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/contrib/mmap.cc:449 +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "" + +#: cmdline/apt-extracttemplates.cc:224 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ ཐུམ་སྒྲིལ་ཚུ་ནང་ལས་\n" +"རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིན།\n" +"གདམ་ཁ་ཚུ།\n" +" -h འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདཝ་ཨིན།\n" +" -t འདི་གིས་temp་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།\n" +" -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n" +" -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་" +"བཟུམ།\n" -#: apt-pkg/contrib/progress.cc:148 +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས།" + +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "debconf ་་འཐོན་རིམ་འདི་ལེན་མ་ཚུགས། debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?" + +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +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 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... འཛོལ་བ་!" +msgid "Error processing directory %s" +msgstr "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "འབྱུང་ཁུངས་རྒྱ་བསྐྱེད་ཀྱི་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིང་པས།" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "ནང་དོན་ཡིག་སྣོད་ལུ་མགོ་ཡིག་འཛོལ་བ་འབྲི་ནིའི་མགོ་ཡིག" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... འབད་ཚར་ཡོད།" +msgid "Error processing contents %s" +msgstr "%sའཛོལ་བ་ལས་སྦྱོར་འབད་ནིའི་ནང་དོན།" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" +"ལག་ལེན:apt-ftparchive [options] command\n" +"བརྡ་བཀོད་ཚུ:packages binarypath [overridefile [pathprefix]]\n" +"sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive་འདི་གིས་ ཌི་བི་ཡཱན་ཡིག་མཛོད་ཚུ་གི་དོན་ལུ་ ཚིག་ཡིག་གི་ཡིག་སྣོད་ཚུ་བཟོ་བཏོན་འབདཝ་" +"ཨིན། dpkg-scanpackages དང་ dpkg-scansources་གི་དོན་ལུ་ལས་འགན་ཚབ་མ་ཚུ་ལུ་ཆ་ཚང་སྦེ་ " +"རང་བཞིན་གྱི་སྦེ་བཟོ་བཟོཝ་་ནང་ལས་བཟོ་བཏོན་གྱི་བཟོ་རྣམ་ཚུ་ལྷམ་པ་མ་འདྲཝ་སྦེ་ཡོད་མི་ལུ་རྒྱབ་སྐྱོར་འབདཝ་" +"ཨིན།\n" +"\n" +"apt-ftparchive་ འདི་གིས་.debs་གི་རྩ་འབྲེལ་ཅིག་ནང་ལས་ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད་ཚུ་བཟོ་བཏོན་འབདཝ་ཨིན། " +"ཐུམ་སྒྲིལ་\n" +" ཡིག་སྣོད་འདི་གི་ནང་ན་ ཐུམ་སྒྲིལ་རེ་རེ་བཞིན་ནང་གི་ཚད་འཛིན་ས་སྒོ་ཚུ་ཆ་མཉམ་གི་ནང་དོན་དང་ ཨེམ་ཌི་༥་དྲྭ་" +"རྟགས། (#)་དང་ཡིག་སྣོད་ཀྱི་ཚད་ཚུ་ཡང་ཡོདཔ་ཨིན། ཟུར་བཞག་ཡིག་སྣོད་འདི་\n" +"གཙོ་རིམ་དང་དབྱེ་ཚན་གྱི་གནས་གོང་དེ་བང་བཙོང་འབད་ནི་ལུ་རྒྱབ་སྐྱོར་འབད་ཡོདཔ་ཨིན།\n" +"\n" +"འདི་དང་ཆ་འདྲཝ་སྦེ་ apt-ftparchive་ འདི་གིས་.dscs་གི་རྩ་འབྲེལ་ཅིག་ནང་ལས་འབྱུང་ཁུངས་ཡིག་སྣོད་ཚུ་" +"བཟོ་བཏོན་འབདཝ་ཨིན།\n" +" --source-ཟུར་བཞག་གི་གདམ་ཁ་འདི་ ཨེསི་ཨར་སི་ ཟུར་བཞག་ཡིག་སྣོད་ཅིག་གསལ་བཀོད་འབད་ནི་ལུ་ལག་ལེན་" +"འཐབ་བཐུབ་ཨིན།\n" +"\n" +"'ཐུམ་སྒྲིལ་ཚུ་'་དང་'འབྱུང་ཁུངས་་' བརྡ་བཀོད་ཚུ་རྩ་འབྲེལ་འདི་གི་་རྩ་བ་ནང་ལུ་སྦེ་གཡོག་བཀོལ་དགོཔ་ཨིན། ཟུང་" +"ལྡན་འགྲུལ་ལམ་འདི་གིས་ལོག་རིམ་འཚོལ་ཞིབ་འདི་གི་གཞི་རྟེན་ལུ་དཔག་དགོཔ་ཨིནམ་དང་\n" +"ཟུར་བཞག་ཡིག་སྣོད་འདི་ལུ་ཟུར་བཞག་གི་ཟུར་རྟགས་འོང་དགོཔ་ཨིན། འགྲུལ་ལམ་སྔོན་ཚིག་འདི་\n" +"ཡོད་པ་ཅིན་ཡིག་སྣོད་མིང་གི་ས་སྒོ་ཚུ་ལུ་འཇུག་སྣོན་འབད་དེ་ཡོདཔ་ཨིན། དཔེར་ན་ ཌི་བི་ཡཱན་ཡིག་མཛོད་ལས་ལག་" +"ལེན་བཟུམ:\n" +"apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"གདམ་ཁ་ཚུ:\n" +" -h འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདཝ་ཨིན།\n" +" --md5 ཨེམ་ཌི་༥་ བཟོ་བཏོན་འདི་ཚད་འཛིན་འབདཝ་ཨིན།\n" +" -s=? འབྱུང་ཁུངས་ཟུར་བཞག་གི་ཡིག་སྣོད།\n" +" -q ཁུ་སིམ་སིམ།\n" +" -d=? གདམ་ཁ་ཅན་གྱི་འདྲ་མཛོད་གནད་སྡུད་གཞི་རྟེན་འདི་སེལ་འཐུ་འབད།\n" +" --no-delink འབྲེལ་ལམ་མེད་སྦེ་བཟོ་་ནིའི་རྐྱེན་སེལ་ཐབས་ལམ་འདི་ལྕོགས་ཅན་བཟོ།\n" +" --contents ནང་དོན་གི་ཡིག་སྣོད་བཟོ་བཏོན་འདི་ཚད་འཛིན་འབད།\n" +" -c=? འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷག\n" +" -o=? མཐུན་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབད།" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... འབད་ཚར་ཡོད།" +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "སེལ་འཐུ་ཚུ་མཐུན་སྒྲིག་མིན་འདུག" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "%lid %lih %limin %lis" +msgid "Some files are missing in the package file group `%s'" +msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཐུམ་སྒྲིལ་ཡིག་སྣོད་སྡེ་ཚན་`%s'ནང་བརླག་སྟོར་ཞུགས་ནུག" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "ཌི་བི་ངན་ཅན་བྱུང་ནུག་ %s.རྒསཔ་ལུ་ཡིག་སྣོད་འདི་བསྐྱར་མིང་བཏགས་ཡི།" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་ %s་ཡར་བསྐྱེད་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོ།" + +#: ftparchive/cachedb.cc:94 +#, fuzzy +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" +"ཌི་བི་རྩ་སྒྲིག་འདི་ ནུས་མེད་ཨིན་པས། ཁྱོད་ཀྱི་ apt་ གྱི་འཐོན་རིམ་རྙིངམ་ཅིག་ནང་ལས་ ཡར་བསྐྱེད་འབད་ཡོད་" +"པ་ཅིན་ རྩ་བསྐྲད་གཏང་ཞིནམ་ལས་ གནད་སྡུད་གཞི་རྟེན་འདི་ ལོག་དེ་གསར་བསྐྲུན་འབད། " + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་ཐོ་མིན་འདུག" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།" + +#: ftparchive/writer.cc:91 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "ཌབ་ལུ:%sསྣོད་ཐོ་འདི་ལྷག་མ་ཚུགས།\n" + +#: ftparchive/writer.cc:96 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "ཌབ་ལུ་ %s སིཊེཊི་འབད་མ་ཚུགས།\n" + +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "ཨི:" + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "ཌབ་ལུ:" + +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབད།" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%lih %limin %lis" -msgstr "" +msgid "Failed to resolve %s" +msgstr "%s་མོས་མཐུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 -#, c-format -msgid "%limin %lis" -msgstr "" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "རྩ་འབྲེལ་ཕྱིར་བགྲོད་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོདཔ།" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:219 #, c-format -msgid "%lis" -msgstr "" +msgid "Failed to open %s" +msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:278 #, c-format -msgid "Selection %s not found" -msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།" +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:286 #, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" +msgid "Failed to readlink %s" +msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: apt-pkg/deb/debsystem.cc:94 -#, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།" +#: ftparchive/writer.cc:290 +#, c-format +msgid "Failed to unlink %s" +msgstr "%s་འབྲེལ་ལམ་མེད་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:298 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "" +msgid "*** Failed to link %s to %s" +msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "" +#: ftparchive/writer.cc:308 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n" -#: apt-pkg/deb/dpkgpm.cc:95 -#, fuzzy, c-format -msgid "Installing %s" -msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Configuring %s" -msgstr "%s་རིམ་སྒྲིག་འབད་དོ།" +msgid " %s has no override entry\n" +msgstr " %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Removing %s" -msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།" - -#: apt-pkg/deb/dpkgpm.cc:98 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།" +msgid " %s maintainer is %s not %s\n" +msgstr " %s ་རྒྱུན་སྐྱོང་པ་འདི་ %s ཨིན་ %s མེན།\n" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:706 #, c-format -msgid "Noting disappearance of %s" -msgstr "" +msgid " %s has no source override entry\n" +msgstr " %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:710 #, c-format -msgid "Running post-installation trigger %s" -msgstr "" - -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 -#, fuzzy, c-format -msgid "Directory '%s' missing" -msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག" +msgid " %s has no binary override entry either\n" +msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "དྲན་ཚད་སྤྲོད་ནིའི་དོན་ལུ་ རི་ཨེ་ལོཀ་ འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing %s" -msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།" +msgid "Unable to open %s" +msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/deb/dpkgpm.cc:993 -#, c-format -msgid "Unpacking %s" -msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།" +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing to configure %s" -msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།" +msgid "Failed to read the override file %s" +msgstr "ཟུར་བཞག་ཡིག་སྣོད་%sའདི་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/deb/dpkgpm.cc:1000 -#, c-format -msgid "Installed %s" -msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" +#: ftparchive/override.cc:166 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #1" +msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1" -#: apt-pkg/deb/dpkgpm.cc:1005 -#, c-format -msgid "Preparing for removal of %s" -msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #2" -#: apt-pkg/deb/dpkgpm.cc:1007 -#, c-format -msgid "Removed %s" -msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #3" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Preparing to completely remove %s" -msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" +msgid "Unknown compression algorithm '%s'" +msgstr " མ་ཤེས་ཨེབ་བཙུགས་ཨཱལ་གོ་རི་དམ'%s'" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:103 #, c-format -msgid "Completely removed %s" -msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།" - -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr " %sལུ་འབྲི་མ་ཚུགས།" +msgid "Compressed output %s needs a compression set" +msgstr "ཨེབ་བཙུགས་འབད་ཡོད་པའི་ཨའུཊི་པུཊི་%sལུ་ཨེབ་བཙུགས་ཆ་ཚན་ཅིག་དགོཔ་འདུག" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "ཡིག་སྣོད་*་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "ཁ་སྤེལ་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "ཆ་ལག་ཨེབ་བཙུགས་འབད།" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "ནང་འཁོད་འཛོལ་བ་ %s་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་IO/ཡིག་སྣོད་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "ཨེམ་ཌི་༥་གློག་རིག་རྐྱབ་པའི་སྐབས་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ།" -#: apt-pkg/deb/dpkgpm.cc:1707 +#: cmdline/apt-internal-solver.cc:49 +#, fuzzy msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ ཐུམ་སྒྲིལ་ཚུ་ནང་ལས་\n" +"རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིན།\n" +"གདམ་ཁ་ཚུ།\n" +" -h འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདཝ་ཨིན།\n" +" -t འདི་གིས་temp་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།\n" +" -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n" +" -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་" +"བཟུམ།\n" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" -msgstr "" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "མ་ཤེས་པའི་ཐུམ་སྒྲིལ་གི་དྲན་ཐོ།" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"ལག་ལེན: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs་ འདི་ཐུམ་སྒྲིལ་གི་ཡིག་སྣོད་ཚུ་དབྱེ་སེལ་འབད་ནི་ལུ་ འཇམ་སམ་གྱི་ལག་ཆས་ཅིག་ཨིན། -s " +"གདམ་ཁ་འདི་ ཡིག་སྣོད་ཀྱི་དབྱེ་ཁག་ག་ཅི་བཟུམ་ཅིག་ཨིན་ན\n" +"་བརྡ་སྟོན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་སྟེ་ཡོདཔ་ཨིན།\n" +"\n" +"གདམ་ཁ་ཚུ:\n" +" -h འ་ནི་འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདཝ་ཨིན།\n" +" -s འདི་གིས་འབྱུང་ཁུངས་ ཡིག་སྣོད་གསོག་འཇོག་འབད་དོན་ལུ་ལག་ལེན་འཐབ་ཨིན།\n" +" -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n" +" -o=? འདི་གིས་ མཐུན་སྒྲིག་ རིམ་སྒྲིག་གི་གདམ་ཁ་ཚུ་ཁཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/" +"tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/el.po b/po/el.po index 92f178b0d..ebc604fc9 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: Θανάσης Νάτσης \n" "Language-Team: Greek \n" @@ -166,7 +166,7 @@ msgid " Version table:" msgstr " Πίνακας Έκδοσης:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -371,7 +371,7 @@ msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" @@ -391,96 +391,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -489,7 +489,7 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το %s δεν επιτρέπεται στο " "πακέτο %s" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -497,14 +497,14 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -513,7 +513,7 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις της έκδοσης" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -522,30 +522,30 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν έχει " "υποψήφιαέκδοση" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog για %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -686,7 +686,7 @@ msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί" @@ -780,16 +780,16 @@ msgstr "Αδυναμία απόσυναρμογής του CD-ROM στο %s, μ msgid "Disk not found." msgstr "Ο δίσκος δεν βρέθηκε." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Το αρχείο Δε Βρέθηκε" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Αποτυχία εύρεσης της κατάστασης" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης" @@ -843,7 +843,7 @@ msgstr "Η εντολή '%s' στο σενάριο εισόδου απέτυχε msgid "TYPE failed, server said: %s" msgstr "Η εντολή TYPE απέτυχε, ο διακομιστής απάντησε: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Λήξη χρόνου σύνδεσης" @@ -865,7 +865,7 @@ msgstr "Το μήνυμα απάντησης υπερχείλισε την εν msgid "Protocol corruption" msgstr "Αλλοίωση του πρωτοκόλλου" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -926,7 +926,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο msgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" @@ -935,7 +935,7 @@ msgstr "Πρόβλημα κατά το hashing του αρχείου" msgid "Unable to fetch file, server said '%s'" msgstr "Αδυναμία λήψης του αρχείου, ο διακομιστής απάντησε '%s'" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Λήξη χρόνου υποδοχής δεδομένων" @@ -985,7 +985,7 @@ msgstr "Αδύνατη η σύνδεση στο %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Σύνδεση στο %s" @@ -1130,42 +1130,17 @@ msgstr "Η σύνδεση απέτυχε" msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Hit " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Φέρε:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Αγνόησε " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Σφάλμα " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Μεταφορτώθηκαν %sB σε %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Επεξεργασία]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Αλλαγή Μέσου: Παρακαλώ εισάγετε το δίσκο με ετικέτα\n" -" '%s'\n" -"στη συσκευή '%s' και πιέστε enter\n" +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:93 msgid "Correcting dependencies..." @@ -1197,34 +1172,210 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Εγκατεστημένα]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [Εγκατεστημένα]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση;" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Εγκατεστημένα]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Εγκατεστημένα]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Αποτυχία ανάκτησης του %s %s\n" +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:35 +#, 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:97 +#, 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:101 +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:82 msgid "Internal error, InstallPackages was called with broken packages!" @@ -1279,6 +1430,10 @@ msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερ msgid "You don't have enough free space in %s." msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s." +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes" + #: apt-private/private-install.cc:216 apt-private/private-install.cc:238 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία" @@ -1490,935 +1645,689 @@ msgstr "" msgid "Package '%s' is not installed, so not removed\n" msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n" -#: apt-private/private-list.cc:129 -msgid "Listing" -msgstr "" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!" -#: apt-private/private-list.cc:159 +#: apt-private/private-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n" + +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν" + +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση;" + +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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] "" +msgid "Failed to fetch %s %s\n" +msgstr "Αποτυχία ανάκτησης του %s %s\n" -#: 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!" +#: apt-private/private-sources.cc:58 +#, fuzzy, c-format +msgid "Failed to parse %s. Edit again? " +msgstr "Αποτυχία μετονομασίας του %s σε %s" + +#: apt-private/private-sources.cc:70 +#, c-format +msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 -#: apt-private/private-show.cc:89 -msgid "unknown" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" -#: apt-private/private-output.cc:265 -#, fuzzy, c-format -msgid "[installed,upgradable to: %s]" -msgstr " [Εγκατεστημένα]" +#: apt-private/private-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "Υπολογισμός της αναβάθμισης... " -#: apt-private/private-output.cc:268 -#, fuzzy -msgid "[installed,local]" -msgstr " [Εγκατεστημένα]" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "Ετοιμο" -#: apt-private/private-output.cc:270 -msgid "[installed,auto-removable]" -msgstr "" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Hit " -#: apt-private/private-output.cc:272 -#, fuzzy -msgid "[installed,automatic]" -msgstr " [Εγκατεστημένα]" +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Φέρε:" -#: apt-private/private-output.cc:274 -#, fuzzy -msgid "[installed]" -msgstr " [Εγκατεστημένα]" +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Αγνόησε " -#: apt-private/private-output.cc:277 +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Σφάλμα " + +#: apt-private/acqprogress.cc:146 #, c-format -msgid "[upgradable from: %s]" -msgstr "" +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Μεταφορτώθηκαν %sB σε %s (%sB/s)\n" -#: apt-private/private-output.cc:281 -msgid "[residual-config]" -msgstr "" +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Επεξεργασία]" -#: apt-private/private-output.cc:455 +#: apt-private/acqprogress.cc:297 #, c-format -msgid "but %s is installed" -msgstr "αλλά το %s είναι εγκατεστημένο" +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Αλλαγή Μέσου: Παρακαλώ εισάγετε το δίσκο με ετικέτα\n" +" '%s'\n" +"στη συσκευή '%s' και πιέστε enter\n" -#: apt-private/private-output.cc:457 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "but %s is to be installed" -msgstr "αλλά το %s πρόκειται να εγκατασταθεί" +msgid "Unable to read %s" +msgstr "Αδύνατη η ανάγνωση του %s" -#: apt-private/private-output.cc:464 -msgid "but it is not installable" -msgstr "αλλά δεν είναι εγκαταστάσημο" +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 +#, c-format +msgid "Unable to change to %s" +msgstr "Αδύνατη η αλλαγή σε %s" -#: apt-private/private-output.cc:466 -msgid "but it is a virtual package" -msgstr "αλλά είναι ένα εικονικό πακέτο" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" -#: apt-private/private-output.cc:469 -msgid "but it is not installed" -msgstr "αλλά δεν είναι εγκατεστημένο" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 +#, fuzzy, c-format +msgid "Can not read mirror file '%s'" +msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-private/private-output.cc:469 -msgid "but it is not going to be installed" -msgstr "αλλά δεν πρόκειται να εγκατασταθεί" +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-private/private-output.cc:474 -msgid " or" -msgstr " η" +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" +msgstr "" -#: apt-private/private-output.cc:488 apt-private/private-output.cc:500 -msgid "The following packages have unmet dependencies:" -msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Αποτυχία κατά τη δημιουργία διασωλήνωσης IPC στην υποδιεργασία" -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "Η σύνδεση έκλεισε πρόωρα" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "Κακή προκαθορισμένη ρύθμιση!" -#: apt-private/private-output.cc:571 -msgid "The following packages have been kept back:" -msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "Πιέστε enter για συνέχεια." -#: apt-private/private-output.cc:592 -msgid "The following packages will be upgraded:" -msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:" +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Επιθυμείτε τη διαγραφή ήδη μεταφορτωμένων αρχείων .deb;" -#: apt-private/private-output.cc:613 -msgid "The following packages will be DOWNGRADED:" -msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:" +#: dselect/install:102 +#, fuzzy +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "Προέκυψανσφάλματα κατά την αποσυμπίεση. Θα ρυθμίσω τα " -#: apt-private/private-output.cc:633 -msgid "The following held packages will be changed:" -msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:" +#: dselect/install:103 +#, fuzzy +msgid "will be configured. This may result in duplicate errors" +msgstr "πακέτα που εγκαταστάθηκαν. Αυτό μπορεί να παράγει διπλά λάθη" -#: apt-private/private-output.cc:688 -#, c-format -msgid "%s (due to %s) " -msgstr "%s (λόγω του %s) " +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" +"ή σφάλματα που προκύπτουν από χαλασμένες εξαρτήσεις. Αυτό είναι εντάξει, " +"μόνο τα λάθη" -#: apt-private/private-output.cc:696 +#: dselect/install:105 msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" -"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n" -"Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!" +"πριν από το μήνυμα αυτό έχει σημασία. Παρακαλώ διορθώστε τα και τρέξτε " +"[I]nstall ξανά" -#: apt-private/private-output.cc:727 -#, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, " +#: dselect/update:30 +msgid "Merging available information" +msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών" -#: apt-private/private-output.cc:731 -#, c-format -msgid "%lu reinstalled, " -msgstr "%lu επανεγκατεστημένα," +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "Κλήση του DropNode σε έναν ήδη συνδεδεμένο κόμβο" -#: apt-private/private-output.cc:733 -#, c-format -msgid "%lu downgraded, " -msgstr "%lu υποβαθμισμένα, " +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Αποτυχία εντοπισμού του στοιχείου hash!" -#: apt-private/private-output.cc:735 -#, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Αδυναμία εντοπισμού εκτροπής" -#: apt-private/private-output.cc:739 -#, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Εσωτερικό Σφάλμα στο AddDiversion" -#. 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 "[Ν/ο]" +#: apt-inst/filelist.cc:477 +#, c-format +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Προσπάθεια για αντικατάσταση εκτροπής, %s -> %s και %s/%s" -#. 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 "[ν/Ο]" +#: apt-inst/filelist.cc:506 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "Διπλή προσθήκη εκτροπής %s -> %s" -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:778 -msgid "Y" -msgstr "" +#: apt-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "Διπλό αρχείο ρυθμίσεων %s/%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-inst/extract.cc:101 apt-inst/extract.cc:172 +#, c-format +msgid "The path %s is too long" +msgstr "Η διαδρομή %s έχει υπερβολικό μήκος" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 +#: apt-inst/extract.cc:132 #, c-format -msgid "Regex compilation error - %s" -msgstr "σφάλμα μεταγλωτισμου - %s" +msgid "Unpacking %s more than once" +msgstr "Αποσυμπίεση του %s πάνω από μια φορά" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "Ο φάκελος %s έχει εκτραπεί" -#: apt-private/private-show.cc:156 +#: apt-inst/extract.cc:152 #, 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] "" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Το πακέτο προσπαθεί να γράψει στον προορισμό εκτροπής %s/%s" -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" -msgstr "" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Η διαδρομή εκτροπής έχει υπερβολικό μήκος" -#: apt-private/private-sources.cc:58 -#, fuzzy, c-format -msgid "Failed to parse %s. Edit again? " +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 +#, c-format +msgid "Failed to stat %s" +msgstr "Αποτυχία εύρεσης της κατάστασης του %s." + +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#, c-format +msgid "Failed to rename %s to %s" msgstr "Αποτυχία μετονομασίας του %s σε %s" -#: apt-private/private-sources.cc:70 +#: apt-inst/extract.cc:249 #, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "" +msgid "The directory %s is being replaced by a non-directory" +msgstr "Ο φάκελος %s αντικαθίσταται από ένα μη-φάκελο" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Η εντολή update δεν παίρνει ορίσματα" +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Αποτυχία εντοπισμού του κόμβου στην ομάδα hash του" + +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Η διαδρομή έχει υπερβολικό μήκος" -#: apt-private/private-update.cc:90 +#: apt-inst/extract.cc:421 #, 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] "" +msgid "Overwrite package match with no version for %s" +msgstr "Αντικατάσταση πακέτου χωρίς καμία έκδοση %s" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." -msgstr "" +#: apt-inst/extract.cc:438 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "Υπολογισμός της αναβάθμισης... " +#: apt-inst/extract.cc:498 +#, c-format +msgid "Unable to stat %s" +msgstr "Αδύνατη η εύρεση της κατάστασης του %s" -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "Ετοιμο" +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#, c-format +msgid "Failed to write file %s" +msgstr "Αποτυχία εγγραφής του αρχείου %s" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Unable to read %s" -msgstr "Αδύνατη η ανάγνωση του %s" +msgid "Failed to close file %s" +msgstr "Αποτυχία στο κλείσιμο του αρχείου %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "Unable to change to %s" -msgstr "Αδύνατη η αλλαγή σε %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Αυτό δεν είναι ένα έγκυρο αρχείο DEB, αγνοείται το μέλος '%s'" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "No mirror file '%s' found " -msgstr "" +msgid "Internal error, could not locate member %s" +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 -msgid "Can not read mirror file '%s'" -msgstr "Αδύνατο το άνοιγμα του αρχείου %s" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Μη αναλύσιμο αρχείο control" -#: methods/mirror.cc:315 +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Μη έγκυρη υπογραφή αρχειοθήκης" + +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Σφάλμα κατά την ανάγνωση της επικεφαλίδας του μέλους της αρχειοθήκης" + +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format -msgid "No entry found in mirror file '%s'" -msgstr "Αδύνατο το άνοιγμα του αρχείου %s" +msgid "Invalid archive member header %s" +msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης" -#: methods/mirror.cc:445 -#, c-format -msgid "[Mirror: %s]" -msgstr "" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης" -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "Αποτυχία κατά τη δημιουργία διασωλήνωσης IPC στην υποδιεργασία" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Η αρχειοθήκη είναι πολύ μικρή" -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" -msgstr "Η σύνδεση έκλεισε πρόωρα" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Αποτυχία ανάγνωσης των επικεφαλίδων της αρχειοθήκης" -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "Κακή προκαθορισμένη ρύθμιση!" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Αποτυχία κατά τη δημιουργία διασωληνώσεων" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "Πιέστε enter για συνέχεια." +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Αποτυχία κατά την εκτέλεση του gzip " -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "Επιθυμείτε τη διαγραφή ήδη μεταφορτωμένων αρχείων .deb;" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Κατεστραμμένη αρχειοθήκη" -#: dselect/install:102 -#, fuzzy -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "Προέκυψανσφάλματα κατά την αποσυμπίεση. Θα ρυθμίσω τα " +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είναι κατεστραμμένη" -#: dselect/install:103 -#, fuzzy -msgid "will be configured. This may result in duplicate errors" -msgstr "πακέτα που εγκαταστάθηκαν. Αυτό μπορεί να παράγει διπλά λάθη" +#: apt-inst/contrib/extracttar.cc:308 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s" -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" +#: apt-pkg/install-progress.cc:57 +#, c-format +msgid "Progress: [%3i%%]" msgstr "" -"ή σφάλματα που προκύπτουν από χαλασμένες εξαρτήσεις. Αυτό είναι εντάξει, " -"μόνο τα λάθη" -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" msgstr "" -"πριν από το μήνυμα αυτό έχει σημασία. Παρακαλώ διορθώστε τα και τρέξτε " -"[I]nstall ξανά" -#: dselect/update:30 -msgid "Merging available information" -msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών" +#: apt-pkg/init.cc:146 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Χρήση: apt-extracttemplates αρχείο1 [αρχείο2 ...]\n" -"\n" -"το apt-extracttemplates είναι ένα βοήθημα για να εξάγετε ρυθμίσεις \n" -"και πρότυπα από πακέτα debian\n" -"\n" -"Επιλογές:\n" -" -h Το παρόν κείμενο βοήθειας\n" -" -t Καθορισμός προσωρινού καταλόγου\n" -" -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" -" -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" - -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Αδύνατη η εύρεση της κατάστασης του %s" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Unable to write to %s" -msgstr "Αδύνατη η εγγραφή στο %s" - -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;" - -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Ο κατάλογος επεκτάσεων του πακέτου είναι υπερβολικά μακρύς" +msgid "Wrote %i records.\n" +msgstr "Εγιναν %i εγγραφές.\n" -#: 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 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Error processing directory %s" -msgstr "Σφάλμα επεξεργασίας του καταλόγου %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Ο κατάλογος επεκτάσεων των πηγών είναι υπερβολικά μακρύς" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Σφάλμα εγγραφής κεφαλίδων στο αρχείο περιεχομένων" +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "Error processing contents %s" -msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n" -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" +#: apt-pkg/indexcopy.cc:515 +#, c-format +msgid "Can't find authentication record for: %s" msgstr "" -"Χρήση: apt-ftparchive [επιλογές] εντολή\n" -"Εντολές: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"Το apt-ftparchive παράγει αρχεία περιεχομένων για τις αρχειοθήκες Debian\n" -"Υποστηρίζει πολλές παραλλαγές παραγωγής, από απόλυτα αυτοματοποιημένες έως\n" -"λειτουργικές αντικαταστάσεις για την dpkg-scanpackages και dpkg-scansources\n" -"\n" -"Το apt-ftparchive παράγει αρχεία Package από ένα σύνολο αρχείων .debs. Στο\n" -"αρχείο Package περιέχονται όλα τα πεδία ελέγχου κάθε πακέτου καθώς και\n" -"το μέγεθος τους και το MD5 hash. Υποστηρίζει την ύπαρξη αρχείου παράκαμψης\n" -"για τη βεβιασμένη αλλαγή των πεδίων Priority (Προτεραιότητα) και Section\n" -"(Τομέας).\n" -"\n" -"Με τον ίδιο τρόπο, το apt-ftparchive παράγει αρχεία πηγών (Sources) από μια\n" -"ιεραρχία αρχείων .dsc. Η επιλογή --source-override μπορεί να χρησιμοποιηθεί\n" -"για παράκαμψη των αρχείων πηγών src.\n" -"\n" -"Οι εντολές 'packages' και 'sources' θα πρέπει να εκτελούνται στον βασικό\n" -"κατάλογο της ιεραρχίας.Το BinaryPath θα πρέπει να δείχνει στον αρχικό\n" -"κατάλογο που θα ξεκινάει η αναδρομική αναζήτηση και το αρχείο παράκαμψης\n" -"θα πρέπει να περιέχει τις επιλογές παράκαμψης. Το Pathprefix προστίθεται " -"στα\n" -"πεδία όνομάτων αρχείων, αν υπάρχει. Δείτε παράδειγμα χρήσης στην αρχειοθήκη\n" -"πακέτων του Debian :\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Επιλογές:\n" -" -h Αυτό το κείμενο βοηθείας\n" -" --md5 Έλεγχος παραγωγής MD5\n" -" -s=? αρχείο παράκαμψης πηγών\n" -" -q Χωρίς έξοδο\n" -" -d=? Επιλογή προαιρετικής βάσης δεδομένων cache\n" -" --no-delink Αποσφαλμάτωση του delinking\n" -" --contents Έλεγχος παραγωγής αρχείου περιεχομένων\n" -" -c=? Χρήση αυτού του αρχείου ρυθμίσεων\n" -" -o=? Ορισμός αυθαίρετης επιλογής ρύθμισης" -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Δεν ταιριαξε καμία επιλογή" +#: apt-pkg/indexcopy.cc:521 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Ανόμοιο MD5Sum" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Λείπουν μερικά αρχεία από την ομάδα πακέτων '%s'" +msgid "The method driver %s could not be found." +msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί." -#: ftparchive/cachedb.cc:65 +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" + +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Η βάση είναι κατεστραμμένη, το αρχείο μετονομάστηκε σε %s.old" +msgid "Method %s did not start correctly" +msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά" -#: ftparchive/cachedb.cc:83 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s" +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "" +"Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε " +"enter." -#: ftparchive/cachedb.cc:94 -#, fuzzy -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." msgstr "" -"Το φορμά της βάσης δεν είναι έγκυρο. Εάν αναβαθμίσατε το apt σε νεότερη " -"έκδοση, παρακαλώ αφαιρέστε και δημιουργήστε τη βάση εκ νέου." +"Αδύνατο το άνοιγμα ή η ανάλυση των λιστών πακέτων ή του αρχείου κατάστασης." -#: ftparchive/cachedb.cc:99 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Το άνοιγμά του αρχείου της βάσης %s: %s απέτυχε" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 -#, c-format -msgid "Failed to stat %s" -msgstr "Αποτυχία εύρεσης της κατάστασης του %s." +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Αδύνατη η ανάγνωση της λίστας πηγών." -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Αποτυχία ανάγνωσης του %s" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Άδειο cache πακέτων" -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχου" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο" -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Αδύνατη η πρόσβαση σε δείκτη" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Το αρχείο cache των πακέτων είναι ασύμβατης έκδοσης" -#: ftparchive/writer.cc:91 -#, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: Αδύνατη η ανάγνωση του καταλόγου %s\n" +#: apt-pkg/pkgcache.cc:169 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο" -#: ftparchive/writer.cc:96 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "W: Αδύνατη η εύρεση της κατάστασης του %s\n" +msgid "This APT does not support the versioning system '%s'" +msgstr "Αυτό το APT δεν υποστηρίζει το Σύστημα Απόδοσης Έκδοσης '%s'" -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Η cache πακέτων κατασκευάστηκε για μια διαφορετική αρχιτεκτονική" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "W: " +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Εξαρτάται από" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: Σφάλματα στο αρχείο" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "ΠροΕξαρτάται από" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 -#, c-format -msgid "Failed to resolve %s" -msgstr "Αδύνατη η εύρεση του %s" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Προτείνει" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Αποτυχία ανεύρεσης" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Συστήνει" -#: ftparchive/writer.cc:219 -#, c-format -msgid "Failed to open %s" -msgstr "Αποτυχία ανοίγματος του %s" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Ασύμβατο με" -#: ftparchive/writer.cc:278 -#, c-format -msgid " DeLink %s [%s]\n" -msgstr "Αποσύνδεση %s [%s]\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Αντικαθιστά" -#: ftparchive/writer.cc:286 -#, c-format -msgid "Failed to readlink %s" -msgstr "Αποτυχία ανάγνωσης του %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Απαρχαιώνει" -#: ftparchive/writer.cc:290 -#, c-format -msgid "Failed to unlink %s" -msgstr "Αποτυχία αποσύνδεσης του %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Χαλάει" -#: ftparchive/writer.cc:298 -#, c-format -msgid "*** Failed to link %s to %s" -msgstr " Αποτυχία σύνδεσης του %s με το %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "" -#: ftparchive/writer.cc:308 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Αποσύνδεση ορίου του %sB hit.\n" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "σημαντικό" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "απαιτούμενο" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "καθιερωμένο" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " %s συντηρητής είναι ο %s όχι ο %s\n" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "προαιρετικό" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s δεν έχει εγγραφή πηγαίας παράκαμψης\n" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "επιπλέον" -#: ftparchive/writer.cc:710 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n" - -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realoc - Αδυναμία εκχώρησης μνήμης" +msgid "Index file type '%s' is not supported" +msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %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)" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 +#: apt-pkg/sourcelist.cc:170 #, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1" +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Αποτυχία ανάγνωσης του αρχείου παράκαμψης %s" +#: apt-pkg/sourcelist.cc:173 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" -#: ftparchive/override.cc:166 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1" +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: ftparchive/override.cc:178 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #2" +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: ftparchive/override.cc:191 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #3" +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: ftparchive/multicompress.cc:73 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Άγνωστος Αλγόριθμος Συμπίεσης '%s'" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Η συμπιεσμένη έξοδος του %s χρειάζεται καθορισμό συμπίεσης" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Αποτυχία δημιουργίας του ΑΡΧΕΙΟΥ" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Αποτυχία αγκίστρωσης" - -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Συμπίεση απογόνου" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Εσωτερικό Σφάλμα, Αποτυχία δημιουργίας του %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "απέτυχε η Ε/Ε στην υποδιεργασία/αρχείο" - -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό MD5" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "Problem unlinking %s" -msgstr "Πρόβλημα κατά την αποσύνδεση του %s" +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Αποτυχία μετονομασίας του %s σε %s" - -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Χρήση: apt-extracttemplates αρχείο1 [αρχείο2 ...]\n" -"\n" -"το apt-extracttemplates είναι ένα βοήθημα για να εξάγετε ρυθμίσεις \n" -"και πρότυπα από πακέτα debian\n" -"\n" -"Επιλογές:\n" -" -h Το παρόν κείμενο βοήθειας\n" -" -t Καθορισμός προσωρινού καταλόγου\n" -" -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" -" -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Άγνωστη εγγραφή πακέτου!" - -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Χρήση: apt-sortpkgs [παράμετροι] file1 [file2 ...]\n" -"\n" -"το apt-sortpkgs είναι ένα απλό εργαλείο για να ταξινομήσετε αρχεία πηγαίου " -"κώδικα. Η επιλογή\n" -"-s δείχνει τον τύπο του αρχείου.\n" -"\n" -"Παράμετροι:\n" -" -h Αυτό το κείμενο βοήθειας\n" -" -s Χρήση του τύπου αρχείου\n" -" -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" -" -o=? Θέσε μια αυθαίρετη παράμετρο,πχ -o dir::cache=/tmp\n" +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "Failed to write file %s" -msgstr "Αποτυχία εγγραφής του αρχείου %s" +msgid "Opening %s" +msgstr "Άνοιγμα του %s" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "Failed to close file %s" -msgstr "Αποτυχία στο κλείσιμο του αρχείου %s" +msgid "Line %u too long in source list %s." +msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s." -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "The path %s is too long" -msgstr "Η διαδρομή %s έχει υπερβολικό μήκος" +msgid "Malformed line %u in source list %s (type)" +msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)" -#: apt-inst/extract.cc:132 +#: apt-pkg/sourcelist.cc:375 #, c-format -msgid "Unpacking %s more than once" -msgstr "Αποσυμπίεση του %s πάνω από μια φορά" +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " -#: apt-inst/extract.cc:142 -#, c-format -msgid "The directory %s is diverted" -msgstr "Ο φάκελος %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-inst/extract.cc:152 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Το πακέτο προσπαθεί να γράψει στον προορισμό εκτροπής %s/%s" - -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Η διαδρομή εκτροπής έχει υπερβολικό μήκος" - -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Ο φάκελος %s αντικαθίσταται από ένα μη-φάκελο" - -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Αποτυχία εντοπισμού του κόμβου στην ομάδα hash του" - -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Η διαδρομή έχει υπερβολικό μήκος" - -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Αντικατάσταση πακέτου χωρίς καμία έκδοση %s" +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται" -#: apt-inst/extract.cc:438 +#: apt-pkg/clean.cc:64 #, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s" +msgid "Unable to stat %s." +msgstr "Αδύνατη η εύρεση της κατάστασης του %s." -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "Αδύνατη η εύρεση της κατάστασης του %s" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "Κλήση του DropNode σε έναν ήδη συνδεδεμένο κόμβο" +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Αποτυχία εντοπισμού του στοιχείου hash!" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "" +"Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το " +"APT." -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Αδυναμία εντοπισμού εκτροπής" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT." -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Εσωτερικό Σφάλμα στο AddDiversion" +#: apt-pkg/pkgcachegen.cc:263 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Εκπληκτικό, υπερβήκατε τον αριθμό των περιγραφών που υποστηρίζει το APT." -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Προσπάθεια για αντικατάσταση εκτροπής, %s -> %s και %s/%s" +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "" +"Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT." -#: apt-inst/filelist.cc:506 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Διπλή προσθήκη εκτροπής %s -> %s" +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου" -#: apt-inst/filelist.cc:549 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Διπλό αρχείο ρυθμίσεων %s/%s" - -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Μη έγκυρη υπογραφή αρχειοθήκης" - -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Σφάλμα κατά την ανάγνωση της επικεφαλίδας του μέλους της αρχειοθήκης" - -#: apt-inst/contrib/arfile.cc:96 -#, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης" - -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης" - -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Η αρχειοθήκη είναι πολύ μικρή" - -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Αποτυχία ανάγνωσης των επικεφαλίδων της αρχειοθήκης" - -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Αποτυχία κατά τη δημιουργία διασωληνώσεων" - -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Αποτυχία κατά την εκτέλεση του gzip " - -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Κατεστραμμένη αρχειοθήκη" - -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είναι κατεστραμμένη" +msgid "Couldn't stat source package list %s" +msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s" -#: apt-inst/contrib/extracttar.cc:308 -#, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Ανάγνωση Λιστών Πακέτων" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 -#, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Αυτό δεν είναι ένα έγκυρο αρχείο DEB, αγνοείται το μέλος '%s'" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Συλλογή Παροχών Αρχείου" -#: apt-inst/deb/debfile.cc:132 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού του μέλους %s" - -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Μη αναλύσιμο αρχείο control" +msgid "Unable to write to %s" +msgstr "Αδύνατη η εγγραφή στο %s" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, fuzzy, c-format -msgid "List directory %spartial is missing." -msgstr "Ο φάκελος λιστών %spartial αγνοείται." +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών" -#: apt-pkg/acquire.cc:91 -#, fuzzy, c-format -msgid "Archives directory %spartial is missing." -msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται." +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "" -#: apt-pkg/acquire.cc:99 -#, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "Αδύνατο το κλείδωμα του καταλόγου" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "Λήψη αρχείου %li του %li" +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2438,35 +2347,35 @@ msgstr "Ανόμοιο μέγεθος" msgid "Invalid file format" msgstr "Μη έγκυρη λειτουργία %s" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, 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:1589 +#: apt-pkg/acquire-item.cc:1656 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/acquire-item.cc:1631 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2474,12 +2383,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2488,12 +2397,12 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2501,118 +2410,96 @@ msgstr "" "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί." +msgid "Vendor block %s contains no fingerprint" +msgstr "Η εγγραφή κατασκευαστή %s δεν περιέχει ταυτότητα" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" +msgid "List directory %spartial is missing." +msgstr "Ο φάκελος λιστών %spartial αγνοείται." -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 +#, fuzzy, c-format +msgid "Archives directory %spartial is missing." +msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται." + +#: apt-pkg/acquire.cc:99 +#, fuzzy, c-format +msgid "Unable to lock directory %s" +msgstr "Αδύνατο το κλείδωμα του καταλόγου" + +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "Method %s did not start correctly" -msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)" -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:904 #, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε " -"enter." +msgid "Retrieving file %li of %li" +msgstr "Λήψη αρχείου %li του %li" -#: apt-pkg/algorithms.cc:265 +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list" + +#: apt-pkg/policy.cc:83 #, c-format msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -"Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση " -"κάποιας κατάλληλης αρχείοθήκης." -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως " -"προκλήθηκε από κρατούμενα πακέτα." - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα." - -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." -msgstr "" -"Αδύνατο το άνοιγμα ή η ανάλυση των λιστών πακέτων ή του αρχείου κατάστασης." - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "" -"Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Αδύνατη η ανάγνωση της λίστας πηγών." - -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Η έκδοση %s για το %s δεν βρέθηκε" - -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Η έκδοση %s για το %s δεν βρέθηκε" - -#: apt-pkg/cacheset.cc:603 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s" - -#: apt-pkg/cacheset.cc:609 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Αδύνατη η εύρεση του πακέτου %s" - -#: apt-pkg/cacheset.cc:615 +#: apt-pkg/policy.cc:422 #, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Αδύνατη η εύρεση του πακέτου %s" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package" -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" +msgid "Did not understand pin type %s" +msgstr "Αδύνατη η κατανόηση του τύπου καθήλωσης %s" + +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" msgstr "" +"Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" +"Αυτή η προσπάθεια εγκατάστασης απαιτεί προσωρινή αφαίρεση του σημαντικού " +"πακέτου %s λόγω ενός βρόγχου Ασυμβατότητας/ΠροΕξάρτησης. Αυτό συνήθως δεν " +"είναι καλό, αλλά εάν πραγματικά θέλετε να συνεχίσετε ενεργοποιήστε την " +"επιλογή APT::Force-LoopBreak option." -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +#: 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:497 apt-pkg/sourcelist.cc:347 -#, c-format -msgid "Line %u too long in source list %s." -msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s." +"Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα " +"στη θέση τους." #: apt-pkg/cdrom.cc:571 msgid "Unmounting CD-ROM...\n" @@ -2689,10 +2576,25 @@ msgstr "Eγγραφή νέας λίστας πηγών\n" msgid "Source list entries for this disc are:\n" msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Αδύνατη η εύρεση της κατάστασης του %s." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση " +"κάποιας κατάλληλης αρχείοθήκης." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως " +"προκλήθηκε από κρατούμενα πακέτα." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα." #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2720,55 +2622,67 @@ msgstr "Αποτυχία ανοίγματος του αρχείου κατάστ msgid "Failed to write temporary StateFile %s" msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Η έκδοση %s για το %s δεν βρέθηκε" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Η έκδοση %s για το %s δεν βρέθηκε" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 -#, c-format -msgid "Wrote %i records.\n" -msgstr "Εγιναν %i εγγραφές.\n" +#: apt-pkg/cacheset.cc:609 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Αδύνατη η εύρεση του πακέτου %s" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "Ανόμοιο MD5Sum" +#: apt-pkg/cacheset.cc:663 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" #: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format @@ -2795,321 +2709,223 @@ msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεω msgid "Invalid 'Date' entry in Release file %s" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων" +msgid "%lid %lih %limin %lis" +msgstr "" -#: apt-pkg/install-progress.cc:57 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Progress: [%3i%%]" +msgid "%lih %limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 +#, c-format +msgid "%limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "%lis" msgstr "" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "Αδύνατο το άνοιγμα του αρχείου %s" +#: apt-pkg/contrib/strutl.cc:1258 +#, c-format +msgid "Selection %s not found" +msgstr "Η επιλογή %s δε βρέθηκε" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:190 #, 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." +msgid "Not using locking for read only lock file %s" msgstr "" -"Αυτή η προσπάθεια εγκατάστασης απαιτεί προσωρινή αφαίρεση του σημαντικού " -"πακέτου %s λόγω ενός βρόγχου Ασυμβατότητας/ΠροΕξάρτησης. Αυτό συνήθως δεν " -"είναι καλό, αλλά εάν πραγματικά θέλετε να συνεχίσετε ενεργοποιήστε την " -"επιλογή APT::Force-LoopBreak option." +"Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Άδειο cache πακέτων" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο" - -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Το αρχείο cache των πακέτων είναι ασύμβατης έκδοσης" - -#: apt-pkg/pkgcache.cc:169 -#, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο" - -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:218 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Αυτό το APT δεν υποστηρίζει το Σύστημα Απόδοσης Έκδοσης '%s'" - -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "Η cache πακέτων κατασκευάστηκε για μια διαφορετική αρχιτεκτονική" - -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Εξαρτάται από" - -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "ΠροΕξαρτάται από" - -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Προτείνει" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Συστήνει" - -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Ασύμβατο με" - -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Αντικαθιστά" - -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Απαρχαιώνει" - -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Χαλάει" - -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" +msgid "Not using locking for nfs mounted lock file %s" msgstr "" +"Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος " +"%s" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "σημαντικό" - -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "απαιτούμενο" - -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "καθιερωμένο" - -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "προαιρετικό" - -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "επιπλέον" - -#: apt-pkg/pkgcachegen.cc:93 -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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 -#, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Αδύνατο το κλείδωμα %s" -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" msgstr "" -"Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το " -"APT." - -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT." -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -"Εκπληκτικό, υπερβήκατε τον αριθμό των περιγραφών που υποστηρίζει το APT." -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -"Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT." -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/fileutl.cc:421 #, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου" +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/fileutl.cc:824 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s" - -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Ανάγνωση Λιστών Πακέτων" - -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Συλλογή Παροχών Αρχείου" +msgid "Sub-process %s received a segmentation fault." +msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών" +#: apt-pkg/contrib/fileutl.cc:826 +#, fuzzy, c-format +msgid "Sub-process %s received signal %u." +msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται" +msgid "Sub-process %s returned an error code (%u)" +msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" -msgstr "" +msgid "Sub-process %s exited unexpectedly" +msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/fileutl.cc:913 #, fuzzy, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package" +msgid "Problem closing the gzip file %s" +msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/fileutl.cc:1101 #, c-format -msgid "Did not understand pin type %s" -msgstr "Αδύνατη η κατανόηση του τύπου καθήλωσης %s" - -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "" -"Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση" +msgid "Could not open file %s" +msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 #, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" +msgid "Could not open file descriptor %d" +msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Αποτυχία δημιουργίας IPC στην υποδιεργασία" + +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Αποτυχία εκτέλεσης του συμπιεστή " + +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" +msgid "read, still have %llu to read but none left" +msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" +msgid "write, still have %llu to write but couldn't" +msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" +msgid "Problem closing the file %s" +msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" +msgid "Problem renaming the file %s to %s" +msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" -msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" +msgid "Problem unlinking the file %s" +msgstr "Πρόβλημα κατά την διαγραφή του αρχείου" -#: apt-pkg/sourcelist.cc:206 -#, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" +msgid "%c%s... Error!" +msgstr "%c%s... Σφάλμα!" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" +msgid "%c%s... Done" +msgstr "%c%s... Ολοκληρώθηκε" -#: apt-pkg/sourcelist.cc:217 -#, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)" +#: apt-pkg/contrib/progress.cc:181 +msgid "..." +msgstr "" -#: 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" +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Ολοκληρώθηκε" -#: apt-pkg/sourcelist.cc:371 -#, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)" +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Αδύνατη η απεικόνιση mmap ενός άδειου αρχείου" -#: 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/contrib/mmap.cc:111 +#, fuzzy, c-format +msgid "Couldn't duplicate file descriptor %i" +msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s" -#: apt-pkg/sourcelist.cc:416 +#: apt-pkg/contrib/mmap.cc:119 #, fuzzy, c-format -msgid "Type '%s' is not known on stanza %u in source list %s" -msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " +msgid "Couldn't make mmap of %llu bytes" +msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes" -#: apt-pkg/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list" +#: apt-pkg/contrib/mmap.cc:146 +#, fuzzy +msgid "Unable to close mmap" +msgstr "Αδύνατο το άνοιγμα του %s" -#: apt-pkg/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "Αδύνατη η εκτέλεση" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes" -#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 +#: apt-pkg/contrib/mmap.cc:322 #, fuzzy +msgid "Failed to truncate file" +msgstr "Αποτυχία εγγραφής του αρχείου %s" + +#: apt-pkg/contrib/mmap.cc:341 +#, c-format msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα " -"στη θέση τους." -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Η εγγραφή κατασκευαστή %s δεν περιέχει ταυτότητα" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" + +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" #: apt-pkg/contrib/cdromutl.cc:65 #, c-format @@ -3120,53 +2936,6 @@ msgstr "Αδύνατη η εύρεση της κατάστασης του σημ msgid "Failed to stat the cdrom" msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom" -#: apt-pkg/contrib/cmndline.cc:121 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "Η επιλογή γραμμής εντολών '%c' [από %s] δεν είναι γνωστή." - -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "Η επιλογή γραμμής εντολών %s δεν είναι κατανοητή" - -#: apt-pkg/contrib/cmndline.cc:168 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "Η επιλογή γραμμής εντολών %s δεν είναι boolean" - -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "Η επιλογή %s απαιτεί ένα όρισμα." - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "" -"Επιλογή %s: Οι προδιαγραφές του αντικειμένου ρυθμίσεων απαιτούν =." - -#: apt-pkg/contrib/cmndline.cc:278 -#, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "Επιλογή %s: απαιτείται ένας ακέραιος αριθμός ως όρισμα, όχι '%s'" - -#: apt-pkg/contrib/cmndline.cc:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "Η επιλογή '%s' έχει υπερβολικό μήκος" - -#: apt-pkg/contrib/cmndline.cc:341 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "Η τιμή %s δεν είναι κατανοητή, δοκιμάστε σωστό (true) ή λάθος (false)." - -#: apt-pkg/contrib/cmndline.cc:391 -#, c-format -msgid "Invalid operation %s" -msgstr "Μη έγκυρη λειτουργία %s" - #: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" @@ -3224,390 +2993,616 @@ msgstr "" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου" -#: apt-pkg/contrib/fileutl.cc:190 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Εγκατάλειψη της εγκατάστασης." + +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "" -"Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s" +msgid "Command line option '%c' [from %s] is not known." +msgstr "Η επιλογή γραμμής εντολών '%c' [από %s] δεν είναι γνωστή." -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Could not open lock file %s" -msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s" +msgid "Command line option %s is not understood" +msgstr "Η επιλογή γραμμής εντολών %s δεν είναι κατανοητή" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "" -"Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος " -"%s" +msgid "Command line option %s is not boolean" +msgstr "Η επιλογή γραμμής εντολών %s δεν είναι boolean" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "Could not get lock %s" -msgstr "Αδύνατο το κλείδωμα %s" +msgid "Option %s requires an argument." +msgstr "Η επιλογή %s απαιτεί ένα όρισμα." -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "List of files can't be created as '%s' is not a directory" +msgid "Option %s: Configuration item specification must have an =." msgstr "" +"Επιλογή %s: Οι προδιαγραφές του αντικειμένου ρυθμίσεων απαιτούν =." -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Επιλογή %s: απαιτείται ένας ακέραιος αριθμός ως όρισμα, όχι '%s'" -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" +msgid "Option '%s' is too long" +msgstr "Η επιλογή '%s' έχει υπερβολικό μήκος" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" +msgid "Sense %s is not understood, try true or false." +msgstr "Η τιμή %s δεν είναι κατανοητή, δοκιμάστε σωστό (true) ή λάθος (false)." -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" +msgid "Invalid operation %s" +msgstr "Μη έγκυρη λειτουργία %s" -#: apt-pkg/contrib/fileutl.cc:826 -#, fuzzy, c-format -msgid "Sub-process %s received signal %u." -msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" +#: apt-pkg/deb/dpkgpm.cc:110 +#, c-format +msgid "Installing %s" +msgstr "Εγκατάσταση του %s" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)" +msgid "Configuring %s" +msgstr "Ρύθμιση του %s" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα" +msgid "Removing %s" +msgstr "Αφαιρώ το %s" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/dpkgpm.cc:113 #, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" +msgid "Completely removing %s" +msgstr "Το %s διαγράφηκε πλήρως" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Could not open file %s" -msgstr "Αδύνατο το άνοιγμα του αρχείου %s" - -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 -#, fuzzy, c-format -msgid "Could not open file descriptor %d" -msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s" +msgid "Noting disappearance of %s" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Αποτυχία δημιουργίας IPC στην υποδιεργασία" +#: apt-pkg/deb/dpkgpm.cc:115 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Εκτέλεση του post-installation trigger %s" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Αποτυχία εκτέλεσης του συμπιεστή " +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 +#, c-format +msgid "Directory '%s' missing" +msgstr "Ο φάκελος %s αγνοείται." -#: apt-pkg/contrib/fileutl.cc:1514 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, fuzzy, c-format -msgid "read, still have %llu to read but none left" -msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα" +msgid "Could not open file '%s'" +msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, fuzzy, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία" +#: apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Preparing %s" +msgstr "Προετοιμασία του %s" -#: apt-pkg/contrib/fileutl.cc:1915 -#, fuzzy, c-format -msgid "Problem closing the file %s" -msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr "Ξεπακετάρισμα του %s" -#: apt-pkg/contrib/fileutl.cc:1927 -#, fuzzy, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing to configure %s" +msgstr "Προετοιμασία ρύθμισης του %s" -#: apt-pkg/contrib/fileutl.cc:1938 -#, fuzzy, c-format -msgid "Problem unlinking the file %s" -msgstr "Πρόβλημα κατά την διαγραφή του αρχείου" +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr "Έγινε εγκατάσταση του %s" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "Προετοιμασία για την αφαίρεση του %s" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Εγκατάλειψη της εγκατάστασης." +#: apt-pkg/deb/dpkgpm.cc:1022 +#, c-format +msgid "Removed %s" +msgstr "Αφαίρεσα το %s" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Αδύνατη η απεικόνιση mmap ενός άδειου αρχείου" +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Προετοιμασία πλήρης αφαίρεσης του %s" -#: apt-pkg/contrib/mmap.cc:111 -#, fuzzy, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s" +#: apt-pkg/deb/dpkgpm.cc:1028 +#, c-format +msgid "Completely removed %s" +msgstr "Το %s διαγράφηκε πλήρως" -#: apt-pkg/contrib/mmap.cc:119 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes" +msgid "Can not write log (%s)" +msgstr "Αδύνατη η εγγραφή στο %s" -#: apt-pkg/contrib/mmap.cc:146 -#, fuzzy -msgid "Unable to close mmap" -msgstr "Αδύνατο το άνοιγμα του %s" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -#, fuzzy -msgid "Unable to synchronize mmap" -msgstr "Αδύνατη η εκτέλεση" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "" -#: apt-pkg/contrib/mmap.cc:322 -#, fuzzy -msgid "Failed to truncate file" -msgstr "Αποτυχία εγγραφής του αρχείου %s" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "" -#: apt-pkg/contrib/mmap.cc:341 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1726 msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -#: apt-pkg/contrib/mmap.cc:446 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1732 msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +"No apport report written because the error message indicates a disk full " +"error" msgstr "" -#: apt-pkg/contrib/mmap.cc:449 +#: apt-pkg/deb/dpkgpm.cc:1739 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"No apport report written because the error message indicates a out of memory " +"error" msgstr "" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "%c%s... Error!" -msgstr "%c%s... Σφάλμα!" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" -#: apt-pkg/contrib/progress.cc:150 +#: 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 "%c%s... Done" -msgstr "%c%s... Ολοκληρώθηκε" +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgstr "" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" msgstr "" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Χρήση: apt-extracttemplates αρχείο1 [αρχείο2 ...]\n" +"\n" +"το apt-extracttemplates είναι ένα βοήθημα για να εξάγετε ρυθμίσεις \n" +"και πρότυπα από πακέτα debian\n" +"\n" +"Επιλογές:\n" +" -h Το παρόν κείμενο βοήθειας\n" +" -t Καθορισμός προσωρινού καταλόγου\n" +" -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" +" -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:254 #, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Ολοκληρώθηκε" +msgid "Unable to mkstemp %s" +msgstr "Αδύνατη η εύρεση της κατάστασης του %s" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;" + +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +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 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "" +msgid "Error processing directory %s" +msgstr "Σφάλμα επεξεργασίας του καταλόγου %s" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Ο κατάλογος επεκτάσεων των πηγών είναι υπερβολικά μακρύς" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Σφάλμα εγγραφής κεφαλίδων στο αρχείο περιεχομένων" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "%lih %limin %lis" +msgid "Error processing contents %s" +msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s" + +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" +"Χρήση: apt-ftparchive [επιλογές] εντολή\n" +"Εντολές: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"Το apt-ftparchive παράγει αρχεία περιεχομένων για τις αρχειοθήκες Debian\n" +"Υποστηρίζει πολλές παραλλαγές παραγωγής, από απόλυτα αυτοματοποιημένες έως\n" +"λειτουργικές αντικαταστάσεις για την dpkg-scanpackages και dpkg-scansources\n" +"\n" +"Το apt-ftparchive παράγει αρχεία Package από ένα σύνολο αρχείων .debs. Στο\n" +"αρχείο Package περιέχονται όλα τα πεδία ελέγχου κάθε πακέτου καθώς και\n" +"το μέγεθος τους και το MD5 hash. Υποστηρίζει την ύπαρξη αρχείου παράκαμψης\n" +"για τη βεβιασμένη αλλαγή των πεδίων Priority (Προτεραιότητα) και Section\n" +"(Τομέας).\n" +"\n" +"Με τον ίδιο τρόπο, το apt-ftparchive παράγει αρχεία πηγών (Sources) από μια\n" +"ιεραρχία αρχείων .dsc. Η επιλογή --source-override μπορεί να χρησιμοποιηθεί\n" +"για παράκαμψη των αρχείων πηγών src.\n" +"\n" +"Οι εντολές 'packages' και 'sources' θα πρέπει να εκτελούνται στον βασικό\n" +"κατάλογο της ιεραρχίας.Το BinaryPath θα πρέπει να δείχνει στον αρχικό\n" +"κατάλογο που θα ξεκινάει η αναδρομική αναζήτηση και το αρχείο παράκαμψης\n" +"θα πρέπει να περιέχει τις επιλογές παράκαμψης. Το Pathprefix προστίθεται " +"στα\n" +"πεδία όνομάτων αρχείων, αν υπάρχει. Δείτε παράδειγμα χρήσης στην αρχειοθήκη\n" +"πακέτων του Debian :\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Επιλογές:\n" +" -h Αυτό το κείμενο βοηθείας\n" +" --md5 Έλεγχος παραγωγής MD5\n" +" -s=? αρχείο παράκαμψης πηγών\n" +" -q Χωρίς έξοδο\n" +" -d=? Επιλογή προαιρετικής βάσης δεδομένων cache\n" +" --no-delink Αποσφαλμάτωση του delinking\n" +" --contents Έλεγχος παραγωγής αρχείου περιεχομένων\n" +" -c=? Χρήση αυτού του αρχείου ρυθμίσεων\n" +" -o=? Ορισμός αυθαίρετης επιλογής ρύθμισης" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Δεν ταιριαξε καμία επιλογή" + +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "%limin %lis" +msgid "Some files are missing in the package file group `%s'" +msgstr "Λείπουν μερικά αρχεία από την ομάδα πακέτων '%s'" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Η βάση είναι κατεστραμμένη, το αρχείο μετονομάστηκε σε %s.old" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s" + +#: ftparchive/cachedb.cc:94 +#, fuzzy +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" +"Το φορμά της βάσης δεν είναι έγκυρο. Εάν αναβαθμίσατε το apt σε νεότερη " +"έκδοση, παρακαλώ αφαιρέστε και δημιουργήστε τη βάση εκ νέου." + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Το άνοιγμά του αρχείου της βάσης %s: %s απέτυχε" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Αποτυχία ανάγνωσης του %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχου" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Αδύνατη η πρόσβαση σε δείκτη" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:91 #, c-format -msgid "%lis" -msgstr "" +msgid "W: Unable to read directory %s\n" +msgstr "W: Αδύνατη η ανάγνωση του καταλόγου %s\n" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:96 #, c-format -msgid "Selection %s not found" -msgstr "Η επιλογή %s δε βρέθηκε" +msgid "W: Unable to stat %s\n" +msgstr "W: Αδύνατη η εύρεση της κατάστασης του %s\n" -#: apt-pkg/deb/debsystem.cc:91 -#, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " -#: apt-pkg/deb/debsystem.cc:94 -#, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Αδύνατο το κλείδωμα του καταλόγου" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "W: " -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: Σφάλματα στο αρχείο" + +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "" +msgid "Failed to resolve %s" +msgstr "Αδύνατη η εύρεση του %s" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Αποτυχία ανεύρεσης" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:219 #, c-format -msgid "Installing %s" -msgstr "Εγκατάσταση του %s" +msgid "Failed to open %s" +msgstr "Αποτυχία ανοίγματος του %s" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:278 #, c-format -msgid "Configuring %s" -msgstr "Ρύθμιση του %s" +msgid " DeLink %s [%s]\n" +msgstr "Αποσύνδεση %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:286 #, c-format -msgid "Removing %s" -msgstr "Αφαιρώ το %s" - -#: apt-pkg/deb/dpkgpm.cc:98 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "Το %s διαγράφηκε πλήρως" +msgid "Failed to readlink %s" +msgstr "Αποτυχία ανάγνωσης του %s" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:290 #, c-format -msgid "Noting disappearance of %s" -msgstr "" +msgid "Failed to unlink %s" +msgstr "Αποτυχία αποσύνδεσης του %s" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:298 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Εκτέλεση του post-installation trigger %s" +msgid "*** Failed to link %s to %s" +msgstr " Αποτυχία σύνδεσης του %s με το %s" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:308 #, c-format -msgid "Directory '%s' missing" -msgstr "Ο φάκελος %s αγνοείται." +msgid " DeLink limit of %sB hit.\n" +msgstr " Αποσύνδεση ορίου του %sB hit.\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "Αδύνατο το άνοιγμα του αρχείου %s" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Preparing %s" -msgstr "Προετοιμασία του %s" +msgid " %s has no override entry\n" +msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Unpacking %s" -msgstr "Ξεπακετάρισμα του %s" +msgid " %s maintainer is %s not %s\n" +msgstr " %s συντηρητής είναι ο %s όχι ο %s\n" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing to configure %s" -msgstr "Προετοιμασία ρύθμισης του %s" +msgid " %s has no source override entry\n" +msgstr " %s δεν έχει εγγραφή πηγαίας παράκαμψης\n" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/writer.cc:710 #, c-format -msgid "Installed %s" -msgstr "Έγινε εγκατάσταση του %s" +msgid " %s has no binary override entry either\n" +msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n" -#: apt-pkg/deb/dpkgpm.cc:1005 -#, c-format -msgid "Preparing for removal of %s" -msgstr "Προετοιμασία για την αφαίρεση του %s" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realoc - Αδυναμία εκχώρησης μνήμης" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Removed %s" -msgstr "Αφαίρεσα το %s" +msgid "Unable to open %s" +msgstr "Αδύνατο το άνοιγμα του %s" -#: apt-pkg/deb/dpkgpm.cc:1012 -#, c-format -msgid "Preparing to completely remove %s" -msgstr "Προετοιμασία πλήρης αφαίρεσης του %s" +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Completely removed %s" -msgstr "Το %s διαγράφηκε πλήρως" +msgid "Failed to read the override file %s" +msgstr "Αποτυχία ανάγνωσης του αρχείου παράκαμψης %s" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/override.cc:166 #, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Αδύνατη η εγγραφή στο %s" +msgid "Malformed override %s line %llu #1" +msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #2" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #3" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" +#: ftparchive/multicompress.cc:73 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Άγνωστος Αλγόριθμος Συμπίεσης '%s'" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Η συμπιεσμένη έξοδος του %s χρειάζεται καθορισμό συμπίεσης" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Αποτυχία δημιουργίας του ΑΡΧΕΙΟΥ" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Αποτυχία αγκίστρωσης" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Συμπίεση απογόνου" -#: apt-pkg/deb/dpkgpm.cc:1707 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Εσωτερικό Σφάλμα, Αποτυχία δημιουργίας του %s" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "απέτυχε η Ε/Ε στην υποδιεργασία/αρχείο" + +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό MD5" + +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Πρόβλημα κατά την αποσύνδεση του %s" + +#: cmdline/apt-internal-solver.cc:49 +#, fuzzy msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Χρήση: apt-extracttemplates αρχείο1 [αρχείο2 ...]\n" +"\n" +"το apt-extracttemplates είναι ένα βοήθημα για να εξάγετε ρυθμίσεις \n" +"και πρότυπα από πακέτα debian\n" +"\n" +"Επιλογές:\n" +" -h Το παρόν κείμενο βοήθειας\n" +" -t Καθορισμός προσωρινού καταλόγου\n" +" -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" +" -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Άγνωστη εγγραφή πακέτου!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Χρήση: apt-sortpkgs [παράμετροι] file1 [file2 ...]\n" +"\n" +"το apt-sortpkgs είναι ένα απλό εργαλείο για να ταξινομήσετε αρχεία πηγαίου " +"κώδικα. Η επιλογή\n" +"-s δείχνει τον τύπο του αρχείου.\n" +"\n" +"Παράμετροι:\n" +" -h Αυτό το κείμενο βοήθειας\n" +" -s Χρήση του τύπου αρχείου\n" +" -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" +" -o=? Θέσε μια αυθαίρετη παράμετρο,πχ -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/es.po b/po/es.po index 7ecd14890..641c4877a 100644 --- a/po/es.po +++ b/po/es.po @@ -33,7 +33,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.10\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-10-15 19:57+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2014-11-20 02:25+0100\n" "Last-Translator: Manuel \"Venturi\" Porras Peralta \n" @@ -214,7 +214,7 @@ msgid " Version table:" msgstr " Tabla de versión:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -423,7 +423,7 @@ msgstr "No se puede bloquear el directorio de descarga" 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "No se pudo encontrar el paquete de fuentes para %s" @@ -450,81 +450,81 @@ msgstr "" "para obtener las últimas actualizaciones (posiblemente no publicadas aún) " "del paquete.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omitiendo el fichero ya descargado «%s»\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "No se pudo determinar el espacio libre en %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, c-format msgid "Need to get %sB/%sB of source archives.\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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Se necesita descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de solo descarga" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Omitiendo desempaquetamiento de paquetes fuente ya desempaquetados en %s\n" -#: cmdline/apt-get.cc:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orden de desempaquetamiento «%s».\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orden de construcción «%s».\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Falló el proceso hijo" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -533,17 +533,17 @@ msgstr "" "No hay información disponible de arquitectura para %s. Vea apt.conf(5) APT::" "Arquitecturas para la configuración" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construcción.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -552,7 +552,7 @@ msgstr "" "La dependencia %s para %s no puede satisfacerse porque no se permite %s en " "los paquetes «%s»" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -561,14 +561,14 @@ msgstr "" "La dependencia %s para %s no puede satisfacerse porque no se puede encontrar " "el paquete %s" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -577,7 +577,7 @@ msgstr "" "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:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -586,30 +586,30 @@ msgstr "" "La dependencia %s para %s no puede satisfacerse porque el paquete %s no " "tiene ninguna versión presentada" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, 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:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construcción" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Informe de cambios para %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Módulos admitidos:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -762,8 +762,9 @@ msgstr "%s ya estaba fijado como retenido.\n" msgid "%s was already not hold.\n" msgstr "%s ya no estaba retenido.\n" -#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1272 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Se esperaba %s pero no estaba presente" @@ -1249,10 +1250,255 @@ msgstr "Falló la conexión" msgid "Internal error" msgstr "Error interno" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "Listando" + +#: apt-private/private-list.cc:159 +#, 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:93 +msgid "Correcting dependencies..." +msgstr "Corrigiendo dependencias..." + +#: apt-private/private-cachefile.cc:96 +msgid " failed." +msgstr " falló." + +#: apt-private/private-cachefile.cc:99 +msgid "Unable to correct dependencies" +msgstr "No se pueden corregir las dependencias" + +#: apt-private/private-cachefile.cc:102 +msgid "Unable to minimize the upgrade set" +msgstr "No se puede minimizar el conjunto de actualización" + +#: apt-private/private-cachefile.cc:104 +msgid " Done" +msgstr " Listo" + +#: apt-private/private-cachefile.cc:108 +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:111 +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:35 +#, 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:97 +#, 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:101 +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:82 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!" @@ -1523,254 +1769,9 @@ msgstr "" 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:129 -msgid "Listing" -msgstr "Listando" - -#: apt-private/private-list.cc:159 -#, 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:93 -msgid "Correcting dependencies..." -msgstr "Corrigiendo dependencias..." - -#: apt-private/private-cachefile.cc:96 -msgid " failed." -msgstr " falló." - -#: apt-private/private-cachefile.cc:99 -msgid "Unable to correct dependencies" -msgstr "No se pueden corregir las dependencias" - -#: apt-private/private-cachefile.cc:102 -msgid "Unable to minimize the upgrade set" -msgstr "No se puede minimizar el conjunto de actualización" - -#: apt-private/private-cachefile.cc:104 -msgid " Done" -msgstr " Listo" - -#: apt-private/private-cachefile.cc:108 -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:111 -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:35 -#, 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:97 -#, 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:101 -msgid "All packages are up to date." -msgstr "Todos los paquetes están actualizados." - -#: 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-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "ATENCIÓN: ¡No se han podido autenticar los siguientes paquetes!" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "ATENCIÓN: ¡No se han podido autenticar los siguientes paquetes!" #: apt-private/private-download.cc:40 msgid "Authentication warning overridden.\n" @@ -1851,17 +1852,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-inst/extract.cc:471 apt-pkg/init.cc:103 -#: apt-pkg/init.cc:111 apt-pkg/acquire.cc:494 apt-pkg/clean.cc:43 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 #: apt-pkg/contrib/cdromutl.cc:205 #, c-format msgid "Unable to read %s" msgstr "No se pudo leer %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -2154,15 +2155,35 @@ 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/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." -msgstr "" -"No se pudieron analizar o abrir las listas de paquetes o el archivo de " -"estado." +#: apt-pkg/acquire-worker.cc:116 +#, c-format +msgid "The method driver %s could not be found." +msgstr "No se pudo encontrar el método %s." -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Tal vez deba ejecutar «apt-get update» para corregir estos problemas" +#: apt-pkg/acquire-worker.cc:118 +#, c-format +msgid "Is the package %s installed?" +msgstr "¿Está instalado el paquete %s?" + +#: apt-pkg/acquire-worker.cc:169 +#, c-format +msgid "Method %s did not start correctly" +msgstr "El método %s no se inició correctamente" + +#: apt-pkg/acquire-worker.cc:455 +#, 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 "" +"No se pudieron analizar o abrir las listas de paquetes o el archivo de " +"estado." + +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +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." @@ -2249,56 +2270,190 @@ msgstr "opcional" msgid "extra" msgstr "extra" -#: apt-pkg/acquire-worker.cc:116 +#: 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:118 +#: apt-pkg/sourcelist.cc:127 #, c-format -msgid "Is the package %s installed?" -msgstr "¿Está instalado el paquete %s?" +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:169 +#: 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:455 +#: apt-pkg/sourcelist.cc:173 #, 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." +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 "El tipo de fichero de índice «%s» no se admite" +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:490 +#, 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:93 +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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, 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:257 +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:260 +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:263 +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:266 +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:576 +#, 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:1211 +#, 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:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Leyendo lista de paquetes" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Recogiendo archivos que proveen" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "No se pudo escribir en %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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:241 +msgid "Send request to solver" +msgstr "Enviar petición al solucionador" + +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "Preparar para recibir una solución" + +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "Falló solucionador externo sin un mensaje de error apropiado" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "Ejecutar solucionador externo" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2391,70 +2546,6 @@ msgstr "" "Los archivos de índice de paquetes están dañados. No existe un campo " "«Filename:» para el paquete %s." -#: apt-pkg/pkgcachegen.cc:93 -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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 -#, 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:257 -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:260 -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:263 -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:266 -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:576 -#, 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:1211 -#, 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:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Leyendo lista de paquetes" - -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Recogiendo archivos que proveen" - -#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 -#, c-format -msgid "Unable to write to %s" -msgstr "No se pudo escribir en %s" - -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Error de E/S al guardar la caché fuente" - #: apt-pkg/vendorlist.cc:85 #, c-format msgid "Vendor block %s contains no fingerprint" @@ -2475,11 +2566,6 @@ msgstr "Falta el directorio de archivos %spartial." msgid "Unable to lock directory %s" msgstr "No se pudo bloquear el directorio %s" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, c-format -msgid "Clean of %s is not supported" -msgstr "No se admite la limpieza de «%s»" - #. only show the ETA if it makes sense #. two days #: apt-pkg/acquire.cc:902 @@ -2492,23 +2578,10 @@ msgstr "Descargando fichero %li de %li (falta %s)" msgid "Retrieving file %li of %li" msgstr "Descargando fichero %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 "" -"No se han podido descargar algunos archivos de índice, se han omitido, o se " -"han utilizado unos antiguos en su lugar." - -#: apt-pkg/srcrecords.cc:52 -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/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/policy.cc:83 #, c-format msgid "" @@ -2561,10 +2634,13 @@ msgstr "" "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" @@ -2664,25 +2740,31 @@ 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 "Enviar situación al solucionador" +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 +msgid "Building dependency tree" +msgstr "Creando árbol de dependencias" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "Enviar petición al solucionador" +#: apt-pkg/depcache.cc:139 +msgid "Candidate versions" +msgstr "Versiones candidatas" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "Preparar para recibir una solución" +#: apt-pkg/depcache.cc:168 +msgid "Dependency generation" +msgstr "Generación de dependencias" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "Falló solucionador externo sin un mensaje de error apropiado" +#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "Ejecutar solucionador externo" +#: apt-pkg/depcache.cc:250 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "No se pudo abrir el fichero de estado %s" + +#: apt-pkg/depcache.cc:256 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Falló la escritura del fichero de estado temporal %s" #: apt-pkg/tagfile.cc:140 #, c-format @@ -2694,112 +2776,6 @@ msgstr "No se pudo tratar el archivo de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "No se pudo tratar el archivo de paquetes %s (2)" -#: apt-pkg/indexrecords.cc:78 -#, c-format -msgid "Unable to parse Release file %s" -msgstr "No se pudo leer el archivo «Release» %s" - -#: apt-pkg/indexrecords.cc:86 -#, c-format -msgid "No sections in Release file %s" -msgstr "No se encontraron secciones en el archivo «Release» %s" - -#: apt-pkg/indexrecords.cc:117 -#, 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:130 -#, 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:149 -#, 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 -#, 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/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 analizable)" - -#: 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/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/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/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: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/cacheset.cc:489 #, c-format msgid "Release '%s' for '%s' was not found" @@ -2862,184 +2838,59 @@ msgstr "" "No se puede seleccionar la versión instalada del paquete «%s» puesto que no " "está instalado" -#: apt-pkg/deb/dpkgpm.cc:95 -#, c-format -msgid "Installing %s" -msgstr "Instalando %s" - -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 -#, c-format -msgid "Configuring %s" -msgstr "Configurando %s" - -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 -#, c-format -msgid "Removing %s" -msgstr "Eliminando %s" - -#: apt-pkg/deb/dpkgpm.cc:98 -#, c-format -msgid "Completely removing %s" -msgstr "Borrando completamente %s" - -#: apt-pkg/deb/dpkgpm.cc:99 -#, c-format -msgid "Noting disappearance of %s" -msgstr "Se detectó la desaparición de %s" - -#: apt-pkg/deb/dpkgpm.cc:100 -#, 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:830 -#, c-format -msgid "Directory '%s' missing" -msgstr "Falta el directorio «%s»." - -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, c-format -msgid "Could not open file '%s'" -msgstr "No se pudo abrir el fichero «%s»" - -#: apt-pkg/deb/dpkgpm.cc:992 -#, c-format -msgid "Preparing %s" -msgstr "Preparando %s" - -#: apt-pkg/deb/dpkgpm.cc:993 -#, c-format -msgid "Unpacking %s" -msgstr "Desempaquetando %s" - -#: apt-pkg/deb/dpkgpm.cc:998 -#, c-format -msgid "Preparing to configure %s" -msgstr "Preparándose para configurar %s" - -#: apt-pkg/deb/dpkgpm.cc:1000 -#, c-format -msgid "Installed %s" -msgstr "%s instalado" - -#: apt-pkg/deb/dpkgpm.cc:1005 -#, c-format -msgid "Preparing for removal of %s" -msgstr "Preparándose para eliminar %s" - -#: apt-pkg/deb/dpkgpm.cc:1007 -#, c-format -msgid "Removed %s" -msgstr "%s eliminado" - -#: apt-pkg/deb/dpkgpm.cc:1012 -#, c-format -msgid "Preparing to completely remove %s" -msgstr "Preparándose para eliminar completamente %s" - -#: apt-pkg/deb/dpkgpm.cc:1013 +#: apt-pkg/indexrecords.cc:78 #, c-format -msgid "Completely removed %s" -msgstr "%s se borró completamente" +msgid "Unable to parse Release file %s" +msgstr "No se pudo leer el archivo «Release» %s" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: apt-pkg/indexrecords.cc:86 #, c-format -msgid "Can not write log (%s)" -msgstr "No se pudo escribir el informe (%s)" - -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "¿Está montado «/dev/pts»?" - -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "¿Es «stdout» una terminal?" - -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "Se interrumpió la operación antes de que pudiera terminar" - -#: apt-pkg/deb/dpkgpm.cc:1687 -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:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "problemas de dependencias - dejando sin configurar" - -#: apt-pkg/deb/dpkgpm.cc:1694 -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:1700 -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" +msgid "No sections in Release file %s" +msgstr "No se encontraron secciones en el archivo «Release» %s" -#: apt-pkg/deb/dpkgpm.cc:1707 -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/indexrecords.cc:117 +#, c-format +msgid "No Hash entry in Release file %s" +msgstr "No existe una entrada «Hash» en el archivo «Release» %s" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -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/indexrecords.cc:130 +#, c-format +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:1742 -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/indexrecords.cc:149 +#, c-format +msgid "Invalid 'Date' entry in Release file %s" +msgstr "Entrada «Date» inválida en el archivo «Release» %s" -#: apt-pkg/deb/debsystem.cc:91 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, 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 "%lid %lih %limin %lis" +msgstr "%lid %lih %limin %lis" -#: apt-pkg/deb/debsystem.cc:94 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, 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?" +msgid "%lih %limin %lis" +msgstr "%lih %limin %lis" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, 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" +msgid "%limin %lis" +msgstr "%limin %lis" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "No bloqueado" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" +msgstr "%lis" + +#: apt-pkg/contrib/strutl.cc:1258 +#, c-format +msgid "Selection %s not found" +msgstr "Selección %s no encontrada" #: apt-pkg/contrib/fileutl.cc:190 #, c-format @@ -3179,35 +3030,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:418 -#, 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:425 -#, c-format -msgid "%lih %limin %lis" -msgstr "%lih %limin %lis" - -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 -#, c-format -msgid "%limin %lis" -msgstr "%limin %lis" - -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 -#, c-format -msgid "%lis" -msgstr "%lis" - -#: apt-pkg/contrib/strutl.cc:1258 -#, c-format -msgid "Selection %s not found" -msgstr "Selección %s no encontrada" - #: apt-pkg/contrib/mmap.cc:79 msgid "Can't mmap an empty file" msgstr "No puedo hacer mmap de un fichero vacío" @@ -3338,54 +3160,228 @@ msgstr "Error de sintaxis %s:%u: Basura extra al final del archivo" msgid "No keyring installed in %s." msgstr "No se instaló ningún anillo de claves %s." -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, 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:168 +#: apt-pkg/contrib/cmndline.cc:171 #, 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:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format msgid "Option %s requires an argument." msgstr "La opción %s necesita un argumento." -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Opción %s: La especificación del elemento de configuración debe tener un " "=." -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, 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:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "Opción «%s» demasiado larga" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, 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:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "Operación inválida: %s" +#: apt-pkg/deb/dpkgpm.cc:110 +#, c-format +msgid "Installing %s" +msgstr "Instalando %s" + +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 +#, c-format +msgid "Configuring %s" +msgstr "Configurando %s" + +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 +#, c-format +msgid "Removing %s" +msgstr "Eliminando %s" + +#: apt-pkg/deb/dpkgpm.cc:113 +#, c-format +msgid "Completely removing %s" +msgstr "Borrando completamente %s" + +#: apt-pkg/deb/dpkgpm.cc:114 +#, c-format +msgid "Noting disappearance of %s" +msgstr "Se detectó la desaparición de %s" + +#: apt-pkg/deb/dpkgpm.cc:115 +#, 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:845 +#, c-format +msgid "Directory '%s' missing" +msgstr "Falta el directorio «%s»." + +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 +#, c-format +msgid "Could not open file '%s'" +msgstr "No se pudo abrir el fichero «%s»" + +#: apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Preparing %s" +msgstr "Preparando %s" + +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr "Desempaquetando %s" + +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing to configure %s" +msgstr "Preparándose para configurar %s" + +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr "%s instalado" + +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "Preparándose para eliminar %s" + +#: apt-pkg/deb/dpkgpm.cc:1022 +#, c-format +msgid "Removed %s" +msgstr "%s eliminado" + +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Preparándose para eliminar completamente %s" + +#: apt-pkg/deb/dpkgpm.cc:1028 +#, c-format +msgid "Completely removed %s" +msgstr "%s se borró completamente" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, c-format +msgid "Can not write log (%s)" +msgstr "No se pudo escribir el informe (%s)" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "¿Está montado «/dev/pts»?" + +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "Se interrumpió la operación antes de que pudiera terminar" + +#: apt-pkg/deb/dpkgpm.cc:1719 +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:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "problemas de dependencias - dejando sin configurar" + +#: apt-pkg/deb/dpkgpm.cc:1726 +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:1732 +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:1739 +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:1746 apt-pkg/deb/dpkgpm.cc:1752 +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:1774 +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" + #: cmdline/apt-extracttemplates.cc:224 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" @@ -3788,6 +3784,9 @@ msgstr "" " -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n" "cache=/tmp\n" +#~ 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 9379abad0..5a48d5160 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Bertsio taula:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -358,7 +358,7 @@ msgstr "Ezin da deskarga direktorioa blokeatu" msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat" @@ -378,97 +378,97 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturburua\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze mendekotasunik.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -476,7 +476,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -484,14 +484,14 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -500,7 +500,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:1358 +#: cmdline/apt-get.cc:1362 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -508,30 +508,30 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, 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:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Konektatzen -> %s.(%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -672,7 +672,7 @@ msgstr "%s bertsiorik berriena da jada.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s espero zen baina ez zegoen han" @@ -767,16 +767,16 @@ msgstr "" msgid "Disk not found." msgstr "Ez da diska aurkitu" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Ez da fitxategia aurkitu" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Huts egin du atzitzean" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Huts egin du aldaketa ordua ezartzean" @@ -832,7 +832,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "TYPEk huts egin du, eta zerbitzariak hau esan du: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Konexioa denboraz kanpo" @@ -854,7 +854,7 @@ msgstr "Erantzun batek bufferrari gainez eragin dio." msgid "Protocol corruption" msgstr "Protokolo hondatzea" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -916,7 +916,7 @@ msgstr "Datu-socket konexioak denbora muga gainditu du" msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" @@ -925,7 +925,7 @@ msgstr "Arazoa fitxategiaren hash egitean" msgid "Unable to fetch file, server said '%s'" msgstr "Ezin da fitxategia lortu; zerbitzariak hau esan du: '%s'" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Datu-socketak denbora muga gainditu du" @@ -976,7 +976,7 @@ msgstr "Ezin izan da konektatu -> %s:%s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Konektatzen -> %s..." @@ -1116,42 +1116,17 @@ msgstr "Konexioak huts egin du" msgid "Internal error" msgstr "Barne errorea" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Atzituta " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Hartu:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ez ikusi " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Err " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Lortuta: %sB (%s) (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Lanean]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Medio Aldaketa: Mesedez sar\n" -" '%s'\n" -"izeneko diska '%s' gailuan eta enter sakatu\n" +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:93 msgid "Correcting dependencies..." @@ -1181,34 +1156,210 @@ msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko." msgid "Unmet dependencies. Try using -f." msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instalatuta]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Egiaztapen abisua gainidazten.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [Instalatuta]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Zenbait pakete ezin dira egiaztatu" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Paketeak egiaztapen gabe instalatu?" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Instalatuta]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Instalatuta]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Ezin da lortu %s %s\n" +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:35 +#, 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:97 +#, 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:101 +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:82 msgid "Internal error, InstallPackages was called with broken packages!" @@ -1261,6 +1412,10 @@ msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n" msgid "You don't have enough free space in %s." msgstr "Ez daukazu nahikoa leku libre %s(e)n." +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" + #: apt-private/private-install.cc:216 apt-private/private-install.cc:238 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat." @@ -1472,927 +1627,680 @@ 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:129 -msgid "Listing" -msgstr "" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!" -#: apt-private/private-list.cc:159 +#: apt-private/private-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Egiaztapen abisua gainidazten.\n" + +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Zenbait pakete ezin dira egiaztatu" + +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Paketeak egiaztapen gabe instalatu?" + +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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] "" +msgid "Failed to fetch %s %s\n" +msgstr "Ezin da lortu %s %s\n" -#: 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!" +#: apt-private/private-sources.cc:58 +#, fuzzy, c-format +msgid "Failed to parse %s. Edit again? " +msgstr "Huts egin du %s izenaren ordez %s ipintzean" + +#: apt-private/private-sources.cc:70 +#, c-format +msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 -#: apt-private/private-show.cc:89 -msgid "unknown" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" -#: apt-private/private-output.cc:265 -#, fuzzy, c-format -msgid "[installed,upgradable to: %s]" -msgstr " [Instalatuta]" +#: apt-private/private-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "Berriketak kalkulatzen... " -#: apt-private/private-output.cc:268 -#, fuzzy -msgid "[installed,local]" -msgstr " [Instalatuta]" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "Eginda" -#: apt-private/private-output.cc:270 -msgid "[installed,auto-removable]" -msgstr "" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Atzituta " -#: apt-private/private-output.cc:272 -#, fuzzy -msgid "[installed,automatic]" -msgstr " [Instalatuta]" +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Hartu:" -#: apt-private/private-output.cc:274 -#, fuzzy -msgid "[installed]" -msgstr " [Instalatuta]" +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ez ikusi " -#: apt-private/private-output.cc:277 +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Err " + +#: apt-private/acqprogress.cc:146 #, c-format -msgid "[upgradable from: %s]" -msgstr "" +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Lortuta: %sB (%s) (%sB/s)\n" -#: apt-private/private-output.cc:281 -msgid "[residual-config]" -msgstr "" +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Lanean]" -#: apt-private/private-output.cc:455 +#: apt-private/acqprogress.cc:297 #, c-format -msgid "but %s is installed" -msgstr "baina %s instalatuta dago" +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Medio Aldaketa: Mesedez sar\n" +" '%s'\n" +"izeneko diska '%s' gailuan eta enter sakatu\n" -#: apt-private/private-output.cc:457 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "but %s is to be installed" -msgstr "baina %s instalatzeko dago" +msgid "Unable to read %s" +msgstr "Ezin da %s irakurri" -#: apt-private/private-output.cc:464 -msgid "but it is not installable" -msgstr "baina ez da instalagarria" +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 +#, c-format +msgid "Unable to change to %s" +msgstr "Ezin da %s(e)ra aldatu" -#: apt-private/private-output.cc:466 -msgid "but it is a virtual package" -msgstr "baina pakete birtuala da" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" -#: apt-private/private-output.cc:469 -msgid "but it is not installed" -msgstr "baina ez dago instalatuta" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 +#, fuzzy, c-format +msgid "Can not read mirror file '%s'" +msgstr "%s fitxategia ezin izan da ireki" -#: apt-private/private-output.cc:469 -msgid "but it is not going to be installed" -msgstr "baina ez da instalatuko" +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "%s fitxategia ezin izan da ireki" -#: apt-private/private-output.cc:474 -msgid " or" -msgstr " edo" +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" +msgstr "" -#: 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:" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Huts egin du azpiprozesuarentzako IPC kanalizazio bat sortzean" -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "Ondorengo pakete BERRIAK instalatuko dira:" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "Konexioa behar baino lehenago itxi da" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "Ondorengo paketeak KENDUKO dira:" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "Okerreko ezarpen lehenetsia!" -#: apt-private/private-output.cc:571 -msgid "The following packages have been kept back:" -msgstr "Ondorengo paketeak mantendu egin dira:" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "Jarraitzeko, sakatu Sartu." -#: apt-private/private-output.cc:592 -msgid "The following packages will be upgraded:" -msgstr "Ondorengo paketeak bertsio-berrituko dira:" +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Deskargaturiko .deb fitxategi guztiak ezabatu nahi al dituzu?" -#: apt-private/private-output.cc:613 -msgid "The following packages will be DOWNGRADED:" -msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:" +#: dselect/install:102 +#, fuzzy +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "Errore batzuk gertatu dira deskonprimitzean. Konfiguratu egingo ditut" -#: apt-private/private-output.cc:633 -msgid "The following held packages will be changed:" -msgstr "Ondorengo pakete atxikiak aldatu egingo dira:" +#: dselect/install:103 +#, fuzzy +msgid "will be configured. This may result in duplicate errors" +msgstr "instalatutako paketeak. Horrek errore bikoiztuak eragin ditzake" -#: apt-private/private-output.cc:688 -#, c-format -msgid "%s (due to %s) " -msgstr "%s (arrazoia: %s) " +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "edo falta diren mendekotasunen erroreak. Hori ondo dago; mezu honen" -#: apt-private/private-output.cc:696 +#: dselect/install:105 msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" -"KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" -"EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!" +"aurreko erroreak dira garrantzitsuak. Konpondu eta exekutatu [I]nstall " +"berriro" -#: apt-private/private-output.cc:727 -#, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, " +#: dselect/update:30 +msgid "Merging available information" +msgstr "Eskuragarrien datuak biltzen" -#: apt-private/private-output.cc:731 -#, c-format -msgid "%lu reinstalled, " -msgstr "%lu berrinstalatuta, " +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode-ri dei egin zaio oraindik estekatutako nodoan" -#: apt-private/private-output.cc:733 -#, c-format -msgid "%lu downgraded, " -msgstr "%lu aurreko bertsiora itzulita, " +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Huts egin du hash-elementua lokalizatzean!" -#: 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-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Huts egin du desbideratzea lokalizatzean" -#: apt-private/private-output.cc:739 +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "AddDiversion-n barne errorea" + +#: apt-inst/filelist.cc:477 #, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu ez erabat instalatuta edo kenduta.\n" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Desbideratze bat gainidazten saiatzen: %s -> %s eta %s/%s" -#. 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 "" +#: apt-inst/filelist.cc:506 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "Desbideratzearen gehitze bikoitza: %s -> %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-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "Konfigurazio fitxategi bikoiztua: %s/%s" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "Regex compilation error - %s" -msgstr "Adierazpen erregularren konpilazio errorea - %s" +msgid "The path %s is too long" +msgstr "%s bidea luzeegia da" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-inst/extract.cc:132 +#, c-format +msgid "Unpacking %s more than once" +msgstr "%s behin baino gehiagotan deskonprimitzen" -#: apt-private/private-show.cc:156 +#: apt-inst/extract.cc:142 #, 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] "" +msgid "The directory %s is diverted" +msgstr "%s direktorioa desbideratuta dago" -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" -msgstr "" +#: apt-inst/extract.cc:152 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Paketea desbideratze helburuan %s/%s idazten saiatzen ari da" -#: apt-private/private-sources.cc:58 -#, fuzzy, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "Huts egin du %s izenaren ordez %s ipintzean" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Desbideratzearen bidea luzeegia da" -#: apt-private/private-sources.cc:70 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "" +msgid "Failed to stat %s" +msgstr "Huts egin du %s(e)tik datuak lortzean" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "Huts egin du %s izenaren ordez %s ipintzean" -#: apt-private/private-update.cc:90 +#: apt-inst/extract.cc:249 #, 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] "" +msgid "The directory %s is being replaced by a non-directory" +msgstr "%s direktorioa ez-direktorio batekin ordezten ari da" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." -msgstr "" +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Huts egin du nodoa bere hash-ontzian lokalizatzean" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "Berriketak kalkulatzen... " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Bidea luzeegia da" -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "Eginda" +#: apt-inst/extract.cc:421 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "Gainidatzi pakete-konkordantzia %s(r)en bertsiorik gabe" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: apt-inst/extract.cc:438 #, c-format -msgid "Unable to read %s" -msgstr "Ezin da %s irakurri" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "%s/%s fitxategiak %s paketekoa gainidazten du" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/extract.cc:498 #, c-format -msgid "Unable to change to %s" -msgstr "Ezin da %s(e)ra aldatu" +msgid "Unable to stat %s" +msgstr "Ezin da daturik lortu %s(e)tik" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "No mirror file '%s' found " -msgstr "" +msgid "Failed to write file %s" +msgstr "Ezin izan da %s fitxategian idatzi" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:287 -#, fuzzy, c-format -msgid "Can not read mirror file '%s'" -msgstr "%s fitxategia ezin izan da ireki" +#: apt-inst/dirstream.cc:105 +#, c-format +msgid "Failed to close file %s" +msgstr "Ezin izan da %s fitxategia itxi" -#: methods/mirror.cc:315 -#, fuzzy, c-format -msgid "No entry found in mirror file '%s'" -msgstr "%s fitxategia ezin izan da ireki" +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da" -#: methods/mirror.cc:445 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "[Mirror: %s]" -msgstr "" +msgid "Internal error, could not locate member %s" +msgstr "Barne Errorea, ezin da %s atala kokatu" -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "Huts egin du azpiprozesuarentzako IPC kanalizazio bat sortzean" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Kontrol fitxategi ezin analizagarria" -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" -msgstr "Konexioa behar baino lehenago itxi da" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Artxibo sinadura baliogabea" -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "Okerreko ezarpen lehenetsia!" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Errorea artxiboko kidearen goiburua irakurtzean" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "Jarraitzeko, sakatu Sartu." +#: apt-inst/contrib/arfile.cc:96 +#, fuzzy, c-format +msgid "Invalid archive member header %s" +msgstr "Artxiboko kidearen goiburua baliogabea da" -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "Deskargaturiko .deb fitxategi guztiak ezabatu nahi al dituzu?" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Artxiboko kidearen goiburua baliogabea da" -#: dselect/install:102 -#, fuzzy -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "Errore batzuk gertatu dira deskonprimitzean. Konfiguratu egingo ditut" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Artxiboa laburregia da" -#: dselect/install:103 -#, fuzzy -msgid "will be configured. This may result in duplicate errors" -msgstr "instalatutako paketeak. Horrek errore bikoiztuak eragin ditzake" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Huts egin artxibo goiburuak irakurtzean" -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "edo falta diren mendekotasunen erroreak. Hori ondo dago; mezu honen" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Huts egin du kanalizazioak sortzean" -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" -msgstr "" -"aurreko erroreak dira garrantzitsuak. Konpondu eta exekutatu [I]nstall " -"berriro" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Huts egin du gzip exekutatzean " -#: dselect/update:30 -msgid "Merging available information" -msgstr "Eskuragarrien datuak biltzen" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Hondatutako artxiboa" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n" -"\n" -"apt-extracttemplates debian-eko paketeen konfigurazioaren eta txantiloien\n" -"informazioa ateratzeko tresna bat da\n" -"\n" -"Aukerak:\n" -" -h Laguntza testu hau\n" -" -t Ezarri aldi baterako direktorioa\n" -" -c=? Irakurri konfigurazio fitxategi hau\n" -" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia" -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Ezin da daturik lortu %s(e)tik" +#: apt-inst/contrib/extracttar.cc:308 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "%u TAR goiburu mota ezezaguna, %s kidea" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Unable to write to %s" -msgstr "%s : ezin da idatzi" +msgid "Progress: [%3i%%]" +msgstr "" -#: cmdline/apt-extracttemplates.cc:300 -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 -msgid "Package extension list is too long" -msgstr "Pakete luzapenen zerrenda luzeegia da" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +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 +#: apt-pkg/init.cc:146 #, c-format -msgid "Error processing directory %s" -msgstr "Errorea direktorioa prozesatzean %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Iturburu luzapenen zerrenda luzeegia da" +msgid "Packaging system '%s' is not supported" +msgstr "'%s' pakete sistema ez da onartzen" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Errorea eduki fitxategiaren goiburua idaztean" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Ezin da pakete sistemaren mota egokirik zehaztu" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Error processing contents %s" -msgstr "Errorea edukiak prozesatzean %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Erabilera: apt-ftparchive [aukerak] komandoa\n" -"Komandoak: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive Debian artxiboen indizeak sortzeko erabiltzen da. Sortzeko \n" -"estilo asko onartzen ditu, erabat automatizatuak nahiz ordezte funtzionalak\n" -"'dpkg-scanpackages' eta 'dpkg-scansources'erako\n" -"Package izeneko fitxategiak sortzen ditu .deb fitxategien zuhaitz batetik.\n" -"Package fitxategiak pakete bakoitzaren kontrol eremu guztiak izaten ditu,\n" -"MD5 hash balioa eta fitxategi tamaina barne. Override fitxategia erabiltzen\n" -"da lehentasunaren eta sekzioaren balioak behartzeko.\n" -"\n" -"Era berean, iturburu fitxategiak ere sortzen ditu .dsc fitxategien\n" -"zuhaitzetik. --source-override aukera erabil daiteke src override \n" -"fitxategi bat zehazteko.\n" -"'packages' eta 'sources' komandoa zuhaitzaren erroan exekutatu behar dira.\n" -"BinaryPath-ek bilaketa errekurtsiboaren oinarria seinalatu behar du, eta\n" -"override fitxategiak override banderak izan behar ditu. Pathprefix \n" -"fitxategi izenen eremuei eransten zaie (halakorik badago). Hona hemen\n" -"Debian artxiboko erabilera argibide bat:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Aukerak:\n" -" -h Laguntza testu hau\n" -" --md5 Kontrolatu MD5 sortzea\n" -" -s=? Iturburuaren override fitxategia\n" -" -q Isilik\n" -" -d=? Hautatu aukerako katxearen datu-basea\n" -" --no-delink Gaitu delink arazketa modua\n" -" --contents Kontrolatu eduki fitxategia sortzea\n" -" -c=? Irakurri konfigurazio fitxategi hau\n" -" -o=? Ezarri konfigurazio aukera arbitrario bat" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Ez dago bat datorren hautapenik" +msgid "Wrote %i records.\n" +msgstr "%i erregistro grabaturik.\n" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Fitxategi batzuk falta dira `%s' pakete fitxategien taldean" +msgid "Wrote %i records with %i missing files.\n" +msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n" -#: ftparchive/cachedb.cc:65 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Datu-basea hondatuta dago; fitxategiari %s.old izena jarri zaio" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n" -#: ftparchive/cachedb.cc:83 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da" - -#: ftparchive/cachedb.cc:94 -#, fuzzy -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, " -"mesedez datubasea ezabatu eta birsortu." - -#: ftparchive/cachedb.cc:99 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Ezin da ireki %s datu-base fitxategia: %s" +"%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik\n" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Failed to stat %s" -msgstr "Huts egin du %s(e)tik datuak lortzean" +msgid "Can't find authentication record for: %s" +msgstr "" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Huts egin du %s esteka irakurtzean" +#: apt-pkg/indexcopy.cc:521 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Egiaztapena ez dator bat" -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Artxiboak ez du kontrol erregistrorik" +#: apt-pkg/acquire-worker.cc:116 +#, c-format +msgid "The method driver %s could not be found." +msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu." -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Ezin da kurtsorerik eskuratu" +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: ftparchive/writer.cc:91 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "A: Ezin da %s direktorioa irakurri\n" +msgid "Method %s did not start correctly" +msgstr "%s metodoa ez da behar bezala abiarazi" -#: ftparchive/writer.cc:96 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "A: Ezin da %s atzitu\n" +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" -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " +#: 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." -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "A: " +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: Erroreak fitxategiari dagozkio " +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Ezin izan da Iturburu zerrenda irakurri." -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 -#, c-format -msgid "Failed to resolve %s" -msgstr "Huts egin du %s ebaztean" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Paketeen katxea hutsik" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Huts egin dute zuhaitz-urratsek" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Paketeen katxe fitxategia hondatuta dago" -#: ftparchive/writer.cc:219 -#, c-format -msgid "Failed to open %s" -msgstr "Huts egin du %s irekitzean" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Paketeen katxe fixategiaren bertsioa ez da bateragarria" -#: ftparchive/writer.cc:278 -#, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +#: apt-pkg/pkgcache.cc:169 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "Paketeen katxe fitxategia hondatuta dago" -#: ftparchive/writer.cc:286 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Failed to readlink %s" -msgstr "Huts egin du %s esteka irakurtzean" +msgid "This APT does not support the versioning system '%s'" +msgstr "APT honek ez du '%s' bertsio sistema onartzen" -#: ftparchive/writer.cc:290 -#, c-format -msgid "Failed to unlink %s" -msgstr "Huts egin du %s desestekatzean" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Paketeen katxea beste arkitektura batentzat sortuta dago" -#: ftparchive/writer.cc:298 -#, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Ezin izan da %s %s(r)ekin estekatu" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Mendekotasuna:" -#: ftparchive/writer.cc:308 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " DeLink-en mugara (%sB) heldu da.\n" - -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Artxiboak ez du pakete eremurik" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Aurremendekotasuna:" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s: ez du override sarrerarik\n" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Iradokizuna:" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " %s mantentzailea %s da, eta ez %s\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Gomendioa:" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s: ez du jatorri gainidazketa sarrerarik\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Gatazka:" -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s: ez du bitar gainidazketa sarrerarik\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Ordeztea:" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Huts egin du memoria esleitzean" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Zaharkitzea:" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Ezin da %s ireki" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Apurturik" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Gaizki osatutako override %s, lerroa: %lu #1" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Huts egin du %s override fitxategia irakurtzean" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "garrantzitsua" -#: ftparchive/override.cc:166 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Gaizki osatutako override %s, lerroa: %lu #1" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "beharrezkoa" -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Gaizki osatutako override %s, lerroa: %lu #2" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "estandarra" -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Gaizki osatutako override %s, lerroa: %lu #3" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "aukerakoa" -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "'%s' Konpresio Algoritmo Ezezaguna" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "estra" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "%s irteera konprimituak konpresio-tresna bat behar du" +msgid "Index file type '%s' is not supported" +msgstr "'%s' motako indize fitxategirik ez da onartzen" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Huts egin du FILE* sortzean" +#: 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)" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Huts egin du sardetzean" +#: 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)" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Konprimatu Umeak" +#: 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)" -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "Barne Errorea, Huts %s sortzerakoan" +#: 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)" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak" +#: 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)" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Huts egin du MD5 konputatzean" +#: 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)" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Problem unlinking %s" -msgstr "Arazoa %s desestekatzean" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Huts egin du %s izenaren ordez %s ipintzean" - -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n" -"\n" -"apt-extracttemplates debian-eko paketeen konfigurazioaren eta txantiloien\n" -"informazioa ateratzeko tresna bat da\n" -"\n" -"Aukerak:\n" -" -h Laguntza testu hau\n" -" -t Ezarri aldi baterako direktorioa\n" -" -c=? Irakurri konfigurazio fitxategi hau\n" -" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Pakete erregistro ezezaguna!" - -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Erabilera: apt-sortpkgs [aukerak] fitxategia1 [fitxategia2...]\n" -"\n" -"apt-sortpkgs pakete fitxategiak ordenatzeko tresna soil bat da. Zein\n" -"motatako fitxategia den adierazteko -s aukera erabiltzen da.\n" -"\n" -"Aukerak:\n" -" -h Laguntza testu hau\n" -" -s Erabili iturburu fitxategien ordenatzea\n" -" -c=? Irakurri konfigurazio fitxategi hau\n" -" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib: -o dir::cache=/tmp\n" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Failed to write file %s" -msgstr "Ezin izan da %s fitxategian idatzi" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "Failed to close file %s" -msgstr "Ezin izan da %s fitxategia itxi" +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "The path %s is too long" -msgstr "%s bidea luzeegia da" +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-inst/extract.cc:132 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "Unpacking %s more than once" -msgstr "%s behin baino gehiagotan deskonprimitzen" +msgid "Opening %s" +msgstr "%s irekitzen" -#: apt-inst/extract.cc:142 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "The directory %s is diverted" -msgstr "%s direktorioa desbideratuta dago" +msgid "Line %u too long in source list %s." +msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da." -#: apt-inst/extract.cc:152 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Paketea desbideratze helburuan %s/%s idazten saiatzen ari da" - -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Desbideratzearen bidea luzeegia da" +msgid "Malformed line %u in source list %s (type)" +msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)" -#: apt-inst/extract.cc:249 +#: apt-pkg/sourcelist.cc:375 #, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "%s direktorioa ez-direktorio batekin ordezten ari da" - -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Huts egin du nodoa bere hash-ontzian lokalizatzean" +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-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Bidea luzeegia da" +#: 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-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Gainidatzi pakete-konkordantzia %s(r)en bertsiorik gabe" +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "'%s' motako indize fitxategirik ez da onartzen" -#: apt-inst/extract.cc:438 +#: apt-pkg/clean.cc:64 #, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "%s/%s fitxategiak %s paketekoa gainidazten du" +msgid "Unable to stat %s." +msgstr "Ezin da %s atzitu." -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "Ezin da daturik lortu %s(e)tik" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "Katxearen bertsio sistema ez da bateragarria" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "DropNode-ri dei egin zaio oraindik estekatutako nodoan" +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Errorea gertatu da %s prozesatzean (FindPkg)" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Huts egin du hash-elementua lokalizatzean!" +#: apt-pkg/pkgcachegen.cc:257 +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-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Huts egin du desbideratzea lokalizatzean" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "APT honek maneia dezakeen bertsio kopurua gainditu duzu." -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "AddDiversion-n barne errorea" +#: apt-pkg/pkgcachegen.cc:263 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "APT honek maneia dezakeen azalpen kopurua gainditu duzu." -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Desbideratze bat gainidazten saiatzen: %s -> %s eta %s/%s" +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "APT honek maneia dezakeen mendekotasun muga gainditu duzu." -#: apt-inst/filelist.cc:506 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Desbideratzearen gehitze bikoitza: %s -> %s" +msgid "Package %s %s was not found while processing file dependencies" +msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean" -#: apt-inst/filelist.cc:549 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Konfigurazio fitxategi bikoiztua: %s/%s" - -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Artxibo sinadura baliogabea" - -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Errorea artxiboko kidearen goiburua irakurtzean" - -#: apt-inst/contrib/arfile.cc:96 -#, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "Artxiboko kidearen goiburua baliogabea da" - -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Artxiboko kidearen goiburua baliogabea da" - -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Artxiboa laburregia da" - -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Huts egin artxibo goiburuak irakurtzean" - -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Huts egin du kanalizazioak sortzean" - -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Huts egin du gzip exekutatzean " - -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Hondatutako artxiboa" - -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia" +msgid "Couldn't stat source package list %s" +msgstr "Ezin da atzitu %s iturburu paketeen zerrenda" -#: apt-inst/contrib/extracttar.cc:308 -#, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "%u TAR goiburu mota ezezaguna, %s kidea" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Pakete Zerrenda irakurtzen" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 -#, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Fitxategiaren erreferentziak biltzen" -#: apt-inst/deb/debfile.cc:132 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "Barne Errorea, ezin da %s atala kokatu" - -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Kontrol fitxategi ezin analizagarria" +msgid "Unable to write to %s" +msgstr "%s : ezin da idatzi" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, fuzzy, c-format -msgid "List directory %spartial is missing." -msgstr "%spartial zerrenda-direktorioa falta da." +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "S/I errorea iturburu katxea gordetzean" -#: apt-pkg/acquire.cc:91 -#, fuzzy, c-format -msgid "Archives directory %spartial is missing." -msgstr "%spartial artxibo direktorioa falta da." +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "" -#: apt-pkg/acquire.cc:99 -#, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "Ezin da zerrenda direktorioa blokeatu" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "'%s' motako indize fitxategirik ez da onartzen" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "%li fitxategia jasotzen %li-tik" +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2412,35 +2320,35 @@ msgstr "Tamaina ez dator bat" msgid "Invalid file format" msgstr "Eragiketa baliogabea: %s" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, 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:1589 +#: apt-pkg/acquire-item.cc:1656 #, 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:1631 +#: apt-pkg/acquire-item.cc:1698 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:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2448,12 +2356,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2462,12 +2370,12 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2475,113 +2383,95 @@ msgstr "" "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu." +msgid "Vendor block %s contains no fingerprint" +msgstr "%s saltzaile blokeak ez du egiaztapen markarik" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" +msgid "List directory %spartial is missing." +msgstr "%spartial zerrenda-direktorioa falta da." -#: apt-pkg/acquire-worker.cc:169 -#, c-format -msgid "Method %s did not start correctly" -msgstr "%s metodoa ez da behar bezala abiarazi" +#: apt-pkg/acquire.cc:91 +#, fuzzy, c-format +msgid "Archives directory %spartial is missing." +msgstr "%spartial artxibo direktorioa falta da." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 +#, fuzzy, c-format +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:902 #, 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 "Retrieving file %li of %li (%s remaining)" +msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)" -#: apt-pkg/algorithms.cc:265 +#: apt-pkg/acquire.cc:904 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu." +msgid "Retrieving file %li of %li" +msgstr "%li fitxategia jasotzen %li-tik" -#: apt-pkg/algorithms.cc:1086 +#: 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/policy.cc:83 +#, c-format msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -"Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada " -"atxikitako paketeek eraginda." -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." +#: apt-pkg/policy.cc:422 +#, fuzzy, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Erregistro baliogabea hobespenen fitxategian, pakete goibururik ez" -#: 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." +#: apt-pkg/policy.cc:444 +#, c-format +msgid "Did not understand pin type %s" +msgstr "Ez da ulertu %s orratz-mota (pin)" -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Ezin izan da Iturburu zerrenda irakurri." - -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu" - -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu" - -#: apt-pkg/cacheset.cc:603 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "Ezin izan da %s zeregina aurkitu" - -#: apt-pkg/cacheset.cc:609 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Ezin izan da %s paketea aurkitu" - -#: apt-pkg/cacheset.cc:615 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Ezin izan da %s paketea aurkitu" - -#: apt-pkg/cacheset.cc:626 -#, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +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 "" +"Instalazio hau exekutatzeko, funtsezko %s paketea aldi baterako kendu behar " +"da, Gatazka/Aurre-mendekotasun begizta baten ondorioz. Normalean arriskutsua " +"izaten da, baina hala ere egin nahi baduzu, aktibatu APT::Force-LoopBreak " +"aukera." -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +#: 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: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." +"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" @@ -2658,10 +2548,24 @@ msgstr "Jatorri zerrenda berria idazten\n" msgid "Source list entries for this disc are:\n" msgstr "Diskoarentzako jatorri sarrerak:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Ezin da %s atzitu." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada " +"atxikitako paketeek eraginda." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2689,56 +2593,67 @@ msgstr "Huts egin du %s EgoeraFitxategia irekitzean" msgid "Failed to write temporary StateFile %s" msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Ezin da %s pakete fitxategia analizatu (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Ezin da %s pakete fitxategia analizatu (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "Ezin izan da %s zeregina aurkitu" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 -#, c-format -msgid "Wrote %i records.\n" -msgstr "%i erregistro grabaturik.\n" +#: apt-pkg/cacheset.cc:609 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "Ezin izan da %s paketea aurkitu" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Ezin izan da %s paketea aurkitu" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -"%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik\n" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "Egiaztapena ez dator bat" +#: apt-pkg/cacheset.cc:663 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" #: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format @@ -2765,316 +2680,224 @@ msgstr "Lerro baliogabea desbideratze fitxategian: %s" msgid "Invalid 'Date' entry in Release file %s" msgstr "Ezin da %s pakete fitxategia analizatu (1)" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "'%s' pakete sistema ez da onartzen" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Ezin da pakete sistemaren mota egokirik zehaztu" +msgid "%lid %lih %limin %lis" +msgstr "" -#: apt-pkg/install-progress.cc:57 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Progress: [%3i%%]" +msgid "%lih %limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 +#, c-format +msgid "%limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "%lis" msgstr "" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "%s fitxategia ezin izan da ireki" +#: apt-pkg/contrib/strutl.cc:1258 +#, c-format +msgid "Selection %s not found" +msgstr "%s hautapena ez da aurkitu" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:190 #, 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." +msgid "Not using locking for read only lock file %s" msgstr "" -"Instalazio hau exekutatzeko, funtsezko %s paketea aldi baterako kendu behar " -"da, Gatazka/Aurre-mendekotasun begizta baten ondorioz. Normalean arriskutsua " -"izaten da, baina hala ere egin nahi baduzu, aktibatu APT::Force-LoopBreak " -"aukera." - -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Paketeen katxea hutsik" - -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Paketeen katxe fitxategia hondatuta dago" - -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Paketeen katxe fixategiaren bertsioa ez da bateragarria" +"Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo " +"fitxategiarentzat" -#: apt-pkg/pkgcache.cc:169 -#, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "Paketeen katxe fitxategia hondatuta dago" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "Ezin izan da %s blokeo fitxategia ireki" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:218 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "APT honek ez du '%s' bertsio sistema onartzen" +msgid "Not using locking for nfs mounted lock file %s" +msgstr "" +"Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo fitxategiarentzat" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "Paketeen katxea beste arkitektura batentzat sortuta dago" - -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Mendekotasuna:" - -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Aurremendekotasuna:" - -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Iradokizuna:" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Gomendioa:" - -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Gatazka:" - -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Ordeztea:" - -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Zaharkitzea:" - -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Apurturik" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Ezin izan da %s blokeoa hartu" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "garrantzitsua" - -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "beharrezkoa" - -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "estandarra" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "aukerakoa" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "estra" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Katxearen bertsio sistema ez da bateragarria" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du." -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/fileutl.cc:826 #, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Errorea gertatu da %s prozesatzean (FindPkg)" - -#: apt-pkg/pkgcachegen.cc:257 -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:260 -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:263 -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:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "APT honek maneia dezakeen mendekotasun muga gainditu duzu." +msgid "Sub-process %s received signal %u." +msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du." -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 #, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean" +msgid "Sub-process %s returned an error code (%u)" +msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Ezin da atzitu %s iturburu paketeen zerrenda" - -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Pakete Zerrenda irakurtzen" - -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Fitxategiaren erreferentziak biltzen" - -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "S/I errorea iturburu katxea gordetzean" +msgid "Sub-process %s exited unexpectedly" +msgstr "%s azpiprozesua ustekabean amaitu da" -#: apt-pkg/pkgrecords.cc:38 -#, c-format -msgid "Index file type '%s' is not supported" -msgstr "'%s' motako indize fitxategirik ez da onartzen" +#: apt-pkg/contrib/fileutl.cc:913 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Arazoa fitxategia ixtean" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/fileutl.cc:1101 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" -msgstr "" +msgid "Could not open file %s" +msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 #, fuzzy, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Erregistro baliogabea hobespenen fitxategian, pakete goibururik ez" +msgid "Could not open file descriptor %d" +msgstr "Ezin izan da %s(r)en kanalizazioa ireki" -#: apt-pkg/policy.cc:444 -#, c-format -msgid "Did not understand pin type %s" -msgstr "Ez da ulertu %s orratz-mota (pin)" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Huts egin du IPC azpiprozesua sortzean" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Huts egin du konpresorea exekutatzean " -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)" +msgid "read, still have %llu to read but none left" +msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" +msgid "write, still have %llu to write but couldn't" +msgstr "idatzita; oraindik %lu idazteke, baina ezin da" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)" +msgid "Problem closing the file %s" +msgstr "Arazoa fitxategia ixtean" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/fileutl.cc:1927 #, 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)" +msgid "Problem renaming the file %s to %s" +msgstr "Arazoa fitxategia sinkronizatzean" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/fileutl.cc:1938 #, 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)" +msgid "Problem unlinking the file %s" +msgstr "Arazoa fitxategia desestekatzean" -#: 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/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Arazoa fitxategia sinkronizatzean" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)" +msgid "%c%s... Error!" +msgstr "%c%s... Errorea!" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)" +msgid "%c%s... Done" +msgstr "%c%s... Eginda" -#: 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/contrib/progress.cc:181 +msgid "..." +msgstr "" -#: 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)" +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Eginda" -#: 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/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Ezin da fitxategi huts baten mmap egin" -#: apt-pkg/sourcelist.cc:335 -#, c-format -msgid "Opening %s" -msgstr "%s irekitzen" +#: apt-pkg/contrib/mmap.cc:111 +#, fuzzy, c-format +msgid "Couldn't duplicate file descriptor %i" +msgstr "Ezin izan da %s(r)en kanalizazioa ireki" -#: 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 +#: apt-pkg/contrib/mmap.cc:119 #, 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 "Couldn't make mmap of %llu bytes" +msgstr "Ezin izan da %lu byteren mmap egin" -#: apt-pkg/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en" +#: apt-pkg/contrib/mmap.cc:146 +#, fuzzy +msgid "Unable to close mmap" +msgstr "Ezin da %s ireki" -#: apt-pkg/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Ezin da %s pakete fitxategia analizatu (1)" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "Ezin da deitu " -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Ezin da %s pakete fitxategia analizatu (2)" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Ezin izan da %lu byteren mmap egin" -#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 -#, fuzzy +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Huts fitxategia mozterakoan" + +#: apt-pkg/contrib/mmap.cc:341 +#, c-format msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"Indize fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo " -"zaharrak erabili dira haien ordez." +"MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Start muga. Uneko " +"balioa: %lu. (man 5 apt.conf)" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "%s saltzaile blokeak ez du egiaztapen markarik" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" + +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" #: apt-pkg/contrib/cdromutl.cc:65 #, c-format @@ -3085,53 +2908,6 @@ msgstr "Ezin da atzitu %s muntatze puntua" msgid "Failed to stat the cdrom" msgstr "Huts egin du CDROMa atzitzean" -#: apt-pkg/contrib/cmndline.cc:121 -#, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "Ez da ulertzen komando lerroko %s aukera" - -#: apt-pkg/contrib/cmndline.cc:168 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "Komando lerroko %s aukera ez da boolearra." - -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "%s aukerak argumentu bat behar du." - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "" -"%s aukera: konfigurazio elementuaren zehaztapenak = eduki behar du." - -#: apt-pkg/contrib/cmndline.cc:278 -#, 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:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "'%s' aukera luzeegia da" - -#: apt-pkg/contrib/cmndline.cc:341 -#, 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:391 -#, c-format -msgid "Invalid operation %s" -msgstr "Eragiketa baliogabea: %s" - #: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" @@ -3187,391 +2963,610 @@ msgstr "Sintaxi errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria fitxategi amaieran" -#: apt-pkg/contrib/fileutl.cc:190 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Abortatu instalazioa." + +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "" -"Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo " -"fitxategiarentzat" +msgid "Command line option '%c' [from %s] is not known." +msgstr "Ez da ezagutzen komando lerroko '%c' aukera [%s]." -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Could not open lock file %s" -msgstr "Ezin izan da %s blokeo fitxategia ireki" +msgid "Command line option %s is not understood" +msgstr "Ez da ulertzen komando lerroko %s aukera" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "" -"Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo fitxategiarentzat" +msgid "Command line option %s is not boolean" +msgstr "Komando lerroko %s aukera ez da boolearra." -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "Could not get lock %s" -msgstr "Ezin izan da %s blokeoa hartu" +msgid "Option %s requires an argument." +msgstr "%s aukerak argumentu bat behar du." -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "List of files can't be created as '%s' is not a directory" +msgid "Option %s: Configuration item specification must have an =." msgstr "" +"%s aukera: konfigurazio elementuaren zehaztapenak = eduki behar du." -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "%s aukerak osoko argumentu bat behar du, eta ez '%s'" -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" +msgid "Option '%s' is too long" +msgstr "'%s' aukera luzeegia da" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" +msgid "Sense %s is not understood, try true or false." +msgstr "%s zentzua ez da ulertzen; probatu egiazkoa edo faltsua." -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du." +msgid "Invalid operation %s" +msgstr "Eragiketa baliogabea: %s" -#: apt-pkg/contrib/fileutl.cc:826 -#, fuzzy, c-format -msgid "Sub-process %s received signal %u." -msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du." +#: apt-pkg/deb/dpkgpm.cc:110 +#, c-format +msgid "Installing %s" +msgstr "%s Instalatzen" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)" +msgid "Configuring %s" +msgstr "%s konfiguratzen" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "%s azpiprozesua ustekabean amaitu da" +msgid "Removing %s" +msgstr "%s kentzen" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/dpkgpm.cc:113 #, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Arazoa fitxategia ixtean" +msgid "Completely removing %s" +msgstr "%s guztiz ezabatu da" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Could not open file %s" -msgstr "%s fitxategia ezin izan da ireki" +msgid "Noting disappearance of %s" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/deb/dpkgpm.cc:115 +#, 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:845 +#, c-format +msgid "Directory '%s' missing" +msgstr "'%s' direktorioa falta da" + +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, fuzzy, c-format -msgid "Could not open file descriptor %d" -msgstr "Ezin izan da %s(r)en kanalizazioa ireki" +msgid "Could not open file '%s'" +msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Huts egin du IPC azpiprozesua sortzean" +#: apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Preparing %s" +msgstr "%s prestatzen" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Huts egin du konpresorea exekutatzean " +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr "%s irekitzen" -#: apt-pkg/contrib/fileutl.cc:1514 -#, fuzzy, c-format -msgid "read, still have %llu to read but none left" -msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen" +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing to configure %s" +msgstr "%s konfiguratzeko prestatzen" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, fuzzy, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "idatzita; oraindik %lu idazteke, baina ezin da" +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr "%s Instalatuta" -#: apt-pkg/contrib/fileutl.cc:1915 -#, fuzzy, c-format -msgid "Problem closing the file %s" -msgstr "Arazoa fitxategia ixtean" +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "%s kentzeko prestatzen" -#: apt-pkg/contrib/fileutl.cc:1927 -#, fuzzy, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Arazoa fitxategia sinkronizatzean" +#: apt-pkg/deb/dpkgpm.cc:1022 +#, c-format +msgid "Removed %s" +msgstr "%s kendurik" -#: apt-pkg/contrib/fileutl.cc:1938 -#, fuzzy, c-format -msgid "Problem unlinking the file %s" -msgstr "Arazoa fitxategia desestekatzean" +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "%s guztiz ezabatzeko prestatzen" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Arazoa fitxategia sinkronizatzean" +#: apt-pkg/deb/dpkgpm.cc:1028 +#, c-format +msgid "Completely removed %s" +msgstr "%s guztiz ezabatu da" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Abortatu instalazioa." +msgid "Can not write log (%s)" +msgstr "%s : ezin da idatzi" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Ezin da fitxategi huts baten mmap egin" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" -#: apt-pkg/contrib/mmap.cc:111 -#, fuzzy, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Ezin izan da %s(r)en kanalizazioa ireki" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "" -#: apt-pkg/contrib/mmap.cc:119 -#, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Ezin izan da %lu byteren mmap egin" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "" -#: apt-pkg/contrib/mmap.cc:146 -#, fuzzy -msgid "Unable to close mmap" -msgstr "Ezin da %s ireki" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -#, fuzzy -msgid "Unable to synchronize mmap" -msgstr "Ezin da deitu " +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Ezin izan da %lu byteren mmap egin" +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Huts fitxategia mozterakoan" +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" -#: apt-pkg/contrib/mmap.cc:341 +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"Unable to lock the administration directory (%s), is another process using " +"it?" msgstr "" -"MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Start muga. Uneko " -"balioa: %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:446 +#: 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 "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +"dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/contrib/mmap.cc:449 +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "" + +#: cmdline/apt-extracttemplates.cc:224 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n" +"\n" +"apt-extracttemplates debian-eko paketeen konfigurazioaren eta txantiloien\n" +"informazioa ateratzeko tresna bat da\n" +"\n" +"Aukerak:\n" +" -h Laguntza testu hau\n" +" -t Ezarri aldi baterako direktorioa\n" +" -c=? Irakurri konfigurazio fitxategi hau\n" +" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" -#: apt-pkg/contrib/progress.cc:148 +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "Ezin da daturik lortu %s(e)tik" + +#: cmdline/apt-extracttemplates.cc:300 +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 +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 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Errorea!" +msgid "Error processing directory %s" +msgstr "Errorea direktorioa prozesatzean %s" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Iturburu luzapenen zerrenda luzeegia da" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Errorea eduki fitxategiaren goiburua idaztean" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Eginda" +msgid "Error processing contents %s" +msgstr "Errorea edukiak prozesatzean %s" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" +"Erabilera: apt-ftparchive [aukerak] komandoa\n" +"Komandoak: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive Debian artxiboen indizeak sortzeko erabiltzen da. Sortzeko \n" +"estilo asko onartzen ditu, erabat automatizatuak nahiz ordezte funtzionalak\n" +"'dpkg-scanpackages' eta 'dpkg-scansources'erako\n" +"Package izeneko fitxategiak sortzen ditu .deb fitxategien zuhaitz batetik.\n" +"Package fitxategiak pakete bakoitzaren kontrol eremu guztiak izaten ditu,\n" +"MD5 hash balioa eta fitxategi tamaina barne. Override fitxategia erabiltzen\n" +"da lehentasunaren eta sekzioaren balioak behartzeko.\n" +"\n" +"Era berean, iturburu fitxategiak ere sortzen ditu .dsc fitxategien\n" +"zuhaitzetik. --source-override aukera erabil daiteke src override \n" +"fitxategi bat zehazteko.\n" +"'packages' eta 'sources' komandoa zuhaitzaren erroan exekutatu behar dira.\n" +"BinaryPath-ek bilaketa errekurtsiboaren oinarria seinalatu behar du, eta\n" +"override fitxategiak override banderak izan behar ditu. Pathprefix \n" +"fitxategi izenen eremuei eransten zaie (halakorik badago). Hona hemen\n" +"Debian artxiboko erabilera argibide bat:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Aukerak:\n" +" -h Laguntza testu hau\n" +" --md5 Kontrolatu MD5 sortzea\n" +" -s=? Iturburuaren override fitxategia\n" +" -q Isilik\n" +" -d=? Hautatu aukerako katxearen datu-basea\n" +" --no-delink Gaitu delink arazketa modua\n" +" --contents Kontrolatu eduki fitxategia sortzea\n" +" -c=? Irakurri konfigurazio fitxategi hau\n" +" -o=? Ezarri konfigurazio aukera arbitrario bat" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Eginda" +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Ez dago bat datorren hautapenik" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "" +msgid "Some files are missing in the package file group `%s'" +msgstr "Fitxategi batzuk falta dira `%s' pakete fitxategien taldean" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "%lih %limin %lis" -msgstr "" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Datu-basea hondatuta dago; fitxategiari %s.old izena jarri zaio" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "%limin %lis" +msgid "DB is old, attempting to upgrade %s" +msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da" + +#: ftparchive/cachedb.cc:94 +#, fuzzy +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" +"DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, " +"mesedez datubasea ezabatu eta birsortu." + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Ezin da ireki %s datu-base fitxategia: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Huts egin du %s esteka irakurtzean" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Artxiboak ez du kontrol erregistrorik" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Ezin da kurtsorerik eskuratu" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:91 #, c-format -msgid "%lis" -msgstr "" +msgid "W: Unable to read directory %s\n" +msgstr "A: Ezin da %s direktorioa irakurri\n" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:96 #, c-format -msgid "Selection %s not found" -msgstr "%s hautapena ez da aurkitu" +msgid "W: Unable to stat %s\n" +msgstr "A: Ezin da %s atzitu\n" -#: apt-pkg/deb/debsystem.cc:91 -#, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " -#: 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" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "A: " -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: Erroreak fitxategiari dagozkio " + +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "" +msgid "Failed to resolve %s" +msgstr "Huts egin du %s ebaztean" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Huts egin dute zuhaitz-urratsek" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:219 #, c-format -msgid "Installing %s" -msgstr "%s Instalatzen" +msgid "Failed to open %s" +msgstr "Huts egin du %s irekitzean" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:278 #, c-format -msgid "Configuring %s" -msgstr "%s konfiguratzen" +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:286 #, c-format -msgid "Removing %s" -msgstr "%s kentzen" - -#: apt-pkg/deb/dpkgpm.cc:98 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "%s guztiz ezabatu da" +msgid "Failed to readlink %s" +msgstr "Huts egin du %s esteka irakurtzean" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:290 #, c-format -msgid "Noting disappearance of %s" -msgstr "" +msgid "Failed to unlink %s" +msgstr "Huts egin du %s desestekatzean" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:298 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen" +msgid "*** Failed to link %s to %s" +msgstr "*** Ezin izan da %s %s(r)ekin estekatu" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:308 #, c-format -msgid "Directory '%s' missing" -msgstr "'%s' direktorioa falta da" +msgid " DeLink limit of %sB hit.\n" +msgstr " DeLink-en mugara (%sB) heldu da.\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "%s fitxategia ezin izan da ireki" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Artxiboak ez du pakete eremurik" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Preparing %s" -msgstr "%s prestatzen" +msgid " %s has no override entry\n" +msgstr " %s: ez du override sarrerarik\n" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Unpacking %s" -msgstr "%s irekitzen" +msgid " %s maintainer is %s not %s\n" +msgstr " %s mantentzailea %s da, eta ez %s\n" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing to configure %s" -msgstr "%s konfiguratzeko prestatzen" +msgid " %s has no source override entry\n" +msgstr " %s: ez du jatorri gainidazketa sarrerarik\n" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/writer.cc:710 #, c-format -msgid "Installed %s" -msgstr "%s Instalatuta" +msgid " %s has no binary override entry either\n" +msgstr " %s: ez du bitar gainidazketa sarrerarik\n" -#: apt-pkg/deb/dpkgpm.cc:1005 -#, c-format -msgid "Preparing for removal of %s" -msgstr "%s kentzeko prestatzen" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Huts egin du memoria esleitzean" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Removed %s" -msgstr "%s kendurik" +msgid "Unable to open %s" +msgstr "Ezin da %s ireki" -#: apt-pkg/deb/dpkgpm.cc:1012 -#, c-format -msgid "Preparing to completely remove %s" -msgstr "%s guztiz ezabatzeko prestatzen" +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Gaizki osatutako override %s, lerroa: %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Completely removed %s" -msgstr "%s guztiz ezabatu da" +msgid "Failed to read the override file %s" +msgstr "Huts egin du %s override fitxategia irakurtzean" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/override.cc:166 #, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "%s : ezin da idatzi" +msgid "Malformed override %s line %llu #1" +msgstr "Gaizki osatutako override %s, lerroa: %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "Gaizki osatutako override %s, lerroa: %lu #2" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "Gaizki osatutako override %s, lerroa: %lu #3" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" +#: ftparchive/multicompress.cc:73 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "'%s' Konpresio Algoritmo Ezezaguna" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "%s irteera konprimituak konpresio-tresna bat behar du" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Huts egin du FILE* sortzean" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Huts egin du sardetzean" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Konprimatu Umeak" -#: apt-pkg/deb/dpkgpm.cc:1707 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Barne Errorea, Huts %s sortzerakoan" + +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak" + +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Huts egin du MD5 konputatzean" + +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Arazoa %s desestekatzean" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-internal-solver.cc:49 +#, fuzzy msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n" +"\n" +"apt-extracttemplates debian-eko paketeen konfigurazioaren eta txantiloien\n" +"informazioa ateratzeko tresna bat da\n" +"\n" +"Aukerak:\n" +" -h Laguntza testu hau\n" +" -t Ezarri aldi baterako direktorioa\n" +" -c=? Irakurri konfigurazio fitxategi hau\n" +" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Pakete erregistro ezezaguna!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Erabilera: apt-sortpkgs [aukerak] fitxategia1 [fitxategia2...]\n" +"\n" +"apt-sortpkgs pakete fitxategiak ordenatzeko tresna soil bat da. Zein\n" +"motatako fitxategia den adierazteko -s aukera erabiltzen da.\n" +"\n" +"Aukerak:\n" +" -h Laguntza testu hau\n" +" -s Erabili iturburu fitxategien ordenatzea\n" +" -c=? Irakurri konfigurazio fitxategi hau\n" +" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib: -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/fi.po b/po/fi.po index cb23ace35..a3e97e835 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Versiotaulukko:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -355,7 +355,7 @@ msgstr "Noutokansiota ei saatu lukittua" 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" @@ -375,96 +375,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kansion %s vapaan tilan määrä ei selvinnyt" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -472,7 +472,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -480,14 +480,14 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -496,7 +496,7 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1362 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -504,30 +504,30 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Avataan yhteys %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -667,7 +667,7 @@ msgstr "%s on jo uusin versio.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Odotettiin %s, mutta sitä ei ollut" @@ -761,16 +761,16 @@ msgstr "Rompun %s irrottaminen ei onnistu, se on ehkä käytössä." msgid "Disk not found." msgstr "Levyä ei löydy" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Tiedostoa ei löydy" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Komento stat ei toiminut" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" @@ -824,7 +824,7 @@ msgstr "Komentotiedoston rivi \"%s\" ei toiminut, palvelin ilmoitti: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE ei toiminut, palvelin ilmoitti: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Yhteys aikakatkaistiin" @@ -846,7 +846,7 @@ msgstr "Vastaus aiheutti puskurin ylivuodon." msgid "Protocol corruption" msgstr "Yhteyskäytäntö on turmeltunut" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -907,7 +907,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin" msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" @@ -916,7 +916,7 @@ msgstr "Pulmia tiedoston hajautuksessa" msgid "Unable to fetch file, server said '%s'" msgstr "Tiedostoa ei saatu noudettua, palvelin ilmoitti \"%s\"" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Pistoke aikakatkaistiin" @@ -966,7 +966,7 @@ msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Avataan yhteys %s" @@ -1108,42 +1108,17 @@ msgstr "Yhteys ei toiminut" msgid "Internal error" msgstr "Sisäinen virhe" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Löytyi " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Nouda:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Siv " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Vrhe " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Noudettiin %st ajassa %s (%st/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Työskennellään]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Taltion vaihto: Pistä levy \n" -"\"%s\"\n" -"asemaan \"%s\" ja paina Enter\n" +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:93 msgid "Correcting dependencies..." @@ -1173,34 +1148,210 @@ msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä." msgid "Unmet dependencies. Try using -f." msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Asennettu]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Varoitus varmistamisesta on ohitettu.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [Asennettu]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Asennetaanko nämä paketit ilman todennusta?" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Asennettu]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Asennettu]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Tiedoston %s nouto ei onnistunut %s\n" +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:35 +#, 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:97 +#, 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:101 +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:82 msgid "Internal error, InstallPackages was called with broken packages!" @@ -1252,6 +1403,10 @@ msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n" msgid "You don't have enough free space in %s." msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa." +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes" + #: apt-private/private-install.cc:216 apt-private/private-install.cc:238 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" @@ -1464,932 +1619,684 @@ 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:129 -msgid "Listing" -msgstr "" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!" -#: apt-private/private-list.cc:159 +#: apt-private/private-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Varoitus varmistamisesta on ohitettu.\n" + +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua" + +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Asennetaanko nämä paketit ilman todennusta?" + +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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] "" +msgid "Failed to fetch %s %s\n" +msgstr "Tiedoston %s nouto ei onnistunut %s\n" -#: 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!" +#: apt-private/private-sources.cc:58 +#, fuzzy, c-format +msgid "Failed to parse %s. Edit again? " +msgstr "Nimen muuttaminen %s -> %s ei onnistunut" + +#: apt-private/private-sources.cc:70 +#, c-format +msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 -#: apt-private/private-show.cc:89 -msgid "unknown" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" -#: apt-private/private-output.cc:265 -#, fuzzy, c-format -msgid "[installed,upgradable to: %s]" -msgstr " [Asennettu]" +#: apt-private/private-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "Käsitellään päivitystä ... " -#: apt-private/private-output.cc:268 -#, fuzzy -msgid "[installed,local]" -msgstr " [Asennettu]" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "Valmis" -#: apt-private/private-output.cc:270 -msgid "[installed,auto-removable]" -msgstr "" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Löytyi " -#: apt-private/private-output.cc:272 -#, fuzzy -msgid "[installed,automatic]" -msgstr " [Asennettu]" +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Nouda:" -#: apt-private/private-output.cc:274 -#, fuzzy -msgid "[installed]" -msgstr " [Asennettu]" +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Siv " -#: apt-private/private-output.cc:277 +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Vrhe " + +#: apt-private/acqprogress.cc:146 #, c-format -msgid "[upgradable from: %s]" -msgstr "" +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Noudettiin %st ajassa %s (%st/s)\n" -#: apt-private/private-output.cc:281 -msgid "[residual-config]" -msgstr "" +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Työskennellään]" -#: apt-private/private-output.cc:455 +#: apt-private/acqprogress.cc:297 #, c-format -msgid "but %s is installed" -msgstr "mutta %s on asennettu" +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Taltion vaihto: Pistä levy \n" +"\"%s\"\n" +"asemaan \"%s\" ja paina Enter\n" -#: apt-private/private-output.cc:457 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "but %s is to be installed" -msgstr "mutta %s on merkitty asennettavaksi" +msgid "Unable to read %s" +msgstr "Tiedostoa %s ei voi lukea" -#: apt-private/private-output.cc:464 -msgid "but it is not installable" -msgstr "mutta ei ole asennuskelpoinen" +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 +#, c-format +msgid "Unable to change to %s" +msgstr "Kansioon %s vaihto ei onnistu" -#: apt-private/private-output.cc:466 -msgid "but it is a virtual package" -msgstr "mutta on näennäispaketti" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" -#: apt-private/private-output.cc:469 -msgid "but it is not installed" -msgstr "mutta ei ole asennettu" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 +#, fuzzy, c-format +msgid "Can not read mirror file '%s'" +msgstr "Tiedostoa %s ei voitu avata" -#: apt-private/private-output.cc:469 -msgid "but it is not going to be installed" -msgstr "mutta ei ole merkitty asennettavaksi" +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Tiedostoa %s ei voitu avata" -#: apt-private/private-output.cc:474 -msgid " or" -msgstr " tai" +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" +msgstr "" -#: 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:" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "IPC-putken luominen aliprosessiin ei onnistunut" -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "Seuraavat UUDET paketit asennetaan:" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "Yhteys katkesi ennenaikaisesti" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "Seuraavat paketit POISTETAAN:" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "Oletusasetus ei kelpaa!" -#: apt-private/private-output.cc:571 -msgid "The following packages have been kept back:" -msgstr "Nämä paketit on jätetty odottamaan:" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "Jatka painamalla Enter." -#: apt-private/private-output.cc:592 -msgid "The following packages will be upgraded:" -msgstr "Nämä paketit päivitetään:" +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Haluatko poistaa aiemmin noudettuja .deb-tiedostoja?" -#: apt-private/private-output.cc:613 -msgid "The following packages will be DOWNGRADED:" -msgstr "Nämä paketit VARHENNETAAN:" +#: dselect/install:102 +#, fuzzy +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "Tapahtui virheitä purettaessa. Tehdään asennettujen" -#: apt-private/private-output.cc:633 -msgid "The following held packages will be changed:" -msgstr "Seuraavat pysytetyt paketit muutetaan:" +#: dselect/install:103 +#, fuzzy +msgid "will be configured. This may result in duplicate errors" +msgstr "pakettien asetukset. Samat virheet voivat tulla toiseen kertaan" -#: apt-private/private-output.cc:688 -#, c-format -msgid "%s (due to %s) " -msgstr "%s (syynä %s) " +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" +"tai tyydyttämättömät riippuvuudet aiheuttavat virheitä. Tämä ei haittaa" -#: apt-private/private-output.cc:696 +#: dselect/install:105 msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"above this message are important. Please fix them and run [I]nstall again" 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!" +"vain tätä viestiä ennen tulleilla virheillä on merkitystä. Korjaa ne ja aja " +"[I]nstall uudestaan" -#: apt-private/private-output.cc:727 -#, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu päivitetty, %lu uutta asennusta, " +#: dselect/update:30 +msgid "Merging available information" +msgstr "Yhdistetään saatavuustiedot" -#: apt-private/private-output.cc:731 -#, c-format -msgid "%lu reinstalled, " -msgstr "%lu uudelleen asennettua, " +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "Kutsuttiin DropNode mutta tiedostoon on vielä linkki" -#: apt-private/private-output.cc:733 -#, c-format -msgid "%lu downgraded, " -msgstr "%lu varhennettua, " +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Hajautusalkiota ei löytynyt!" -#: apt-private/private-output.cc:735 +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Korvautuksen varaus ei onnistunut" + +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "AddDiversion: sisäinen virhe" + +#: apt-inst/filelist.cc:477 #, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Yritetään kirjoittaa korvautuksen päälle, %s -> %s ja %s/%s" -#: apt-private/private-output.cc:739 +#: apt-inst/filelist.cc:506 #, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" +msgid "Double add of diversion %s -> %s" +msgstr "Korvautuksen kaksoislisäys %s -> %s" -#. 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]" +#: apt-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "Asetustiedoston kaksoiskappale %s/%s" -#. 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 "" +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#, c-format +msgid "The path %s is too long" +msgstr "Polku %s on liian pitkä" -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:778 -msgid "Y" -msgstr "K" +#: apt-inst/extract.cc:132 +#, c-format +msgid "Unpacking %s more than once" +msgstr "Purettiin %s useammin kuin kerran" -#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:784 -msgid "N" -msgstr "" +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "Kansio %s on korvautunut" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 +#: apt-inst/extract.cc:152 #, c-format -msgid "Regex compilation error - %s" -msgstr "Käännösvirhe lausekkeessa - %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Paketti yrittää kirjoittaa korvautuksen kohteeseen %s/%s" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Korvautuspolku on liian pitkä" -#: apt-private/private-show.cc:156 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, 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 "" +msgid "Failed to stat %s" +msgstr "Tiedostolle %s ei toimi stat" -#: apt-private/private-sources.cc:58 -#, fuzzy, c-format -msgid "Failed to parse %s. Edit again? " +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#, c-format +msgid "Failed to rename %s to %s" msgstr "Nimen muuttaminen %s -> %s ei onnistunut" -#: apt-private/private-sources.cc:70 +#: apt-inst/extract.cc:249 #, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "" +msgid "The directory %s is being replaced by a non-directory" +msgstr "Kansiota %s ollaan korvaamassa muulla kuin kansiolla" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Komento update ei käytä parametreja" +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Solmua ei löytynyt sen hajautuslokerosta" + +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Polku on liian pitkä" -#: apt-private/private-update.cc:90 +#: apt-inst/extract.cc:421 #, 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] "" +msgid "Overwrite package match with no version for %s" +msgstr "Päälle kirjoitettava paketti täsmää mutta paketille %s ei ole versiota" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." -msgstr "" +#: apt-inst/extract.cc:438 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "Käsitellään päivitystä ... " +#: apt-inst/extract.cc:498 +#, c-format +msgid "Unable to stat %s" +msgstr "Tiedostolle %s ei toimi stat" -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "Valmis" +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#, c-format +msgid "Failed to write file %s" +msgstr "Tiedoston %s kirjoittaminen ei onnistunut" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Unable to read %s" -msgstr "Tiedostoa %s ei voi lukea" +msgid "Failed to close file %s" +msgstr "Tiedoston %s sulkeminen ei onnistunut" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "Unable to change to %s" -msgstr "Kansioon %s vaihto ei onnistu" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Tämä ei ole kelvollinen DEB-arkisto, puuttuu tiedosto \"%s\"" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "No mirror file '%s' found " -msgstr "" +msgid "Internal error, could not locate member %s" +msgstr "Tapahtui sisäinen virhe, tiedostoa %s ei löydy" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:287 -#, fuzzy, c-format -msgid "Can not read mirror file '%s'" -msgstr "Tiedostoa %s ei voitu avata" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Ohjaustiedosto ei jäsenny" -#: methods/mirror.cc:315 +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Arkiston tarkistussumma on virheellinen" + +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Tapahtui virhe luettaessa arkiston tiedoston otsikkoa" + +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format -msgid "No entry found in mirror file '%s'" -msgstr "Tiedostoa %s ei voitu avata" +msgid "Invalid archive member header %s" +msgstr "Arkiston tiedoston otsikko on virheellinen" -#: methods/mirror.cc:445 -#, c-format -msgid "[Mirror: %s]" -msgstr "" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Arkiston tiedoston otsikko on virheellinen" -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "IPC-putken luominen aliprosessiin ei onnistunut" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Arkisto on pienempi kuin pitäisi" -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" -msgstr "Yhteys katkesi ennenaikaisesti" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Arkiston otsikoiden luku ei onnistunut" -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "Oletusasetus ei kelpaa!" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Putkien luonti ei onnistunut" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "Jatka painamalla Enter." +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "exec gzip ei onnistunut" -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "Haluatko poistaa aiemmin noudettuja .deb-tiedostoja?" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Arkisto on turmeltunut" -#: dselect/install:102 -#, fuzzy -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "Tapahtui virheitä purettaessa. Tehdään asennettujen" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut" -#: dselect/install:103 -#, fuzzy -msgid "will be configured. This may result in duplicate errors" -msgstr "pakettien asetukset. Samat virheet voivat tulla toiseen kertaan" +#: apt-inst/contrib/extracttar.cc:308 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s" -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" +#: apt-pkg/install-progress.cc:57 +#, c-format +msgid "Progress: [%3i%%]" msgstr "" -"tai tyydyttämättömät riippuvuudet aiheuttavat virheitä. Tämä ei haittaa" -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" msgstr "" -"vain tätä viestiä ennen tulleilla virheillä on merkitystä. Korjaa ne ja aja " -"[I]nstall uudestaan" - -#: dselect/update:30 -msgid "Merging available information" -msgstr "Yhdistetään saatavuustiedot" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n" -"\n" -"apt-extracttemplates on työkalu asetus- ja mallitietojen \n" -"poimintaan debian-paketeista\n" -"\n" -"Valitsimet:\n" -" -h Tämä ohje\n" -" -t Aseta väliaikaisten tiedostojen kansio\n" -" -c=? Lue tämä asetustiedosto\n" -" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" +#: apt-pkg/init.cc:146 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu" -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Tiedostolle %s ei toimi stat" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Unable to write to %s" -msgstr "Tiedostoon %s kirjoittaminen ei onnistu" - -#: cmdline/apt-extracttemplates.cc:300 -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 -msgid "Package extension list is too long" -msgstr "Paketin laajennuslista on liian pitkä" +msgid "Wrote %i records.\n" +msgstr "Kirjoitettiin %i tietuetta.\n" -#: 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 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Error processing directory %s" -msgstr "Tapahtui virhe käsiteltäessa kansiota %s" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n" -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Lähteiden laajennuslista on liian pitkä" +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"Tapahtui virhe kirjoitettaessa otsikkotietoa sisällysluettelotiedostoon" +"Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa ja %i paritonta " +"tiedostoa\n" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Error processing contents %s" -msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" +msgid "Can't find authentication record for: %s" msgstr "" -"Käyttö: apt-ftparchive [valitsimet] komento\n" -"Komennot: packages binääripolku [poikkeustdsto [polun alku]]\n" -" sources lähdepolku [poikkeustdsto [polun alku]]\n" -" contents polku\n" -" release polku\n" -" generate asetukset [ryhmät]\n" -" clean asetukset\n" -"\n" -"apt-ftparchive tuottaa hakemistoja Debianin arkistoista. Monta " -"tuottamistapaa\n" -"on tuettu alkaen täysin automaattisista toiminnallisesti samoihin kuin\n" -"dpkg-scanpackages ja dpkg-scansources.\n" -"\n" -"apt-ftparchive tuottaa pakettitiedostoja .deb-tiedostojen puusta.\n" -"Pakettitiedostossa on kunkin paketin kaikkien ohjauskenttien\n" -"sisältö sekä MD5 tiiviste ja tiedoston koko. Poikkeus-\n" -"tiedostolla voidaan arvot Priority ja Section pakottaa halutuiksi.\n" -"\n" -"Samaan tapaan apt-ftparchive tuottaa lähdetiedostoja\n" -".dscs-tiedostojen puusta. Valitsimella --source-overrride voidaan\n" -"määrittää lähteiden poikkeustiedosto.\n" -"\n" -"Komennot \"packages\" ja \"sources\" olisi suoritettava puun juuressa.\n" -"Binääripolun olisi osoitettava rekursiivisen haun alkukohtaan ja\n" -"poikkeustiedostossa olisi oltava poikkeusilmaisimet. Polun alku\n" -"yhdistetään tiedoston nimeen jos se on annettu. Esimerkki\n" -"käytöstä Debianin arkiston kanssa:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Valitsimet:\n" -" -h Tämä ohje\n" -" --md5 MD5 luonti\n" -" -s=? Lähteiden poikkeustdosto\n" -" -q Ei tulostusta\n" -" -d=? Valinnainen välimuistitietokanta\n" -" --no-delink delinking-virheenjäljitys päälle\n" -" --contents Sisällysluettelotiedoston luonti\n" -" -c=? Lue tämä asetustiedosto\n" -" -o=? Aseta mikä asetusvalitsin tahansa" -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Mitkään valinnat eivät täsmänneet" +#: apt-pkg/indexcopy.cc:521 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Kohteen %s tarkistussumma ei täsmää" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja" +msgid "The method driver %s could not be found." +msgstr "Menetelmän ajuria %s ei löytynyt" -#: ftparchive/cachedb.cc:65 +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" + +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Tietokanta on turmeltunut, tiedosto nimetty %s.old" +msgid "Method %s did not start correctly" +msgstr "Menetelmä %s ei käynnistynyt oikein" -#: ftparchive/cachedb.cc:83 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Tietokanta on vanha, yritetään päivittää %s" +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." -#: ftparchive/cachedb.cc:94 -#, fuzzy -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." msgstr "" -"Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, " -"on tietokanta poistettava ja luotava uudelleen." +"Pakettiluettelonn tai tilatiedoston avaaminen tai jäsennys epäonnistui." -#: ftparchive/cachedb.cc:99 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Tietokantatiedostoa %s ei saatu avattua: %s" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 -#, c-format -msgid "Failed to stat %s" -msgstr "Tiedostolle %s ei toimi stat" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Lähteiden luetteloa ei pystynyt lukemaan." -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "readlink %s ei onnistunut" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Pakettivarasto on tyhjä" -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Arkistolla ei ole ohjaustietuetta" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Pakettivarasto on turmeltunut" -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Kohdistinta ei saada" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Pakettivaraston versio on yhteensopimaton" -#: ftparchive/writer.cc:91 -#, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: Kansiota %s ei voi lukea\n" +#: apt-pkg/pkgcache.cc:169 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "Pakettivarasto on turmeltunut" -#: ftparchive/writer.cc:96 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "W: Tdstolle %s ei toimi stat\n" +msgid "This APT does not support the versioning system '%s'" +msgstr "Tämä APT ei tue versionhallintajärjestelmää \"%s\"" -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Pakettivarasto on tehty muulle arkkitehtuurille" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "W: " +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Riippuvuudet" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: Tiedostossa virheitä " +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Esiriippuvuudet" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 -#, c-format -msgid "Failed to resolve %s" -msgstr "Osoitteen %s selvitys ei onnistunut" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Ehdotukset" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Puun läpikäynti ei onnistunut" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Suosittelut" -#: ftparchive/writer.cc:219 -#, c-format -msgid "Failed to open %s" -msgstr "Tiedoston %s avaaminen ei onnistunut" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Ristiriidat" -#: ftparchive/writer.cc:278 -#, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Korvaavuudet" -#: ftparchive/writer.cc:286 -#, c-format -msgid "Failed to readlink %s" -msgstr "readlink %s ei onnistunut" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Täydet korvaavuudet" -#: ftparchive/writer.cc:290 -#, c-format -msgid "Failed to unlink %s" -msgstr "unlink %s ei onnistunut" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Rikkoo" -#: ftparchive/writer.cc:298 -#, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Linkin %s -> %s luonti ei onnistunut" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "" -#: ftparchive/writer.cc:308 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " DeLinkin yläraja %st saavutettu.\n" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "tärkeä" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Arkistossa ei ollut pakettikenttää" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "välttämätön" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s:llä ei ole poikkeustietuetta\n" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "perus" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " %s ylläpitäjä on %s eikä %s\n" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "valinnainen" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s:llä ei ole poikkeustietuetta\n" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "ylimääräinen" -#: ftparchive/writer.cc:710 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n" - -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Muistin varaaminen ei onnistunut" +msgid "Index file type '%s' is not supported" +msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Tiedoston %s avaaminen ei onnistunut" +#: 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)" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 +#: apt-pkg/sourcelist.cc:170 #, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1" +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Poikkeustiedoston %s lukeminen ei onnistunut" +#: 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)" -#: ftparchive/override.cc:166 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1" +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)" -#: ftparchive/override.cc:178 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2" +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)" -#: ftparchive/override.cc:191 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3" +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)" -#: ftparchive/multicompress.cc:73 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Tuntematon pakkausalgoritmi \"%s\"" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Pakattu tulostus %s tarvitsee pakkausjoukon" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "FILE* luominen ei onnistunut" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "fork ei onnistunut" - -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Compress-lapsiprosessi" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Sisäinen virhe, prosessin %s luominen ei onnistunut" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Syöttö/tulostus aliprosessiin/tiedostoon ei onnistunut" - -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "Problem unlinking %s" -msgstr "Ilmeni pulmia poistettaessa tiedosto %s" +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Nimen muuttaminen %s -> %s ei onnistunut" - -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n" -"\n" -"apt-extracttemplates on työkalu asetus- ja mallitietojen \n" -"poimintaan debian-paketeista\n" -"\n" -"Valitsimet:\n" -" -h Tämä ohje\n" -" -t Aseta väliaikaisten tiedostojen kansio\n" -" -c=? Lue tämä asetustiedosto\n" -" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Tuntematon pakettitietue!" - -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Käyttö: apt-sortpkgs [valitsimet] tdsto1 [tdsto2 ...]\n" -"\n" -"apt-sortpkgs on yksinkertainen työkalu pakettitiedostojen lajitteluun.\n" -"Valitsimella -s ilmaistaan minkälainen tiedosto on.\n" -"\n" -"Valitsimet:\n" -" -h Tämä ohje\n" -" -s Käytä lähdetiedostolajittelua\n" -" -c=? Lue tämä asetustiedosto\n" -" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "Failed to write file %s" -msgstr "Tiedoston %s kirjoittaminen ei onnistunut" +msgid "Opening %s" +msgstr "Avataan %s" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "Failed to close file %s" -msgstr "Tiedoston %s sulkeminen ei onnistunut" +msgid "Line %u too long in source list %s." +msgstr "Rivi %u on liian pitkä lähdeluettelossa %s." -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "The path %s is too long" -msgstr "Polku %s on liian pitkä" +msgid "Malformed line %u in source list %s (type)" +msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" -#: apt-inst/extract.cc:132 +#: apt-pkg/sourcelist.cc:375 #, c-format -msgid "Unpacking %s more than once" -msgstr "Purettiin %s useammin kuin kerran" +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" -#: apt-inst/extract.cc:142 -#, c-format -msgid "The directory %s is diverted" -msgstr "Kansio %s on korvautunut" +#: 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-inst/extract.cc:152 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu" + +#: apt-pkg/clean.cc:64 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Paketti yrittää kirjoittaa korvautuksen kohteeseen %s/%s" +msgid "Unable to stat %s." +msgstr "stat %s ei onnistu." -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Korvautuspolku on liian pitkä" - -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Kansiota %s ollaan korvaamassa muulla kuin kansiolla" - -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Solmua ei löytynyt sen hajautuslokerosta" - -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Polku on liian pitkä" - -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Päälle kirjoitettava paketti täsmää mutta paketille %s ei ole versiota" - -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle" - -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "Tiedostolle %s ei toimi stat" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "Kutsuttiin DropNode mutta tiedostoon on vielä linkki" +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Hajautusalkiota ei löytynyt!" +#: apt-pkg/pkgcachegen.cc:257 +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-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Korvautuksen varaus ei onnistunut" +#: apt-pkg/pkgcachegen.cc:260 +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-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "AddDiversion: sisäinen virhe" +#: apt-pkg/pkgcachegen.cc:263 +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-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Yritetään kirjoittaa korvautuksen päälle, %s -> %s ja %s/%s" +#: apt-pkg/pkgcachegen.cc:266 +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-inst/filelist.cc:506 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Korvautuksen kaksoislisäys %s -> %s" +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia." -#: apt-inst/filelist.cc:549 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Asetustiedoston kaksoiskappale %s/%s" - -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Arkiston tarkistussumma on virheellinen" - -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Tapahtui virhe luettaessa arkiston tiedoston otsikkoa" - -#: apt-inst/contrib/arfile.cc:96 -#, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "Arkiston tiedoston otsikko on virheellinen" - -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Arkiston tiedoston otsikko on virheellinen" - -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Arkisto on pienempi kuin pitäisi" - -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Arkiston otsikoiden luku ei onnistunut" - -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Putkien luonti ei onnistunut" - -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "exec gzip ei onnistunut" - -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Arkisto on turmeltunut" - -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut" +msgid "Couldn't stat source package list %s" +msgstr "stat ei toiminut lähdepakettiluettelolle %s" -#: apt-inst/contrib/extracttar.cc:308 -#, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Luetaan pakettiluetteloita" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 -#, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Tämä ei ole kelvollinen DEB-arkisto, puuttuu tiedosto \"%s\"" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Kootaan tiedostojen tarjoamistietoja" -#: apt-inst/deb/debfile.cc:132 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "Tapahtui sisäinen virhe, tiedostoa %s ei löydy" - -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Ohjaustiedosto ei jäsenny" +msgid "Unable to write to %s" +msgstr "Tiedostoon %s kirjoittaminen ei onnistu" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, fuzzy, c-format -msgid "List directory %spartial is missing." -msgstr "Luettelokansio %spartial puuttuu." +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" -#: apt-pkg/acquire.cc:91 -#, fuzzy, c-format -msgid "Archives directory %spartial is missing." -msgstr "Arkistokansio %spartial puuttuu." +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "" -#: apt-pkg/acquire.cc:99 -#, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "Luettelokansiota ei voitu lukita" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "Noudetaan tiedosto %li / %li" +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2409,35 +2316,35 @@ msgstr "Koko ei täsmää" msgid "Invalid file format" msgstr "Virheellinen toiminto %s" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, 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:1589 +#: apt-pkg/acquire-item.cc:1656 #, 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:1631 +#: apt-pkg/acquire-item.cc:1698 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:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2445,12 +2352,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2459,12 +2366,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:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2472,113 +2379,94 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Menetelmän ajuria %s ei löytynyt" +msgid "Vendor block %s contains no fingerprint" +msgstr "Toimittajan lohkosta %s puuttuu sormenjälki" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" +msgid "List directory %spartial is missing." +msgstr "Luettelokansio %spartial puuttuu." -#: apt-pkg/acquire-worker.cc:169 -#, c-format -msgid "Method %s did not start correctly" -msgstr "Menetelmä %s ei käynnistynyt oikein" +#: apt-pkg/acquire.cc:91 +#, fuzzy, c-format +msgid "Archives directory %spartial is missing." +msgstr "Arkistokansio %spartial puuttuu." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 +#, fuzzy, c-format +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:902 #, 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 "Retrieving file %li of %li (%s remaining)" +msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)" -#: apt-pkg/algorithms.cc:265 +#: apt-pkg/acquire.cc:904 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy." +msgid "Retrieving file %li of %li" +msgstr "Noudetaan tiedosto %li / %li" -#: apt-pkg/algorithms.cc:1086 +#: 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/policy.cc:83 +#, c-format msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -"Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt " -"paketit." -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty." +#: apt-pkg/policy.cc:422 +#, fuzzy, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu" -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." -msgstr "" -"Pakettiluettelonn tai tilatiedoston avaaminen tai jäsennys epäonnistui." - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Lähteiden luetteloa ei pystynyt lukemaan." - -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt" - -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt" - -#: apt-pkg/cacheset.cc:603 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "Tehtävää %s ei löytynyt" - -#: apt-pkg/cacheset.cc:609 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Pakettia %s ei löytynyt" - -#: apt-pkg/cacheset.cc:615 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Pakettia %s ei löytynyt" +msgid "Did not understand pin type %s" +msgstr "Tunnistetyyppi %s on tuntematon" -#: apt-pkg/cacheset.cc:626 -#, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +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 "" +"Tämän asennusajo vaatii tilapäisesti poistettavaksi välttämättömän paketin " +"%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/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +#: 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: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." +"Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai " +"käytetty vanhoja. " #: apt-pkg/cdrom.cc:571 msgid "Unmounting CD-ROM...\n" @@ -2655,10 +2543,23 @@ msgstr "Kirjoitetaan uusi lähdeluettelo\n" msgid "Source list entries for this disc are:\n" msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "stat %s ei onnistu." +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:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt " +"paketit." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty." #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2686,57 +2587,67 @@ msgstr "Tilatiedoston %s avaaminen ei onnistunut" msgid "Failed to write temporary StateFile %s" msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "Tehtävää %s ei löytynyt" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 -#, c-format -msgid "Wrote %i records.\n" -msgstr "Kirjoitettiin %i tietuetta.\n" +#: apt-pkg/cacheset.cc:609 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "Pakettia %s ei löytynyt" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Pakettia %s ei löytynyt" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -"Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa ja %i paritonta " -"tiedostoa\n" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "Kohteen %s tarkistussumma ei täsmää" +#: apt-pkg/cacheset.cc:663 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" #: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format @@ -2763,807 +2674,891 @@ msgstr "Virheellinen rivi korvautustiedostossa: %s" msgid "Invalid 'Date' entry in Release file %s" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/init.cc:146 -#, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä" - -#: apt-pkg/install-progress.cc:57 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Progress: [%3i%%]" +msgid "%lid %lih %limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "%limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "Tiedostoa %s ei voitu avata" - -#: apt-pkg/packagemanager.cc:630 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, 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." +msgid "%lis" msgstr "" -"Tämän asennusajo vaatii tilapäisesti poistettavaksi välttämättömän paketin " -"%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/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Pakettivarasto on tyhjä" +#: apt-pkg/contrib/strutl.cc:1258 +#, c-format +msgid "Selection %s not found" +msgstr "Valintaa %s ei löydy" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Pakettivarasto on turmeltunut" +#: apt-pkg/contrib/fileutl.cc:190 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "Lukkoa ei käytetä kirjoitussuojatulle tiedostolle %s" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Pakettivaraston versio on yhteensopimaton" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "Lukkotiedostoa %s ei voitu avata" -#: apt-pkg/pkgcache.cc:169 -#, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "Pakettivarasto on turmeltunut" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:223 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Tämä APT ei tue versionhallintajärjestelmää \"%s\"" +msgid "Could not get lock %s" +msgstr "Lukkoa %s ei saada" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "Pakettivarasto on tehty muulle arkkitehtuurille" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Riippuvuudet" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Esiriippuvuudet" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Ehdotukset" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Suosittelut" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Aliprosessi %s aiheutti suojausvirheen." -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Ristiriidat" +#: apt-pkg/contrib/fileutl.cc:826 +#, fuzzy, c-format +msgid "Sub-process %s received signal %u." +msgstr "Aliprosessi %s aiheutti suojausvirheen." -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Korvaavuudet" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Aliprosessi %s palautti virhekoodin (%u)" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Täydet korvaavuudet" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Aliprosessi %s lopetti odottamatta" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Rikkoo" +#: apt-pkg/contrib/fileutl.cc:913 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Pulmia tiedoston sulkemisessa" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "tärkeä" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, fuzzy, c-format +msgid "Could not open file descriptor %d" +msgstr "Putkea %s ei voitu avata" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "välttämätön" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Prosessien välistä kommunikaatiota aliprosessiin ei saatu luotua" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "perus" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Pakkaajan käynnistäminen ei onnistunut" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "valinnainen" +#: apt-pkg/contrib/fileutl.cc:1514 +#, fuzzy, c-format +msgid "read, still have %llu to read but none left" +msgstr "read, vielä %lu lukematta mutta tiedosto loppui" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "ylimääräinen" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, fuzzy, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva" +#: apt-pkg/contrib/fileutl.cc:1915 +#, fuzzy, c-format +msgid "Problem closing the file %s" +msgstr "Pulmia tiedoston sulkemisessa" -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)" +msgid "Problem renaming the file %s to %s" +msgstr "Pulmia tehtäessä tiedostolle sync" -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:1938 +#, fuzzy, c-format +msgid "Problem unlinking the file %s" +msgstr "Pulmia tehtäessä tiedostolle unlink" + +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Pulmia tehtäessä tiedostolle sync" + +#: apt-pkg/contrib/progress.cc:148 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... Virhe!" + +#: apt-pkg/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Valmis" + +#: apt-pkg/contrib/progress.cc:181 +msgid "..." msgstr "" -"Jummijammi, annoit enemmän pakettien nimiä kuin tämä APT osaa käsitellä." -#: apt-pkg/pkgcachegen.cc:260 -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ä." +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Valmis" -#: apt-pkg/pkgcachegen.cc:263 -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/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia" -#: apt-pkg/pkgcachegen.cc:266 -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/contrib/mmap.cc:111 +#, fuzzy, c-format +msgid "Couldn't duplicate file descriptor %i" +msgstr "Putkea %s ei voitu avata" -#: apt-pkg/pkgcachegen.cc:576 -#, 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/contrib/mmap.cc:119 +#, fuzzy, c-format +msgid "Couldn't make mmap of %llu bytes" +msgstr "Ei voitu tehdä %lu tavun mmap:ia" -#: apt-pkg/pkgcachegen.cc:1211 -#, c-format -msgid "Couldn't stat source package list %s" -msgstr "stat ei toiminut lähdepakettiluettelolle %s" +#: apt-pkg/contrib/mmap.cc:146 +#, fuzzy +msgid "Unable to close mmap" +msgstr "Tiedoston %s avaaminen ei onnistunut" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Luetaan pakettiluetteloita" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "Käynnistys ei onnistu" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Kootaan tiedostojen tarjoamistietoja" +#: apt-pkg/contrib/mmap.cc:290 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "Ei voitu tehdä %lu tavun mmap:ia" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Tiedoston typistäminen ei onnistunut" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/mmap.cc:341 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu" +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." msgstr "" -#: apt-pkg/policy.cc:422 -#, fuzzy, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu" +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "Did not understand pin type %s" -msgstr "Tunnistetyyppi %s on tuntematon" +msgid "Unable to stat the mount point %s" +msgstr "Komento stat ei toiminut liitoskohdalle %s" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)" +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Komento stat ei toiminut rompulle" -#: 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/contrib/configuration.cc:519 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Tuntematon tyypin lyhenne: \"%c\"" -#: 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 +#: apt-pkg/contrib/configuration.cc:633 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)" +msgid "Opening configuration file %s" +msgstr "Avataan asetustiedosto %s" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/configuration.cc:801 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Syntaksivirhe %s: %u: Lohko alkaa ilman nimeä." -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/configuration.cc:820 #, 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)" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Syntaksivirhe %s: %u: väärän muotoinen nimikenttä" -#: apt-pkg/sourcelist.cc:217 +#: apt-pkg/contrib/configuration.cc:837 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Syntaksivirhe %s: %u: Arvon jälkeen ylimääräistä roskaa" -#: apt-pkg/sourcelist.cc:224 +#: apt-pkg/contrib/configuration.cc:877 #, 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)" +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/sourcelist.cc:335 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "Opening %s" -msgstr "Avataan %s" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Syntaksivirhe %s: %u: Liian monta sisäkkäistä includea" -#: apt-pkg/sourcelist.cc:371 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" +msgid "Syntax error %s:%u: Included from here" +msgstr "Syntaksivirhe %s: %u: Sisällytetty tästä" -#: apt-pkg/sourcelist.cc:375 +#: apt-pkg/contrib/configuration.cc:897 #, 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" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Syntaksivirhe %s: %u: Tätä direktiiviä ei tueta \"%s\"" -#: apt-pkg/sourcelist.cc:416 +#: apt-pkg/contrib/configuration.cc:900 #, 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/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI" - -#: apt-pkg/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" - -#: apt-pkg/tagfile.cc:237 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" - -#: 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/vendorlist.cc:85 -#, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Toimittajan lohkosta %s puuttuu sormenjälki" +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/cdromutl.cc:65 +#: apt-pkg/contrib/configuration.cc:950 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "Komento stat ei toiminut liitoskohdalle %s" +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa" -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "Komento stat ei toiminut rompulle" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Asennus keskeytetään." -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Komentorivin valitsin \"%c\" [%s] on tuntematon." -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format msgid "Command line option %s is not understood" msgstr "Komentorivin valitsin %s on tuntematon" -#: apt-pkg/contrib/cmndline.cc:168 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format msgid "Command line option %s is not boolean" msgstr "Komentorivin valitsin %s ei ole totuusarvoinen" -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format msgid "Option %s requires an argument." msgstr "Valitsin %s tarvitsee parametrin" -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Valitsin %s: Asetusarvon määrityksessä on oltava =." -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Valitsin %s tarvitsee kokonaislukuparametrin, ei \"%s\"" -#: apt-pkg/contrib/cmndline.cc:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "Valitsin \"%s\" on liian pitkä" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, 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:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "Virheellinen toiminto %s" -#: apt-pkg/contrib/configuration.cc:519 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Tuntematon tyypin lyhenne: \"%c\"" +msgid "Installing %s" +msgstr "Asennetaan %s" -#: apt-pkg/contrib/configuration.cc:633 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Opening configuration file %s" -msgstr "Avataan asetustiedosto %s" +msgid "Configuring %s" +msgstr "Tehdään asetukset: %s" -#: apt-pkg/contrib/configuration.cc:801 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Syntaksivirhe %s: %u: Lohko alkaa ilman nimeä." +msgid "Removing %s" +msgstr "Poistetaan %s" -#: apt-pkg/contrib/configuration.cc:820 -#, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Syntaksivirhe %s: %u: väärän muotoinen nimikenttä" +#: apt-pkg/deb/dpkgpm.cc:113 +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "%s poistettiin kokonaan" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Syntaksivirhe %s: %u: Arvon jälkeen ylimääräistä roskaa" +msgid "Noting disappearance of %s" +msgstr "" -#: apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/deb/dpkgpm.cc:115 #, 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" +msgid "Running post-installation trigger %s" +msgstr "Suoritetaan jälkiasennusliipaisin %s" -#: apt-pkg/contrib/configuration.cc:884 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Syntaksivirhe %s: %u: Liian monta sisäkkäistä includea" +msgid "Directory '%s' missing" +msgstr "Kansio \"%s\" puuttuu." -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 -#, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Syntaksivirhe %s: %u: Sisällytetty tästä" +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 +#, fuzzy, c-format +msgid "Could not open file '%s'" +msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Syntaksivirhe %s: %u: Tätä direktiiviä ei tueta \"%s\"" +msgid "Preparing %s" +msgstr "Valmistellaan %s" -#: apt-pkg/contrib/configuration.cc:900 -#, 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/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr "Puretaan %s" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa" +msgid "Preparing to configure %s" +msgstr "Valmistaudutaan tekemään asetukset: %s" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Lukkoa ei käytetä kirjoitussuojatulle tiedostolle %s" +msgid "Installed %s" +msgstr "%s asennettu" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "Could not open lock file %s" -msgstr "Lukkotiedostoa %s ei voitu avata" +msgid "Preparing for removal of %s" +msgstr "Valmistaudutaan poistamaan %s" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s" +msgid "Removed %s" +msgstr "%s poistettu" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Could not get lock %s" -msgstr "Lukkoa %s ei saada" +msgid "Preparing to completely remove %s" +msgstr "Valmistaudutaan poistamaan %s kokonaan" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "List of files can't be created as '%s' is not a directory" +msgid "Completely removed %s" +msgstr "%s poistettiin kokonaan" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Tiedostoon %s kirjoittaminen ei onnistu" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/contrib/fileutl.cc:394 -#, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/contrib/fileutl.cc:412 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" msgstr "" -#: apt-pkg/contrib/fileutl.cc:421 -#, c-format +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1726 msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -#: apt-pkg/contrib/fileutl.cc:824 -#, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Aliprosessi %s aiheutti suojausvirheen." +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:826 -#, fuzzy, c-format -msgid "Sub-process %s received signal %u." -msgstr "Aliprosessi %s aiheutti suojausvirheen." +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Aliprosessi %s palautti virhekoodin (%u)" +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 -#, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Aliprosessi %s lopetti odottamatta" - -#: apt-pkg/contrib/fileutl.cc:913 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Pulmia tiedoston sulkemisessa" +#: apt-pkg/deb/dpkgpm.cc:1774 +msgid "" +"No apport report written because the error message indicates a dpkg I/O error" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "Could not open file %s" -msgstr "Tiedostoa %s ei voitu avata" - -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 -#, fuzzy, c-format -msgid "Could not open file descriptor %d" -msgstr "Putkea %s ei voitu avata" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Prosessien välistä kommunikaatiota aliprosessiin ei saatu luotua" - -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Pakkaajan käynnistäminen ei onnistunut" - -#: apt-pkg/contrib/fileutl.cc:1514 -#, fuzzy, c-format -msgid "read, still have %llu to read but none left" -msgstr "read, vielä %lu lukematta mutta tiedosto loppui" - -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, fuzzy, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui" - -#: apt-pkg/contrib/fileutl.cc:1915 -#, fuzzy, c-format -msgid "Problem closing the file %s" -msgstr "Pulmia tiedoston sulkemisessa" - -#: apt-pkg/contrib/fileutl.cc:1927 -#, fuzzy, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Pulmia tehtäessä tiedostolle sync" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1938 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format -msgid "Problem unlinking the file %s" -msgstr "Pulmia tehtäessä tiedostolle unlink" - -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Pulmia tehtäessä tiedostolle sync" +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Luettelokansiota ei voitu lukita" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Asennus keskeytetään." +#. 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/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "" -#: apt-pkg/contrib/mmap.cc:111 -#, fuzzy, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Putkea %s ei voitu avata" +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n" +"\n" +"apt-extracttemplates on työkalu asetus- ja mallitietojen \n" +"poimintaan debian-paketeista\n" +"\n" +"Valitsimet:\n" +" -h Tämä ohje\n" +" -t Aseta väliaikaisten tiedostojen kansio\n" +" -c=? Lue tämä asetustiedosto\n" +" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" -#: apt-pkg/contrib/mmap.cc:119 +#: cmdline/apt-extracttemplates.cc:254 #, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Ei voitu tehdä %lu tavun mmap:ia" +msgid "Unable to mkstemp %s" +msgstr "Tiedostolle %s ei toimi stat" -#: apt-pkg/contrib/mmap.cc:146 -#, fuzzy -msgid "Unable to close mmap" -msgstr "Tiedoston %s avaaminen ei onnistunut" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Ohjelman debconf versiota ei saa selvitettyä. Onko debconf asennettu?" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -#, fuzzy -msgid "Unable to synchronize mmap" -msgstr "Käynnistys ei onnistu" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "Paketin laajennuslista on liian pitkä" -#: apt-pkg/contrib/mmap.cc:290 +#: 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 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Ei voitu tehdä %lu tavun mmap:ia" +msgid "Error processing directory %s" +msgstr "Tapahtui virhe käsiteltäessa kansiota %s" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Tiedoston typistäminen ei onnistunut" +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Lähteiden laajennuslista on liian pitkä" -#: apt-pkg/contrib/mmap.cc:341 -#, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" msgstr "" +"Tapahtui virhe kirjoitettaessa otsikkotietoa sisällysluettelotiedostoon" -#: apt-pkg/contrib/mmap.cc:446 +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "" +msgid "Error processing contents %s" +msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s" -#: apt-pkg/contrib/mmap.cc:449 +#: ftparchive/apt-ftparchive.cc:626 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" +"Käyttö: apt-ftparchive [valitsimet] komento\n" +"Komennot: packages binääripolku [poikkeustdsto [polun alku]]\n" +" sources lähdepolku [poikkeustdsto [polun alku]]\n" +" contents polku\n" +" release polku\n" +" generate asetukset [ryhmät]\n" +" clean asetukset\n" +"\n" +"apt-ftparchive tuottaa hakemistoja Debianin arkistoista. Monta " +"tuottamistapaa\n" +"on tuettu alkaen täysin automaattisista toiminnallisesti samoihin kuin\n" +"dpkg-scanpackages ja dpkg-scansources.\n" +"\n" +"apt-ftparchive tuottaa pakettitiedostoja .deb-tiedostojen puusta.\n" +"Pakettitiedostossa on kunkin paketin kaikkien ohjauskenttien\n" +"sisältö sekä MD5 tiiviste ja tiedoston koko. Poikkeus-\n" +"tiedostolla voidaan arvot Priority ja Section pakottaa halutuiksi.\n" +"\n" +"Samaan tapaan apt-ftparchive tuottaa lähdetiedostoja\n" +".dscs-tiedostojen puusta. Valitsimella --source-overrride voidaan\n" +"määrittää lähteiden poikkeustiedosto.\n" +"\n" +"Komennot \"packages\" ja \"sources\" olisi suoritettava puun juuressa.\n" +"Binääripolun olisi osoitettava rekursiivisen haun alkukohtaan ja\n" +"poikkeustiedostossa olisi oltava poikkeusilmaisimet. Polun alku\n" +"yhdistetään tiedoston nimeen jos se on annettu. Esimerkki\n" +"käytöstä Debianin arkiston kanssa:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Valitsimet:\n" +" -h Tämä ohje\n" +" --md5 MD5 luonti\n" +" -s=? Lähteiden poikkeustdosto\n" +" -q Ei tulostusta\n" +" -d=? Valinnainen välimuistitietokanta\n" +" --no-delink delinking-virheenjäljitys päälle\n" +" --contents Sisällysluettelotiedoston luonti\n" +" -c=? Lue tämä asetustiedosto\n" +" -o=? Aseta mikä asetusvalitsin tahansa" -#: apt-pkg/contrib/progress.cc:148 -#, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Virhe!" +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Mitkään valinnat eivät täsmänneet" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Valmis" - -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "" - -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Valmis" +msgid "Some files are missing in the package file group `%s'" +msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Tietokanta on turmeltunut, tiedosto nimetty %s.old" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "%lih %limin %lis" +msgid "DB is old, attempting to upgrade %s" +msgstr "Tietokanta on vanha, yritetään päivittää %s" + +#: ftparchive/cachedb.cc:94 +#, fuzzy +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" +"Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, " +"on tietokanta poistettava ja luotava uudelleen." -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "%limin %lis" -msgstr "" +msgid "Unable to open DB file %s: %s" +msgstr "Tietokantatiedostoa %s ei saatu avattua: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "readlink %s ei onnistunut" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Arkistolla ei ole ohjaustietuetta" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Kohdistinta ei saada" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:91 #, c-format -msgid "%lis" -msgstr "" +msgid "W: Unable to read directory %s\n" +msgstr "W: Kansiota %s ei voi lukea\n" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:96 #, c-format -msgid "Selection %s not found" -msgstr "Valintaa %s ei löydy" +msgid "W: Unable to stat %s\n" +msgstr "W: Tdstolle %s ei toimi stat\n" -#: apt-pkg/deb/debsystem.cc:91 -#, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " -#: 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" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "W: " -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: Tiedostossa virheitä " + +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "" +msgid "Failed to resolve %s" +msgstr "Osoitteen %s selvitys ei onnistunut" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Puun läpikäynti ei onnistunut" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:219 #, c-format -msgid "Installing %s" -msgstr "Asennetaan %s" +msgid "Failed to open %s" +msgstr "Tiedoston %s avaaminen ei onnistunut" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:278 #, c-format -msgid "Configuring %s" -msgstr "Tehdään asetukset: %s" +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:286 #, c-format -msgid "Removing %s" -msgstr "Poistetaan %s" - -#: apt-pkg/deb/dpkgpm.cc:98 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "%s poistettiin kokonaan" +msgid "Failed to readlink %s" +msgstr "readlink %s ei onnistunut" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:290 #, c-format -msgid "Noting disappearance of %s" -msgstr "" +msgid "Failed to unlink %s" +msgstr "unlink %s ei onnistunut" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:298 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Suoritetaan jälkiasennusliipaisin %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Linkin %s -> %s luonti ei onnistunut" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:308 #, c-format -msgid "Directory '%s' missing" -msgstr "Kansio \"%s\" puuttuu." +msgid " DeLink limit of %sB hit.\n" +msgstr " DeLinkin yläraja %st saavutettu.\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "Tiedostoa %s ei voitu avata" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Arkistossa ei ollut pakettikenttää" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Preparing %s" -msgstr "Valmistellaan %s" +msgid " %s has no override entry\n" +msgstr " %s:llä ei ole poikkeustietuetta\n" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Unpacking %s" -msgstr "Puretaan %s" +msgid " %s maintainer is %s not %s\n" +msgstr " %s ylläpitäjä on %s eikä %s\n" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing to configure %s" -msgstr "Valmistaudutaan tekemään asetukset: %s" +msgid " %s has no source override entry\n" +msgstr " %s:llä ei ole poikkeustietuetta\n" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/writer.cc:710 #, c-format -msgid "Installed %s" -msgstr "%s asennettu" +msgid " %s has no binary override entry either\n" +msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n" -#: apt-pkg/deb/dpkgpm.cc:1005 -#, c-format -msgid "Preparing for removal of %s" -msgstr "Valmistaudutaan poistamaan %s" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Muistin varaaminen ei onnistunut" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Removed %s" -msgstr "%s poistettu" +msgid "Unable to open %s" +msgstr "Tiedoston %s avaaminen ei onnistunut" -#: apt-pkg/deb/dpkgpm.cc:1012 -#, c-format -msgid "Preparing to completely remove %s" -msgstr "Valmistaudutaan poistamaan %s kokonaan" +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Completely removed %s" -msgstr "%s poistettiin kokonaan" +msgid "Failed to read the override file %s" +msgstr "Poikkeustiedoston %s lukeminen ei onnistunut" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/override.cc:166 #, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Tiedostoon %s kirjoittaminen ei onnistu" +msgid "Malformed override %s line %llu #1" +msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" +#: ftparchive/multicompress.cc:73 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Tuntematon pakkausalgoritmi \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Pakattu tulostus %s tarvitsee pakkausjoukon" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "FILE* luominen ei onnistunut" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "fork ei onnistunut" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Compress-lapsiprosessi" -#: apt-pkg/deb/dpkgpm.cc:1707 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Sisäinen virhe, prosessin %s luominen ei onnistunut" + +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "Syöttö/tulostus aliprosessiin/tiedostoon ei onnistunut" + +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä" + +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Ilmeni pulmia poistettaessa tiedosto %s" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-internal-solver.cc:49 +#, fuzzy msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n" +"\n" +"apt-extracttemplates on työkalu asetus- ja mallitietojen \n" +"poimintaan debian-paketeista\n" +"\n" +"Valitsimet:\n" +" -h Tämä ohje\n" +" -t Aseta väliaikaisten tiedostojen kansio\n" +" -c=? Lue tämä asetustiedosto\n" +" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Tuntematon pakettitietue!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Käyttö: apt-sortpkgs [valitsimet] tdsto1 [tdsto2 ...]\n" +"\n" +"apt-sortpkgs on yksinkertainen työkalu pakettitiedostojen lajitteluun.\n" +"Valitsimella -s ilmaistaan minkälainen tiedosto on.\n" +"\n" +"Valitsimet:\n" +" -h Tämä ohje\n" +" -s Käytä lähdetiedostolajittelua\n" +" -c=? Lue tämä asetustiedosto\n" +" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/fr.po b/po/fr.po index df4698b41..45196755d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2013-12-12 18:37+0100\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2013-12-15 16:45+0100\n" "Last-Translator: Julien Patriarca \n" "Language-Team: French \n" @@ -20,168 +20,153 @@ msgstr "" "X-Generator: Lokalize 1.5\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n > 1;\n" -#: cmdline/apt-cache.cc:140 +#: 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:268 +#: cmdline/apt-cache.cc:277 msgid "Total package names: " msgstr "Nombre total de paquets : " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:279 msgid "Total package structures: " msgstr "Nombre total de structures de paquets : " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:319 msgid " Normal packages: " msgstr " Paquets ordinaires : " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:320 msgid " Pure virtual packages: " msgstr " Paquets entièrement virtuels : " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:321 msgid " Single virtual packages: " msgstr " Paquets virtuels simples : " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:322 msgid " Mixed virtual packages: " msgstr " Paquets virtuels mixtes : " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Manquants : " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:325 msgid "Total distinct versions: " msgstr "Nombre de versions distinctes : " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:327 msgid "Total distinct descriptions: " msgstr "Nombre de descriptions distinctes : " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:329 msgid "Total dependencies: " msgstr "Nombre de dépendances : " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:332 msgid "Total ver/file relations: " msgstr "Nombre de relations version/fichier : " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:334 msgid "Total Desc/File relations: " msgstr "Nombre de relations description/fichier : " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:336 msgid "Total Provides mappings: " msgstr "Nombre de relations « Provides » : " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:348 msgid "Total globbed strings: " msgstr "Nombre de motifs rationnels : " -#: cmdline/apt-cache.cc:353 +#: cmdline/apt-cache.cc:362 msgid "Total dependency version space: " msgstr "Espace occupé par les versions des dépendances : " -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:367 msgid "Total slack space: " msgstr "Espace disque gaspillé : " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:375 msgid "Total space accounted for: " msgstr "Total de l'espace attribué : " -#: cmdline/apt-cache.cc:497 -#: cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:52 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Fichier du paquet %s désynchronisé." -#: cmdline/apt-cache.cc:575 -#: cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 -#: cmdline/apt-cache.cc:1511 -#: cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 -#: cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:114 -#: apt-private/private-show.cc:116 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1442 +#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: 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:1245 +#: cmdline/apt-cache.cc:1254 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:1411 +#: cmdline/apt-cache.cc:1421 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:1506 -#: apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596 #, c-format msgid "Unable to locate package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1546 msgid "Package files:" msgstr "Fichiers du paquet :" -#: cmdline/apt-cache.cc:1543 -#: cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644 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:1557 +#: cmdline/apt-cache.cc:1567 msgid "Pinned packages:" msgstr "Paquets épinglés :" -#: cmdline/apt-cache.cc:1569 -#: cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624 msgid "(not found)" msgstr "(non trouvé)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1587 msgid " Installed: " msgstr " Installé : " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1588 msgid " Candidate: " msgstr " Candidat : " -#: cmdline/apt-cache.cc:1596 -#: cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614 msgid "(none)" msgstr "(aucun)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1621 msgid " Package pin: " msgstr " Épinglage de paquet : " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1630 msgid " Version table:" msgstr " Table de version :" -#: cmdline/apt-cache.cc:1733 -#: cmdline/apt-cdrom.cc:210 -#: cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1579 -#: cmdline/apt-mark.cc:377 -#: cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:229 -#: ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 +#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 +#: 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 pour %s compilé sur %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1750 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -230,7 +215,8 @@ msgstr "" " showsrc - Affiche les enregistrements des sources\n" " stats - Affiche quelques statistiques de base\n" " dump - Affiche la totalité des fichiers dans une forme succincte\n" -" dumpavail - Affiche une liste de fichiers disponibles sur la sortie standard\n" +" dumpavail - Affiche une liste de fichiers disponibles sur la sortie " +"standard\n" " unmet - Affiche les dépendances manquantes\n" " search - Cherche une expression rationnelle dans la liste des paquets\n" " show - Affiche la description du paquet\n" @@ -246,37 +232,47 @@ msgstr "" " -p=? Le cache des paquets\n" " -s=? Le cache des sources\n" " -q Enlève l'indicateur de progression\n" -" -i Affiche seulement les dépendances importantes pour la commande « unmet »\n" +" -i Affiche seulement les dépendances importantes pour la commande " +"« unmet »\n" " -c=? Lit ce fichier de configuration\n" " -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" -"Veuillez consulter les pages de manuel de apt-cache(8) et apt.conf(5) pour plus\n" +"Veuillez consulter les pages de manuel de apt-cache(8) et apt.conf(5) pour " +"plus\n" "d'informations.\n" -#. }}} -#: cmdline/apt-cdrom.cc:45 -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. See 'man apt-cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" -"Aucun CD n'a été détecté sur le point de montage par défaut.\n" -"Vous pouvez utiliser l'option --cdrom pour indiquer le point de montage du 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:89 +#: cmdline/apt-cdrom.cc:76 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 »" +msgstr "" +"Veuillez indiquer le nom de ce disque, par exemple « Debian 5.0.3 Disk 1 »" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 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" +msgstr "" +"Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée" #: cmdline/apt-cdrom.cc:139 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Impossible de monter « %s » sur « %s »" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:178 +#, fuzzy +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 "" +"Aucun CD n'a été détecté sur le point de montage par défaut.\n" +"Vous pouvez utiliser l'option --cdrom pour indiquer le point de montage du " +"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 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "Veuillez répéter cette opération pour tous les disques de votre jeu de cédéroms." +msgstr "" +"Veuillez répéter cette opération pour tous les disques de votre jeu de " +"cédéroms." #: cmdline/apt-config.cc:48 msgid "Arguments not in pairs" @@ -310,83 +306,87 @@ 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:244 +#: cmdline/apt-get.cc:245 #, c-format msgid "Can not find a package for architecture '%s'" msgstr "Impossible de trouver de paquet correspondant à l'architecture « %s »" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:327 #, c-format msgid "Can not find a package '%s' with version '%s'" -msgstr "Impossible de trouver de paquet «%s » correspondant à la version « %s »" +msgstr "" +"Impossible de trouver de paquet «%s » correspondant à la version « %s »" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "Can not find a package '%s' with release '%s'" -msgstr "Impossible de trouver de paquet « %s » correspondant à la publication « %s »" +msgstr "" +"Impossible de trouver de paquet « %s » correspondant à la publication « %s »" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:367 #, 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:422 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Impossible de trouver la version « %s » du paquet « %s »" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-get.cc:458 -#: cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:865 #, c-format msgid "%s set to manually installed.\n" msgstr "%s passé en « installé manuellement ».\n" -#: cmdline/apt-get.cc:460 -#: cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s passé en « installé automatiquement ».\n" -#: cmdline/apt-get.cc:468 -#: cmdline/apt-mark.cc:116 -msgid "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' instead." -msgstr "Cette commande est obsolète. Veuillez utiliser « apt-mark auto » et « apt-mark manual »." +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 +msgid "" +"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " +"instead." +msgstr "" +"Cette commande est obsolète. Veuillez utiliser « apt-mark auto » et « apt-" +"mark manual »." -#: cmdline/apt-get.cc:537 -#: cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" -msgstr "Erreur interne, la tentative de résolution du problème a cassé certaines parties" +msgstr "" +"Erreur interne, la tentative de résolution du problème a cassé certaines " +"parties" -#: cmdline/apt-get.cc:573 -#: cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le répertoire de téléchargement" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:726 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:762 -#: cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, 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:779 +#: cmdline/apt-get.cc:786 #, 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 suivi de versions « %s » à l'adresse :\n" +"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:784 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -395,148 +395,170 @@ msgid "" msgstr "" "Veuillez utiliser la commande :\n" "bzr branch %s\n" -"pour récupérer les dernières mises à jour (éventuellement non encore publiées) du paquet.\n" +"pour récupérer les dernières mises à jour (éventuellement non encore " +"publiées) du paquet.\n" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n" -#: cmdline/apt-get.cc:860 -#: cmdline/apt-get.cc:863 -#: apt-private/private-install.cc:198 -#: apt-private/private-install.cc:201 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 +#: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de déterminer l'espace disponible sur %s" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" #. 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:883 +#: cmdline/apt-get.cc:895 #, 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:888 +#: cmdline/apt-get.cc:900 #, 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:894 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Récupération des sources %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:924 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:325 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 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:946 +#: cmdline/apt-get.cc:954 #, 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:967 #, 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:968 #, 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:981 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction « %s » a échoué.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Échec du processus fils" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1034 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" +msgstr "" +"Il faut spécifier au moins un paquet pour vérifier les dépendances de " +"construction" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1059 #, c-format -msgid "No architecture information available for %s. See apt.conf(5) APT::Architectures for setup" -msgstr "Aucune information sur l'architecture n'est disponible pour %s. Veuillez consulter la section à propos de APT::Architectures dans la page de manuel apt.conf(5)." +msgid "" +"No architecture information available for %s. See apt.conf(5) APT::" +"Architectures for setup" +msgstr "" +"Aucune information sur l'architecture n'est disponible pour %s. Veuillez " +"consulter la section à propos de APT::Architectures dans la page de manuel " +"apt.conf(5)." -#: cmdline/apt-get.cc:1069 -#: cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dépendance de construction.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1276 #, c-format -msgid "%s dependency for %s can't be satisfied because %s is not allowed on '%s' packages" -msgstr "La dépendance %s vis-à-vis de %s ne peut être satisfaite car %s n'est pas autorisé avec les paquets « %s »." +msgid "" +"%s dependency for %s can't be satisfied because %s is not allowed on '%s' " +"packages" +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:1280 +#: cmdline/apt-get.cc:1294 #, c-format -msgid "%s dependency for %s cannot be satisfied because the package %s cannot be found" -msgstr "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne peut être trouvé" +msgid "" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" +msgstr "" +"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne " +"peut être trouvé" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1317 #, 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" +msgstr "" +"Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s " +"est trop récent" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1356 #, c-format -msgid "%s dependency for %s cannot be satisfied because candidate version of package %s can't satisfy version requirements" -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." +msgid "" +"%s dependency for %s cannot be satisfied because candidate version of " +"package %s can't satisfy version requirements" +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:1348 +#: cmdline/apt-get.cc:1362 #, c-format -msgid "%s dependency for %s cannot be satisfied because package %s has no candidate version" -msgstr "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s n'a pas de version disponible." +msgid "" +"%s dependency for %s cannot be satisfied because package %s has no candidate " +"version" +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:1371 +#: cmdline/apt-get.cc:1385 #, 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:1386 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." +msgstr "" +"Les dépendances de compilation pour %s ne peuvent pas être satisfaites." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dépendances de construction" -#: cmdline/apt-get.cc:1484 -#: cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Journal des modifications pour %s (%s)" -#: cmdline/apt-get.cc:1584 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Modules reconnus :" -#: cmdline/apt-get.cc:1625 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -611,7 +633,8 @@ msgstr "" " -h Ce texte d'aide\n" " -q Message de sortie enregistrable - aucun indicateur de progression\n" " -qq Aucun message de sortie, exceptés les messages d'erreur\n" -" -d Simple téléchargement - n'installe pas ou ne décompacte pas les archives\n" +" -d Simple téléchargement - n'installe pas ou ne décompacte pas les " +"archives\n" " -s N'agit pas. Réalise uniquement une simulation de commande\n" " -y Répond oui à toutes les questions et n'interroge pas l'utilisateur\n" " -f Tente de poursuivre si le contrôle d'intégrité échoue\n" @@ -625,57 +648,83 @@ msgstr "" "apt.conf(5) pour plus d'informations et d'options.\n" " Cet APT a les « Super Cow Powers »\n" -#: cmdline/apt-mark.cc:57 +#: cmdline/apt-helper.cc:36 +msgid "Need one URL as argument" +msgstr "" + +#: cmdline/apt-helper.cc:49 +#, fuzzy +msgid "Must specify at least one pair url/filename" +msgstr "Vous devez spécifier au moins un paquet source" + +#: cmdline/apt-helper.cc:67 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:80 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +" auto-detect-proxy - detect proxy using apt.conf\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + +#: cmdline/apt-mark.cc:68 #, 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:63 +#: cmdline/apt-mark.cc:74 #, 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:65 +#: cmdline/apt-mark.cc:76 #, 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:230 +#: cmdline/apt-mark.cc:241 #, c-format msgid "%s was already set on hold.\n" msgstr "%s était déjà marqué comme figé (« hold »).\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, c-format msgid "%s was already not hold.\n" msgstr "%s était déjà marqué comme non figé.\n" -#: cmdline/apt-mark.cc:247 -#: cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 -#: apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1178 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1304 #, 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:262 -#: cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, c-format msgid "%s set on hold.\n" msgstr "%s passé en figé (« hold »).\n" -#: cmdline/apt-mark.cc:264 -#: cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, c-format msgid "Canceled hold on %s.\n" msgstr "Annulation de l'état figé pour %s.\n" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" -msgstr "Échec de l'exécution de dpkg. Possédez-vous les privilèges du superutilisateur ?" +msgstr "" +"Échec de l'exécution de dpkg. Possédez-vous les privilèges du " +"superutilisateur ?" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 +#, fuzzy msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -685,6 +734,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -719,19 +773,25 @@ msgstr "" "Veuillez consulter les pages de manuel apt-mark(8) et apt.conf(5)\n" "pour plus d'informations." -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 +#, fuzzy msgid "" "Usage: apt [options] command\n" "\n" "CLI for apt.\n" -"Commands: \n" +"Basic commands: \n" " list - list packages based on package names\n" " search - search in package descriptions\n" " show - show package details\n" "\n" " update - update list of available packages\n" +"\n" " install - install packages\n" -" upgrade - upgrade the systems packages\n" +" remove - remove packages\n" +"\n" +" upgrade - upgrade the system by installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -755,8 +815,12 @@ msgid "Unable to read the cdrom database %s" msgstr "Impossible de lire la base de données %s du cédérom" #: 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 "Veuillez utiliser apt-cdrom afin de faire reconnaître ce cédérom par votre APT. apt-get update ne peut être employé pour ajouter de nouveaux cédéroms" +msgid "" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" +msgstr "" +"Veuillez utiliser apt-cdrom afin de faire reconnaître ce cédérom par votre " +"APT. apt-get update ne peut être employé pour ajouter de nouveaux cédéroms" #: methods/cdrom.cc:222 msgid "Wrong CD-ROM" @@ -765,203 +829,186 @@ msgstr "Mauvais cédérom" #: methods/cdrom.cc:249 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "Impossible de démonter le cédérom dans %s, il doit toujours être en cours d'utilisation." +msgstr "" +"Impossible de démonter le cédérom dans %s, il doit toujours être en cours " +"d'utilisation." #: methods/cdrom.cc:254 msgid "Disk not found." msgstr "Disque non trouvé." -#: methods/cdrom.cc:262 -#: methods/file.cc:82 -#: methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Fichier non trouvé" -#: methods/copy.cc:46 -#: methods/gzip.cc:105 -#: methods/gzip.cc:114 -#: methods/rred.cc:512 -#: methods/rred.cc:521 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/rred.cc:608 msgid "Failed to stat" msgstr "Impossible de statuer" -#: methods/copy.cc:83 -#: methods/gzip.cc:111 -#: methods/rred.cc:518 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Impossible de modifier l'heure " -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" 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:173 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Connexion en cours" -#: methods/ftp.cc:179 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Impossible de déterminer le nom de la machine distante" -#: methods/ftp.cc:184 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Impossible de déterminer le nom local" -#: methods/ftp.cc:215 -#: methods/ftp.cc:243 +#: methods/ftp.cc:219 methods/ftp.cc:247 #, c-format msgid "The server refused the connection and said: %s" msgstr "Le serveur a refusé la connexion et a répondu : %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "USER incorrect, le serveur a répondu : %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS incorrect, le serveur a répondu : %s" -#: methods/ftp.cc:248 -msgid "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin is empty." -msgstr "Un serveur proxy a été spécifié, mais aucun script de connexion, Acquire::ftp::ProxyLogin est vide." +#: methods/ftp.cc:252 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" +"Un serveur proxy a été spécifié, mais aucun script de connexion, Acquire::" +"ftp::ProxyLogin est vide." -#: methods/ftp.cc:276 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "La commande « %s » du script de connexion a échoué, le serveur a répondu : %s" +msgstr "" +"La commande « %s » du script de connexion a échoué, le serveur a répondu : %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:306 #, c-format msgid "TYPE failed, server said: %s" msgstr "Échec de TYPE, le serveur a répondu : %s" -#: methods/ftp.cc:340 -#: methods/ftp.cc:452 -#: methods/rsh.cc:192 -#: methods/rsh.cc:237 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Dépassement du délai de connexion" -#: methods/ftp.cc:346 +#: methods/ftp.cc:350 msgid "Server closed the connection" msgstr "Le serveur a fermé la connexion" -#: methods/ftp.cc:349 -#: methods/rsh.cc:199 -#: apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 -#: apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Erreur de lecture" -#: methods/ftp.cc:356 -#: methods/rsh.cc:206 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Une réponse a fait déborder le tampon." -#: methods/ftp.cc:373 -#: methods/ftp.cc:385 +#: methods/ftp.cc:377 methods/ftp.cc:389 msgid "Protocol corruption" msgstr "Corruption du protocole" -#: methods/ftp.cc:458 -#: methods/rred.cc:238 -#: methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 -#: apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Erreur d'écriture" -#: methods/ftp.cc:697 -#: methods/ftp.cc:703 -#: methods/ftp.cc:738 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Impossible de créer un connecteur" -#: methods/ftp.cc:708 +#: methods/ftp.cc:712 msgid "Could not connect data socket, connection timed out" -msgstr "Impossible de se connecter sur le port de données, délai de connexion dépassé" +msgstr "" +"Impossible de se connecter sur le port de données, délai de connexion dépassé" -#: methods/ftp.cc:712 -#: methods/connect.cc:116 -#: apt-private/private-upgrade.cc:21 +#: methods/ftp.cc:716 methods/connect.cc:116 msgid "Failed" msgstr "Échec" -#: methods/ftp.cc:714 +#: methods/ftp.cc:718 msgid "Could not connect passive socket." msgstr "Impossible de se connecter au port en mode passif." -#: methods/ftp.cc:731 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo n'a pu obtenir un port d'écoute" -#: methods/ftp.cc:745 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Impossible de se connecter à un port" -#: methods/ftp.cc:749 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Impossible d'écouter sur le port" -#: methods/ftp.cc:756 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Impossible de déterminer le nom du port" -#: methods/ftp.cc:788 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Impossible d'envoyer la commande PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Famille d'adresses %u inconnue (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT a échoué, le serveur a répondu : %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Délai de connexion au port de données dépassé" -#: methods/ftp.cc:834 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:873 -#: methods/server.cc:353 -#: methods/rsh.cc:313 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Problème de hachage du fichier" -#: methods/ftp.cc:886 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Impossible de récupérer le fichier, le serveur a répondu « %s »" -#: methods/ftp.cc:901 -#: methods/rsh.cc:332 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Pas de réponse du port de données dans les délais" -#: methods/ftp.cc:931 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Le transfert de données a échoué, le serveur a répondu « %s »" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Requête" -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Impossible d'invoquer " @@ -997,14 +1044,12 @@ msgstr "Connexion à %s: %s (%s) impossible." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 -#: methods/rsh.cc:435 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Connexion à %s" -#: methods/connect.cc:180 -#: methods/connect.cc:199 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Ne parvient pas à résoudre « %s »" @@ -1022,102 +1067,115 @@ msgstr "Erreur système lors de la résolution de « %s:%s »" #: methods/connect.cc:211 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" -msgstr "Quelque chose d'imprévisible est survenu lors de la détermination de « %s:%s » (%i - %s)" +msgstr "" +"Quelque chose d'imprévisible est survenu lors de la détermination de « %s:" +"%s » (%i - %s)" #: methods/connect.cc:258 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Impossible de se connecter à %s:%s :" -#: methods/gpgv.cc:167 -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:168 +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:171 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "Au moins une signature non valable a été rencontrée." -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:174 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" -msgstr "Impossible d'exécuter « gpgv » pour contrôler la signature (veuillez vérifier si gpgv est installé)." +msgstr "" +"Impossible d'exécuter « gpgv » pour contrôler la signature (veuillez " +"vérifier si gpgv est installé)." #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:180 #, c-format -msgid "Clearsigned file isn't valid, got '%s' (does the network require authentication?)" -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." +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +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:183 +#: methods/gpgv.cc:184 msgid "Unknown error executing gpgv" msgstr "Erreur inconnue à l'exécution de gpgv" -#: methods/gpgv.cc:216 -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 msgid "The following signatures were invalid:\n" msgstr "Les signatures suivantes ne sont pas valables :\n" -#: methods/gpgv.cc:230 -msgid "The following signatures couldn't be verified because the public key is not available:\n" -msgstr "Les signatures suivantes n'ont pas pu être vérifiées car la clé publique n'est pas disponible :\n" +#: methods/gpgv.cc:231 +msgid "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" +msgstr "" +"Les signatures suivantes n'ont pas pu être vérifiées car la clé publique " +"n'est pas disponible :\n" -#: methods/gzip.cc:65 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "Les fichiers vides ne peuvent être des archives valables" -#: methods/http.cc:519 +#: methods/http.cc:511 msgid "Error writing to the file" msgstr "Erreur d'écriture sur le fichier" -#: methods/http.cc:533 +#: methods/http.cc:525 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:535 +#: methods/http.cc:527 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:571 +#: methods/http.cc:563 msgid "Error writing to file" msgstr "Erreur d'écriture sur un fichier" -#: methods/http.cc:631 +#: methods/http.cc:623 msgid "Select failed" msgstr "Sélection défaillante" -#: methods/http.cc:636 +#: methods/http.cc:628 msgid "Connection timed out" msgstr "Délai de connexion dépassé" -#: methods/http.cc:659 +#: methods/http.cc:651 msgid "Error writing to output file" msgstr "Erreur d'écriture du fichier de sortie" -#: methods/server.cc:56 +#: methods/server.cc:52 msgid "Waiting for headers" msgstr "Attente des fichiers d'en-tête" -#: methods/server.cc:114 +#: methods/server.cc:110 msgid "Bad header line" msgstr "Mauvaise ligne d'en-tête" -#: methods/server.cc:139 -#: methods/server.cc:146 +#: methods/server.cc:135 methods/server.cc:142 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:176 +#: methods/server.cc:172 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:199 +#: methods/server.cc:195 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:201 +#: methods/server.cc:197 msgid "This HTTP server has broken range support" msgstr "Ce serveur http possède un support des limites non-valide" -#: methods/server.cc:225 +#: methods/server.cc:221 msgid "Unknown date format" msgstr "Format de date inconnu" @@ -1125,348 +1183,153 @@ msgstr "Format de date inconnu" msgid "Bad header data" msgstr "Mauvais en-tête de donnée" -#: methods/server.cc:507 -#: methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Échec de la connexion" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Erreur interne" -#: apt-private/private-list.cc:143 +#: apt-private/private-list.cc:129 msgid "Listing" msgstr "En train de lister" -#: apt-private/private-install.cc:93 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés." - -#: apt-private/private-install.cc:102 -msgid "Packages need to be removed but remove is disabled." -msgstr "Les paquets doivent être enlevés mais la désinstallation est désactivée." - -#: apt-private/private-install.cc:121 -msgid "Internal error, Ordering didn't finish" -msgstr "Erreur interne. Le tri a été interrompu." - -#: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "Étrangement, les tailles ne correspondent pas. Veuillez le signaler par courriel à apt@packages.debian.org." - -#. 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 -#: apt-private/private-install.cc:166 -#, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "Il est nécessaire de prendre %so/%so dans les archives.\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 "Need to get %sB of archives.\n" -msgstr "Il est nécessaire de prendre %so dans les archives.\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:178 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Après cette opération, %so d'espace disque supplémentaires seront utilisé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 -#: apt-private/private-install.cc:183 -#, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Après cette opération, %so d'espace disque seront libérés.\n" - -#: apt-private/private-install.cc:211 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "Pas assez d'espace disponible sur %s" - -#: apt-private/private-install.cc:221 -#: apt-private/private-download.cc:55 -msgid "There are problems and -y was used without --force-yes" -msgstr "Il y a des problèmes et -y a été employé sans --force-yes" - -#: apt-private/private-install.cc:227 -#: apt-private/private-install.cc:249 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération triviale." - -# The space before the exclamation mark must not be a non-breaking space; this -# sentence is supposed to be typed by a user who cannot see the difference. -#. 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) -#: apt-private/private-install.cc:231 -msgid "Yes, do as I say!" -msgstr "Oui, faites ce que je vous dis !" - -#: apt-private/private-install.cc:233 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Vous êtes sur le point de faire quelque chose de potentiellement dangereux\n" -"Pour continuer, tapez la phrase « %s »\n" -" ?]" - -#: apt-private/private-install.cc:239 -#: apt-private/private-install.cc:257 -msgid "Abort." -msgstr "Annulation." - -#: apt-private/private-install.cc:254 -msgid "Do you want to continue?" -msgstr "Souhaitez-vous continuer ?" - -#: apt-private/private-install.cc:324 -msgid "Some files failed to download" -msgstr "Certains fichiers n'ont pu être téléchargés." - -#: apt-private/private-install.cc:331 -msgid "Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?" -msgstr "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:335 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "l'option --fix-missing et l'échange de support ne sont pas encore reconnus." - -#: apt-private/private-install.cc:340 -msgid "Unable to correct missing packages." -msgstr "Impossible de corriger le fait que des paquets manquent." - -#: apt-private/private-install.cc:341 -msgid "Aborting install." -msgstr "Annulation de l'installation." - -#: apt-private/private-install.cc:377 -msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" +msgid "There is %i additional version. Please use the '-a' switch to see it" msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" +"There are %i additional versions. Please use the '-a' switch to see them." msgstr[0] "" -"Le paquet suivant a disparu du système car tous ses fichiers\n" -"ont été remplacés par d'autres paquets :" msgstr[1] "" -"Les paquets suivants ont disparu du système car tous leurs fichiers\n" -"ont été remplacés par d'autres paquets :" - -#: apt-private/private-install.cc:381 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Note : cette opération volontaire (effectuée par dpkg) est automatique." - -#: apt-private/private-install.cc:402 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "Aucune suppression n'est censée se produire : impossible de lancer « Autoremover »" - -#: apt-private/private-install.cc:510 -msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." -msgstr "" -"Il semble que l'outil de suppression automatique (« Autoremover ») ait\n" -"supprimé quelque chose, ce qui est inattendu. Veuillez envoyer un\n" -"rapport de bogue pour le paquet « apt »." -#. -#. if (Packages == 1) -#. { -#. c1out << std::endl; -#. c1out << -#. _("Since you only requested a single operation it is extremely likely that\n" -#. "the package is simply not installable and a bug report against\n" -#. "that package should be filed.") << std::endl; -#. } -#. -#: apt-private/private-install.cc:513 -#: apt-private/private-install.cc:654 -msgid "The following information may help to resolve the situation:" -msgstr "L'information suivante devrait vous aider à résoudre la situation : " +#: apt-private/private-cachefile.cc:93 +msgid "Correcting dependencies..." +msgstr "Correction des dépendances..." -#: apt-private/private-install.cc:517 -msgid "Internal Error, AutoRemover broke stuff" -msgstr "Erreur interne, l'outil de suppression automatique a cassé quelque chose." +#: apt-private/private-cachefile.cc:96 +msgid " failed." +msgstr " a échoué." -#: apt-private/private-install.cc:524 -msgid "The following package was automatically installed and is no longer required:" -msgid_plural "The following packages were automatically installed and are no longer required:" -msgstr[0] "Le paquet suivant a été installé automatiquement et n'est plus nécessaire :" -msgstr[1] "Les paquets suivants ont été installés automatiquement et ne sont plus nécessaires :" +#: apt-private/private-cachefile.cc:99 +msgid "Unable to correct dependencies" +msgstr "Impossible de corriger les dépendances" -#: apt-private/private-install.cc:528 -#, c-format -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 paquet a été installé automatiquement et n'est plus nécessaire.\n" -msgstr[1] "%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n" +#: apt-private/private-cachefile.cc:102 +msgid "Unable to minimize the upgrade set" +msgstr "Impossible de minimiser le nombre des paquets mis à jour" -#: apt-private/private-install.cc:530 -msgid "Use 'apt-get autoremove' to remove it." -msgid_plural "Use 'apt-get autoremove' to remove them." -msgstr[0] "Veuillez utiliser « apt-get autoremove » pour le supprimer." -msgstr[1] "Veuillez utiliser « apt-get autoremove » pour les supprimer." +#: apt-private/private-cachefile.cc:104 +msgid " Done" +msgstr " Fait" -#: apt-private/private-install.cc:624 -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:108 +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-install.cc:626 -msgid "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)." -msgstr "" -"Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" -"(ou indiquez une solution)." +#: apt-private/private-cachefile.cc:111 +msgid "Unmet dependencies. Try using -f." +msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f." -#: apt-private/private-install.cc:639 -msgid "" -"Some packages could not be installed. This may mean that you have\n" -"requested an impossible situation or if you are using the unstable\n" -"distribution that some required packages have not yet been created\n" -"or been moved out of Incoming." +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -"Certains paquets ne peuvent être installés. Ceci peut signifier\n" -"que vous avez demandé l'impossible, ou bien, si vous utilisez\n" -"la distribution unstable, que certains paquets n'ont pas encore\n" -"été créés ou ne sont pas sortis d'Incoming." - -#: apt-private/private-install.cc:660 -msgid "Broken packages" -msgstr "Paquets défectueux" - -#: apt-private/private-install.cc:713 -msgid "The following extra packages will be installed:" -msgstr "Les paquets supplémentaires suivants seront installés : " - -#: apt-private/private-install.cc:803 -msgid "Suggested packages:" -msgstr "Paquets suggérés :" - -#: apt-private/private-install.cc:804 -msgid "Recommended packages:" -msgstr "Paquets recommandés :" - -#: apt-private/private-download.cc:32 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés." - -#: apt-private/private-download.cc:36 -msgid "Authentication warning overridden.\n" -msgstr "Avertissement d'authentification ignoré.\n" - -#: apt-private/private-download.cc:41 -#: apt-private/private-download.cc:48 -msgid "Some packages could not be authenticated" -msgstr "Certains paquets n'ont pas pu être authentifiés" - -#: apt-private/private-download.cc:46 -msgid "Install these packages without verification?" -msgstr "Faut-il installer ces paquets sans vérification ?" -#: apt-private/private-download.cc:87 -#: apt-pkg/update.cc:84 -#, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Impossible de récupérer %s %s\n" - -#: apt-private/private-output.cc:198 -msgid "installed,upgradable to: " +#: 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:204 +#: apt-private/private-output.cc:268 msgid "[installed,local]" msgstr " [installé, local]" -#: apt-private/private-output.cc:207 +#: apt-private/private-output.cc:270 msgid "[installed,auto-removable]" msgstr "[installé, pouvant être supprimé automatiquement]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:272 msgid "[installed,automatic]" msgstr " [installé, automatique]" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:274 msgid "[installed]" msgstr " [installé]" -#: apt-private/private-output.cc:217 -msgid "[upgradable from: " +#: apt-private/private-output.cc:277 +#, fuzzy, c-format +msgid "[upgradable from: %s]" msgstr "[pouvant être mis à jour depuis :" -#: apt-private/private-output.cc:223 +#: apt-private/private-output.cc:281 msgid "[residual-config]" msgstr "[configuration restante]" -#: apt-private/private-output.cc:314 -msgid "The following packages have unmet dependencies:" -msgstr "Les paquets suivants contiennent des dépendances non satisfaites :" - -#: apt-private/private-output.cc:404 +#: apt-private/private-output.cc:455 #, c-format msgid "but %s is installed" msgstr "mais %s est installé" -#: apt-private/private-output.cc:406 +#: 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:413 +#: apt-private/private-output.cc:464 msgid "but it is not installable" msgstr "mais il n'est pas installable" -#: apt-private/private-output.cc:415 +#: 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:418 +#: apt-private/private-output.cc:469 msgid "but it is not installed" msgstr "mais il n'est pas installé" -#: apt-private/private-output.cc:418 +#: 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:423 +#: apt-private/private-output.cc:474 msgid " or" msgstr " ou" -#: apt-private/private-output.cc:452 -msgid "The following NEW packages will be installed:" +#: 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:478 +#: 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:500 +#: 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:521 +#: 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:542 +#: 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:562 +#: 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:617 +#: apt-private/private-output.cc:688 #, c-format msgid "%s (due to %s) " msgstr "%s (en raison de %s) " -#: apt-private/private-output.cc:625 +#: 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!" @@ -1475,27 +1338,27 @@ msgstr "" "Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n" "que vous êtes en train de faire." -#: apt-private/private-output.cc:656 +#: 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:660 +#: apt-private/private-output.cc:731 #, c-format msgid "%lu reinstalled, " msgstr "%lu réinstallés, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:733 #, c-format msgid "%lu downgraded, " msgstr "%lu remis à une version inférieure, " -#: apt-private/private-output.cc:664 +#: 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:668 +#: 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" @@ -1504,7 +1367,7 @@ msgstr "%lu partiellement installés ou enlevés.\n" #. 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:690 +#: apt-private/private-output.cc:761 msgid "[Y/n]" msgstr "[O/n]" @@ -1512,84 +1375,58 @@ msgstr "[O/n]" #. 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:696 +#: 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:707 +#: 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:713 +#: apt-private/private-output.cc:784 msgid "N" msgstr "N" -#: apt-private/private-output.cc:735 -#: apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" -#: apt-private/private-cachefile.cc:87 -msgid "Correcting dependencies..." -msgstr "Correction des dépendances..." - -#: apt-private/private-cachefile.cc:90 -msgid " failed." -msgstr " a échoué." - -#: apt-private/private-cachefile.cc:93 -msgid "Unable to correct dependencies" -msgstr "Impossible de corriger les dépendances" - -#: apt-private/private-cachefile.cc:96 -msgid "Unable to minimize the upgrade set" -msgstr "Impossible de minimiser le nombre des paquets mis à jour" - -#: apt-private/private-cachefile.cc:98 -msgid " Done" -msgstr " Fait" - -#: apt-private/private-cachefile.cc:102 -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:105 -msgid "Unmet dependencies. Try using -f." -msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f." - -#: apt-private/private-cacheset.cc:26 -#: apt-private/private-search.cc:57 -msgid "Sorting" -msgstr "En train de trier" - -#: apt-private/private-update.cc:45 +#: 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-upgrade.cc:18 -msgid "Calculating upgrade... " -msgstr "Calcul de la mise à jour... " +#: apt-private/private-update.cc:97 +#, 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-upgrade.cc:23 -msgid "Internal error, Upgrade broke stuff" -msgstr "Erreur interne, Upgrade a cassé le boulot !" +#: apt-private/private-update.cc:101 +msgid "All packages are up to date." +msgstr "" -#: apt-private/private-upgrade.cc:25 -msgid "Done" -msgstr "Fait" +#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 +msgid "Sorting" +msgstr "En train de trier" -#: apt-private/private-search.cc:61 -msgid "Full Text Search" -msgstr "Recherche en texte intégral" +#: 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:106 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "pas un véritable paquet (virtuel)" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1603,1914 +1440,2363 @@ msgstr "" " et la situation n'est donc pas forcément représentative\n" " de la réalité !" -#: apt-private/private-sources.cc:41 -#, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "Impossible de lire %s. Faut-il l'éditer à nouveau ?" - -#: apt-private/private-sources.cc:52 -#, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "Votre fichier « %s » a changé, veuillez lancer « apt-get update »." - -#: apt-private/acqprogress.cc:60 -msgid "Hit " -msgstr "Atteint " +#: apt-private/private-install.cc:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés." -#: apt-private/acqprogress.cc:84 -msgid "Get:" -msgstr "Réception de : " +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "" +"Les paquets doivent être enlevés mais la désinstallation est désactivée." -#: apt-private/acqprogress.cc:115 -msgid "Ign " -msgstr "Ign " +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Erreur interne. Le tri a été interrompu." -#: apt-private/acqprogress.cc:119 -msgid "Err " -msgstr "Err " +#: apt-private/private-install.cc:148 +#, 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 " +"courriel à apt@packages.debian.org." -#: apt-private/acqprogress.cc:140 +#. 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 +#: apt-private/private-install.cc:155 #, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "%so réceptionnés en %s (%so/s)\n" +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Il est nécessaire de prendre %so/%so dans les archives.\n" -#: apt-private/acqprogress.cc:230 +#. 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:160 #, c-format -msgid " [Working]" -msgstr " [En cours]" +msgid "Need to get %sB of archives.\n" +msgstr "Il est nécessaire de prendre %so dans les archives.\n" -#: apt-private/acqprogress.cc:291 +#. 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:167 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" -"Changement de support : veuillez insérer le disque\n" -"« %s »\n" -"dans le lecteur « %s » et appuyez sur la touche Entrée\n" +"Après cette opération, %so d'espace disque supplémentaires seront utilisés.\n" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 -#: apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 -#: apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 -#: apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 -#: apt-pkg/acquire.cc:485 -#: apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 -#: apt-pkg/clean.cc:36 -#: apt-pkg/policy.cc:373 +#. 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:172 #, c-format -msgid "Unable to read %s" -msgstr "Impossible de lire %s" +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Après cette opération, %so d'espace disque seront libérés.\n" -#: methods/mirror.cc:101 -#: methods/mirror.cc:130 -#: apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 -#: apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 -#: apt-pkg/clean.cc:42 -#: apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: apt-private/private-install.cc:200 #, c-format -msgid "Unable to change to %s" -msgstr "Impossible d'accéder à %s" +msgid "You don't have enough free space in %s." +msgstr "Pas assez d'espace disponible sur %s" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 -#, c-format -msgid "No mirror file '%s' found " -msgstr "Aucun fichier miroir « %s » n'a été trouvé" +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Il y a des problèmes et -y a été employé sans --force-yes" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:287 -#, c-format -msgid "Can not read mirror file '%s'" -msgstr "Impossible de lire le fichier de miroir « %s »." +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "" +"L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération " +"triviale." -#: methods/mirror.cc:315 -#, c-format -msgid "No entry found in mirror file '%s'" -msgstr "Pas d'entrée trouvée dans le fichier de miroir « %s »." +# The space before the exclamation mark must not be a non-breaking space; this +# sentence is supposed to be typed by a user who cannot see the difference. +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Oui, faites ce que je vous dis !" -#: methods/mirror.cc:445 +#: apt-private/private-install.cc:222 #, c-format -msgid "[Mirror: %s]" -msgstr "[Miroir : %s]" +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Vous êtes sur le point de faire quelque chose de potentiellement dangereux\n" +"Pour continuer, tapez la phrase « %s »\n" +" ?]" -#: methods/rred.cc:491 -#, c-format -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." +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Annulation." -#: methods/rred.cc:496 -#, c-format -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 correctif semble être corrompu." +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Souhaitez-vous continuer ?" -#: methods/rsh.cc:99 -#: ftparchive/multicompress.cc:168 -msgid "Failed to create IPC pipe to subprocess" -msgstr "Impossible de créer le tube IPC sur le sous-processus" +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Certains fichiers n'ont pu être téléchargés." -#: methods/rsh.cc:340 -msgid "Connection closed prematurely" -msgstr "Connexion fermée prématurément" +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Impossible de récupérer certaines archives, peut-être devrez-vous lancer apt-" +"get update ou essayer avec --fix-missing ?" -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "Mauvais paramètre par défaut !" +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "" +"l'option --fix-missing et l'échange de support ne sont pas encore reconnus." -#: dselect/install:52 -#: dselect/install:84 -#: dselect/install:88 -#: dselect/install:95 -#: dselect/install:106 -#: dselect/update:45 -msgid "Press enter to continue." -msgstr "Veuillez appuyer sur Entrée pour continuer." +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Impossible de corriger le fait que des paquets manquent." -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "Voulez-vous effacer les fichiers .deb précédemment téléchargés ?" +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Annulation de l'installation." -#: dselect/install:102 -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "Quelques erreurs sont apparues lors du décompactage. Les paquets qui" +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"Le paquet suivant a disparu du système car tous ses fichiers\n" +"ont été remplacés par d'autres paquets :" +msgstr[1] "" +"Les paquets suivants ont disparu du système car tous leurs fichiers\n" +"ont été remplacés par d'autres paquets :" -#: 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" +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "" +"Note : cette opération volontaire (effectuée par dpkg) est automatique." -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "ou des erreurs provoquées par les dépendances manquantes. C'est bénin, seules les erreurs." +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" +"Aucune suppression n'est censée se produire : impossible de lancer " +"« Autoremover »" -#: dselect/install:105 -msgid "above this message are important. Please fix them and run [I]nstall again" +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." msgstr "" -"précédant ce message sont importantes. Veuillez les corriger et\n" -"démarrer l'[I]nstallation une nouvelle fois." +"Il semble que l'outil de suppression automatique (« Autoremover ») ait\n" +"supprimé quelque chose, ce qui est inattendu. Veuillez envoyer un\n" +"rapport de bogue pour le paquet « apt »." -#: dselect/update:30 -msgid "Merging available information" -msgstr "Fusion des informations disponibles" +#. +#. if (Packages == 1) +#. { +#. c1out << std::endl; +#. c1out << +#. _("Since you only requested a single operation it is extremely likely that\n" +#. "the package is simply not installable and a bug report against\n" +#. "that package should be filed.") << std::endl; +#. } +#. +#: apt-private/private-install.cc:502 apt-private/private-install.cc:653 +msgid "The following information may help to resolve the situation:" +msgstr "L'information suivante devrait vous aider à résoudre la situation : " -#: cmdline/apt-extracttemplates.cc:102 -#, c-format -msgid "%s not a valid DEB package." -msgstr "%s n'est pas un paquet Debian valide." +#: apt-private/private-install.cc:506 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" +"Erreur interne, l'outil de suppression automatique a cassé quelque chose." -#: cmdline/apt-extracttemplates.cc:236 +#: apt-private/private-install.cc:513 msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Usage : apt-extracttemplates fichier1 [fichier2 ...]\n" -"\n" -"apt-extracttemplates est un outil pour extraire la configuration et les\n" -"informations des gabarits des paquets Debian\n" -"\n" -"Options :\n" -" -h Ce texte d'aide\n" -" -t Place le répertoire temporaire\n" -" -c=? Lit ce fichier de configuration\n" -" -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" +"The following package was automatically installed and is no longer required:" +msgid_plural "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr[0] "" +"Le paquet suivant a été installé automatiquement et n'est plus nécessaire :" +msgstr[1] "" +"Les paquets suivants ont été installés automatiquement et ne sont plus " +"nécessaires :" -#: cmdline/apt-extracttemplates.cc:271 -#: apt-pkg/pkgcachegen.cc:1388 +#: apt-private/private-install.cc:517 #, c-format -msgid "Unable to write to %s" -msgstr "Impossible d'écrire sur %s" - -#: cmdline/apt-extracttemplates.cc:313 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" +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 paquet a été installé automatiquement et n'est plus nécessaire.\n" +msgstr[1] "" +"%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n" -#: ftparchive/apt-ftparchive.cc:171 -#: ftparchive/apt-ftparchive.cc:349 -msgid "Package extension list is too long" -msgstr "La liste d'extension du paquet est trop longue" +#: apt-private/private-install.cc:519 +msgid "Use 'apt-get autoremove' to remove it." +msgid_plural "Use 'apt-get autoremove' to remove them." +msgstr[0] "Veuillez utiliser « apt-get autoremove » pour le supprimer." +msgstr[1] "Veuillez utiliser « apt-get autoremove » pour les supprimer." -#: ftparchive/apt-ftparchive.cc:173 -#: ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 -#: ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 -#: ftparchive/apt-ftparchive.cc:300 -#, c-format -msgid "Error processing directory %s" -msgstr "Erreur lors du traitement du répertoire %s" +#: apt-private/private-install.cc:612 +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 :" -#: ftparchive/apt-ftparchive.cc:262 -msgid "Source extension list is too long" -msgstr "La liste d'extension des sources est trop grande" +#: apt-private/private-install.cc:614 +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +msgstr "" +"Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" +"(ou indiquez une solution)." -#: ftparchive/apt-ftparchive.cc:379 -msgid "Error writing header to contents file" -msgstr "Erreur lors de l'écriture de l'en-tête du fichier contenu" +#: apt-private/private-install.cc:638 +msgid "" +"Some packages could not be installed. This may mean that you have\n" +"requested an impossible situation or if you are using the unstable\n" +"distribution that some required packages have not yet been created\n" +"or been moved out of Incoming." +msgstr "" +"Certains paquets ne peuvent être installés. Ceci peut signifier\n" +"que vous avez demandé l'impossible, ou bien, si vous utilisez\n" +"la distribution unstable, que certains paquets n'ont pas encore\n" +"été créés ou ne sont pas sortis d'Incoming." + +#: apt-private/private-install.cc:659 +msgid "Broken packages" +msgstr "Paquets défectueux" -#: ftparchive/apt-ftparchive.cc:409 +#: apt-private/private-install.cc:712 +msgid "The following extra packages will be installed:" +msgstr "Les paquets supplémentaires suivants seront installés : " + +#: apt-private/private-install.cc:802 +msgid "Suggested packages:" +msgstr "Paquets suggérés :" + +#: apt-private/private-install.cc:803 +msgid "Recommended packages:" +msgstr "Paquets recommandés :" + +#: apt-private/private-install.cc:825 #, c-format -msgid "Error processing contents %s" -msgstr "Erreur du traitement du contenu %s" +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n" -#: ftparchive/apt-ftparchive.cc:597 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" +#: apt-private/private-install.cc:829 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" -"Usage : apt-ftparchive [options] commande\n" -"Commandes : paquets binarypath [fichier d'« override » [chemin du préfixe]]\n" -" sources srcpath [fichier d'« override » [chemin du préfixe]]\n" -" contents path\n" -" release path\n" -" generate config [groupes]\n" -" clean config\n" -"\n" -"apt-ftparchive génère des fichiers d'index pour les archives Debian. Il\n" -"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" -"de chaque paquet aussi bien que les hachés MD5 et la taille du fichier. Un\n" -"fichier d'« override » est accepté pour forcer la valeur des priorités et\n" -"des sections\n" -"\n" -"De façon similaire, apt-ftparchive génère des fichiers de source à partir\n" -"d'un arbre de .dscs. L'option --source-override peut être employée pour\n" -"spécifier un fichier src d'« override »\n" -"\n" -"Les commandes « packages » et « sources » devraient être démarrées à la\n" -"racine de l'arbre. « BinaryPath » devrait pointer sur la base d'une\n" -"recherche récursive et le fichier d'« override » devrait contenir les\n" -"drapeaux d'annulation. « Pathprefix » est ajouté au champ du 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" -"\n" -"Options :\n" -" -h Ce texte d'aide\n" -" --md5 Contrôle la génération des MD5\n" -" -s=? Fichier d'« override » pour les sources\n" -" -q Silencieux\n" -" -d=? Sélectionne la base de données optionnelle de cache\n" -" --no-delink Permet le mode de débogage délié\n" -" --contents Contrôle la génération de fichier\n" -" -c=? Lit ce fichier de configuration\n" -" -o=? Place une option de configuration arbitraire" +"%s ignoré : il n'est pas installé et seules des mises à jour ont été " +"demandées.\n" -#: ftparchive/apt-ftparchive.cc:803 -msgid "No selections matched" -msgstr "Aucune sélection ne correspond" +#: apt-private/private-install.cc:841 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "" +"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" -#: ftparchive/apt-ftparchive.cc:881 +#: apt-private/private-install.cc:846 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »" +msgid "%s is already the newest version.\n" +msgstr "%s est déjà la plus récente version disponible.\n" -#: ftparchive/cachedb.cc:47 +#: apt-private/private-install.cc:894 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Base de données corrompue, fichier renommé en %s.old" +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Version choisie « %s » (%s) pour « %s »\n" -#: ftparchive/cachedb.cc:65 +#: apt-private/private-install.cc:899 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Base de données ancienne, tentative de mise à jour de %s\"" +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Version choisie « %s » (%s) pour « %s » à cause de « %s »\n" -#: ftparchive/cachedb.cc:76 -msgid "DB format is invalid. If you upgraded from an older version of apt, please remove and re-create the database." -msgstr "Le format de la base de données n'est pas valable. Si vous mettez APT à jour, veuillez supprimer puis recréer la base de données." +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:941 +#, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "" +"Le paquet « %s » n'est pas installé, et ne peut donc être supprimé. Peut-" +"être vouliez-vous écrire « %s » ?\n" -#: ftparchive/cachedb.cc:81 +#: apt-private/private-install.cc:947 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Impossible d'ouvrir le fichier de base de données %s : %s" +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-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés." + +#: apt-private/private-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Avertissement d'authentification ignoré.\n" -#: ftparchive/cachedb.cc:127 -#: apt-inst/extract.cc:179 -#: apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Certains paquets n'ont pas pu être authentifiés" + +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Faut-il installer ces paquets sans vérification ?" + +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format -msgid "Failed to stat %s" -msgstr "Impossible de statuer %s" +msgid "Failed to fetch %s %s\n" +msgstr "Impossible de récupérer %s %s\n" -#: ftparchive/cachedb.cc:249 -msgid "Archive has no control record" -msgstr "L'archive n'a pas d'enregistrement de contrôle" +#: apt-private/private-sources.cc:58 +#, c-format +msgid "Failed to parse %s. Edit again? " +msgstr "Impossible de lire %s. Faut-il l'éditer à nouveau ?" -#: ftparchive/cachedb.cc:490 -msgid "Unable to get a cursor" -msgstr "Impossible d'obtenir un curseur" +#: apt-private/private-sources.cc:70 +#, c-format +msgid "Your '%s' file changed, please run 'apt-get update'." +msgstr "Votre fichier « %s » a changé, veuillez lancer « apt-get update »." + +#: apt-private/private-search.cc:69 +msgid "Full Text Search" +msgstr "Recherche en texte intégral" + +#: apt-private/private-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "Calcul de la mise à jour... " + +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "Fait" + +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Atteint " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Réception de : " + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ign " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Err " -#: ftparchive/writer.cc:82 +#: apt-private/acqprogress.cc:146 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "A : Impossible de lire le contenu du répertoire %s\n" +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "%so réceptionnés en %s (%so/s)\n" -#: ftparchive/writer.cc:87 +#: apt-private/acqprogress.cc:236 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "A : Impossible de statuer %s\n" +msgid " [Working]" +msgstr " [En cours]" -#: ftparchive/writer.cc:143 -msgid "E: " -msgstr "E : " +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Changement de support : veuillez insérer le disque\n" +"« %s »\n" +"dans le lecteur « %s » et appuyez sur la touche Entrée\n" -#: ftparchive/writer.cc:145 -msgid "W: " -msgstr "A : " +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 +#, c-format +msgid "Unable to read %s" +msgstr "Impossible de lire %s" -#: ftparchive/writer.cc:152 -msgid "E: Errors apply to file " -msgstr "E : des erreurs sont survenues sur le fichier " +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 +#, c-format +msgid "Unable to change to %s" +msgstr "Impossible d'accéder à %s" -#: ftparchive/writer.cc:170 -#: ftparchive/writer.cc:202 +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 #, c-format -msgid "Failed to resolve %s" -msgstr "Impossible de résoudre %s" +msgid "No mirror file '%s' found " +msgstr "Aucun fichier miroir « %s » n'a été trouvé" -#: ftparchive/writer.cc:183 -msgid "Tree walking failed" -msgstr "Échec du parcours de l'arbre" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 +#, c-format +msgid "Can not read mirror file '%s'" +msgstr "Impossible de lire le fichier de miroir « %s »." + +#: methods/mirror.cc:315 +#, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Pas d'entrée trouvée dans le fichier de miroir « %s »." + +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" +msgstr "[Miroir : %s]" + +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Impossible de créer le tube IPC sur le sous-processus" + +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "Connexion fermée prématurément" + +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "Mauvais paramètre par défaut !" + +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "Veuillez appuyer sur Entrée pour continuer." + +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Voulez-vous effacer les fichiers .deb précédemment téléchargés ?" + +#: dselect/install:102 +msgid "Some errors occurred while unpacking. Packages that were installed" +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" + +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" +"ou des erreurs provoquées par les dépendances manquantes. C'est bénin, " +"seules les erreurs." + +#: dselect/install:105 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "" +"précédant ce message sont importantes. Veuillez les corriger et\n" +"démarrer l'[I]nstallation une nouvelle fois." + +#: dselect/update:30 +msgid "Merging available information" +msgstr "Fusion des informations disponibles" + +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode appelé sur un nœud toujours lié" + +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Impossible de situer l'élément haché !" + +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Échec lors de l'allocation de la déviation" -#: ftparchive/writer.cc:210 -#, c-format -msgid "Failed to open %s" -msgstr "Impossible d'ouvrir %s" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Erreur interne dans AddDiversion" -#: ftparchive/writer.cc:269 +#: apt-inst/filelist.cc:477 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " Délier %s [%s]\n" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Essaye d'écraser une déviation, %s -> %s et %s/%s" -#: ftparchive/writer.cc:277 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Failed to readlink %s" -msgstr "Impossible de lire le lien %s" +msgid "Double add of diversion %s -> %s" +msgstr "Addition double d'une déviation %s -> %s" -#: ftparchive/writer.cc:281 +#: apt-inst/filelist.cc:549 #, c-format -msgid "Failed to unlink %s" -msgstr "Impossible de délier %s" +msgid "Duplicate conf file %s/%s" +msgstr "Fichier de configuration en double %s/%s" -#: ftparchive/writer.cc:289 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Impossible de lier %s à %s" +msgid "The path %s is too long" +msgstr "Le chemin %s est trop long" -#: ftparchive/writer.cc:299 +#: apt-inst/extract.cc:132 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Seuil de delink de %so atteint.\n" +msgid "Unpacking %s more than once" +msgstr "Veuillez décompresser %s plus d'une fois" -#: ftparchive/writer.cc:404 -msgid "Archive had no package field" -msgstr "L'archive ne possède pas de champ de paquet" +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "Le répertoire %s est détourné" -#: ftparchive/writer.cc:412 -#: ftparchive/writer.cc:702 +#: apt-inst/extract.cc:152 #, c-format -msgid " %s has no override entry\n" -msgstr "%s ne possède pas d'entrée « override »\n" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Le paquet est en train d'essayer d'écrire sur la cible détournée %s/%s" + +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Le chemin de déviation est trop long" -#: ftparchive/writer.cc:480 -#: ftparchive/writer.cc:846 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " le responsable de %s est %s et non %s\n" +msgid "Failed to stat %s" +msgstr "Impossible de statuer %s" -#: ftparchive/writer.cc:712 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid " %s has no source override entry\n" -msgstr " %s ne possède pas d'entrée « source override »\n" +msgid "Failed to rename %s to %s" +msgstr "Impossible de changer le nom %s en %s" -#: ftparchive/writer.cc:716 +#: apt-inst/extract.cc:249 #, 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" +msgid "The directory %s is being replaced by a non-directory" +msgstr "Le répertoire %s va être remplacé par un non-répertoire" -#: ftparchive/contents.cc:341 -#: ftparchive/contents.cc:372 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Échec de l'allocation de mémoire" +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Échec pour localiser le nœud dans la table de hachage" -#: ftparchive/override.cc:35 -#: ftparchive/override.cc:143 -#, c-format -msgid "Unable to open %s" -msgstr "Impossible d'ouvrir %s" +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Le chemin est trop long" -#: ftparchive/override.cc:61 -#: ftparchive/override.cc:167 +#: apt-inst/extract.cc:421 #, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Entrée « override » %s mal formée ligne %llu n° 1" +msgid "Overwrite package match with no version for %s" +msgstr "Écrase la correspondance de paquet sans version pour %s " -#: ftparchive/override.cc:75 -#: ftparchive/override.cc:179 +#: apt-inst/extract.cc:438 #, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Entrée « override » %s mal formée %llu n° 2" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s" -#: ftparchive/override.cc:89 -#: ftparchive/override.cc:192 +#: apt-inst/extract.cc:498 #, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Entrée « override » %s mal formée %llu n° 3" +msgid "Unable to stat %s" +msgstr "Impossible de statuer pour %s." -#: ftparchive/override.cc:128 -#: ftparchive/override.cc:202 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Failed to read the override file %s" -msgstr "Impossible de lire le fichier d'« override » %s" +msgid "Failed to write file %s" +msgstr "Erreur d'écriture du fichier %s" -#: ftparchive/multicompress.cc:70 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Algorithme de compression « %s » inconnu" +msgid "Failed to close file %s" +msgstr "Échec de clôture du fichier %s" -#: ftparchive/multicompress.cc:100 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "La sortie compressée %s a besoin d'un ensemble de compression" - -#: ftparchive/multicompress.cc:189 -msgid "Failed to create FILE*" -msgstr "Impossible de créer FILE*" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to fork" -msgstr "Échec du fork" - -#: ftparchive/multicompress.cc:206 -msgid "Compress child" -msgstr "Fils compressé" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Ce n'est pas une archive DEB valide, partie « %s » manquante" -#: ftparchive/multicompress.cc:229 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Erreur interne, impossible de créer %s" +msgid "Internal error, could not locate member %s" +msgstr "Erreur interne, ne peut localiser la partie %s" -#: ftparchive/multicompress.cc:304 -msgid "IO to subprocess/file failed" -msgstr "Échec d'entrée/sortie du sous-processus sur le fichier" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Fichier de contrôle non traitable" -#: ftparchive/multicompress.cc:342 -msgid "Failed to read while computing MD5" -msgstr "Impossible de lire lors du calcul de la somme MD5" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Signature d'archive invalide" -#: ftparchive/multicompress.cc:358 -#, c-format -msgid "Problem unlinking %s" -msgstr "Problème en déliant %s" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Erreur de lecture de l'en-tête du membre d'archive" -#: ftparchive/multicompress.cc:373 -#: apt-inst/extract.cc:187 +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Impossible de changer le nom %s en %s" +msgid "Invalid archive member header %s" +msgstr "En-tête du membre d'archive %s non valable" -#: cmdline/apt-internal-solver.cc:38 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Utilisation: apt-internal-solver\n" -"\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" -"équivalent.\n" -"\n" -"Options:\n" -" -h La présente aide.\n" -" -q Affichage journalisable - pas de barre de progression\n" -" -c=? lecture du fichier de configuration indiqué\n" -" -o=? utilisation d'une option de configuration,\n" -" p. ex. -o dir::cache=/tmp\n" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "En-tête du membre d'archive non-valable" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Enregistrement de paquet inconnu !" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "L'archive est trop petite" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Usage : apt-sortpkgs [options] fichier1 [fichier2 ...]\n" -"\n" -"apt-sortpkgs est un outil simple pour trier les paquets. L'option -s est\n" -"employée pour indiquer le type de fichier dont il s'agit.\n" -"\n" -"Options :\n" -" -h Ce texte d'aide\n" -" -s Trie le fichier source\n" -" -c=? Lit ce fichier de configuration\n" -" -o=? Place une option de configuration arbitraire, p. ex. -o dir::cache=/tmp\n" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Échec de la lecture des en-têtes d'archive" -#: apt-inst/contrib/extracttar.cc:116 +#: apt-inst/contrib/extracttar.cc:124 msgid "Failed to create pipes" msgstr "Échec de création de tubes" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:151 msgid "Failed to exec gzip " msgstr "Impossible d'exécuter gzip " -#: apt-inst/contrib/extracttar.cc:180 -#: apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 msgid "Corrupted archive" msgstr "Archive corrompue" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:203 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:300 +#: apt-inst/contrib/extracttar.cc:308 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Type d'en-tête %u inconnu pour TAR, partie %s" -#: apt-inst/contrib/arfile.cc:74 -msgid "Invalid archive signature" -msgstr "Signature d'archive invalide" - -#: apt-inst/contrib/arfile.cc:82 -msgid "Error reading archive member header" -msgstr "Erreur de lecture de l'en-tête du membre d'archive" - -#: apt-inst/contrib/arfile.cc:94 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Invalid archive member header %s" -msgstr "En-tête du membre d'archive %s non valable" - -#: apt-inst/contrib/arfile.cc:106 -msgid "Invalid archive member header" -msgstr "En-tête du membre d'archive non-valable" - -#: apt-inst/contrib/arfile.cc:135 -msgid "Archive is too short" -msgstr "L'archive est trop petite" +msgid "Progress: [%3i%%]" +msgstr "Progression : [%3i%%]" -#: apt-inst/contrib/arfile.cc:139 -msgid "Failed to read the archive headers" -msgstr "Échec de la lecture des en-têtes d'archive" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "Exécution de dpkg" -#: apt-inst/filelist.cc:382 -msgid "DropNode called on still linked node" -msgstr "DropNode appelé sur un nœud toujours lié" +#: apt-pkg/init.cc:146 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "Le système de paquet « %s » n'est pas supporté" -#: apt-inst/filelist.cc:414 -msgid "Failed to locate the hash element!" -msgstr "Impossible de situer l'élément haché !" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Impossible de déterminer un type du système de paquets adéquat" -#: apt-inst/filelist.cc:461 -msgid "Failed to allocate diversion" -msgstr "Échec lors de l'allocation de la déviation" +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#, c-format +msgid "Wrote %i records.\n" +msgstr "%i enregistrements écrits.\n" -#: apt-inst/filelist.cc:466 -msgid "Internal error in AddDiversion" -msgstr "Erreur interne dans AddDiversion" +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#, c-format +msgid "Wrote %i records with %i missing files.\n" +msgstr "%i enregistrements écrits avec %i fichiers manquants.\n" -#: apt-inst/filelist.cc:479 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Essaye d'écraser une déviation, %s -> %s et %s/%s" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n" -#: apt-inst/filelist.cc:508 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Addition double d'une déviation %s -> %s" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "" +"%i enregistrements écrits avec %i fichiers manquants et %i qui ne " +"correspondent pas\n" -#: apt-inst/filelist.cc:551 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Fichier de configuration en double %s/%s" +msgid "Can't find authentication record for: %s" +msgstr "Impossible de trouver l'enregistrement d'authentification pour %s" -#: apt-inst/dirstream.cc:43 -#: apt-inst/dirstream.cc:50 -#: apt-inst/dirstream.cc:55 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "Failed to write file %s" -msgstr "Erreur d'écriture du fichier %s" +msgid "Hash mismatch for: %s" +msgstr "Somme de contrôle de hachage incohérente pour %s" -#: apt-inst/dirstream.cc:98 -#: apt-inst/dirstream.cc:106 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "Failed to close file %s" -msgstr "Échec de clôture du fichier %s" +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:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n" -#: apt-inst/extract.cc:94 -#: apt-inst/extract.cc:165 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "The path %s is too long" -msgstr "Le chemin %s est trop long" +msgid "Method %s did not start correctly" +msgstr "La méthode %s n'a pas démarré correctement" -#: apt-inst/extract.cc:125 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "Unpacking %s more than once" -msgstr "Veuillez décompresser %s plus d'une fois" +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 "" +"Les listes de paquets ou le fichier « status » ne peuvent être analysés ou " +"lus." + +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes." + +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "La liste des sources ne peut être lue." + +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Cache des paquets vide" + +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Le fichier de cache des paquets est corrompu" + +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Le fichier de cache des paquets a une version incompatible" -#: apt-inst/extract.cc:135 -#, c-format -msgid "The directory %s is diverted" -msgstr "Le répertoire %s est détourné" +#: apt-pkg/pkgcache.cc:169 +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-inst/extract.cc:145 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Le paquet est en train d'essayer d'écrire sur la cible détournée %s/%s" +msgid "This APT does not support the versioning system '%s'" +msgstr "Cet APT ne supporte pas le système de version « %s »" -#: apt-inst/extract.cc:155 -#: apt-inst/extract.cc:299 -msgid "The diversion path is too long" -msgstr "Le chemin de déviation est trop long" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Le cache des paquets a été construit pour une architecture différente" -#: apt-inst/extract.cc:242 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Le répertoire %s va être remplacé par un non-répertoire" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Dépend" -#: apt-inst/extract.cc:282 -msgid "Failed to locate node in its hash bucket" -msgstr "Échec pour localiser le nœud dans la table de hachage" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Pré-Dépend" -#: apt-inst/extract.cc:286 -msgid "The path is too long" -msgstr "Le chemin est trop long" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Suggère" -#: apt-inst/extract.cc:414 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Écrase la correspondance de paquet sans version pour %s " +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Recommande" -#: apt-inst/extract.cc:431 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Est en conflit avec" -#: apt-inst/extract.cc:491 -#, c-format -msgid "Unable to stat %s" -msgstr "Impossible de statuer pour %s." +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Remplace" -#: apt-inst/deb/debfile.cc:41 -#: apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 -#, 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" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Rend obsolète" -#: apt-inst/deb/debfile.cc:119 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "Erreur interne, ne peut localiser la partie %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Casse" -#: apt-inst/deb/debfile.cc:213 -msgid "Unparsable control file" -msgstr "Fichier de contrôle non traitable" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Améliore" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Impossible de mapper un fichier vide en mémoire" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "important" -#: apt-pkg/contrib/mmap.cc:111 -#, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Impossible de dupliquer le descripteur de fichier %i" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "nécessaire" -#: apt-pkg/contrib/mmap.cc:119 -#, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Impossible de réaliser un mapping de %llu octets en mémoire" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "standard" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Impossible de fermer la « mmap »" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "optionnel" -#: apt-pkg/contrib/mmap.cc:174 -#: apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Impossible de synchroniser la « mmap »" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "supplémentaire" -#: apt-pkg/contrib/mmap.cc:290 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Impossible de réaliser un mapping de %lu octets en mémoire" +msgid "Index file type '%s' is not supported" +msgstr "Le type de fichier d'index « %s » n'est pas accepté" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Échec de la troncature du fichier" +#: 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/contrib/mmap.cc:341 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. Current value: %lu. (man 5 apt.conf)" -msgstr "La zone dynamique d'allocation mémoire (« Dynamic MMap ») n'a plus de place. Vous devriez augmenter la taille de APT::Cache-Start, dont la valeur actuelle est de %lu (voir « man 5 apt.conf »)." +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/contrib/mmap.cc:440 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "Unable to increase the size of the MMap as the limit of %lu bytes is already reached." -msgstr "Impossible d'augmenter la taille de la « mmap » car la limite de %lu octets est déjà atteinte." - -#: apt-pkg/contrib/mmap.cc:443 -msgid "Unable to increase size of the MMap as automatic growing is disabled by user." -msgstr "Impossible d'augmenter la taille de la « mmap » car l'augmentation automatique a été désactivée par une option utilisateur." +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)" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%lid %lih %limin %lis" +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)" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/sourcelist.cc:190 #, c-format -msgid "%lih %limin %lis" -msgstr "%lih %limin %lis" +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é)" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "%limin %lis" -msgstr "%limin %lis" +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)" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "%lis" -msgstr "%lis" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Selection %s not found" -msgstr "La sélection %s n'a pu être trouvée" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Type d'abréviation non reconnue : « %c »" +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/contrib/configuration.cc:617 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "Opening configuration file %s" -msgstr "Ouverture du fichier de configuration %s" +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/contrib/configuration.cc:785 +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Erreur syntaxique %s:%u : le bloc commence sans aucun nom." +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/contrib/configuration.cc:804 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Erreur syntaxique %s:%u : balise mal formée" +msgid "Opening %s" +msgstr "Ouverture de %s" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Erreur syntaxique %s:%u : valeur suivie de choses illicites" +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/contrib/configuration.cc:861 +#: apt-pkg/sourcelist.cc:371 #, 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" +msgid "Malformed line %u in source list %s (type)" +msgstr "Ligne %u mal formée dans la liste des sources %s (type)" -#: apt-pkg/contrib/configuration.cc:868 +#: apt-pkg/sourcelist.cc:375 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Erreur syntaxique %s:%u: trop de niveaux d'imbrication d'includes" +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/contrib/configuration.cc:872 -#: apt-pkg/contrib/configuration.cc:877 -#, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Erreur syntaxique %s:%u : inclus à partir d'ici" +#: 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/contrib/configuration.cc:881 -#, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Erreur syntaxique %s:%u : directive « %s » non tolérée" +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Le type de fichier d'index « %s » n'est pas accepté" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/clean.cc:64 #, 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" +msgid "Unable to stat %s." +msgstr "Impossible de localiser %s." -#: apt-pkg/contrib/configuration.cc:934 -#, 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/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "Le cache possède un système de version incompatible" -#: apt-pkg/contrib/progress.cc:146 +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Erreur !" +msgid "Error occurred while processing %s (%s%d)" +msgstr "Erreur apparue lors du traitement de %s (%s%d)" -#: apt-pkg/contrib/progress.cc:148 -#, c-format -msgid "%c%s... Done" -msgstr "%c%s... Fait" +#: apt-pkg/pkgcachegen.cc:257 +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/contrib/progress.cc:179 -msgid "..." -msgstr "…" +#: apt-pkg/pkgcachegen.cc:260 +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." -#. Print the spinner -#: apt-pkg/contrib/progress.cc:195 -#, c-format -msgid "%c%s... %u%%" -msgstr "%c%s… %u%%" +#: apt-pkg/pkgcachegen.cc:263 +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/contrib/cmndline.cc:116 -#, 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/pkgcachegen.cc:266 +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/contrib/cmndline.cc:141 -#: apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Command line option %s is not understood" -msgstr "L'option %s de la ligne de commande n'est pas reconnue" +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/contrib/cmndline.cc:163 +#: apt-pkg/pkgcachegen.cc:1211 #, 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" +msgid "Couldn't stat source package list %s" +msgstr "Impossible de localiser la liste des paquets sources %s" + +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Lecture des listes de paquets" -#: apt-pkg/contrib/cmndline.cc:204 -#: apt-pkg/contrib/cmndline.cc:225 +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Assemblage des fichiers listés dans les champs Provides" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "Option %s requires an argument." -msgstr "L'option %s nécessite un paramètre." +msgid "Unable to write to %s" +msgstr "Impossible d'écrire sur %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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:241 +msgid "Send request to solver" +msgstr "Envoi d'une requête au solveur" -#: apt-pkg/contrib/cmndline.cc:238 -#: apt-pkg/contrib/cmndline.cc:244 +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "Préparation à la réception de la solution" + +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "Échec du solveur externe sans message d'erreur adapté" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "Exécution du solveur externe" + +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "Option %s : l'item configuration doit être spécifiée avec un =." +msgid "rename failed, %s (%s -> %s)." +msgstr "impossible de changer le nom, %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "Somme de contrôle de hachage incohérente" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "Taille incohérente" + +#: apt-pkg/acquire-item.cc:173 +msgid "Invalid file format" +msgstr "Format de fichier invalide" + +#: apt-pkg/acquire-item.cc:1640 #, 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 »" +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" -#: apt-pkg/contrib/cmndline.cc:304 +#: apt-pkg/acquire-item.cc:1656 #, c-format -msgid "Option '%s' is too long" -msgstr "L'option « %s » est trop longue" +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "" +"Impossible de trouver la somme de contrôle de « %s » dans le fichier Release" + +#: apt-pkg/acquire-item.cc:1698 +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/contrib/cmndline.cc:336 +#: apt-pkg/acquire-item.cc:1736 #, 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." +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." -#: apt-pkg/contrib/cmndline.cc:386 +#: apt-pkg/acquire-item.cc:1758 #, c-format -msgid "Invalid operation %s" -msgstr "L'opération %s n'est pas valable" +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)" -#: apt-pkg/contrib/cdromutl.cc:56 +#: apt-pkg/acquire-item.cc:1788 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "Impossible de localiser le point de montage %s" +msgid "" +"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" +msgstr "" +"Une erreur s'est produite lors du contrôle de la signature. Le dépôt n'est " +"pas mis à jour et les fichiers d'index précédents seront utilisés. Erreur de " +"GPG : %s : %s\n" -#: apt-pkg/contrib/cdromutl.cc:225 -msgid "Failed to stat the cdrom" -msgstr "Impossible d'accéder au cédérom." +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 +#, c-format +msgid "GPG error: %s: %s" +msgstr "Erreur de GPG : %s : %s" -#: apt-pkg/contrib/fileutl.cc:95 +#: apt-pkg/acquire-item.cc:1926 #, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problème de fermeture du fichier gzip %s" +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 "" +"Impossible de localiser un fichier du paquet %s. Cela signifie que vous " +"devrez corriger ce paquet vous-même (absence d'architecture)." -#: apt-pkg/contrib/fileutl.cc:228 +#: apt-pkg/acquire-item.cc:1992 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Verrou non utilisé pour le fichier %s en lecture seule" +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/contrib/fileutl.cc:233 +#: apt-pkg/acquire-item.cc:2050 #, c-format -msgid "Could not open lock file %s" -msgstr "Impossible d'ouvrir le fichier verrou %s" +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "" +"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » " +"pour le paquet %s." -#: apt-pkg/contrib/fileutl.cc:256 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs" +msgid "Vendor block %s contains no fingerprint" +msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Could not get lock %s" -msgstr "Impossible d'obtenir le verrou %s" +msgid "List directory %spartial is missing." +msgstr "Le répertoire %spartial pour les listes n'existe pas." -#: apt-pkg/contrib/fileutl.cc:398 -#: apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "La liste des fichiers ne peut pas être créée car « %s » n'est pas un répertoire" +msgid "Archives directory %spartial is missing." +msgstr "Le répertoire d'archive %spartial n'existe pas." -#: apt-pkg/contrib/fileutl.cc:432 +#: apt-pkg/acquire.cc:99 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "« %s » dans le répertoire « %s » a été ignoré car ce n'est pas un fichier ordinaire" +msgid "Unable to lock directory %s" +msgstr "Impossible de verrouiller le répertoire %s" -#: apt-pkg/contrib/fileutl.cc:450 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "« %s » dans le répertoire « %s » a été ignoré car il n'utilise pas d'extension" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Téléchargement du fichier %li sur %li (%s restant)" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/acquire.cc:904 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "« %s » dans le répertoire « %s » a été ignoré car il utilise une extension non valable" +msgid "Retrieving file %li of %li" +msgstr "Téléchargement du fichier %li sur %li" -#: apt-pkg/contrib/fileutl.cc:862 +#: 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/policy.cc:83 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Le sous-processus %s a commis une violation d'accès mémoire" +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" +msgstr "" +"La valeur « %s » n'est pas valable pour APT::Default-Release car cette " +"version ne fait pas partie des sources disponibles." -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/policy.cc:422 #, c-format -msgid "Sub-process %s received signal %u." -msgstr "Le sous-processus %s a reçu le signal %u" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "" +"Enregistrement non valable dans le fichier de préférences %s, aucune entrée " +"« Package »." -#: apt-pkg/contrib/fileutl.cc:868 -#: apt-pkg/contrib/gpgv.cc:243 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)" +msgid "Did not understand pin type %s" +msgstr "Type d'épinglage %s inconnu" + +#: apt-pkg/policy.cc:452 +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/contrib/fileutl.cc:870 -#: apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Le sous-processus %s s'est arrêté prématurément" +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" +"Impossible d'effectuer la configuration immédiate de « %s ». Veuillez " +"consulter la page de manuel apt.conf(5) et notamment la section à propos de " +"APT::Immediate-Configure, pour plus d'informations. (%d)" -#: apt-pkg/contrib/fileutl.cc:1016 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, c-format -msgid "Could not open file %s" -msgstr "Impossible d'ouvrir le fichier %s" +msgid "Could not configure '%s'. " +msgstr "Impossible de configurer « %s »." -#: apt-pkg/contrib/fileutl.cc:1093 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Could not open file descriptor %d" -msgstr "Impossible d'ouvrir le descripteur de fichier %d" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." +msgstr "" +"Cette installation va temporairement nécessiter l'enlèvement du paquet " +"essentiel %s en raison d'une boucle entre les champs Conflicts et Pre-" +"Depends. C'est souvent une mauvaise chose, mais si vous souhaitez réellement " +"le faire, activez l'option APT::Force-LoopBreak." -#: apt-pkg/contrib/fileutl.cc:1178 -msgid "Failed to create subprocess IPC" -msgstr "Impossible de créer un sous-processus IPC" +#: 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/contrib/fileutl.cc:1233 -msgid "Failed to exec compressor " -msgstr "Impossible d'exécuter la compression " +#: apt-pkg/cdrom.cc:571 +msgid "Unmounting CD-ROM...\n" +msgstr "Démontage du cédérom...\n" -#: apt-pkg/contrib/fileutl.cc:1326 +#: apt-pkg/cdrom.cc:586 #, c-format -msgid "read, still have %llu to read but none left" -msgstr "lu(s), %llu restant à lire, mais rien n'est disponible" +msgid "Using CD-ROM mount point %s\n" +msgstr "Utilisation du point de montage %s pour le cédérom\n" + +#: apt-pkg/cdrom.cc:599 +msgid "Waiting for disc...\n" +msgstr "Attente du disque...\n" + +#: apt-pkg/cdrom.cc:609 +msgid "Mounting CD-ROM...\n" +msgstr "Montage du cédérom...\n" -#: apt-pkg/contrib/fileutl.cc:1413 -#: apt-pkg/contrib/fileutl.cc:1435 +#: apt-pkg/cdrom.cc:620 +#, fuzzy +msgid "Identifying... " +msgstr "Identification..." + +#: apt-pkg/cdrom.cc:662 #, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "écrit(s), %llu restant à écrire, mais l'écriture est impossible" +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" -#: apt-pkg/contrib/fileutl.cc:1726 +#: apt-pkg/cdrom.cc:734 #, c-format -msgid "Problem closing the file %s" -msgstr "Problème de fermeture du fichier %s" +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" +msgstr "" +"%zu index de paquets trouvés, %zu index de sources, %zu index de traductions " +"et %zu signatures\n" -#: apt-pkg/contrib/fileutl.cc:1738 +#: apt-pkg/cdrom.cc:744 +msgid "" +"Unable to locate any package files, perhaps this is not a Debian Disc or the " +"wrong architecture?" +msgstr "" +"Aucun fichier de paquets trouvé. Ceci n'est peut-être pas un disque Debian " +"ou bien l'architecture est-elle incorrecte." + +#: apt-pkg/cdrom.cc:771 #, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Problème de renommage du fichier %s en %s" +msgid "Found label '%s'\n" +msgstr "Étiquette « %s » trouvée\n" -#: apt-pkg/contrib/fileutl.cc:1749 +#: apt-pkg/cdrom.cc:800 +msgid "That is not a valid name, try again.\n" +msgstr "Ce nom n'est pas valable, veuillez recommencer.\n" + +#: apt-pkg/cdrom.cc:817 #, c-format -msgid "Problem unlinking the file %s" -msgstr "Problème de suppression du lien %s" +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"Ce disque s'appelle :\n" +"« %s »\n" -#: apt-pkg/contrib/fileutl.cc:1762 -msgid "Problem syncing the file" -msgstr "Problème de synchronisation du fichier" +#: apt-pkg/cdrom.cc:819 +msgid "Copying package lists..." +msgstr "Copie des listes de paquets..." -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:76 +#: apt-pkg/cdrom.cc:863 +msgid "Writing new source list\n" +msgstr "Écriture de la nouvelle liste de sources\n" + +#: apt-pkg/cdrom.cc:874 +msgid "Source list entries for this disc are:\n" +msgstr "Les entrées de listes de sources pour ce disque sont :\n" + +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "No keyring installed in %s." -msgstr "Pas de porte-clés installé dans %s." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Le paquet %s doit être réinstallé, mais il est impossible de trouver son " +"archive." -#: apt-pkg/pkgcache.cc:148 -msgid "Empty package cache" -msgstr "Cache des paquets vide" +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +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/pkgcache.cc:154 -msgid "The package cache file is corrupted" -msgstr "Le fichier de cache des paquets est corrompu" +#: apt-pkg/algorithms.cc:1088 +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/pkgcache.cc:159 -msgid "The package cache file is an incompatible version" -msgstr "Le fichier de cache des paquets a une version incompatible" +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 +msgid "Building dependency tree" +msgstr "Construction de l'arbre des dépendances" -#: apt-pkg/pkgcache.cc:162 -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/depcache.cc:139 +msgid "Candidate versions" +msgstr "Versions possibles" + +#: apt-pkg/depcache.cc:168 +msgid "Dependency generation" +msgstr "Génération des dépendances" + +#: 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/pkgcache.cc:167 +#: apt-pkg/depcache.cc:250 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Cet APT ne supporte pas le système de version « %s »" +msgid "Failed to open StateFile %s" +msgstr "Impossible d'ouvrir le fichier d'état %s" -#: apt-pkg/pkgcache.cc:172 -msgid "The package cache was built for a different architecture" -msgstr "Le cache des paquets a été construit pour une architecture différente" +#: apt-pkg/depcache.cc:256 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Erreur d'écriture du fichier d'état temporaire %s" -#: apt-pkg/pkgcache.cc:314 -msgid "Depends" -msgstr "Dépend" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Impossible de traiter le fichier %s (1)" -#: apt-pkg/pkgcache.cc:314 -msgid "PreDepends" -msgstr "Pré-Dépend" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Impossible de traiter le fichier %s (2)" -#: apt-pkg/pkgcache.cc:314 -msgid "Suggests" -msgstr "Suggère" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "La version « %s » de « %s » est introuvable" -#: apt-pkg/pkgcache.cc:315 -msgid "Recommends" -msgstr "Recommande" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "La version « %s » de « %s » n'a pu être trouvée" -#: apt-pkg/pkgcache.cc:315 -msgid "Conflicts" -msgstr "Est en conflit avec" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Impossible de trouver la tâche « %s »" -#: apt-pkg/pkgcache.cc:315 -msgid "Replaces" -msgstr "Remplace" +#: apt-pkg/cacheset.cc:609 +#, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "" +"Impossible de trouver de paquet correspondant à l'expression rationnelle " +"« %s »" -#: apt-pkg/pkgcache.cc:316 -msgid "Obsoletes" -msgstr "Rend obsolète" +#: apt-pkg/cacheset.cc:615 +#, 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/pkgcache.cc:316 -msgid "Breaks" -msgstr "Casse" +#: apt-pkg/cacheset.cc:626 +#, 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/pkgcache.cc:316 -msgid "Enhances" -msgstr "Améliore" +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#, c-format +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"Impossible de choisir une version installée ou candidate du paquet « %s » " +"qui n'en n'a aucune" -#: apt-pkg/pkgcache.cc:327 -msgid "important" -msgstr "important" +#: apt-pkg/cacheset.cc:647 +#, 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/pkgcache.cc:327 -msgid "required" -msgstr "nécessaire" +#: apt-pkg/cacheset.cc:655 +#, 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/pkgcache.cc:327 -msgid "standard" -msgstr "standard" +#: apt-pkg/cacheset.cc:663 +#, 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/pkgcache.cc:328 -msgid "optional" -msgstr "optionnel" +#: apt-pkg/indexrecords.cc:78 +#, c-format +msgid "Unable to parse Release file %s" +msgstr "Impossible d'analyser le fichier Release %s" -#: apt-pkg/pkgcache.cc:328 -msgid "extra" -msgstr "supplémentaire" +#: apt-pkg/indexrecords.cc:86 +#, c-format +msgid "No sections in Release file %s" +msgstr "Pas de sections dans le fichier Release %s" -#: apt-pkg/depcache.cc:132 -#: apt-pkg/depcache.cc:161 -msgid "Building dependency tree" -msgstr "Construction de l'arbre des dépendances" +#: apt-pkg/indexrecords.cc:117 +#, c-format +msgid "No Hash entry in Release file %s" +msgstr "Pas d'entrée de hachage dans le fichier Release %s" -#: apt-pkg/depcache.cc:133 -msgid "Candidate versions" -msgstr "Versions possibles" +#: apt-pkg/indexrecords.cc:130 +#, 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/depcache.cc:162 -msgid "Dependency generation" -msgstr "Génération des dépendances" +#: apt-pkg/indexrecords.cc:149 +#, c-format +msgid "Invalid 'Date' entry in Release file %s" +msgstr "Entrée « Date » non valable dans le fichier Release %s" -#: apt-pkg/depcache.cc:182 -#: apt-pkg/depcache.cc:215 -#: apt-pkg/depcache.cc:219 -msgid "Reading state information" -msgstr "Lecture des informations d'état" +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 +#, c-format +msgid "%lid %lih %limin %lis" +msgstr "%lid %lih %limin %lis" -#: apt-pkg/depcache.cc:244 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Failed to open StateFile %s" -msgstr "Impossible d'ouvrir le fichier d'état %s" +msgid "%lih %limin %lis" +msgstr "%lih %limin %lis" -#: apt-pkg/depcache.cc:250 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Failed to write temporary StateFile %s" -msgstr "Erreur d'écriture du fichier d'état temporaire %s" +msgid "%limin %lis" +msgstr "%limin %lis" -#: apt-pkg/tagfile.cc:138 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Impossible de traiter le fichier %s (1)" +msgid "%lis" +msgstr "%lis" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Impossible de traiter le fichier %s (2)" +msgid "Selection %s not found" +msgstr "La sélection %s n'a pu être trouvée" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/contrib/fileutl.cc:190 #, 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])" +msgid "Not using locking for read only lock file %s" +msgstr "Verrou non utilisé pour le fichier %s en lecture seule" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/contrib/fileutl.cc:195 #, 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)" +msgid "Could not open lock file %s" +msgstr "Impossible d'ouvrir le fichier verrou %s" -#: apt-pkg/sourcelist.cc:110 +#: apt-pkg/contrib/fileutl.cc:218 #, 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)" +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs" -#: apt-pkg/sourcelist.cc:116 +#: apt-pkg/contrib/fileutl.cc:223 #, 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é)" +msgid "Could not get lock %s" +msgstr "Impossible d'obtenir le verrou %s" -#: apt-pkg/sourcelist.cc:119 +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 #, 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)" +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" +"La liste des fichiers ne peut pas être créée car « %s » n'est pas un " +"répertoire" -#: apt-pkg/sourcelist.cc:132 +#: apt-pkg/contrib/fileutl.cc:394 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)" +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" +"« %s » dans le répertoire « %s » a été ignoré car ce n'est pas un fichier " +"ordinaire" -#: apt-pkg/sourcelist.cc:134 +#: apt-pkg/contrib/fileutl.cc:412 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" +"« %s » dans le répertoire « %s » a été ignoré car il n'utilise pas " +"d'extension" -#: apt-pkg/sourcelist.cc:137 +#: apt-pkg/contrib/fileutl.cc:421 #, 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)" +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" +"« %s » dans le répertoire « %s » a été ignoré car il utilise une extension " +"non valable" -#: apt-pkg/sourcelist.cc:143 +#: apt-pkg/contrib/fileutl.cc:824 #, 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)" +msgid "Sub-process %s received a segmentation fault." +msgstr "Le sous-processus %s a commis une violation d'accès mémoire" -#: apt-pkg/sourcelist.cc:150 +#: apt-pkg/contrib/fileutl.cc:826 #, 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)" +msgid "Sub-process %s received signal %u." +msgstr "Le sous-processus %s a reçu le signal %u" -#: apt-pkg/sourcelist.cc:248 +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 #, c-format -msgid "Opening %s" -msgstr "Ouverture de %s" +msgid "Sub-process %s returned an error code (%u)" +msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)" -#: apt-pkg/sourcelist.cc:265 -#: apt-pkg/cdrom.cc:495 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 #, 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." +msgid "Sub-process %s exited unexpectedly" +msgstr "Le sous-processus %s s'est arrêté prématurément" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/contrib/fileutl.cc:913 #, 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 "Problem closing the gzip file %s" +msgstr "Problème de fermeture du fichier gzip %s" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/contrib/fileutl.cc:1101 #, 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" +msgid "Could not open file %s" +msgstr "Impossible d'ouvrir le fichier %s" -#: apt-pkg/packagemanager.cc:296 -#: apt-pkg/packagemanager.cc:922 +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 #, c-format -msgid "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)" -msgstr "Impossible d'effectuer la configuration immédiate de « %s ». Veuillez consulter la page de manuel apt.conf(5) et notamment la section à propos de APT::Immediate-Configure, pour plus d'informations. (%d)" +msgid "Could not open file descriptor %d" +msgstr "Impossible d'ouvrir le descripteur de fichier %d" + +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Impossible de créer un sous-processus IPC" -#: apt-pkg/packagemanager.cc:497 -#: apt-pkg/packagemanager.cc:528 +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Impossible d'exécuter la compression " + +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format -msgid "Could not configure '%s'. " -msgstr "Impossible de configurer « %s »." +msgid "read, still have %llu to read but none left" +msgstr "lu(s), %llu restant à lire, mais rien n'est disponible" -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format -msgid "This installation run will require temporarily removing the essential package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "Cette installation va temporairement nécessiter l'enlèvement du paquet essentiel %s en raison d'une boucle entre les champs Conflicts et Pre-Depends. C'est souvent une mauvaise chose, mais si vous souhaitez réellement le faire, activez l'option APT::Force-LoopBreak." +msgid "write, still have %llu to write but couldn't" +msgstr "écrit(s), %llu restant à écrire, mais l'écriture est impossible" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Le type de fichier d'index « %s » n'est pas accepté" +msgid "Problem closing the file %s" +msgstr "Problème de fermeture du fichier %s" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format -msgid "The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "Le paquet %s doit être réinstallé, mais il est impossible de trouver son archive." +msgid "Problem renaming the file %s to %s" +msgstr "Problème de renommage du fichier %s en %s" -#: apt-pkg/algorithms.cc:1068 -msgid "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages." -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/contrib/fileutl.cc:1938 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "Problème de suppression du lien %s" -#: apt-pkg/algorithms.cc:1070 -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/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Problème de synchronisation du fichier" -#: apt-pkg/acquire.cc:81 -#: apt-pkg/cdrom.cc:838 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "List directory %spartial is missing." -msgstr "Le répertoire %spartial pour les listes n'existe pas." +msgid "%c%s... Error!" +msgstr "%c%s... Erreur !" -#: apt-pkg/acquire.cc:85 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "Archives directory %spartial is missing." -msgstr "Le répertoire d'archive %spartial n'existe pas." +msgid "%c%s... Done" +msgstr "%c%s... Fait" -#: apt-pkg/acquire.cc:93 -#, c-format -msgid "Unable to lock directory %s" -msgstr "Impossible de verrouiller le répertoire %s" +#: apt-pkg/contrib/progress.cc:181 +msgid "..." +msgstr "…" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:893 +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 #, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Téléchargement du fichier %li sur %li (%s restant)" +msgid "%c%s... %u%%" +msgstr "%c%s… %u%%" + +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Impossible de mapper un fichier vide en mémoire" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "Retrieving file %li of %li" -msgstr "Téléchargement du fichier %li sur %li" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Impossible de dupliquer le descripteur de fichier %i" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/contrib/mmap.cc:119 #, 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 "Couldn't make mmap of %llu bytes" +msgstr "Impossible de réaliser un mapping de %llu octets en mémoire" + +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Impossible de fermer la « mmap »" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Impossible de synchroniser la « mmap »" + +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Method %s did not start correctly" -msgstr "La méthode %s n'a pas démarré correctement" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Impossible de réaliser un mapping de %lu octets en mémoire" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Échec de la troncature du fichier" + +#: apt-pkg/contrib/mmap.cc:341 #, 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." +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" +"La zone dynamique d'allocation mémoire (« Dynamic MMap ») n'a plus de place. " +"Vous devriez augmenter la taille de APT::Cache-Start, dont la valeur " +"actuelle est de %lu (voir « man 5 apt.conf »)." -#: apt-pkg/init.cc:143 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Le système de paquet « %s » n'est pas supporté" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" +"Impossible d'augmenter la taille de la « mmap » car la limite de %lu octets " +"est déjà atteinte." -#: apt-pkg/init.cc:159 -msgid "Unable to determine a suitable packaging system type" -msgstr "Impossible de déterminer un type du système de paquets adéquat" +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Impossible d'augmenter la taille de la « mmap » car l'augmentation " +"automatique a été désactivée par une option utilisateur." -#: apt-pkg/clean.cc:57 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "Unable to stat %s." -msgstr "Impossible de localiser %s." +msgid "Unable to stat the mount point %s" +msgstr "Impossible de localiser le point de montage %s" -#: apt-pkg/srcrecords.cc:47 -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/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Impossible d'accéder au cédérom." -#: apt-pkg/cachefile.cc:87 -msgid "The package lists or status file could not be parsed or opened." -msgstr "Les listes de paquets ou le fichier « status » ne peuvent être analysés ou lus." +#: apt-pkg/contrib/configuration.cc:519 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Type d'abréviation non reconnue : « %c »" -#: apt-pkg/cachefile.cc:91 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes." +#: apt-pkg/contrib/configuration.cc:633 +#, c-format +msgid "Opening configuration file %s" +msgstr "Ouverture du fichier de configuration %s" -#: apt-pkg/cachefile.cc:109 -msgid "The list of sources could not be read." -msgstr "La liste des sources ne peut être lue." +#: apt-pkg/contrib/configuration.cc:801 +#, 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/policy.cc:75 +#: apt-pkg/contrib/configuration.cc:820 #, c-format -msgid "The value '%s' is invalid for APT::Default-Release as such a release is not available in the sources" -msgstr "La valeur « %s » n'est pas valable pour APT::Default-Release car cette version ne fait pas partie des sources disponibles." +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Erreur syntaxique %s:%u : balise mal formée" -#: apt-pkg/policy.cc:410 +#: apt-pkg/contrib/configuration.cc:837 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Enregistrement non valable dans le fichier de préférences %s, aucune entrée « Package »." +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Erreur syntaxique %s:%u : valeur suivie de choses illicites" -#: apt-pkg/policy.cc:432 +#: apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "Did not understand pin type %s" -msgstr "Type d'épinglage %s inconnu" +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/policy.cc:440 -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/contrib/configuration.cc:884 +#, 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/pkgcachegen.cc:87 -msgid "Cache has an incompatible versioning system" -msgstr "Le cache possède un système de version incompatible" +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#, c-format +msgid "Syntax error %s:%u: Included from here" +msgstr "Erreur syntaxique %s:%u : inclus à partir d'ici" -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 -#: apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 -#: apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 -#: apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 -#: apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 -#: apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 -#: apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 -#: apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 -#: apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/contrib/configuration.cc:897 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Erreur apparue lors du traitement de %s (%s%d)" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Erreur syntaxique %s:%u : directive « %s » non tolérée" -#: apt-pkg/pkgcachegen.cc:251 -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/contrib/configuration.cc:900 +#, 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/pkgcachegen.cc:254 -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/contrib/configuration.cc:950 +#, 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/pkgcachegen.cc:257 -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." +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, c-format +msgid "No keyring installed in %s." +msgstr "Pas de porte-clés installé dans %s." -#: apt-pkg/pkgcachegen.cc:260 -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/contrib/cmndline.cc:124 +#, 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/pkgcachegen.cc:570 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, 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" +msgid "Command line option %s is not understood" +msgstr "L'option %s de la ligne de commande n'est pas reconnue" -#: apt-pkg/pkgcachegen.cc:1199 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Impossible de localiser la liste des paquets sources %s" +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/pkgcachegen.cc:1287 -#: apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 -#: apt-pkg/pkgcachegen.cc:1554 -msgid "Reading package lists" -msgstr "Lecture des listes de paquets" +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 +#, c-format +msgid "Option %s requires an argument." +msgstr "L'option %s nécessite un paramètre." -#: apt-pkg/pkgcachegen.cc:1304 -msgid "Collecting File Provides" -msgstr "Assemblage des fichiers listés dans les champs Provides" +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 +#, c-format +msgid "Option %s: Configuration item specification must have an =." +msgstr "Option %s : l'item configuration doit être spécifiée avec un =." -#: apt-pkg/pkgcachegen.cc:1496 -#: apt-pkg/pkgcachegen.cc:1503 -msgid "IO Error saving source cache" -msgstr "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" +#: apt-pkg/contrib/cmndline.cc:281 +#, 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/acquire-item.cc:139 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "impossible de changer le nom, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:154 -msgid "Hash Sum mismatch" -msgstr "Somme de contrôle de hachage incohérente" +msgid "Option '%s' is too long" +msgstr "L'option « %s » est trop longue" -#: apt-pkg/acquire-item.cc:159 -msgid "Size mismatch" -msgstr "Taille incohérente" +#: apt-pkg/contrib/cmndline.cc:344 +#, 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/acquire-item.cc:164 -msgid "Invalid file format" -msgstr "Format de fichier invalide" +#: apt-pkg/contrib/cmndline.cc:394 +#, c-format +msgid "Invalid operation %s" +msgstr "L'opération %s n'est pas valable" -#: apt-pkg/acquire-item.cc:1419 +#: apt-pkg/deb/dpkgpm.cc:110 #, 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" +msgid "Installing %s" +msgstr "Installation de %s" -#: apt-pkg/acquire-item.cc:1435 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Unable to find hash sum for '%s' in Release file" -msgstr "Impossible de trouver la somme de contrôle de « %s » dans le fichier Release" +msgid "Configuring %s" +msgstr "Configuration de %s" -#: apt-pkg/acquire-item.cc:1477 -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/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 +#, c-format +msgid "Removing %s" +msgstr "Suppression de %s" -#: apt-pkg/acquire-item.cc:1515 +#: apt-pkg/deb/dpkgpm.cc:113 #, 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." +msgid "Completely removing %s" +msgstr "Suppression complète de %s" -#: apt-pkg/acquire-item.cc:1537 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)" +msgid "Noting disappearance of %s" +msgstr "Disparition de %s constatée" -#: apt-pkg/acquire-item.cc:1567 +#: apt-pkg/deb/dpkgpm.cc:115 #, c-format -msgid "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" -msgstr "Une erreur s'est produite lors du contrôle de la signature. Le dépôt n'est pas mis à jour et les fichiers d'index précédents seront utilisés. Erreur de GPG : %s : %s\n" +msgid "Running post-installation trigger %s" +msgstr "Exécution des actions différées (« trigger ») de %s" -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1577 -#: apt-pkg/acquire-item.cc:1582 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "GPG error: %s: %s" -msgstr "Erreur de GPG : %s : %s" +msgid "Directory '%s' missing" +msgstr "Répertoire %s inexistant" -#: apt-pkg/acquire-item.cc:1705 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, 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 "Impossible de localiser un fichier du paquet %s. Cela signifie que vous devrez corriger ce paquet vous-même (absence d'architecture)." +msgid "Could not open file '%s'" +msgstr "Impossible d'ouvrir le fichier « %s »" -#: apt-pkg/acquire-item.cc:1771 +#: apt-pkg/deb/dpkgpm.cc:1007 #, 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 »" +msgid "Preparing %s" +msgstr "Préparation de %s" -#: apt-pkg/acquire-item.cc:1829 +#: apt-pkg/deb/dpkgpm.cc:1008 #, c-format -msgid "The package index files are corrupted. No Filename: field for package %s." -msgstr "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » pour le paquet %s." +msgid "Unpacking %s" +msgstr "Décompression de %s" -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Unable to parse Release file %s" -msgstr "Impossible d'analyser le fichier Release %s" +msgid "Preparing to configure %s" +msgstr "Préparation de la configuration de %s" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "No sections in Release file %s" -msgstr "Pas de sections dans le fichier Release %s" +msgid "Installed %s" +msgstr "%s installé" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "No Hash entry in Release file %s" -msgstr "Pas d'entrée de hachage dans le fichier Release %s" +msgid "Preparing for removal of %s" +msgstr "Préparation de la suppression de %s" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "Entrée « Valid-Until » non valable dans le fichier Release %s" +msgid "Removed %s" +msgstr "%s supprimé" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Invalid 'Date' entry in Release file %s" -msgstr "Entrée « Date » non valable dans le fichier Release %s" +msgid "Preparing to completely remove %s" +msgstr "Préparation de la suppression complète de %s" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte" +msgid "Completely removed %s" +msgstr "%s complètement supprimé" -#: apt-pkg/cdrom.cc:576 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Utilisation du point de montage %s pour le cédérom\n" -"Montage du cédérom\n" +msgid "Can not write log (%s)" +msgstr "Impossible d'écrire le journal (%s)" -#: apt-pkg/cdrom.cc:585 -#: apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "Identification..." +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "Est-ce que /dev/pts est monté ?" -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "Étiquette stockée : %s\n" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "L'opération a été interrompue avant de se terminer" -#: apt-pkg/cdrom.cc:622 -#: apt-pkg/cdrom.cc:915 -msgid "Unmounting CD-ROM...\n" -msgstr "Démontage du cédérom...\n" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint" -#: apt-pkg/cdrom.cc:642 -#, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "Utilisation du point de montage %s pour le cédérom\n" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "problème de dépendances : laissé non configuré" -#: apt-pkg/cdrom.cc:660 -msgid "Unmounting CD-ROM\n" -msgstr "Démontage du cédérom\n" +#: apt-pkg/deb/dpkgpm.cc:1726 +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/cdrom.cc:665 -msgid "Waiting for disc...\n" -msgstr "Attente du disque...\n" +#: apt-pkg/deb/dpkgpm.cc:1732 +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/cdrom.cc:674 -msgid "Mounting CD-ROM...\n" -msgstr "Montage du cédérom...\n" +#: apt-pkg/deb/dpkgpm.cc:1739 +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/cdrom.cc:693 -msgid "Scanning disc for index files..\n" -msgstr "Examen du disque à la recherche de fichiers d'index...\n" +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +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/cdrom.cc:744 +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "Found %zu package indexes, %zu source indexes, %zu translation indexes and %zu signatures\n" -msgstr "%zu index de paquets trouvés, %zu index de sources, %zu index de traductions et %zu signatures\n" +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/cdrom.cc:755 -msgid "Unable to locate any package files, perhaps this is not a Debian Disc or the wrong architecture?" -msgstr "Aucun fichier de paquets trouvé. Ceci n'est peut-être pas un disque Debian ou bien l'architecture est-elle incorrecte." +#: 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 ?" -#: apt-pkg/cdrom.cc:782 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 #, c-format -msgid "Found label '%s'\n" -msgstr "Étiquette « %s » trouvée\n" +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/cdrom.cc:811 -msgid "That is not a valid name, try again.\n" -msgstr "Ce nom n'est pas valable, veuillez recommencer.\n" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "Non verrouillé" -#: apt-pkg/cdrom.cc:828 -#, c-format +#: cmdline/apt-extracttemplates.cc:224 msgid "" -"This disc is called: \n" -"'%s'\n" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Ce disque s'appelle :\n" -"« %s »\n" +"Usage : apt-extracttemplates fichier1 [fichier2 ...]\n" +"\n" +"apt-extracttemplates est un outil pour extraire la configuration et les\n" +"informations des gabarits des paquets Debian\n" +"\n" +"Options :\n" +" -h Ce texte d'aide\n" +" -t Place le répertoire temporaire\n" +" -c=? Lit ce fichier de configuration\n" +" -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n" -#: apt-pkg/cdrom.cc:830 -msgid "Copying package lists..." -msgstr "Copie des listes de paquets..." +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "Impossible de statuer pour %s." -#: apt-pkg/cdrom.cc:865 -msgid "Writing new source list\n" -msgstr "Écriture de la nouvelle liste de sources\n" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "" +"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" -#: apt-pkg/cdrom.cc:873 -msgid "Source list entries for this disc are:\n" -msgstr "Les entrées de listes de sources pour ce disque sont :\n" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "La liste d'extension du paquet est trop longue" -#: apt-pkg/indexcopy.cc:236 -#: apt-pkg/indexcopy.cc:775 +#: 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 #, c-format -msgid "Wrote %i records.\n" -msgstr "%i enregistrements écrits.\n" +msgid "Error processing directory %s" +msgstr "Erreur lors du traitement du répertoire %s" -#: apt-pkg/indexcopy.cc:238 -#: apt-pkg/indexcopy.cc:777 -#, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "%i enregistrements écrits avec %i fichiers manquants.\n" +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "La liste d'extension des sources est trop grande" -#: apt-pkg/indexcopy.cc:241 -#: apt-pkg/indexcopy.cc:780 -#, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Erreur lors de l'écriture de l'en-tête du fichier contenu" -#: apt-pkg/indexcopy.cc:244 -#: apt-pkg/indexcopy.cc:783 +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "%i enregistrements écrits avec %i fichiers manquants et %i qui ne correspondent pas\n" +msgid "Error processing contents %s" +msgstr "Erreur du traitement du contenu %s" + +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Usage : apt-ftparchive [options] commande\n" +"Commandes : paquets binarypath [fichier d'« override » [chemin du " +"préfixe]]\n" +" sources srcpath [fichier d'« override » [chemin du préfixe]]\n" +" contents path\n" +" release path\n" +" generate config [groupes]\n" +" clean config\n" +"\n" +"apt-ftparchive génère des fichiers d'index pour les archives Debian. Il\n" +"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" +"de chaque paquet aussi bien que les hachés MD5 et la taille du fichier. Un\n" +"fichier d'« override » est accepté pour forcer la valeur des priorités et\n" +"des sections\n" +"\n" +"De façon similaire, apt-ftparchive génère des fichiers de source à partir\n" +"d'un arbre de .dscs. L'option --source-override peut être employée pour\n" +"spécifier un fichier src d'« override »\n" +"\n" +"Les commandes « packages » et « sources » devraient être démarrées à la\n" +"racine de l'arbre. « BinaryPath » devrait pointer sur la base d'une\n" +"recherche récursive et le fichier d'« override » devrait contenir les\n" +"drapeaux d'annulation. « Pathprefix » est ajouté au champ du 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" +"\n" +"Options :\n" +" -h Ce texte d'aide\n" +" --md5 Contrôle la génération des MD5\n" +" -s=? Fichier d'« override » pour les sources\n" +" -q Silencieux\n" +" -d=? Sélectionne la base de données optionnelle de cache\n" +" --no-delink Permet le mode de débogage délié\n" +" --contents Contrôle la génération de fichier\n" +" -c=? Lit ce fichier de configuration\n" +" -o=? Place une option de configuration arbitraire" -#: apt-pkg/indexcopy.cc:515 -#, c-format -msgid "Can't find authentication record for: %s" -msgstr "Impossible de trouver l'enregistrement d'authentification pour %s" +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Aucune sélection ne correspond" -#: apt-pkg/indexcopy.cc:521 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Somme de contrôle de hachage incohérente pour %s" +msgid "Some files are missing in the package file group `%s'" +msgstr "" +"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »" -#: apt-pkg/cacheset.cc:467 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "La version « %s » de « %s » est introuvable" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Base de données corrompue, fichier renommé en %s.old" -#: apt-pkg/cacheset.cc:470 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "La version « %s » de « %s » n'a pu être trouvée" +msgid "DB is old, attempting to upgrade %s" +msgstr "Base de données ancienne, tentative de mise à jour de %s\"" -#: apt-pkg/cacheset.cc:581 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "Impossible de trouver la tâche « %s »" +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"Le format de la base de données n'est pas valable. Si vous mettez APT à " +"jour, veuillez supprimer puis recréer la base de données." -#: apt-pkg/cacheset.cc:587 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Impossible de trouver de paquet correspondant à l'expression rationnelle « %s »" +msgid "Unable to open DB file %s: %s" +msgstr "Impossible d'ouvrir le fichier de base de données %s : %s" -#: apt-pkg/cacheset.cc:598 -#, 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" +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Impossible de lire le lien %s" -#: apt-pkg/cacheset.cc:605 -#: apt-pkg/cacheset.cc:612 -#, c-format -msgid "Can't select installed nor candidate version from package '%s' as it has neither of them" -msgstr "Impossible de choisir une version installée ou candidate du paquet « %s » qui n'en n'a aucune" +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "L'archive n'a pas d'enregistrement de contrôle" -#: apt-pkg/cacheset.cc:619 -#, 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" +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Impossible d'obtenir un curseur" -#: apt-pkg/cacheset.cc:627 +#: ftparchive/writer.cc:91 #, 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" +msgid "W: Unable to read directory %s\n" +msgstr "A : Impossible de lire le contenu du répertoire %s\n" -#: apt-pkg/cacheset.cc:635 +#: ftparchive/writer.cc:96 #, 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/edsp.cc:41 -#: apt-pkg/edsp.cc:61 -msgid "Send scenario to solver" -msgstr "Envoi du scénario au solveur" - -#: apt-pkg/edsp.cc:209 -msgid "Send request to solver" -msgstr "Envoi d'une requête au solveur" +msgid "W: Unable to stat %s\n" +msgstr "A : Impossible de statuer %s\n" -#: apt-pkg/edsp.cc:279 -msgid "Prepare for receiving solution" -msgstr "Préparation à la réception de la solution" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E : " -#: apt-pkg/edsp.cc:286 -msgid "External solver failed without a proper error message" -msgstr "Échec du solveur externe sans message d'erreur adapté" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "A : " -#: apt-pkg/edsp.cc:556 -#: apt-pkg/edsp.cc:559 -#: apt-pkg/edsp.cc:564 -msgid "Execute external solver" -msgstr "Exécution du solveur externe" +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E : des erreurs sont survenues sur le fichier " -#: apt-pkg/install-progress.cc:50 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "Progress: [%3i%%]" -msgstr "Progression : [%3i%%]" - -#: apt-pkg/install-progress.cc:84 -#: apt-pkg/install-progress.cc:167 -msgid "Running dpkg" -msgstr "Exécution de dpkg" +msgid "Failed to resolve %s" +msgstr "Impossible de résoudre %s" -#: apt-pkg/update.cc:110 -#: apt-pkg/update.cc:112 -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." +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Échec du parcours de l'arbre" -#: apt-pkg/deb/dpkgpm.cc:91 +#: ftparchive/writer.cc:219 #, c-format -msgid "Installing %s" -msgstr "Installation de %s" +msgid "Failed to open %s" +msgstr "Impossible d'ouvrir %s" -#: apt-pkg/deb/dpkgpm.cc:92 -#: apt-pkg/deb/dpkgpm.cc:978 +#: ftparchive/writer.cc:278 #, c-format -msgid "Configuring %s" -msgstr "Configuration de %s" +msgid " DeLink %s [%s]\n" +msgstr " Délier %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:93 -#: apt-pkg/deb/dpkgpm.cc:985 +#: ftparchive/writer.cc:286 #, c-format -msgid "Removing %s" -msgstr "Suppression de %s" +msgid "Failed to readlink %s" +msgstr "Impossible de lire le lien %s" -#: apt-pkg/deb/dpkgpm.cc:94 +#: ftparchive/writer.cc:290 #, c-format -msgid "Completely removing %s" -msgstr "Suppression complète de %s" +msgid "Failed to unlink %s" +msgstr "Impossible de délier %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:298 #, c-format -msgid "Noting disappearance of %s" -msgstr "Disparition de %s constatée" +msgid "*** Failed to link %s to %s" +msgstr "*** Impossible de lier %s à %s" -#: apt-pkg/deb/dpkgpm.cc:96 +#: ftparchive/writer.cc:308 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Exécution des actions différées (« trigger ») de %s" +msgid " DeLink limit of %sB hit.\n" +msgstr " Seuil de delink de %so atteint.\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "L'archive ne possède pas de champ de paquet" + +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Directory '%s' missing" -msgstr "Répertoire %s inexistant" +msgid " %s has no override entry\n" +msgstr "%s ne possède pas d'entrée « override »\n" -#: apt-pkg/deb/dpkgpm.cc:824 -#: apt-pkg/deb/dpkgpm.cc:846 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Could not open file '%s'" -msgstr "Impossible d'ouvrir le fichier « %s »" +msgid " %s maintainer is %s not %s\n" +msgstr " le responsable de %s est %s et non %s\n" -#: apt-pkg/deb/dpkgpm.cc:971 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing %s" -msgstr "Préparation de %s" +msgid " %s has no source override entry\n" +msgstr " %s ne possède pas d'entrée « source override »\n" -#: apt-pkg/deb/dpkgpm.cc:972 +#: ftparchive/writer.cc:710 #, c-format -msgid "Unpacking %s" -msgstr "Décompression de %s" +msgid " %s has no binary override entry either\n" +msgstr " %s ne possède pas également pas d'entrée « binary override »\n" + +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Échec de l'allocation de mémoire" -#: apt-pkg/deb/dpkgpm.cc:977 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing to configure %s" -msgstr "Préparation de la configuration de %s" +msgid "Unable to open %s" +msgstr "Impossible d'ouvrir %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Entrée « override » %s mal formée ligne %llu n° 1" + +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Installed %s" -msgstr "%s installé" +msgid "Failed to read the override file %s" +msgstr "Impossible de lire le fichier d'« override » %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: ftparchive/override.cc:166 #, c-format -msgid "Preparing for removal of %s" -msgstr "Préparation de la suppression de %s" +msgid "Malformed override %s line %llu #1" +msgstr "Entrée « override » %s mal formée ligne %llu n° 1" -#: apt-pkg/deb/dpkgpm.cc:986 +#: ftparchive/override.cc:178 #, c-format -msgid "Removed %s" -msgstr "%s supprimé" +msgid "Malformed override %s line %llu #2" +msgstr "Entrée « override » %s mal formée %llu n° 2" -#: apt-pkg/deb/dpkgpm.cc:991 +#: ftparchive/override.cc:191 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Préparation de la suppression complète de %s" +msgid "Malformed override %s line %llu #3" +msgstr "Entrée « override » %s mal formée %llu n° 3" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Completely removed %s" -msgstr "%s complètement supprimé" +msgid "Unknown compression algorithm '%s'" +msgstr "Algorithme de compression « %s » inconnu" -#: apt-pkg/deb/dpkgpm.cc:1045 -#: apt-pkg/deb/dpkgpm.cc:1066 +#: ftparchive/multicompress.cc:103 #, c-format -msgid "Can not write log (%s)" -msgstr "Impossible d'écrire le journal (%s)" +msgid "Compressed output %s needs a compression set" +msgstr "La sortie compressée %s a besoin d'un ensemble de compression" -#: apt-pkg/deb/dpkgpm.cc:1045 -msgid "Is /dev/pts mounted?" -msgstr "Est-ce que /dev/pts est monté ?" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Impossible de créer FILE*" -#: apt-pkg/deb/dpkgpm.cc:1066 -msgid "Is stdout a terminal?" -msgstr "Est-ce que stdout est un terminal ?" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Échec du fork" -#: apt-pkg/deb/dpkgpm.cc:1549 -msgid "Operation was interrupted before it could finish" -msgstr "L'opération a été interrompue avant de se terminer" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Fils compressé" -#: apt-pkg/deb/dpkgpm.cc:1611 -msgid "No apport report written because MaxReports is reached already" -msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Erreur interne, impossible de créer %s" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1616 -msgid "dependency problems - leaving unconfigured" -msgstr "problème de dépendances : laissé non configuré" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "Échec d'entrée/sortie du sous-processus sur le fichier" + +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Impossible de lire lors du calcul de la somme MD5" + +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Problème en déliant %s" + +#: cmdline/apt-internal-solver.cc:49 +msgid "" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Utilisation: apt-internal-solver\n" +"\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" +"équivalent.\n" +"\n" +"Options:\n" +" -h La présente aide.\n" +" -q Affichage journalisable - pas de barre de progression\n" +" -c=? lecture du fichier de configuration indiqué\n" +" -o=? utilisation d'une option de configuration,\n" +" p. ex. -o dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1618 -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." +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Enregistrement de paquet inconnu !" -#: apt-pkg/deb/dpkgpm.cc:1624 -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é" +#: cmdline/apt-sortpkgs.cc:153 +msgid "" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Usage : apt-sortpkgs [options] fichier1 [fichier2 ...]\n" +"\n" +"apt-sortpkgs est un outil simple pour trier les paquets. L'option -s est\n" +"employée pour indiquer le type de fichier dont il s'agit.\n" +"\n" +"Options :\n" +" -h Ce texte d'aide\n" +" -s Trie le fichier source\n" +" -c=? Lit ce fichier de configuration\n" +" -o=? Place une option de configuration arbitraire, p. ex. -o dir::cache=/" +"tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1631 -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" +#~ msgid "Internal error, Upgrade broke stuff" +#~ msgstr "Erreur interne, Upgrade a cassé le boulot !" -#: apt-pkg/deb/dpkgpm.cc:1638 -#: apt-pkg/deb/dpkgpm.cc:1644 -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" +#~ 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." -#: apt-pkg/deb/dpkgpm.cc:1665 -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" +#~ 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 " +#~ "correctif semble être corrompu." -#: apt-pkg/deb/debsystem.cc:84 -#, 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 "%s not a valid DEB package." +#~ msgstr "%s n'est pas un paquet Debian valide." -#: apt-pkg/deb/debsystem.cc:87 -#, 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 "" +#~ "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" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 -#, 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." +#~ msgid "Unmounting CD-ROM\n" +#~ msgstr "Démontage du cédérom\n" -#: apt-pkg/deb/debsystem.cc:121 -msgid "Not locked" -msgstr "Non verrouillé" +#~ 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" @@ -3547,40 +3833,9 @@ msgstr "Non verrouillé" #~ msgid "Virtual packages like '%s' can't be removed\n" #~ msgstr "Les paquets virtuels comme « %s » ne peuvent pas être supprimés\n" -#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -#~ msgstr "" -#~ "Le paquet « %s » n'est pas installé, et ne peut donc être supprimé. Peut-" -#~ "être vouliez-vous écrire « %s » ?\n" - -#~ 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" - #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Note : sélection de « %s » au lieu de « %s »\n" -#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n" -#~ msgstr "" -#~ "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n" - -#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -#~ msgstr "" -#~ "%s ignoré : il n'est pas installé et seules des mises à jour ont été " -#~ "demandées.\n" - -#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#~ msgstr "" -#~ "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "%s est déjà la plus récente version disponible.\n" - -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Version choisie « %s » (%s) pour « %s »\n" - -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Version choisie « %s » (%s) pour « %s » à cause de « %s »\n" - #~ msgid "Ignore unavailable target release '%s' of package '%s'" #~ msgstr "" #~ "La distribution cible « %s » indisponible pour le paquet « %s » est " diff --git a/po/gl.po b/po/gl.po index e7aa78713..e876546ef 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2011-05-12 15:28+0100\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: galician \n" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " Táboa de versións:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -361,7 +361,7 @@ msgstr "Non é posíbel bloquear o directorio de descargas" 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Non sé posíbel atopar un paquete fonte para %s" @@ -387,97 +387,97 @@ msgstr "" "para obter as últimas actualizacións (posibelmente non publicadas) do " "paquete.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado «%s»\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non foi posíbel determinar o espazo libre en %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Non hai espazo libre abondo en %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, 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:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Non se puideron obter algúns arquivos." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetado «%s».\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a orde de construción de «%s».\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -486,7 +486,7 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -495,14 +495,14 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -511,7 +511,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:1358 +#: cmdline/apt-get.cc:1362 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -520,30 +520,30 @@ msgstr "" "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o " "paquete %s" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, 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:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Non se puideron procesar as dependencias de construción" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Rexistro de cambios de %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Módulos admitidos:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -690,7 +690,7 @@ msgstr "%s xa é a versión máis recente.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Agardouse por %s pero non estaba alí" @@ -784,16 +784,16 @@ msgstr "Non é posíbel desmontar o CD-ROM de %s, pode estarse empregando aínda msgid "Disk not found." msgstr "Non se atopou o disco" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Non se atopou o ficheiro" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Non foi posíbel determinar o estado" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Non foi posíbel estabelecer a hora de modificación" @@ -847,7 +847,7 @@ msgstr "Fallou a orde do script de acceso «%s», o servidor dixo: %s" msgid "TYPE failed, server said: %s" msgstr "Fallou a orde TYPE, o servidor dixo: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Esgotouse o tempo para a conexión" @@ -869,7 +869,7 @@ msgstr "Unha resposta desbordou o búfer." msgid "Protocol corruption" msgstr "Dano no protocolo" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -931,7 +931,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:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Xurdiu un problema ao calcular o hash do ficheiro" @@ -940,7 +940,7 @@ msgstr "Xurdiu un problema ao calcular o hash do ficheiro" msgid "Unable to fetch file, server said '%s'" msgstr "Non é posíbel obter o ficheiro, o servidor dixo «%s»" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "O socket de datos esgotou o tempo" @@ -990,7 +990,7 @@ msgstr "Non foi posíbel conectar a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" @@ -1135,42 +1135,17 @@ msgstr "Produciuse un fallo na conexión" msgid "Internal error" msgstr "Produciuse un erro interno" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Teño " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Rcb:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ign " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Err " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Obtivéronse %sB en %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Traballando]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Cambio de soporte: introduza o disco etiquetado\n" -" «%s»\n" -"na unidade «%s» e prema Intro\n" +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:93 msgid "Correcting dependencies..." @@ -1200,167 +1175,352 @@ msgstr "Pode querer executar «apt-get -f install» para corrixilos." msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumpridas. Probe a empregar -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "AVISO: Non se poden autenticar os seguintes paquetes!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instalado]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Ignórase o aviso de autenticación.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [Instalado]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Non foi posíbel autenticar algúns paquetes" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Instalar estes paquetes sen verificación?" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Instalado]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Xurdiron problemas e empregouse -y sen --force-yes" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Instalado]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Non foi posíbel obter %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" +msgid "[upgradable from: %s]" msgstr "" -"Produciuse un erro interno, chamouse a InstallPackages con paquetes " -"estragados." - -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "Hai que retirar paquetes mais o retirado está desactivado." - -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Produciuse un erro interno; non rematou a ordenación" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" msgstr "" -"Que estraño... Os tamaños non coinciden; envíe un correo-e 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 -#: apt-private/private-install.cc:155 +#: apt-private/private-output.cc:455 #, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "Ten que recibir %sB/%sB de arquivos.\n" +msgid "but %s is installed" +msgstr "mais %s está instalado" -#. 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:160 +#: apt-private/private-output.cc:457 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "Ten que recibir %sB de arquivos.\n" +msgid "but %s is to be installed" +msgstr "mais vaise instalar %s" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Despois desta operación ocuparanse %sB de disco adicionais.\n" +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "mais non é instalábel" -#. 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:172 -#, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Despois desta operación liberaranse %sB de espazo de disco.\n" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "mais é un paquete virtual" -#: apt-private/private-install.cc:200 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "Non hai espazo libre abondo en %s." +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "mais non está instalado" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Especificouse «Só triviais» mais esta non é unha operación trivial." +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "mais non se vai a instalar" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Si, fai o que digo!" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " ou" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Está a piques de facer algo perigoso.\n" -"Para continuar escriba a frase «%s»\n" -" ?] " +#: 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-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Interromper." +#: apt-private/private-output.cc:523 +msgid "The following NEW packages will be installed:" +msgstr "Os seguintes paquetes NOVOS hanse instalar:" -#: apt-private/private-install.cc:243 -msgid "Do you want to continue?" -msgstr "Quere continuar?" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "Vanse RETIRAR os paquetes seguintes:" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Non foi posíbel descargar algúns ficheiros" +#: apt-private/private-output.cc:571 +msgid "The following packages have been kept back:" +msgstr "Consérvanse os seguintes paquetes:" -#: apt-private/private-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Non foi posíbel obter algúns arquivos; probe con apt-get update ou --fix-" -"missing." +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "Vanse anovar os paquetes seguintes:" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "" -"O emprego conxunto de --fix-missing e intercambio de discos non está admitido" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" +msgstr "Vanse REVERTER os seguintes paquetes :" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Non é posíbel corrixir os paquetes non dispoñíbeis." +#: apt-private/private-output.cc:633 +msgid "The following held packages will be changed:" +msgstr "Vanse modificar os paquetes retidos seguintes:" -#: apt-private/private-install.cc:330 -msgid "Aborting install." -msgstr "Interrompendo a instalación." +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (por mor de %s) " -#: apt-private/private-install.cc:366 +#: apt-private/private-output.cc:696 msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"O seguinte paquete desapareceu do seu sistema e todos os \n" -"ficheiros serán sobrescritos por outros paquetes:" -msgstr[1] "" -"Os seguintes paquetes desapareceron do seu sistema e todos os \n" -"ficheiros serán sobrescritos por outros paquetes:" +"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-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Nota: Isto será feito automaticamente por dpkg." +#: apt-private/private-output.cc:727 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu anovados, %lu instalados, " -#: apt-private/private-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "" -"Non se agarda que eliminemos cousas, non se pode iniciar o Retirado " -"automático" +#: apt-private/private-output.cc:731 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu reinstalados, " -#: apt-private/private-install.cc:499 +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "" +"Produciuse un erro interno, chamouse a InstallPackages con paquetes " +"estragados." + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "Hai que retirar paquetes mais o retirado está desactivado." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Produciuse un erro interno; non rematou a ordenación" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Que estraño... Os tamaños non coinciden; envíe un correo-e 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Ten que recibir %sB/%sB de arquivos.\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:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Ten que recibir %sB de arquivos.\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:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Despois desta operación ocuparanse %sB de disco adicionais.\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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Despois desta operación liberaranse %sB de espazo de disco.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Non hai espazo libre abondo en %s." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Xurdiron problemas e empregouse -y sen --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "Especificouse «Só triviais» mais esta non é unha 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Si, fai o que digo!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Está a piques de facer algo perigoso.\n" +"Para continuar escriba a frase «%s»\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Interromper." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Quere continuar?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Non foi posíbel descargar algúns ficheiros" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Non foi posíbel obter algúns arquivos; probe con apt-get update ou --fix-" +"missing." + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "" +"O emprego conxunto de --fix-missing e intercambio de discos non está admitido" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Non é posíbel corrixir os paquetes non dispoñíbeis." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Interrompendo a instalación." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"O seguinte paquete desapareceu do seu sistema e todos os \n" +"ficheiros serán sobrescritos por outros paquetes:" +msgstr[1] "" +"Os seguintes paquetes desapareceron do seu sistema e todos os \n" +"ficheiros serán sobrescritos por outros paquetes:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Nota: Isto será feito automaticamente por dpkg." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" +"Non se agarda que eliminemos cousas, non se pode iniciar o Retirado " +"automático" + +#: apt-private/private-install.cc:499 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1496,211 +1656,26 @@ 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:129 -msgid "Listing" -msgstr "" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "AVISO: Non se poden autenticar os seguintes paquetes!" -#: apt-private/private-list.cc:159 -#, 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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Ignórase o aviso de autenticación.\n" -#: 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:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Non foi posíbel autenticar algúns paquetes" -#: 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:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Produciuse un erro na compilación da expresión regular - %s" - -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Instalar estes paquetes sen verificación?" -#: apt-private/private-show.cc:156 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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 "" +msgid "Failed to fetch %s %s\n" +msgstr "Non foi posíbel obter %s %s\n" #: apt-private/private-sources.cc:58 #, fuzzy, c-format @@ -1712,20 +1687,8 @@ msgstr "Non foi posíbel cambiar o nome de %s a %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: 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:90 -#, 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:94 -msgid "All packages are up to date." +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" #: apt-private/private-upgrade.cc:25 @@ -1736,20 +1699,57 @@ msgstr "Calculando a anovación... " msgid "Done" msgstr "Feito" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Teño " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Rcb:" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ign " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Err " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Obtivéronse %sB en %s (%sB/s)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Traballando]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Cambio de soporte: introduza o disco etiquetado\n" +" «%s»\n" +"na unidade «%s» e prema 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-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, 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:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1783,7 +1783,7 @@ msgstr "[Replica: %s]" msgid "Failed to create IPC pipe to subprocess" msgstr "Non foi posíbel crear a canle IPC ao subproceso" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "A conexión pechouse prematuramente" @@ -1824,828 +1824,712 @@ msgstr "" msgid "Merging available information" msgstr "Mesturando a información sobre paquetes dispoñíbeis" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Uso: apt-extracttemplates fich1 [fich2 ...]\n" -"\n" -"apt-extracttemplates é unha ferramenta para extraer información\n" -"de configuración e patróns dos paquetes debian\n" -"\n" -"Opcións:\n" -" -h Este texto de axuda\n" -" -t Estabelece o directorio temporal\n" -" -c=? Le este ficheiro de configuración\n" -" -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/" -"tmp\n" - -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Non é posíbel determinar o estado %s" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "Chamouse a DropNode nun nodo aínda ligado" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "Non é posíbel escribir en %s" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Non foi posíbel atopar o elemento hash" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Non é posíbel obter a versión de debconf. Debconf está instalado?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Non foi posíbel reservar un desvío" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "A lista de extensións de paquetes é longa de máis" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Produciuse un erro interno en AddDiversion" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "Produciuse un erro ao procesar o directorio %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "A lista de extensións de fontes é longa de máis" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Produciuse un erro ao gravar a cabeceira no ficheiro de contido" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Téntase sobrescribir un desvío, %s -> %s e %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "Produciuse un erro ao procesar o contido %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Emprego: apt-ftparchive [opcións] orde\n" -"Ordes: packages rutabinaria [fichoverride [prefixoruta]]\n" -" sources rutafontes [fichoverride [prefixoruta]]\n" -" contents ruta\n" -" release ruta\n" -" generate config [grupos]\n" -" clean config\n" -"\n" -"apt-ftparchive xera ficheiros de índices para arquivos de Debian. Admite\n" -"varios estilos de xeración, de totalmente automática a substitutos " -"funcionais\n" -"de dpkg-scanpackages e dpkg-scansources\n" -"\n" -"apt-ftparchive xera ficheiros Packages dunha árbore de .debs. O ficheiro\n" -"Packages ten o contido de todos os campos de control de cada paquete, así\n" -"coma a suma MD5 e o tamaño do ficheiro. Admitese un ficheiro de «overrides»\n" -"para forzar o valor dos campos Priority e Section.\n" -"\n" -"De xeito semellante, apt-ftparchive xera ficheiros Sources dunha árbore de\n" -".dscs. Pódese empregar a opción --source-override para especificar un " -"ficheiro\n" -"de «overrides» para fontes.\n" -"\n" -"As ordes «packages» e «sources» deberían executarse na raíz da árbore.\n" -"«Rutabinaria» debería apuntar á base da busca recursiva e o ficheiro\n" -"«fichoverride» debería conter os modificadores de «override». «Prefixoruta»\n" -"engádese aos campos de nomes de ficheiros se está presente. Un exemplo\n" -"de emprego do arquivo de Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Opcións:\n" -" -h Este texto de axuda\n" -" --md5 Controla a xeración de MD5\n" -" -s=? Ficheiro de «override» de fontes\n" -" -q Non produce ningunha saída por pantalla\n" -" -d=? Escolle a base de datos de caché opcional\n" -" --no-delink Activa o modo de depuración de desligado\n" -" --contents Controla a xeración do ficheiro de contido\n" -" -c=? Le este ficheiro de configuración\n" -" -o=? Estabelece unha opción de configuración" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Non coincide ningunha selección" +msgid "Double add of diversion %s -> %s" +msgstr "Desvío %s -> %s engadido dúas veces" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Faltan ficheiros no grupo de ficheiros de paquetes «%s»" +msgid "Duplicate conf file %s/%s" +msgstr "Ficheiro de configuración %s/%s duplicado" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "A base de datos estaba danada, cambiouse o nome do ficheiro a %s.old" +msgid "The path %s is too long" +msgstr "A ruta %s é longa de máis" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "A base de datos é antiga, tentando anovar %s" +msgid "Unpacking %s more than once" +msgstr "Desempaquetando %s máis dunha vez" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"O formato da base de datos non é correcto. Se a anovou desde unha versión " -"antiga de apt, retirea e volva a crear a base de datos" +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "O directorio %s está desviado" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Non é posíbel abrir o ficheiro de base de datos %s: %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "O paquete tenta escribir no destino do desvío %s/%s" + +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "A ruta do desvío é longa de máis" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Non foi posíbel determinar o estado %s" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Non foi posíbel ler a ligazón %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "O arquivo non ten un rexistro de control" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Non é posíbel obter un cursor" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "A: non é posíbel ler o directorio %s\n" +msgid "Failed to rename %s to %s" +msgstr "Non foi posíbel cambiar o nome de %s a %s" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "A: non é posíbel atopar %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "O directorio %s estase a substituír por algo que non é un directorio" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "A: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Non foi posíbel atopar o nodo no seu contedor hash" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: os erros aplícanse ao ficheiro " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "A ruta é longa de máis" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "Non foi posíbel solucionar %s" +msgid "Overwrite package match with no version for %s" +msgstr "Coincidencia na sobrescritura sen versión para %s" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Fallou o percorrido da árbore" +#: apt-inst/extract.cc:438 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "O ficheiro %s/%s sobrescribe o do paquete %s" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:498 #, c-format -msgid "Failed to open %s" -msgstr "Non foi posíbel abrir %s" +msgid "Unable to stat %s" +msgstr "Non é posíbel determinar o estado %s" -#: ftparchive/writer.cc:278 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " DesLig %s [%s]\n" +msgid "Failed to write file %s" +msgstr "Non foi posíbel escribir no ficheiro «%s»" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to readlink %s" -msgstr "Non foi posíbel ler a ligazón %s" +msgid "Failed to close file %s" +msgstr "Non foi posíbel pechar o ficheiro %s" -#: ftparchive/writer.cc:290 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "Failed to unlink %s" -msgstr "Non foi posíbel desligar %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Este non é un arquivo DEB correcto, falta o membro «%s»" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Non foi posíbel ligar %s con %s" - -#: ftparchive/writer.cc:308 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Acadouse o límite de desligado de %sB.\n" - -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "O arquivo non tiña un campo Package" +msgid "Internal error, could not locate member %s" +msgstr "Produciuse un erro interno, non foi posíbel atopar o membro %s" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s non ten unha entrada de «override»\n" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Ficheiro de control non analizábel" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " O mantedor de %s é %s, non %s\n" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Sinatura de arquivo incorrecta" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s non ten unha entrada de «override» de código fonte\n" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Produciuse un erro ao ler a cabeceira do membro do arquivo" -#: ftparchive/writer.cc:710 +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s tampouco ten unha entrada de «override» de binarios\n" +msgid "Invalid archive member header %s" +msgstr "Cabeceira do membro do arquivo incorrecta %s" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Non foi posíbel reservar memoria" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Cabeceira do membro do arquivo incorrecta" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Non é posíbel puido abrir %s" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "O arquivo é curto de máis" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "«Override» %s liña %lu incorrecta (1)" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Non foi posíbel ler as cabeceiras dos arquivos" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Non foi posíbel ler o ficheiro de «override» %s" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Non foi posíbel crear as canles" -#: ftparchive/override.cc:166 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "«Override» %s liña %lu incorrecta (1)" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Non foi posíbel executar gzip " -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "«Override» %s liña %lu incorrecta (2)" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Arquivo danado" -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "«Override» %s liña %lu incorrecta (3)" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "A suma de comprobación do arquivo tar non coincide, está danado" -#: ftparchive/multicompress.cc:73 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Algoritmo de compresión «%s» descoñecido" +msgid "Unknown TAR header type %u, member %s" +msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "A saída comprimida %s precisa dun conxunto de compresión" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Non foi posíbel crear o FILE*" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Non foi posíbel facer a bifurcación" +msgid "Progress: [%3i%%]" +msgstr "" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Fillo de compresión" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "Executando dpkg" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/init.cc:146 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Produciuse un erro interno, non foi posíbel crear %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Produciuse un fallo na E/S do subproceso/ficheiro" +msgid "Packaging system '%s' is not supported" +msgstr "O sistema de empaquetado «%s» non está admitido" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Non foi posíbel ler ao calcular o MD5" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Non é posíbel determinar un tipo de sistema de empaquetado axeitado" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Problem unlinking %s" -msgstr "Xurdiu un problema ao desligar %s" +msgid "Wrote %i records.\n" +msgstr "Escribíronse %i rexistros.\n" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -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 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Uso: apt-extracttemplates fich1 [fich2 ...]\n" -"\n" -"apt-extracttemplates é unha ferramenta para extraer información\n" -"de configuración e patróns dos paquetes debian\n" -"\n" -"Opcións:\n" -" -h Este texto de axuda\n" -" -t Estabelece o directorio temporal\n" -" -c=? Le este ficheiro de configuración\n" -" -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/" -"tmp\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Escribíronse %i rexistros con %i ficheiros que faltan.\n" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Rexistro de paquete descoñecido!" +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Escribíronse %i rexistros con %i ficheiros que non coinciden\n" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"Emprego: apt-sortpkgs [opcións] fich1 [fich2 ...]\n" -"\n" -"apt-sortpkgs é unha ferramenta simple para ordenar ficheiros de paquetes.\n" -"A opción -s emprégase para indicar o tipo de ficheiro que é.\n" -"\n" -"Opcións:\n" -" -h Este texto de axuda\n" -" -s Emprega ordenamento por ficheiros fonte\n" -" -c=? Le este ficheiro de configuración\n" -" -o=? Estabelece unha opción de configuración; por exemplo, -o dir::cache=/" -"tmp\n" +"Escribíronse %i rexistros con %i ficheiros que faltan e %i ficheiros que non " +"coinciden\n" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Failed to write file %s" -msgstr "Non foi posíbel escribir no ficheiro «%s»" +msgid "Can't find authentication record for: %s" +msgstr "Non é posíbel atopar un rexistro de autenticación para: %s" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "Failed to close file %s" -msgstr "Non foi posíbel pechar o ficheiro %s" +msgid "Hash mismatch for: %s" +msgstr "Valor de hash non coincidente para: %s" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "The path %s is too long" -msgstr "A ruta %s é longa de máis" +msgid "The method driver %s could not be found." +msgstr "Non foi posíbel atopar o controlador de métodos %s." -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" -msgstr "Desempaquetando %s máis dunha vez" +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n" -#: apt-inst/extract.cc:142 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "The directory %s is diverted" -msgstr "O directorio %s está desviado" +msgid "Method %s did not start correctly" +msgstr "O método %s non se iniciou correctamente" -#: apt-inst/extract.cc:152 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "O paquete tenta escribir no destino do desvío %s/%s" - -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "A ruta do desvío é longa de máis" +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-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "O directorio %s estase a substituír por algo que non é un directorio" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "" +"Non foi posíbel analizar ou abrir as listas de paquetes ou ficheiro de " +"estado." -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Non foi posíbel atopar o nodo no seu contedor hash" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Pode querer executar «apt-get update» para corrixir estes problemas" -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "A ruta é longa de máis" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Non foi posíbel ler a lista de orixes." -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Coincidencia na sobrescritura sen versión para %s" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Caché de paquetes baleira" -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "O ficheiro %s/%s sobrescribe o do paquete %s" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "O ficheiro de caché de paquetes está danado" -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "Non é posíbel determinar o estado %s" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "O ficheiro de caché de paquetes é unha versión incompatíbel" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "Chamouse a DropNode nun nodo aínda ligado" +#: apt-pkg/pkgcache.cc:169 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "O ficheiro de caché de paquetes está danado" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Non foi posíbel atopar o elemento hash" +#: apt-pkg/pkgcache.cc:174 +#, c-format +msgid "This APT does not support the versioning system '%s'" +msgstr "Este APT non admite o sistema de versionado «%s»" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Non foi posíbel reservar un desvío" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "A caché de paquetes construíuse para unha arquitectura diferente" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Produciuse un erro interno en AddDiversion" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Depende" -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Téntase sobrescribir un desvío, %s -> %s e %s/%s" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "PreDepende" -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Desvío %s -> %s engadido dúas veces" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Suxire" -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Ficheiro de configuración %s/%s duplicado" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Recomenda" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Sinatura de arquivo incorrecta" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Conflitos" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Produciuse un erro ao ler a cabeceira do membro do arquivo" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Substitúe a" -#: apt-inst/contrib/arfile.cc:96 -#, c-format -msgid "Invalid archive member header %s" -msgstr "Cabeceira do membro do arquivo incorrecta %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Fai obsoleto a" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Cabeceira do membro do arquivo incorrecta" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Estraga" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "O arquivo é curto de máis" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Mellora" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Non foi posíbel ler as cabeceiras dos arquivos" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "importante" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Non foi posíbel crear as canles" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "requirido" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Non foi posíbel executar gzip " +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "estándar" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Arquivo danado" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "opcional" -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "A suma de comprobación do arquivo tar non coincide, está danado" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "extra" -#: apt-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s" +msgid "Index file type '%s' is not supported" +msgstr "O tipo de ficheiros de índices «%s» non está admitido" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 -#, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Este non é un arquivo DEB correcto, falta o membro «%s»" +#: 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-inst/deb/debfile.cc:132 +#: apt-pkg/sourcelist.cc:170 #, c-format -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 -msgid "Unparsable control file" -msgstr "Ficheiro de control non analizábel" +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.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "List directory %spartial is missing." -msgstr "Non se atopa a lista de directorios %sparcial." +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/acquire.cc:91 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "Archives directory %spartial is missing." -msgstr "Non se atopa a lista de arquivos %sparcial." +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/acquire.cc:99 +#: apt-pkg/sourcelist.cc:190 #, c-format -msgid "Unable to lock directory %s" -msgstr "Non é posíbel bloquear o directorio %s" - -#: apt-pkg/acquire.cc:490 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" +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)" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Obtendo o ficheiro %li de %li (restan %s)" +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/acquire.cc:904 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Retrieving file %li of %li" -msgstr "Obtendo o ficheiro %li de %li" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Liña %lu mal construída na lista de orixes %s (URI)" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "A sumas «hash» non coinciden" - -#: apt-pkg/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "Os tamaños non coinciden" - -#: apt-pkg/acquire-item.cc:173 -#, fuzzy -msgid "Invalid file format" -msgstr "Operación incorrecta: %s" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Liña %lu mal construída na lista de orixes %s (dist)" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" -msgstr "" -"Non é posíbel atopar a entrada agardada «%s» no ficheiro de publicación " -"(entrada sources.list incorrecta ou ficheiro con formato incorrecto)" +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/acquire-item.cc:1589 +#: apt-pkg/sourcelist.cc:217 #, 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:1631 -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" +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/acquire-item.cc:1669 +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "" -"Release file for %s is expired (invalid since %s). Updates for this " -"repository will not be applied." -msgstr "" +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/acquire-item.cc:1691 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)" +msgid "Opening %s" +msgstr "Abrindo %s" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "" -"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" -msgstr "" -"Produciuse un erro durante a verificación da sinatura. O repositorio non foi " -"actualizado, empregaranse os ficheiros de índice anteriores. Erro de GPG: " -"%s: %s\n" +msgid "Line %u too long in source list %s." +msgstr "Liña %u longa de máis na lista de orixes %s." -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "GPG error: %s: %s" -msgstr "Produciuse un erro de GPG: %s %s" +msgid "Malformed line %u in source list %s (type)" +msgstr "Liña %u mal construída na lista de orixes %s (tipo)" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/sourcelist.cc:375 #, 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 "" -"Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que " -"ten que arranxar este paquete a man. (Falta a arquitectura)" +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:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "O tipo de ficheiros de índices «%s» non está admitido" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/clean.cc:64 #, c-format -msgid "Can't find a source to download version '%s' of '%s'" +msgid "Unable to stat %s." +msgstr "Non é posíbel analizar %s." + +#: apt-pkg/pkgcachegen.cc:93 +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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Produciuse un erro ao procesar %s (FindPkg)" + +#: apt-pkg/pkgcachegen.cc:257 +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:260 +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:263 +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:266 +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/acquire-item.cc:1983 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "" -"The package index files are corrupted. No Filename: field for package %s." +msgid "Package %s %s was not found while processing file dependencies" msgstr "" -"Os ficheiros de índices de paquetes están danados. Non hai un campo " -"Filename: para o paquete %s." +"Non foi posíbel atopar o paquete %s %s ao procesar as dependencias de " +"ficheiros" -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "The method driver %s could not be found." -msgstr "Non foi posíbel atopar o controlador de métodos %s." +msgid "Couldn't stat source package list %s" +msgstr "Non foi posíbel atopar a lista de paquetes fonte %s" -#: apt-pkg/acquire-worker.cc:118 -#, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Lendo as listas de paquetes" -#: apt-pkg/acquire-worker.cc:169 -#, c-format -msgid "Method %s did not start correctly" -msgstr "O método %s non se iniciou correctamente" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Recollendo as provisións de ficheiros" -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, 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 "Unable to write to %s" +msgstr "Non é posíbel escribir en %s" -#: apt-pkg/algorithms.cc:265 -#, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"O paquete %s ten que ser reinstalado, mais non é posíbel atopar o seu " -"arquivo." +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "Produciuse un erro de E/S ao gravar a caché de fontes" -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" msgstr "" -"Erro, pkgProblemResolver::Resolve xerou interrupcións, isto pode estar " -"causado por paquetes retidos." -#: apt-pkg/algorithms.cc:1088 -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:241 +msgid "Send request to solver" +msgstr "" -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" msgstr "" -"Non foi posíbel analizar ou abrir as listas de paquetes ou ficheiro de " -"estado." -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Pode querer executar «apt-get update» para corrixir estes problemas" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Non foi posíbel ler a lista de orixes." +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" -#: apt-pkg/cacheset.cc:489 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Non se atopou a publicación «%s» de «%s»" +msgid "rename failed, %s (%s -> %s)." +msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)." -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Non se atopou a versión «%s» de «%s»" +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "A sumas «hash» non coinciden" -#: apt-pkg/cacheset.cc:603 +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "Os tamaños non coinciden" + +#: apt-pkg/acquire-item.cc:173 +#, fuzzy +msgid "Invalid file format" +msgstr "Operación incorrecta: %s" + +#: apt-pkg/acquire-item.cc:1640 #, c-format -msgid "Couldn't find task '%s'" -msgstr "Non foi posíbel atopar a tarefa «%s»" +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +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/cacheset.cc:609 +#: apt-pkg/acquire-item.cc:1656 #, 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»" +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/cacheset.cc:615 -#, 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/acquire-item.cc:1698 +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/cacheset.cc:626 +#: apt-pkg/acquire-item.cc:1736 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" +msgid "" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." msgstr "" -"Non é posíbel seleccionar distintas versións do paquete «%s» xa que é " -"puramente virtual" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/acquire-item.cc:1758 +#, 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:1788 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"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" msgstr "" -"Non é posíbel seleccionar nin a versión instalada nin a candidata do paquete " -"«%s» xa que non ten ningunha delas" +"Produciuse un erro durante a verificación da sinatura. O repositorio non foi " +"actualizado, empregaranse os ficheiros de índice anteriores. Erro de GPG: " +"%s: %s\n" -#: apt-pkg/cacheset.cc:647 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" +msgid "GPG error: %s: %s" +msgstr "Produciuse un erro de GPG: %s %s" + +#: apt-pkg/acquire-item.cc:1926 +#, 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 "" -"Non é posíbel seleccionar a versión máis recente do paquete «%s» xa que é " -"puramente virtual" +"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/cacheset.cc:655 +#: apt-pkg/acquire-item.cc:1992 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -"Non é posíbel seleccionar a versión candidata do paquete %s xa que non ten " -"candidata" -#: apt-pkg/cacheset.cc:663 +#: apt-pkg/acquire-item.cc:2050 #, c-format -msgid "Can't select installed version from package %s as it is not installed" +msgid "" +"The package index files are corrupted. No Filename: field for package %s." msgstr "" -"Non é posíbel seleccionar a versión instalada do paquete %s xa que non está " -"instalado" +"Os ficheiros de índices de paquetes están danados. Non hai un campo " +"Filename: para o paquete %s." -#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "Line %u too long in source list %s." -msgstr "Liña %u longa de máis na lista de orixes %s." +msgid "Vendor block %s contains no fingerprint" +msgstr "O bloque de provedor %s non contén unha pegada dixital" -#: apt-pkg/cdrom.cc:571 -msgid "Unmounting CD-ROM...\n" -msgstr "Desmontando o CD-ROM...\n" +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#, c-format +msgid "List directory %spartial is missing." +msgstr "Non se atopa a lista de directorios %sparcial." -#: apt-pkg/cdrom.cc:586 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "Empregando o punto de montaxe de CD-ROM %s\n" +msgid "Archives directory %spartial is missing." +msgstr "Non se atopa a lista de arquivos %sparcial." -#: apt-pkg/cdrom.cc:599 +#: apt-pkg/acquire.cc:99 +#, 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:902 +#, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Obtendo o ficheiro %li de %li (restan %s)" + +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Obtendo o ficheiro %li de %li" + +#: 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/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 "" + +#: apt-pkg/policy.cc:422 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "" +"Rexistro incorrecto no ficheiro de preferencias %s; falta a cabeceira Package" + +#: apt-pkg/policy.cc:444 +#, c-format +msgid "Did not understand pin type %s" +msgstr "Non se entendeu o tipo de inmobilización %s" + +#: apt-pkg/policy.cc:452 +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:303 apt-pkg/packagemanager.cc:957 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +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:550 apt-pkg/packagemanager.cc:580 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "Non foi posíbel abrir o ficheiro «%s»" + +#: apt-pkg/packagemanager.cc:630 +#, 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 instalación requirirá que se retire temporalmente o paquete esencial %s " +"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/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" +msgstr "Desmontando o CD-ROM...\n" + +#: apt-pkg/cdrom.cc:586 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "Empregando o punto de montaxe de CD-ROM %s\n" + +#: apt-pkg/cdrom.cc:599 msgid "Waiting for disc...\n" msgstr "Agardando polo disco...\n" @@ -2713,10 +2597,25 @@ msgstr "Escribindo a nova lista de orixes\n" msgid "Source list entries for this disc are:\n" msgstr "As entradas da lista de orixes deste disco son:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Non é posíbel analizar %s." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"O paquete %s ten que ser reinstalado, mais non é posíbel atopar o seu " +"arquivo." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Erro, pkgProblemResolver::Resolve xerou interrupcións, isto pode estar " +"causado por paquetes retidos." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos." #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2744,57 +2643,77 @@ msgstr "Non foi posíbel abrir o ficheiro de estado %s" msgid "Failed to write temporary StateFile %s" msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Non se atopou a publicación «%s» de «%s»" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Non se atopou a versión «%s» de «%s»" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Non foi posíbel atopar a tarefa «%s»" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "Escribíronse %i rexistros.\n" +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/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, 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:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Escribíronse %i rexistros con %i ficheiros que faltan.\n" +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/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Escribíronse %i rexistros con %i ficheiros que non coinciden\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"Non é posíbel seleccionar nin a versión instalada nin a candidata do paquete " +"«%s» xa que non ten ningunha delas" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -"Escribíronse %i rexistros con %i ficheiros que faltan e %i ficheiros que non " -"coinciden\n" +"Non é posíbel seleccionar a versión máis recente do paquete «%s» xa que é " +"puramente virtual" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "Non é posíbel atopar un rexistro de autenticación para: %s" +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/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:663 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Valor de hash non coincidente para: %s" +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/indexrecords.cc:78 #, c-format @@ -2821,326 +2740,226 @@ msgstr "A entrada «Valid-Until» no ficheiro de publicación %s non é válida" msgid "Invalid 'Date' entry in Release file %s" msgstr "A entrada «Date» no ficheiro de publicación %s non é válida" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "O sistema de empaquetado «%s» non está admitido" +msgid "%lid %lih %limin %lis" +msgstr "%lid %lih %limin %lis" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Non é posíbel determinar un tipo de sistema de empaquetado axeitado" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" +msgstr "%lih %limin %lis" -#: apt-pkg/install-progress.cc:57 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Progress: [%3i%%]" -msgstr "" +msgid "%limin %lis" +msgstr "%limin %lis" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "Executando dpkg" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" +msgstr "%lis" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -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)" +msgid "Selection %s not found" +msgstr "Non se atopou a selección %s" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "Non foi posíbel abrir o ficheiro «%s»" +#: apt-pkg/contrib/fileutl.cc:190 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:195 #, 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 instalación requirirá que se retire temporalmente o paquete esencial %s " -"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." +msgid "Could not open lock file %s" +msgstr "Non foi posíbel abrir o ficheiro de bloqueo %s" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Caché de paquetes baleira" - -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "O ficheiro de caché de paquetes está danado" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "O ficheiro de caché de paquetes é unha versión incompatíbel" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Non foi posíbel obter o bloqueo %s" -#: apt-pkg/pkgcache.cc:169 -#, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "O ficheiro de caché de paquetes está danado" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "A lista de ficheiros non pode ser creada como «%s» non é un directorio" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:394 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Este APT non admite o sistema de versionado «%s»" +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "Ignorando «%s» no directorio «%s» xa que non é un ficheiro regular" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "A caché de paquetes construíuse para unha arquitectura diferente" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" +"Ignorando o ficheiro «%s» no directorio «%s» xa que non ten extensión de nome" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Depende" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" +"Ignorando o ficheiro «%s» no directorio «%s» xa que ten unha extensión de " +"nome incorrecta" -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "PreDepende" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "O subproceso %s recibiu un fallo de segmento." -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Suxire" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "O subproceso %s recibiu o sinal %u." -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Recomenda" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "O subproceso %s devolveu un código de erro (%u)" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Conflitos" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "O subproceso %s saíu de xeito inesperado" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Substitúe a" +#: apt-pkg/contrib/fileutl.cc:913 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Produciuse un problema ao pechar o arquivo gzip %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Fai obsoleto a" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Non foi posíbel abrir o ficheiro %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Estraga" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "Non foi posíbel abrir o descritor de ficheiro %d" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Mellora" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Non foi posíbel crear o IPC do subproceso" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "importante" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Non foi posíbel executar o compresor " -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "requirido" +#: apt-pkg/contrib/fileutl.cc:1514 +#, fuzzy, c-format +msgid "read, still have %llu to read but none left" +msgstr "lectura, aínda hai %lu para ler pero non queda ningún" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "estándar" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, fuzzy, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "escritura, aínda hai %lu para escribir pero non se puido" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "opcional" +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" +msgstr "Produciuse un problema ao pechar o ficheiro %s" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "extra" +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Produciuse un problema ao renomear o ficheiro %s a %s" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "A caché ten un sistema de versionado incompatíbel" +#: apt-pkg/contrib/fileutl.cc:1938 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "Produciuse un problema ao desligar o ficheiro %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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 -#, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Produciuse un erro ao procesar %s (FindPkg)" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Produciuse un problema ao sincronizar o ficheiro" -#: apt-pkg/pkgcachegen.cc:257 -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/contrib/progress.cc:148 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... Erro!" -#: apt-pkg/pkgcachegen.cc:260 -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/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Feito" -#: apt-pkg/pkgcachegen.cc:263 -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/contrib/progress.cc:181 +msgid "..." +msgstr "" -#: apt-pkg/pkgcachegen.cc:266 -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." +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Feito" -#: apt-pkg/pkgcachegen.cc:576 -#, 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/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Non é posíbel facer mmap sobre un ficheiro baleiro" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Non foi posíbel atopar a lista de paquetes fonte %s" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Non foi posíbel duplicar o descritor de ficheiro %i" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Lendo as listas de paquetes" +#: apt-pkg/contrib/mmap.cc:119 +#, fuzzy, c-format +msgid "Couldn't make mmap of %llu bytes" +msgstr "Non foi posíbel facer mmap de %lu bytes" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Recollendo as provisións de ficheiros" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Non é posíbel pechar mmap" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Produciuse un erro de E/S ao gravar a caché de fontes" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Non é posíbel sincronizar mmap" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "O tipo de ficheiros de índices «%s» non está admitido" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Non foi posíbel facer mmap de %lu bytes" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Non foi posíbel truncar o ficheiro" + +#: apt-pkg/contrib/mmap.cc:341 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" +"Dynamic MMap executouse fora do lugar. Incremente o tamaño de APT::Cache-" +"Start. O valor actual é : %lu. (man 5 apt.conf)" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." msgstr "" -"Rexistro incorrecto no ficheiro de preferencias %s; falta a cabeceira Package" +"Non é posíbel aumentar o tamaño de MMap xa que o límite de %lu bytes xa foi " +"acadado." -#: apt-pkg/policy.cc:444 -#, c-format -msgid "Did not understand pin type %s" -msgstr "Non se entendeu o tipo de inmobilización %s" - -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "" -"Non se indicou unha prioridade (ou indicouse cero) para a inmobilización" - -#: 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/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: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/srcrecords.cc:52 -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/tagfile.cc:140 -#, 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:237 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)" - -#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 -#, fuzzy +#: apt-pkg/contrib/mmap.cc:449 msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." +"Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" -"Algúns ficheiros de índice fallaron durante a descarga. Ignoráronse, ou " -"foron utilizados algúns antigos no seu lugar" - -#: apt-pkg/vendorlist.cc:85 -#, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "O bloque de provedor %s non contén unha pegada dixital" +"Non é posíbel aumentar o tamaño de MMap xa que o crecemento automático foi " +"desactivado polo usuario." #: apt-pkg/contrib/cdromutl.cc:65 #, c-format @@ -3151,53 +2970,6 @@ 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/cmndline.cc:121 -#, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, 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:168 -#, 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:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "A opción %s precisa dun argumento." - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "" -"Opción %s: A especificación de elemento de configuración debe ter un =." - -#: apt-pkg/contrib/cmndline.cc:278 -#, 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:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "A opción «%s» é longa de máis" - -#: apt-pkg/contrib/cmndline.cc:341 -#, 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:391 -#, c-format -msgid "Invalid operation %s" -msgstr "Operación incorrecta: %s" - #: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" @@ -3257,411 +3029,634 @@ msgstr "" 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/fileutl.cc:190 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s" +msgid "No keyring installed in %s." +msgstr "Non ha ningún chaveiro instalado en %s." -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Could not open lock file %s" -msgstr "Non foi posíbel abrir o ficheiro de bloqueo %s" +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/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s" +msgid "Command line option %s is not understood" +msgstr "Non se entende a opción de liña de ordes %s" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Could not get lock %s" -msgstr "Non foi posíbel obter o bloqueo %s" +msgid "Command line option %s is not boolean" +msgstr "A opción de liña de ordes %s non é booleana" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "A lista de ficheiros non pode ser creada como «%s» non é un directorio" +msgid "Option %s requires an argument." +msgstr "A opción %s precisa dun argumento." -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "Ignorando «%s» no directorio «%s» xa que non é un ficheiro regular" +msgid "Option %s: Configuration item specification must have an =." +msgstr "" +"Opción %s: A especificación de elemento de configuración debe ter un =." -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" -"Ignorando o ficheiro «%s» no directorio «%s» xa que non ten extensión de nome" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "A opción %s precisa dun argumento enteiro, non «%s»" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" -"Ignorando o ficheiro «%s» no directorio «%s» xa que ten unha extensión de " -"nome incorrecta" +msgid "Option '%s' is too long" +msgstr "A opción «%s» é longa de máis" -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "O subproceso %s recibiu un fallo de segmento." +msgid "Sense %s is not understood, try true or false." +msgstr "O senso %s non se entende, probe «true» ou «false»." -#: apt-pkg/contrib/fileutl.cc:826 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s received signal %u." -msgstr "O subproceso %s recibiu o sinal %u." +msgid "Invalid operation %s" +msgstr "Operación incorrecta: %s" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "O subproceso %s devolveu un código de erro (%u)" +msgid "Installing %s" +msgstr "Instalando %s" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "O subproceso %s saíu de xeito inesperado" +msgid "Configuring %s" +msgstr "Configurando %s" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Problem closing the gzip file %s" -msgstr "Produciuse un problema ao pechar o arquivo gzip %s" +msgid "Removing %s" +msgstr "Retirando %s" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Could not open file %s" -msgstr "Non foi posíbel abrir o ficheiro %s" +msgid "Completely removing %s" +msgstr "%s completamente retirado" -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Could not open file descriptor %d" -msgstr "Non foi posíbel abrir o descritor de ficheiro %d" +msgid "Noting disappearance of %s" +msgstr "Tomando nota da desaparición de %s" -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Non foi posíbel crear o IPC do subproceso" +#: apt-pkg/deb/dpkgpm.cc:115 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Executando o disparador de post-instalación %s" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Non foi posíbel executar o compresor " +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 +#, c-format +msgid "Directory '%s' missing" +msgstr "Falta o directorio «%s»" -#: apt-pkg/contrib/fileutl.cc:1514 -#, fuzzy, c-format -msgid "read, still have %llu to read but none left" -msgstr "lectura, aínda hai %lu para ler pero non queda ningún" +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 +#, c-format +msgid "Could not open file '%s'" +msgstr "Non foi posíbel abrir o ficheiro «%s»" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, fuzzy, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "escritura, aínda hai %lu para escribir pero non se puido" +#: apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Preparing %s" +msgstr "Preparando %s" -#: apt-pkg/contrib/fileutl.cc:1915 +#: apt-pkg/deb/dpkgpm.cc:1008 #, c-format -msgid "Problem closing the file %s" -msgstr "Produciuse un problema ao pechar o ficheiro %s" +msgid "Unpacking %s" +msgstr "Desempaquetando %s" -#: apt-pkg/contrib/fileutl.cc:1927 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Produciuse un problema ao renomear o ficheiro %s a %s" +msgid "Preparing to configure %s" +msgstr "Preparandose para configurar %s" -#: apt-pkg/contrib/fileutl.cc:1938 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Problem unlinking the file %s" -msgstr "Produciuse un problema ao desligar o ficheiro %s" +msgid "Installed %s" +msgstr "Instalouse %s" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Produciuse un problema ao sincronizar o ficheiro" +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "Preparándose para o retirado de %s" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "No keyring installed in %s." -msgstr "Non ha ningún chaveiro instalado en %s." +msgid "Removed %s" +msgstr "Retirouse %s" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Non é posíbel facer mmap sobre un ficheiro baleiro" +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Preparándose para retirar %s completamente" -#: apt-pkg/contrib/mmap.cc:111 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Non foi posíbel duplicar o descritor de ficheiro %i" +msgid "Completely removed %s" +msgstr "Retirouse %s completamente" -#: apt-pkg/contrib/mmap.cc:119 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Non foi posíbel facer mmap de %lu bytes" +msgid "Can not write log (%s)" +msgstr "Non é posíbel escribir en %s" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Non é posíbel pechar mmap" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Non é posíbel sincronizar mmap" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Non foi posíbel facer mmap de %lu bytes" +#: apt-pkg/deb/dpkgpm.cc:1719 +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" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Non foi posíbel truncar o ficheiro" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "problemas de dependencias - déixase sen configurar" -#: apt-pkg/contrib/mmap.cc:341 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1726 msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -"Dynamic MMap executouse fora do lugar. Incremente o tamaño de APT::Cache-" -"Start. O valor actual é : %lu. (man 5 apt.conf)" +"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica que " +"é un error provinte dun fallo anterior." -#: apt-pkg/contrib/mmap.cc:446 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1732 msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +"No apport report written because the error message indicates a disk full " +"error" msgstr "" -"Non é posíbel aumentar o tamaño de MMap xa que o límite de %lu bytes xa foi " -"acadado." +"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un " +"erro de disco cheo." -#: apt-pkg/contrib/mmap.cc:449 +#: apt-pkg/deb/dpkgpm.cc:1739 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"No apport report written because the error message indicates a out of memory " +"error" msgstr "" -"Non é posíbel aumentar o tamaño de MMap xa que o crecemento automático foi " -"desactivado polo usuario." +"Non se escribiu un informe de contribución porque a mensaxe de erro indica " +"un erro de falta de memoria" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +#, 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:1774 +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 "%c%s... Error!" -msgstr "%c%s... Erro!" +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/contrib/progress.cc:150 +#: apt-pkg/deb/debsystem.cc:94 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Feito" +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" +"Non é posíbel bloquear o directorio de administración (%s). É o " +"administrador?" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +#. 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. " -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "Non está bloqueado" + +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Uso: apt-extracttemplates fich1 [fich2 ...]\n" +"\n" +"apt-extracttemplates é unha ferramenta para extraer información\n" +"de configuración e patróns dos paquetes debian\n" +"\n" +"Opcións:\n" +" -h Este texto de axuda\n" +" -t Estabelece o directorio temporal\n" +" -c=? Le este ficheiro de configuración\n" +" -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/" +"tmp\n" + +#: cmdline/apt-extracttemplates.cc:254 #, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Feito" +msgid "Unable to mkstemp %s" +msgstr "Non é posíbel determinar o estado %s" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "%lid %lih %limin %lis" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Non é posíbel obter a versión de debconf. Debconf está instalado?" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +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 #, c-format -msgid "%lih %limin %lis" -msgstr "%lih %limin %lis" +msgid "Error processing directory %s" +msgstr "Produciuse un erro ao procesar o directorio %s" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "A lista de extensións de fontes é longa de máis" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Produciuse un erro ao gravar a cabeceira no ficheiro de contido" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "%limin %lis" -msgstr "%limin %lis" +msgid "Error processing contents %s" +msgstr "Produciuse un erro ao procesar o contido %s" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Emprego: apt-ftparchive [opcións] orde\n" +"Ordes: packages rutabinaria [fichoverride [prefixoruta]]\n" +" sources rutafontes [fichoverride [prefixoruta]]\n" +" contents ruta\n" +" release ruta\n" +" generate config [grupos]\n" +" clean config\n" +"\n" +"apt-ftparchive xera ficheiros de índices para arquivos de Debian. Admite\n" +"varios estilos de xeración, de totalmente automática a substitutos " +"funcionais\n" +"de dpkg-scanpackages e dpkg-scansources\n" +"\n" +"apt-ftparchive xera ficheiros Packages dunha árbore de .debs. O ficheiro\n" +"Packages ten o contido de todos os campos de control de cada paquete, así\n" +"coma a suma MD5 e o tamaño do ficheiro. Admitese un ficheiro de «overrides»\n" +"para forzar o valor dos campos Priority e Section.\n" +"\n" +"De xeito semellante, apt-ftparchive xera ficheiros Sources dunha árbore de\n" +".dscs. Pódese empregar a opción --source-override para especificar un " +"ficheiro\n" +"de «overrides» para fontes.\n" +"\n" +"As ordes «packages» e «sources» deberían executarse na raíz da árbore.\n" +"«Rutabinaria» debería apuntar á base da busca recursiva e o ficheiro\n" +"«fichoverride» debería conter os modificadores de «override». «Prefixoruta»\n" +"engádese aos campos de nomes de ficheiros se está presente. Un exemplo\n" +"de emprego do arquivo de Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Opcións:\n" +" -h Este texto de axuda\n" +" --md5 Controla a xeración de MD5\n" +" -s=? Ficheiro de «override» de fontes\n" +" -q Non produce ningunha saída por pantalla\n" +" -d=? Escolle a base de datos de caché opcional\n" +" --no-delink Activa o modo de depuración de desligado\n" +" --contents Controla a xeración do ficheiro de contido\n" +" -c=? Le este ficheiro de configuración\n" +" -o=? Estabelece unha opción de configuración" + +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Non coincide ningunha selección" + +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "%lis" -msgstr "%lis" +msgid "Some files are missing in the package file group `%s'" +msgstr "Faltan ficheiros no grupo de ficheiros de paquetes «%s»" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "Selection %s not found" -msgstr "Non se atopou a selección %s" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "A base de datos estaba danada, cambiouse o nome do ficheiro a %s.old" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/cachedb.cc:83 #, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "A base de datos é antiga, tentando anovar %s" + +#: ftparchive/cachedb.cc:94 msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" -"Non é posíbel bloquear o directorio de administración (%s). Esta usandoo " -"algún outro proceso?" +"O formato da base de datos non é correcto. Se a anovou desde unha versión " +"antiga de apt, retirea e volva a crear a base de datos" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Non é posíbel abrir o ficheiro de base de datos %s: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Non foi posíbel ler a ligazón %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "O arquivo non ten un rexistro de control" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Non é posíbel obter un cursor" + +#: ftparchive/writer.cc:91 #, 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 "W: Unable to read directory %s\n" +msgstr "A: non é posíbel ler o directorio %s\n" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:96 #, 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. " +msgid "W: Unable to stat %s\n" +msgstr "A: non é posíbel atopar %s\n" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "Non está bloqueado" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " -#: apt-pkg/deb/dpkgpm.cc:95 -#, c-format -msgid "Installing %s" -msgstr "Instalando %s" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "A: " -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 -#, c-format -msgid "Configuring %s" -msgstr "Configurando %s" +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: os erros aplícanse ao ficheiro " -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "Removing %s" -msgstr "Retirando %s" +msgid "Failed to resolve %s" +msgstr "Non foi posíbel solucionar %s" -#: apt-pkg/deb/dpkgpm.cc:98 -#, c-format -msgid "Completely removing %s" -msgstr "%s completamente retirado" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Fallou o percorrido da árbore" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:219 #, c-format -msgid "Noting disappearance of %s" -msgstr "Tomando nota da desaparición de %s" +msgid "Failed to open %s" +msgstr "Non foi posíbel abrir %s" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:278 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Executando o disparador de post-instalación %s" +msgid " DeLink %s [%s]\n" +msgstr " DesLig %s [%s]\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:286 #, c-format -msgid "Directory '%s' missing" -msgstr "Falta o directorio «%s»" +msgid "Failed to readlink %s" +msgstr "Non foi posíbel ler a ligazón %s" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:290 #, c-format -msgid "Could not open file '%s'" -msgstr "Non foi posíbel abrir o ficheiro «%s»" +msgid "Failed to unlink %s" +msgstr "Non foi posíbel desligar %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:298 #, c-format -msgid "Preparing %s" -msgstr "Preparando %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Non foi posíbel ligar %s con %s" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:308 #, c-format -msgid "Unpacking %s" -msgstr "Desempaquetando %s" +msgid " DeLink limit of %sB hit.\n" +msgstr " Acadouse o límite de desligado de %sB.\n" + +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "O arquivo non tiña un campo Package" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Preparing to configure %s" -msgstr "Preparandose para configurar %s" +msgid " %s has no override entry\n" +msgstr " %s non ten unha entrada de «override»\n" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Installed %s" -msgstr "Instalouse %s" +msgid " %s maintainer is %s not %s\n" +msgstr " O mantedor de %s é %s, non %s\n" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing for removal of %s" -msgstr "Preparándose para o retirado de %s" +msgid " %s has no source override entry\n" +msgstr " %s non ten unha entrada de «override» de código fonte\n" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/writer.cc:710 #, c-format -msgid "Removed %s" -msgstr "Retirouse %s" +msgid " %s has no binary override entry either\n" +msgstr " %s tampouco ten unha entrada de «override» de binarios\n" + +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Non foi posíbel reservar memoria" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Preparándose para retirar %s completamente" +msgid "Unable to open %s" +msgstr "Non é posíbel puido abrir %s" -#: apt-pkg/deb/dpkgpm.cc:1013 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "«Override» %s liña %lu incorrecta (1)" + +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Completely removed %s" -msgstr "Retirouse %s completamente" +msgid "Failed to read the override file %s" +msgstr "Non foi posíbel ler o ficheiro de «override» %s" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/override.cc:166 #, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Non é posíbel escribir en %s" +msgid "Malformed override %s line %llu #1" +msgstr "«Override» %s liña %lu incorrecta (1)" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "«Override» %s liña %lu incorrecta (2)" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "«Override» %s liña %lu incorrecta (3)" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" +#: ftparchive/multicompress.cc:73 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Algoritmo de compresión «%s» descoñecido" -#: apt-pkg/deb/dpkgpm.cc:1687 -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" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "A saída comprimida %s precisa dun conxunto de compresión" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "problemas de dependencias - déixase sen configurar" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Non foi posíbel crear o FILE*" -#: apt-pkg/deb/dpkgpm.cc:1694 -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." +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Non foi posíbel facer a bifurcación" -#: apt-pkg/deb/dpkgpm.cc:1700 -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." +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Fillo de compresión" -#: apt-pkg/deb/dpkgpm.cc:1707 -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" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Produciuse un erro interno, non foi posíbel crear %s" + +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "Produciuse un fallo na E/S do subproceso/ficheiro" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Non foi posíbel ler ao calcular o MD5" + +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Xurdiu un problema ao desligar %s" + +#: cmdline/apt-internal-solver.cc:49 #, fuzzy msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un " -"erro de disco cheo." +"Uso: apt-extracttemplates fich1 [fich2 ...]\n" +"\n" +"apt-extracttemplates é unha ferramenta para extraer información\n" +"de configuración e patróns dos paquetes debian\n" +"\n" +"Opcións:\n" +" -h Este texto de axuda\n" +" -t Estabelece o directorio temporal\n" +" -c=? Le este ficheiro de configuración\n" +" -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/" +"tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Rexistro de paquete descoñecido!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un " -"erro de E/S en dpkg" +"Emprego: apt-sortpkgs [opcións] fich1 [fich2 ...]\n" +"\n" +"apt-sortpkgs é unha ferramenta simple para ordenar ficheiros de paquetes.\n" +"A opción -s emprégase para indicar o tipo de ficheiro que é.\n" +"\n" +"Opcións:\n" +" -h Este texto de axuda\n" +" -s Emprega ordenamento por ficheiros fonte\n" +" -c=? Le este ficheiro de configuración\n" +" -o=? Estabelece unha opción de configuración; por exemplo, -o dir::cache=/" +"tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/hu.po b/po/hu.po index 9457b384c..584436e37 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2012-06-25 17:09+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Verziótáblázat:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -358,7 +358,7 @@ 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" @@ -384,80 +384,80 @@ msgstr "" "bzr branch %s\n" "a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A már letöltött „%s” fájl kihagyása\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely mennyisége itt: %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Letöltendő forrásadat-mennyiség: %sB.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 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:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "„%s” kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "„%s” elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -466,17 +466,17 @@ 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:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, 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:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -485,7 +485,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:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -494,14 +494,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:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -510,7 +510,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:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -519,30 +519,30 @@ 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:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, 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:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Változási napló ehhez: %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -686,7 +686,7 @@ msgstr "%s eddig sem volt visszafogva.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, 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" @@ -802,16 +802,16 @@ msgstr "" msgid "Disk not found." msgstr "A lemez nem található." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "A fájl nem található" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Nem érhető el" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "A módosítási idő beállítása sikertelen" @@ -867,7 +867,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "Hibás TYPE, a kiszolgáló üzenete: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Időtúllépés a kapcsolatban" @@ -889,7 +889,7 @@ msgstr "A válasz túlcsordította a puffert." msgid "Protocol corruption" msgstr "Protokollhiba" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -951,7 +951,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:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" @@ -960,7 +960,7 @@ msgstr "Probléma a fájl hash értékének meghatározásakor" msgid "Unable to fetch file, server said '%s'" msgstr "Nem lehet letölteni a fájlt, a kiszolgáló üzenete: „%s”" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Az adatfoglalat túllépte az időkorlátot" @@ -1010,7 +1010,7 @@ msgstr "Nem lehet kapcsolódni ehhez: %s: %s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Kapcsolódás: %s" @@ -1150,42 +1150,17 @@ msgstr "Sikertelen kapcsolódás" msgid "Internal error" msgstr "Belső hiba" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Találat " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Letöltés:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Mellőz " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Hiba " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Letöltve %sB %s alatt (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Folyamatban]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Helyezze be a(z)\n" -" „%s”\n" -"címkéjű lemezt a(z) %s meghajtóba, és nyomja meg az Entert\n" +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:93 msgid "Correcting dependencies..." @@ -1215,163 +1190,347 @@ msgstr "Próbálja futtatni az „apt-get -f install” parancsot ezek javítás msgid "Unmet dependencies. Try using -f." msgstr "Teljesítetlen függőségek. Próbálja a -f használatával." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "FIGYELMEZTETÉS: Az alábbi csomagok nem hitelesíthetők!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Telepítve]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "A hitelesítési figyelmeztetés felülbírálva.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [Telepítve]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Néhány csomag nem hitelesíthető" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Telepítve]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Problémák vannak, és a -y kapcsolót használta --force-yes nélkül" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Telepítve]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Sikertelen letöltés: %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!" - -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "Csomagokat kellene eltávolítani, de az eltávolítás nem engedélyezett." - -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Belső hiba, a rendezés nem fejeződött be" +msgid "[upgradable from: %s]" +msgstr "" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" -msgstr "A méretek nem egyeznek, írjon az apt@packages.debian.org címre" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" +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 -#: apt-private/private-install.cc:155 +#: apt-private/private-output.cc:455 #, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "Letöltendő adatmennyiség: %sB/%sB.\n" +msgid "but %s is installed" +msgstr "de %s van telepítve" -#. 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:160 +#: apt-private/private-output.cc:457 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "Letöltendő adatmennyiség: %sB.\n" +msgid "but %s is to be installed" +msgstr "de csak %s telepíthető" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "A művelet után %sB lemezterület kerül felhasználásra.\n" +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "de az nem telepíthető" -#. 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:172 -#, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "A művelet után %sB lemezterület szabadul fel.\n" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "de az egy virtuális csomag" -#: apt-private/private-install.cc:200 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "Nincs elég szabad hely itt: %s." +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "de az nincs telepítve" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "A „Trivial Only” meg van adva, de ez nem egy triviális művelet." +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "de az nincs telepítésre megjelölve" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Igen, tedd amit mondok!" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " vagy" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Ártalmasnak tűnő műveletet készül végrehajtani.\n" -"A folytatáshoz írja be ezt a mondatot: „%s”\n" -" ?] " +#: 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-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Megszakítva." +#: 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-install.cc:243 -msgid "Do you want to continue?" -msgstr "Folytatni akarja?" +#: 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-install.cc:313 -msgid "Some files failed to download" -msgstr "Néhány fájlt nem sikerült letölteni" +#: 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-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Nem lehet letölteni néhány archívumot. Próbálja futtatni az „apt-get update” " -"parancsot, vagy használja a --fix-missing kapcsolót." +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "Az alábbi csomagok frissítve lesznek:" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "A --fix-missing és az adathordozó-csere jelenleg nem támogatott" +#: 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-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Nem lehet javítani a hiányzó csomagokat." +#: 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-install.cc:330 -msgid "Aborting install." -msgstr "Telepítés megszakítása." +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (%s miatt) " -#: apt-private/private-install.cc:366 +#: apt-private/private-output.cc:696 msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"A következő csomag eltűnt a rendszerből, mivel\n" -"az összes fájlt más csomagok fölülírták:" -msgstr[1] "" -"A következő csomagok eltűntek a rendszerből, mivel\n" -"az összes fájlt más csomagok fölülírták:" +"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-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Megjegyzés: ezt a dpkg automatikusan és szándékosan hajtja végre." +#: 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-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "Nem kellene semmit törölni, az AutoRemover nem indítható" +#: apt-private/private-output.cc:731 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu újratelepítendő, " -#: apt-private/private-install.cc:499 -msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "Csomagokat kellene eltávolítani, de az eltávolítás nem engedélyezett." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Belső hiba, a rendezés nem fejeződött be" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "A méretek nem egyeznek, írjon az apt@packages.debian.org címre" + +#. 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Letöltendő adatmennyisé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 +#: apt-private/private-install.cc:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Letöltendő adatmennyiség: %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 +#: apt-private/private-install.cc:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "A művelet után %sB lemezterület kerül felhasználásra.\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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "A művelet után %sB lemezterület szabadul fel.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Nincs elég szabad hely itt: %s." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Problémák vannak, és a -y kapcsolót használta --force-yes nélkül" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "A „Trivial Only” meg van adva, de ez nem egy triviális művelet." + +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Igen, tedd amit mondok!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Ártalmasnak tűnő műveletet készül végrehajtani.\n" +"A folytatáshoz írja be ezt a mondatot: „%s”\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Megszakítva." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Folytatni akarja?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Néhány fájlt nem sikerült letölteni" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Nem lehet letölteni néhány archívumot. Próbálja futtatni az „apt-get update” " +"parancsot, vagy használja a --fix-missing kapcsolót." + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "A --fix-missing és az adathordozó-csere jelenleg nem támogatott" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Nem lehet javítani a hiányzó csomagokat." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Telepítés megszakítása." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"A következő csomag eltűnt a rendszerből, mivel\n" +"az összes fájlt más csomagok fölülírták:" +msgstr[1] "" +"A következő csomagok eltűntek a rendszerből, mivel\n" +"az összes fájlt más csomagok fölülírták:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Megjegyzés: ezt a dpkg automatikusan és szándékosan hajtja végre." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Nem kellene semmit törölni, az AutoRemover nem indítható" + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." msgstr "" "Úgy tűnik, az AutoRemover hibát okozott, ez nem történhetne meg.\n" "Küldjön hibajelentést az apt csomaghoz." @@ -1504,210 +1663,26 @@ 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:129 -msgid "Listing" -msgstr "" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "FIGYELMEZTETÉS: Az alábbi csomagok nem hitelesíthetők!" -#: apt-private/private-list.cc:159 -#, 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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "A hitelesítési figyelmeztetés felülbírálva.\n" -#: 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:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Néhány csomag nem hitelesíthető" -#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 -#: apt-private/private-show.cc:89 -msgid "unknown" -msgstr "" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?" -#: 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:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Regex fordítási hiba - %s" - -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" - -#: apt-private/private-show.cc:156 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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 "" +msgid "Failed to fetch %s %s\n" +msgstr "Sikertelen letöltés: %s %s\n" #: apt-private/private-sources.cc:58 #, fuzzy, c-format @@ -1719,20 +1694,8 @@ msgstr "„%s” átnevezése sikertelen erre: %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Az update parancsnak nincsenek argumentumai" - -#: apt-private/private-update.cc:90 -#, 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:94 -msgid "All packages are up to date." +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" #: apt-private/private-upgrade.cc:25 @@ -1743,20 +1706,57 @@ msgstr "Frissítés kiszámítása... " msgid "Done" msgstr "Kész" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Találat " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Letöltés:" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Mellőz " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Hiba " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Letöltve %sB %s alatt (%sB/s)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Folyamatban]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Helyezze be a(z)\n" +" „%s”\n" +"címkéjű lemezt a(z) %s meghajtóba, és nyomja meg az Entert\n" + #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format msgid "Unable to read %s" msgstr "%s nem olvasható" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1790,7 +1790,7 @@ msgstr "[Tükör: %s]" msgid "Failed to create IPC pipe to subprocess" msgstr "Nem sikerült IPC-adatcsatornát létrehozni az alfolyamathoz" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "A kapcsolat idő előtt lezárult" @@ -1830,514 +1830,124 @@ 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:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Használat:apt-extracttemplates fájl1 [fájl2 ...]\n" -"\n" -"Az apt-extracttemplates egy eszköz konfigurációs- és mintainformációk " -"debian-\n" -"csomagokból való kibontására\n" -"\n" -"Kapcsolók:\n" -" -h Ez a súgó szöveg\n" -" -t Beállítja az átmeneti könyvtárat\n" -" -c=? Ezt a konfigurációs fájlt olvassa be\n" -" -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" +#: 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" -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "%s nem érhető el" - -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "Nem lehet írni ebbe: %s" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "A hash elem nem található!" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Nem lehet megállapítani a debconf verziót. A debconf telepítve van?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Nem lehet eltérítést lefoglalni" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "A csomagkiterjesztések listája túl hosszú" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Belső hiba az AddDiversion hívásban" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "Hiba a(z) %s könyvtár feldolgozásakor" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "A forráskiterjesztések listája túl hosszú" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Hiba a tartalomfájl fejlécének írásakor" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Kísérlet eltérítés felülírására: %s -> %s és %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "Hiba %s tartalmának feldolgozásakor" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Használat: apt-ftparchive [kapcsolók] parancs\n" -"Parancsok: packages binarypath [felülbírálófájl [útvonalelőtag]]\n" -" sources srcpath [felülbírálófájl [útvonalelőtag]]\n" -" contents útvonal\n" -" release útvonal\n" -" generate konfigfájl [csoportok]\n" -" clean konfigfájl\n" -"\n" -"Az apt-ftparchive indexfájlokat generál a Debian archívumokhoz. A generálás\n" -"sok stílusát támogatja, a teljesen automatizálttól kezdve a\n" -"dpkg-scanpackages és a dpkg-scansources funkcionális helyettesítéséig.\n" -"\n" -"Az apt-ftparchive Package fájlokat generál a .deb-ek fájából. A Package\n" -"fájl minden vezérlő mezőt tartalmaz minden egyes csomagról úgy az MD5\n" -"hasht mint a fájlméretet. Az override (felülbíráló) fájl támogatott a\n" -"Prioritás és Szekció mezők értékének kényszerítésére.\n" -"\n" -"Hasonlóképpen az apt-ftparchive Sources fájlokat generál .dsc-k fájából.\n" -"A --source-override opció használható forrás-felülbíráló fájlok megadására\n" -"\n" -"A „packages” és „sources” parancsokat a fa gyökeréből kell futtatni.\n" -"A BinaryPath-nak a rekurzív keresés kiindulópontjára kell mutatnia, és\n" -"a felülbírálófájlnak a felülbíráló jelzőket kell tartalmaznia. Az " -"útvonalelőtag\n" -"hozzáadódik a fájlnév mezőkhöz, ha meg van adva. Felhasználására egy példa " -"a\n" -"Debian archívumból:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Kapcsolók:\n" -" -h Ez a súgó szöveg\n" -" --md5 MD5 generálás vezérlése\n" -" -s=? Forrás-felülbíráló fájl\n" -" -q Szűkszavú mód\n" -" -d=? Opcionális gyorsítótár-adatbázis kiválasztása\n" -" --no-delink „delink” hibakereső mód bekapcsolása\n" -" --contents Tartalom fájl generálásának ellenőrzése\n" -" -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 -msgid "No selections matched" -msgstr "Nincs illeszkedő kiválasztás" +msgid "Double add of diversion %s -> %s" +msgstr "A(z) %s -> %s eltérítés hozzáadásának duplázása" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, 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" +msgid "Duplicate conf file %s/%s" +msgstr "Dupla %s/%s konfigurációs fájl" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "A DB megsérült, a fájl átnevezve %s.old-ra" +msgid "The path %s is too long" +msgstr "A(z) %s útvonal túl hosszú" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "A DB régi, kísérlet a következő frissítésére: %s" +msgid "Unpacking %s more than once" +msgstr "A(z) %s többszöri kicsomagolása" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"Az adatbázis-formátum érvénytelen. Ha az apt egy korábbi verziójáról " -"frissített, akkor távolítsa el, és hozza létre újra az adatbázist." +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "A(z) %s könyvtár eltérítve" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "A csomag megpróbál írni a(z) %s/%s eltérített célpontba" + +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Az eltérített útvonal túl hosszú" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "%s elérése sikertelen" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "readlink nem hajtható végre erre: %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Az archívumnak nincs vezérlő rekordja" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Nem sikerült egy mutatóhoz jutni" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n" +msgid "Failed to rename %s to %s" +msgstr "„%s” átnevezése sikertelen erre: %s" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "F: %s nem érhető el\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "H: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "A(z) %s könyvtár nem egy könyvtárral lesz helyettesítve" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "F: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Nem sikerült a node helyét megtalálni a hashtárolóban" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "H: Hibás a fájl " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Az útvonal túl hosszú" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "Nem sikerült feloldani ezt: %s" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Fabejárás nem sikerült" +msgid "Overwrite package match with no version for %s" +msgstr "Csomagtalálat felülírása %s verziója nélkül" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to open %s" -msgstr "%s megnyitása sikertelen" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt" -#: ftparchive/writer.cc:278 +#: apt-inst/extract.cc:498 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgid "Unable to stat %s" +msgstr "%s nem érhető el" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Failed to readlink %s" -msgstr "readlink nem hajtható végre erre: %s" +msgid "Failed to write file %s" +msgstr "A(z) %s fájl írása sikertelen" -#: ftparchive/writer.cc:290 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to unlink %s" -msgstr "%s törlése sikertelen" +msgid "Failed to close file %s" +msgstr "A(z) %s fájl bezárása sikertelen" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** %s linkelése sikertelen ehhez: %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Ez nem egy érvényes DEB archívum, hiányzik a(z) „%s” tag" -#: ftparchive/writer.cc:308 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " a DeLink korlátja (%sB) elérve.\n" +msgid "Internal error, could not locate member %s" +msgstr "Belső hiba, %s tag nem található" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Az archívumnak nem volt csomag mezője" - -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n" - -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " %s karbantartója %s, nem %s\n" - -#: ftparchive/writer.cc:706 -#, 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:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s nem rendelkezik bináris-felülbíráló bejegyzéssel sem\n" - -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Nem sikerült memóriát lefoglalni" - -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "%s megnyitása sikertelen" - -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "%s felülbírálás deformált a(z) %llu. sorában #1" - -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Nem lehet a(z) %s felülbírálófájlt olvasni" - -#: ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" -msgstr "%s felülbírálás deformált a(z) %llu. sorában #1" - -#: ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %llu #2" -msgstr "%s felülbírálás deformált a(z) %llu. sorában #2" - -#: ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %llu #3" -msgstr "%s felülbírálás deformált a(z) %llu. sorában #3" - -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "„%s” tömörítési algoritmus ismeretlen" - -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "%s tömörített kimenetnek egy tömörítő készletre van szüksége" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Nem sikerült FILE*-ot létrehozni" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Nem sikerült forkolni" - -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Gyermekfolyamat tömörítése" - -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "Belső hiba, %s létrehozása sikertelen" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "IO az alfolyamathoz/fájlhoz nem sikerült" - -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Olvasási hiba az MD5 kiszámításakor" - -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "Hiba %s törlésekor" - -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "„%s” átnevezése sikertelen erre: %s" - -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Használat: apt-internal-solver\n" -"\n" -"Az apt-internal-solver felülettel a jelenlegi belső feloldó külső\n" -"feloldóként használható az APT családhoz hibakeresési vagy hasonló céllal\n" -"\n" -"Kapcsolók:\n" -" -h Ez a súgó szöveg.\n" -" -q Naplózható kimenet - nincs folyamatjelző\n" -" -c=? Ezt a konfigurációs fájlt olvassa be\n" -" -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/" -"tmp\n" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Ismeretlen csomagbejegyzés!" - -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Használat: apt-sortpkgs [kapcsolók] fájl1 [fájl2 ...]\n" -"\n" -"Az apt-sortpkgs egy egyszerű eszköz csomagfájlok rendezésére. A -s " -"kapcsolót\n" -"lehet használni annak jelzésére hogy ez milyen típusú fájl.\n" -"\n" -"Kapcsolók:\n" -" -h Ez a súgó szöveg\n" -" -s Forrásfájlrendezést használ\n" -" -c=? Ezt a konfigurációs fájlt olvassa be\n" -" -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" - -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" -msgstr "A(z) %s fájl írása sikertelen" - -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "A(z) %s fájl bezárása sikertelen" - -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "A(z) %s útvonal túl hosszú" - -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" -msgstr "A(z) %s többszöri kicsomagolása" - -#: apt-inst/extract.cc:142 -#, c-format -msgid "The directory %s is diverted" -msgstr "A(z) %s könyvtár eltérítve" - -#: apt-inst/extract.cc:152 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "A csomag megpróbál írni a(z) %s/%s eltérített célpontba" - -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Az eltérített útvonal túl hosszú" - -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "A(z) %s könyvtár nem egy könyvtárral lesz helyettesítve" - -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Nem sikerült a node helyét megtalálni a hashtárolóban" - -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Az útvonal túl hosszú" - -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Csomagtalálat felülírása %s verziója nélkül" - -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt" - -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "%s nem érhető el" - -#: 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" - -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "A hash elem nem található!" - -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Nem lehet eltérítést lefoglalni" - -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Belső hiba az AddDiversion hívásban" - -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Kísérlet eltérítés felülírására: %s -> %s és %s/%s" - -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "A(z) %s -> %s eltérítés hozzáadásának duplázása" - -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Dupla %s/%s konfigurációs fájl" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Értelmezhetetlen control fájl" #: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" @@ -2385,138 +1995,53 @@ msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérült" msgid "Unknown TAR header type %u, member %s" msgstr "Ismeretlen a(z) %u TAR fejléctípus, %s tag" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Ez nem egy érvényes DEB archívum, hiányzik a(z) „%s” tag" - -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "Belső hiba, %s tag nem található" - -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Értelmezhetetlen control fájl" - -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, c-format -msgid "List directory %spartial is missing." -msgstr "A(z) %spartial listakönyvtár hiányzik." - -#: apt-pkg/acquire.cc:91 -#, c-format -msgid "Archives directory %spartial is missing." -msgstr "A(z) %spartial archívumkönyvtár hiányzik." - -#: apt-pkg/acquire.cc:99 -#, c-format -msgid "Unable to lock directory %s" -msgstr "%s könyvtár zárolása sikertelen" - -#: apt-pkg/acquire.cc:490 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" - -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "%li/%li fájl letöltése (%s marad)" - -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "%li/%li fájl letöltése" - -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "sikertelen átnevezés, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "A Hash Sum nem megfelelő" - -#: apt-pkg/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "A méret nem megfelelő" - -#: apt-pkg/acquire-item.cc:173 -#, fuzzy -msgid "Invalid file format" -msgstr "%s érvénytelen művelet" - -#: apt-pkg/acquire-item.cc:1573 -#, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" +msgid "Progress: [%3i%%]" 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:1589 -#, 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:1631 -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/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "A dpkg futtatása" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/init.cc:146 #, c-format -msgid "" -"Release file for %s is expired (invalid since %s). Updates for this " -"repository will not be applied." -msgstr "" -"A Release fájl elavult ehhez: %s (érvénytelen ez óta: %s). A tároló " -"frissítései nem kerülnek alkalmazásra." +msgid "Packaging system '%s' is not supported" +msgstr "A(z) „%s” csomagrendszer nem támogatott" + +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "A megfelelő csomagrendszertípus nem határozható meg" -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)" +msgid "Wrote %i records.\n" +msgstr "%i rekord kiírva.\n" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "" -"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" -msgstr "" -"Hiba történt az aláírás ellenőrzése közben. A tároló nem frissült, és az " -"előző indexfájl lesz használva. GPG hiba: %s: %s\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "%i rekord kiírva, %i hiányzó fájllal.\n" -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "GPG error: %s: %s" -msgstr "GPG hiba: %s: %s" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "%i rekord kiírva %i eltérő fájllal\n" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, 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 "" -"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)" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "%i rekord kiírva %i hiányzó és %i eltérő fájllal\n" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/indexcopy.cc:515 #, 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" +msgid "Can't find authentication record for: %s" +msgstr "%s hitelesítési rekordja nem található" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/indexcopy.cc:521 #, 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." +msgid "Hash mismatch for: %s" +msgstr "%s ellenőrzőösszege nem megfelelő" #: apt-pkg/acquire-worker.cc:116 #, c-format @@ -2540,25 +2065,6 @@ msgstr "" "Helyezze be a(z) „%s” címkéjű lemezt a(z) „%s” meghajtóba, és nyomja meg az " "Entert." -#: apt-pkg/algorithms.cc:265 -#, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"A(z) %s csomagot újra kell telepíteni, de nem található hozzá archívum." - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott " -"csomagok okozhatják." - -#: apt-pkg/algorithms.cc:1088 -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/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" @@ -2573,175 +2079,257 @@ 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/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "„%s” kiadás nem található ehhez: „%s”" - -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "„%s” verzió nem található ehhez: „%s”" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Üres csomaggyorsítótár" -#: apt-pkg/cacheset.cc:603 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "„%s” feladat nem található" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "A csomaggyorsítótár fájl megsérült" -#: apt-pkg/cacheset.cc:609 -#, 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/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "A csomaggyorsítótár-fájl inkompatibilis verziójú" -#: apt-pkg/cacheset.cc:615 -#, 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/pkgcache.cc:169 +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/cacheset.cc:626 +#: apt-pkg/pkgcache.cc:174 #, 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" +msgid "This APT does not support the versioning system '%s'" +msgstr "Ez az APT nem támogatja a(z) „%s” verziórendszert" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 -#, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" -"„%s” csomagból nem választható sem telepített, sem kiadásra jelölt verzió, " -"mert egyikkel sem rendelkezik" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "A csomaggyorsítótár egy másik architektúrához készült" -#: apt-pkg/cacheset.cc:647 -#, 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/pkgcache.cc:321 +msgid "Depends" +msgstr "Függ ettől" -#: apt-pkg/cacheset.cc:655 -#, 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/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Függ ettől (előfüggés)" -#: apt-pkg/cacheset.cc:663 -#, 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/pkgcache.cc:321 +msgid "Suggests" +msgstr "Javasolja" -#: 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/pkgcache.cc:322 +msgid "Recommends" +msgstr "Ajánlja" -#: apt-pkg/cdrom.cc:571 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM leválasztása...\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Ütközik" -#: apt-pkg/cdrom.cc:586 -#, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "%s CD-ROM csatolási pont használata\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Kicseréli" -#: apt-pkg/cdrom.cc:599 -msgid "Waiting for disc...\n" -msgstr "Várakozás a lemezre...\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Elavulttá teszi" -#: apt-pkg/cdrom.cc:609 -msgid "Mounting CD-ROM...\n" -msgstr "CD-ROM csatolása...\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Töri" -#: apt-pkg/cdrom.cc:620 -msgid "Identifying... " -msgstr "Azonosítás... " +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Bővíti" -#: apt-pkg/cdrom.cc:662 +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "fontos" + +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "szükséges" + +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "szabványos" + +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "opcionális" + +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "extra" + +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Stored label: %s\n" -msgstr "Tárolt címke: %s\n" +msgid "Index file type '%s' is not supported" +msgstr "A(z) „%s” indexfájltípus nem támogatott" -#: apt-pkg/cdrom.cc:680 -msgid "Scanning disc for index files...\n" -msgstr "Indexfájlok keresése a lemezen...\n" +#: 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/cdrom.cc:734 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "" -"Found %zu package indexes, %zu source indexes, %zu translation indexes and " -"%zu signatures\n" +msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -"%zu csomagindex, %zu forrásindex, %zu fordításindex és %zu aláírás " -"megtalálva\n" +"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] " +"feldolgozhatatlan)" -#: apt-pkg/cdrom.cc:744 -msgid "" -"Unable to locate any package files, perhaps this is not a Debian Disc or the " -"wrong architecture?" +#: apt-pkg/sourcelist.cc:173 +#, c-format +msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -"Nem találhatók csomagfájlok, lehet hogy ez nem Debian lemez, vagy nem " -"megfelelő az architektúra?" +"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] túl " +"rövid)" -#: apt-pkg/cdrom.cc:771 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "Found label '%s'\n" -msgstr "Talált címke: „%s”\n" +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/cdrom.cc:800 -msgid "That is not a valid name, try again.\n" -msgstr "A név érvénytelen, próbálja újra.\n" +#: 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/cdrom.cc:817 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "" -"This disc is called: \n" -"'%s'\n" +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -"A lemez neve: \n" -"„%s”\n" +"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] %s kulcsnak " +"nincs értéke)" -#: apt-pkg/cdrom.cc:819 -msgid "Copying package lists..." -msgstr "Csomaglisták másolása..." +#: 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/cdrom.cc:863 -msgid "Writing new source list\n" -msgstr "Új forráslista írása\n" +#: 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/cdrom.cc:874 -msgid "Source list entries for this disc are:\n" -msgstr "A lemezhez tartozó forráslistabejegyzések a következők:\n" +#: 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:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "A(z) „%s” indexfájltípus nem támogatott" #: apt-pkg/clean.cc:64 #, c-format msgid "Unable to stat %s." msgstr "%s nem érhető el." -#: 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/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "A gyorsítótárnak inkompatibilis verziórendszere van" -#: apt-pkg/depcache.cc:139 -msgid "Candidate versions" -msgstr "Lehetséges verziók" +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, 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:168 -msgid "Dependency generation" -msgstr "Függőséggenerálás" +#: apt-pkg/pkgcachegen.cc:257 +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/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:260 +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/depcache.cc:250 +#: apt-pkg/pkgcachegen.cc:263 +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:266 +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:576 #, 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:1211 #, 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:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Csomaglisták olvasása" + +# FIXME +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "„Biztosítja” kapcsolatok összegyűjtése" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Nem lehet írni ebbe: %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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" @@ -2763,78 +2351,150 @@ msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott" msgid "Execute external solver" msgstr "Külső solver végrehajtása" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format -msgid "Wrote %i records.\n" -msgstr "%i rekord kiírva.\n" +msgid "rename failed, %s (%s -> %s)." +msgstr "sikertelen átnevezés, %s (%s -> %s)." -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 -#, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "%i rekord kiírva, %i hiányzó fájllal.\n" +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "A Hash Sum nem megfelelő" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 -#, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "%i rekord kiírva %i eltérő fájllal\n" +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "A méret nem megfelelő" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/acquire-item.cc:173 +#, fuzzy +msgid "Invalid file format" +msgstr "%s érvénytelen művelet" + +#: apt-pkg/acquire-item.cc:1640 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "%i rekord kiírva %i hiányzó és %i eltérő fájllal\n" +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +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/indexcopy.cc:515 +#: apt-pkg/acquire-item.cc:1656 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "%s hitelesítési rekordja nem található" +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/indexcopy.cc:521 +#: apt-pkg/acquire-item.cc:1698 +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:1736 #, c-format -msgid "Hash mismatch for: %s" -msgstr "%s ellenőrzőösszege nem megfelelő" +msgid "" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." +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/indexrecords.cc:78 +#: apt-pkg/acquire-item.cc:1758 #, c-format -msgid "Unable to parse Release file %s" -msgstr "A(z) %s Release fájl nem dolgozható fel" +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)" -#: apt-pkg/indexrecords.cc:86 +#: apt-pkg/acquire-item.cc:1788 #, c-format -msgid "No sections in Release file %s" -msgstr "A(z) %s Release fájl nem tartalmaz szakaszokat" +msgid "" +"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" +msgstr "" +"Hiba történt az aláírás ellenőrzése közben. A tároló nem frissült, és az " +"előző indexfájl lesz használva. GPG hiba: %s: %s\n" -#: apt-pkg/indexrecords.cc:117 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format -msgid "No Hash entry in Release file %s" -msgstr "Nincs Hash bejegyzés a(z) %s Release fájlban" +msgid "GPG error: %s: %s" +msgstr "GPG hiba: %s: %s" -#: apt-pkg/indexrecords.cc:130 +#: apt-pkg/acquire-item.cc:1926 #, c-format -msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "Érvénytelen „Valid-Until” bejegyzés a(z) %s Release fájlban" +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 "" +"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/indexrecords.cc:149 +#: apt-pkg/acquire-item.cc:1992 #, c-format -msgid "Invalid 'Date' entry in Release file %s" -msgstr "Érvénytelen „Date” bejegyzés a(z) %s Release fájlban" +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/init.cc:146 +#: apt-pkg/acquire-item.cc:2050 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "A(z) „%s” csomagrendszer nem támogatott" +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/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "A megfelelő csomagrendszertípus nem határozható meg" +#: apt-pkg/vendorlist.cc:85 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "A(z) %s terjesztőblokk nem tartalmaz ujjlenyomatot" -#: apt-pkg/install-progress.cc:57 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Progress: [%3i%%]" +msgid "List directory %spartial is missing." +msgstr "A(z) %spartial listakönyvtár hiányzik." + +#: apt-pkg/acquire.cc:91 +#, c-format +msgid "Archives directory %spartial is missing." +msgstr "A(z) %spartial archívumkönyvtár hiányzik." + +#: apt-pkg/acquire.cc:99 +#, 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:902 +#, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "%li/%li fájl letöltése (%s marad)" + +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "%li/%li fájl letöltése" + +#: 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/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 "" +"A(z) „%s” érték érvénytelen az APT::Default-Release beállításhoz, mert nincs " +"ilyen kiadás a forrásokban" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "A dpkg futtatása" +#: apt-pkg/policy.cc:422 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Érvénytelen rekord a(z) %s beállításfájlban, nincs Package fejléc" + +#: apt-pkg/policy.cc:444 +#, c-format +msgid "Did not understand pin type %s" +msgstr "A(z) %s rögzítéstípus nem értelmezhető" + +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Nincs prioritás (vagy nulla) megadva a rögzítéshez" #: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format @@ -2861,415 +2521,271 @@ 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/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Üres csomaggyorsítótár" - -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "A csomaggyorsítótár fájl megsérült" - -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "A csomaggyorsítótár-fájl inkompatibilis verziójú" +#: 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/pkgcache.cc:169 -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/cdrom.cc:571 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM leválasztása...\n" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/cdrom.cc:586 #, 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:179 -msgid "The package cache was built for a different architecture" -msgstr "A csomaggyorsítótár egy másik architektúrához készült" +msgid "Using CD-ROM mount point %s\n" +msgstr "%s CD-ROM csatolási pont használata\n" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Függ ettől" +#: apt-pkg/cdrom.cc:599 +msgid "Waiting for disc...\n" +msgstr "Várakozás a lemezre...\n" -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Függ ettől (előfüggés)" +#: apt-pkg/cdrom.cc:609 +msgid "Mounting CD-ROM...\n" +msgstr "CD-ROM csatolása...\n" -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Javasolja" +#: apt-pkg/cdrom.cc:620 +msgid "Identifying... " +msgstr "Azonosítás... " -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Ajánlja" +#: apt-pkg/cdrom.cc:662 +#, c-format +msgid "Stored label: %s\n" +msgstr "Tárolt címke: %s\n" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Ütközik" +#: apt-pkg/cdrom.cc:680 +msgid "Scanning disc for index files...\n" +msgstr "Indexfájlok keresése a lemezen...\n" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Kicseréli" +#: apt-pkg/cdrom.cc:734 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" +msgstr "" +"%zu csomagindex, %zu forrásindex, %zu fordításindex és %zu aláírás " +"megtalálva\n" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Elavulttá teszi" +#: apt-pkg/cdrom.cc:744 +msgid "" +"Unable to locate any package files, perhaps this is not a Debian Disc or the " +"wrong architecture?" +msgstr "" +"Nem találhatók csomagfájlok, lehet hogy ez nem Debian lemez, vagy nem " +"megfelelő az architektúra?" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Töri" +#: apt-pkg/cdrom.cc:771 +#, c-format +msgid "Found label '%s'\n" +msgstr "Talált címke: „%s”\n" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Bővíti" +#: apt-pkg/cdrom.cc:800 +msgid "That is not a valid name, try again.\n" +msgstr "A név érvénytelen, próbálja újra.\n" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "fontos" +#: apt-pkg/cdrom.cc:817 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"A lemez neve: \n" +"„%s”\n" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "szükséges" +#: apt-pkg/cdrom.cc:819 +msgid "Copying package lists..." +msgstr "Csomaglisták másolása..." -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "szabványos" +#: apt-pkg/cdrom.cc:863 +msgid "Writing new source list\n" +msgstr "Új forráslista írása\n" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "opcionális" +#: apt-pkg/cdrom.cc:874 +msgid "Source list entries for this disc are:\n" +msgstr "A lemezhez tartozó forráslistabejegyzések a következők:\n" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "extra" +#: apt-pkg/algorithms.cc:265 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"A(z) %s csomagot újra kell telepíteni, de nem található hozzá archívum." -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "A gyorsítótárnak inkompatibilis verziórendszere van" +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott " +"csomagok okozhatják." -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 -#, 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/algorithms.cc:1088 +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/pkgcachegen.cc:257 -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/depcache.cc:138 apt-pkg/depcache.cc:167 +msgid "Building dependency tree" +msgstr "Függőségi fa építése" -#: apt-pkg/pkgcachegen.cc:260 -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/depcache.cc:139 +msgid "Candidate versions" +msgstr "Lehetséges verziók" -#: apt-pkg/pkgcachegen.cc:263 -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/depcache.cc:168 +msgid "Dependency generation" +msgstr "Függőséggenerálás" -#: apt-pkg/pkgcachegen.cc:266 -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: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:576 +#: apt-pkg/depcache.cc:250 #, 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" +msgid "Failed to open StateFile %s" +msgstr "%s állapotfájl megnyitása sikertelen" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/depcache.cc:256 #, 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:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Csomaglisták olvasása" - -# FIXME -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "„Biztosítja” kapcsolatok összegyűjtése" +msgid "Failed to write temporary StateFile %s" +msgstr "%s átmeneti állapotfájl írása sikertelen" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "IO hiba a forrás-gyorsítótár mentésekor" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/tagfile.cc:237 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "A(z) „%s” indexfájltípus nem támogatott" +msgid "Unable to parse package file %s (2)" +msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" -#: apt-pkg/policy.cc:83 +#: apt-pkg/cacheset.cc:489 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" -msgstr "" -"A(z) „%s” érték érvénytelen az APT::Default-Release beállításhoz, mert nincs " -"ilyen kiadás a forrásokban" +msgid "Release '%s' for '%s' was not found" +msgstr "„%s” kiadás nem található ehhez: „%s”" -#: apt-pkg/policy.cc:422 +#: apt-pkg/cacheset.cc:492 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Érvénytelen rekord a(z) %s beállításfájlban, nincs Package fejléc" +msgid "Version '%s' for '%s' was not found" +msgstr "„%s” verzió nem található ehhez: „%s”" -#: apt-pkg/policy.cc:444 +#: apt-pkg/cacheset.cc:603 #, c-format -msgid "Did not understand pin type %s" -msgstr "A(z) %s rögzítéstípus nem értelmezhető" +msgid "Couldn't find task '%s'" +msgstr "„%s” feladat nem található" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Nincs prioritás (vagy nulla) megadva a rögzítéshez" +#: apt-pkg/cacheset.cc:609 +#, 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/sourcelist.cc:127 +#: apt-pkg/cacheset.cc:615 #, 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)" +msgid "Couldn't find any package by glob '%s'" +msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/cacheset.cc:626 #, 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)" +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/sourcelist.cc:173 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" -"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] túl " -"rövid)" +"„%s” csomagból nem választható sem telepített, sem kiadásra jelölt verzió, " +"mert egyikkel sem rendelkezik" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem " -"érvényes hozzárendelés)" +"„%s” csomag legújabb verziója nem választható ki, mert teljesen virtuális" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem " -"tartalmaz kulcsot)" +"„%s” csomag kiadásra jelölt verziója nem választható ki, mert nincs jelöltje" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/cacheset.cc:663 #, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgid "Can't select installed version from package %s as it is not installed" msgstr "" -"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] %s kulcsnak " -"nincs értéke)" +"„%s” csomag telepített verziója nem választható ki, mert nincs telepítve" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/indexrecords.cc:78 #, 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)" +msgid "Unable to parse Release file %s" +msgstr "A(z) %s Release fájl nem dolgozható fel" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/indexrecords.cc:86 #, 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)" +msgid "No sections in Release file %s" +msgstr "A(z) %s Release fájl nem tartalmaz szakaszokat" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/indexrecords.cc:117 #, 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)" +msgid "No Hash entry in Release file %s" +msgstr "Nincs Hash bejegyzés a(z) %s Release fájlban" -#: apt-pkg/sourcelist.cc:217 +#: apt-pkg/indexrecords.cc:130 #, 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)" +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "Érvénytelen „Valid-Until” bejegyzés a(z) %s Release fájlban" -#: apt-pkg/sourcelist.cc:224 +#: apt-pkg/indexrecords.cc:149 #, 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)" +msgid "Invalid 'Date' entry in Release file %s" +msgstr "Érvénytelen „Date” bejegyzés a(z) %s Release fájlban" -#: apt-pkg/sourcelist.cc:335 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Opening %s" -msgstr "%s megnyitása" +msgid "%lid %lih %limin %lis" +msgstr "%lin %lió %lip %limp" -#: apt-pkg/sourcelist.cc:371 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, 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 "%lih %limin %lis" +msgstr "%lió %lip %limp" -#: apt-pkg/sourcelist.cc:375 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, 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/srcrecords.cc:52 -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" +msgid "%limin %lis" +msgstr "%lip %limp" -#: apt-pkg/tagfile.cc:140 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" +msgid "%lis" +msgstr "%limp" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" +msgid "Selection %s not found" +msgstr "%s kiválasztás nem található" -#: 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/contrib/fileutl.cc:190 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "Nem lesz zárolva a(z) „%s” csak olvasható zárolási fájl" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "A(z) %s terjesztőblokk nem tartalmaz ujjlenyomatot" +msgid "Could not open lock file %s" +msgstr "%s zárolási fájl nem nyitható meg" -#: apt-pkg/contrib/cdromutl.cc:65 +#: apt-pkg/contrib/fileutl.cc:218 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "%s csatolási pont nem érhető el" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "Nem sikerült elérni a CD-ROM-ot." - -#: apt-pkg/contrib/cmndline.cc:121 -#, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "%s parancssori kapcsoló értelmezhetetlen" - -#: apt-pkg/contrib/cmndline.cc:168 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "%s parancssori kapcsoló nem logikai" - -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "%s kapcsolóhoz argumentum szükséges." - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "" -"%s kapcsoló: a konfigurációs elem megadásához szükséges egy =<érték> rész." - -#: apt-pkg/contrib/cmndline.cc:278 -#, 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:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "Túl hosszú „%s” kapcsoló" - -#: apt-pkg/contrib/cmndline.cc:341 -#, 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:391 -#, c-format -msgid "Invalid operation %s" -msgstr "%s érvénytelen művelet" - -#: apt-pkg/contrib/configuration.cc:519 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Ismeretlen típusrövidítés: „%c”" - -#: apt-pkg/contrib/configuration.cc:633 -#, c-format -msgid "Opening configuration file %s" -msgstr "%s konfigurációs fájl megnyitása" - -#: apt-pkg/contrib/configuration.cc:801 -#, 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:820 -#, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Szintaktikai hiba %s: %u: rosszul formázott címke" - -#: apt-pkg/contrib/configuration.cc:837 -#, 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:877 -#, 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:884 -#, 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:888 apt-pkg/contrib/configuration.cc:893 -#, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva" - -#: apt-pkg/contrib/configuration.cc:897 -#, 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:900 -#, 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:950 -#, 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/fileutl.cc:190 -#, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Nem lesz zárolva a(z) „%s” csak olvasható zárolási fájl" - -#: apt-pkg/contrib/fileutl.cc:195 -#, c-format -msgid "Could not open lock file %s" -msgstr "%s zárolási fájl nem nyitható meg" - -#: apt-pkg/contrib/fileutl.cc:218 -#, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Nem lesz zárolva a(z) %s NFS-csatolású zárolási fájl" +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Nem lesz zárolva a(z) %s NFS-csatolású zárolási fájl" #: apt-pkg/contrib/fileutl.cc:223 #, c-format @@ -3374,11 +2890,25 @@ msgstr "Hiba a(z) %s fájl törlésekor" msgid "Problem syncing the file" msgstr "Hiba a fájl szinkronizálásakor" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "No keyring installed in %s." -msgstr "Nincs kulcstartó telepítve ide: %s." +msgid "%c%s... Error!" +msgstr "%c%s... Hiba!" + +#: apt-pkg/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Kész" + +#: apt-pkg/contrib/progress.cc:181 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Kész" # FIXME #: apt-pkg/contrib/mmap.cc:79 @@ -3436,229 +2966,694 @@ msgstr "" "Nem lehet növelni az MMap méretét, mert a felhasználó letiltotta az " "automatikus emelést." -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Hiba!" +msgid "Unable to stat the mount point %s" +msgstr "%s csatolási pont nem érhető el" -#: apt-pkg/contrib/progress.cc:150 +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Nem sikerült elérni a CD-ROM-ot." + +#: apt-pkg/contrib/configuration.cc:519 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Kész" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Ismeretlen típusrövidítés: „%c”" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +#: apt-pkg/contrib/configuration.cc:633 +#, c-format +msgid "Opening configuration file %s" +msgstr "%s konfigurációs fájl megnyitása" + +#: apt-pkg/contrib/configuration.cc:801 +#, 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:820 +#, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Szintaktikai hiba %s: %u: rosszul formázott címke" + +#: apt-pkg/contrib/configuration.cc:837 +#, 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:877 +#, 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:884 +#, 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:888 apt-pkg/contrib/configuration.cc:893 +#, c-format +msgid "Syntax error %s:%u: Included from here" +msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva" + +#: apt-pkg/contrib/configuration.cc:897 +#, 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:900 +#, 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" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Kész" +#: apt-pkg/contrib/configuration.cc:950 +#, 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" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%lin %lió %lip %limp" +msgid "No keyring installed in %s." +msgstr "Nincs kulcstartó telepítve ide: %s." -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "%lih %limin %lis" -msgstr "%lió %lip %limp" +msgid "Command line option '%c' [from %s] is not known." +msgstr "A(z) „%c” parancssori kapcsoló [a következőből: %s] ismeretlen." -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "%limin %lis" -msgstr "%lip %limp" +msgid "Command line option %s is not understood" +msgstr "%s parancssori kapcsoló értelmezhetetlen" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "%lis" -msgstr "%limp" +msgid "Command line option %s is not boolean" +msgstr "%s parancssori kapcsoló nem logikai" -#: apt-pkg/contrib/strutl.cc:1258 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "Selection %s not found" -msgstr "%s kiválasztás nem található" +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 +#, c-format +msgid "Option %s: Configuration item specification must have an =." +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 +#, 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 +#, c-format +msgid "Option '%s' is too long" +msgstr "Túl hosszú „%s” kapcsoló" + +#: apt-pkg/contrib/cmndline.cc:344 +#, 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 +#, c-format +msgid "Invalid operation %s" +msgstr "%s érvénytelen művelet" + +#: apt-pkg/deb/dpkgpm.cc:110 +#, c-format +msgid "Installing %s" +msgstr "%s telepítése" + +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 +#, c-format +msgid "Configuring %s" +msgstr "%s konfigurálása" + +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 +#, c-format +msgid "Removing %s" +msgstr "%s eltávolítása" + +#: apt-pkg/deb/dpkgpm.cc:113 +#, c-format +msgid "Completely removing %s" +msgstr "%s teljes eltávolítása" + +#: apt-pkg/deb/dpkgpm.cc:114 +#, c-format +msgid "Noting disappearance of %s" +msgstr "„%s” eltűnése feljegyezve" + +#: apt-pkg/deb/dpkgpm.cc:115 +#, 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:845 +#, c-format +msgid "Directory '%s' missing" +msgstr "A(z) „%s” könyvtár hiányzik" + +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 +#, c-format +msgid "Could not open file '%s'" +msgstr "A(z) „%s” fájl megnyitása sikertelen" + +#: apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Preparing %s" +msgstr "%s előkészítése" + +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr "%s kicsomagolása" + +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing to configure %s" +msgstr "%s konfigurálásának előkészítése" + +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr "%s telepítve" + +#: apt-pkg/deb/dpkgpm.cc:1020 +#, 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:1022 +#, c-format +msgid "Removed %s" +msgstr "%s eltávolítva" + +#: apt-pkg/deb/dpkgpm.cc:1027 +#, 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:1028 +#, c-format +msgid "Completely removed %s" +msgstr "%s teljesen eltávolítva" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Nem lehet írni ebbe: %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "A művelet megszakadt, mielőtt befejeződhetett volna" + +#: apt-pkg/deb/dpkgpm.cc:1719 +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:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "függőségi hibák - a csomag beállítatlan maradt" + +#: apt-pkg/deb/dpkgpm.cc:1726 +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:1732 +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:1739 +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:1746 apt-pkg/deb/dpkgpm.cc:1752 +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:1774 +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" + +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Használat:apt-extracttemplates fájl1 [fájl2 ...]\n" +"\n" +"Az apt-extracttemplates egy eszköz konfigurációs- és mintainformációk " +"debian-\n" +"csomagokból való kibontására\n" +"\n" +"Kapcsolók:\n" +" -h Ez a súgó szöveg\n" +" -t Beállítja az átmeneti könyvtárat\n" +" -c=? Ezt a konfigurációs fájlt olvassa be\n" +" -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "%s nem érhető el" + +#: cmdline/apt-extracttemplates.cc:300 +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 +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 +#, c-format +msgid "Error processing directory %s" +msgstr "Hiba a(z) %s könyvtár feldolgozásakor" + +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "A forráskiterjesztések listája túl hosszú" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Hiba a tartalomfájl fejlécének írásakor" + +#: ftparchive/apt-ftparchive.cc:431 +#, c-format +msgid "Error processing contents %s" +msgstr "Hiba %s tartalmának feldolgozásakor" + +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Használat: apt-ftparchive [kapcsolók] parancs\n" +"Parancsok: packages binarypath [felülbírálófájl [útvonalelőtag]]\n" +" sources srcpath [felülbírálófájl [útvonalelőtag]]\n" +" contents útvonal\n" +" release útvonal\n" +" generate konfigfájl [csoportok]\n" +" clean konfigfájl\n" +"\n" +"Az apt-ftparchive indexfájlokat generál a Debian archívumokhoz. A generálás\n" +"sok stílusát támogatja, a teljesen automatizálttól kezdve a\n" +"dpkg-scanpackages és a dpkg-scansources funkcionális helyettesítéséig.\n" +"\n" +"Az apt-ftparchive Package fájlokat generál a .deb-ek fájából. A Package\n" +"fájl minden vezérlő mezőt tartalmaz minden egyes csomagról úgy az MD5\n" +"hasht mint a fájlméretet. Az override (felülbíráló) fájl támogatott a\n" +"Prioritás és Szekció mezők értékének kényszerítésére.\n" +"\n" +"Hasonlóképpen az apt-ftparchive Sources fájlokat generál .dsc-k fájából.\n" +"A --source-override opció használható forrás-felülbíráló fájlok megadására\n" +"\n" +"A „packages” és „sources” parancsokat a fa gyökeréből kell futtatni.\n" +"A BinaryPath-nak a rekurzív keresés kiindulópontjára kell mutatnia, és\n" +"a felülbírálófájlnak a felülbíráló jelzőket kell tartalmaznia. Az " +"útvonalelőtag\n" +"hozzáadódik a fájlnév mezőkhöz, ha meg van adva. Felhasználására egy példa " +"a\n" +"Debian archívumból:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Kapcsolók:\n" +" -h Ez a súgó szöveg\n" +" --md5 MD5 generálás vezérlése\n" +" -s=? Forrás-felülbíráló fájl\n" +" -q Szűkszavú mód\n" +" -d=? Opcionális gyorsítótár-adatbázis kiválasztása\n" +" --no-delink „delink” hibakereső mód bekapcsolása\n" +" --contents Tartalom fájl generálásának ellenőrzése\n" +" -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 +msgid "No selections matched" +msgstr "Nincs illeszkedő kiválasztás" + +#: ftparchive/apt-ftparchive.cc:907 +#, 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" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "A DB megsérült, a fájl átnevezve %s.old-ra" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "A DB régi, kísérlet a következő frissítésére: %s" + +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"Az adatbázis-formátum érvénytelen. Ha az apt egy korábbi verziójáról " +"frissített, akkor távolítsa el, és hozza létre újra az adatbázist." + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "readlink nem hajtható végre erre: %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Az archívumnak nincs vezérlő rekordja" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Nem sikerült egy mutatóhoz jutni" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.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?" +msgid "W: Unable to read directory %s\n" +msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:96 #, 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 "W: Unable to stat %s\n" +msgstr "F: %s nem érhető el\n" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "H: " + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "F: " + +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "H: Hibás a fájl " + +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, 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. " +msgid "Failed to resolve %s" +msgstr "Nem sikerült feloldani ezt: %s" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "Nincs zárolva" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Fabejárás nem sikerült" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:219 #, c-format -msgid "Installing %s" -msgstr "%s telepítése" +msgid "Failed to open %s" +msgstr "%s megnyitása sikertelen" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:278 #, c-format -msgid "Configuring %s" -msgstr "%s konfigurálása" +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:286 #, c-format -msgid "Removing %s" -msgstr "%s eltávolítása" +msgid "Failed to readlink %s" +msgstr "readlink nem hajtható végre erre: %s" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:290 #, c-format -msgid "Completely removing %s" -msgstr "%s teljes eltávolítása" +msgid "Failed to unlink %s" +msgstr "%s törlése sikertelen" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:298 #, c-format -msgid "Noting disappearance of %s" -msgstr "„%s” eltűnése feljegyezve" +msgid "*** Failed to link %s to %s" +msgstr "*** %s linkelése sikertelen ehhez: %s" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:308 #, c-format -msgid "Running post-installation trigger %s" -msgstr "A(z) %s telepítés utáni trigger futtatása" +msgid " DeLink limit of %sB hit.\n" +msgstr " a DeLink korlátja (%sB) elérve.\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Az archívumnak nem volt csomag mezője" + +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Directory '%s' missing" -msgstr "A(z) „%s” könyvtár hiányzik" +msgid " %s has no override entry\n" +msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Could not open file '%s'" -msgstr "A(z) „%s” fájl megnyitása sikertelen" +msgid " %s maintainer is %s not %s\n" +msgstr " %s karbantartója %s, nem %s\n" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing %s" -msgstr "%s előkészítése" +msgid " %s has no source override entry\n" +msgstr " %s nem rendelkezik forrás-felülbíráló bejegyzéssel\n" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:710 #, c-format -msgid "Unpacking %s" -msgstr "%s kicsomagolása" +msgid " %s has no binary override entry either\n" +msgstr " %s nem rendelkezik bináris-felülbíráló bejegyzéssel sem\n" + +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Nem sikerült memóriát lefoglalni" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing to configure %s" -msgstr "%s konfigurálásának előkészítése" +msgid "Unable to open %s" +msgstr "%s megnyitása sikertelen" + +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "%s felülbírálás deformált a(z) %llu. sorában #1" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Installed %s" -msgstr "%s telepítve" +msgid "Failed to read the override file %s" +msgstr "Nem lehet a(z) %s felülbírálófájlt olvasni" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:166 #, c-format -msgid "Preparing for removal of %s" -msgstr "%s eltávolításának előkészítése" +msgid "Malformed override %s line %llu #1" +msgstr "%s felülbírálás deformált a(z) %llu. sorában #1" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:178 #, c-format -msgid "Removed %s" -msgstr "%s eltávolítva" +msgid "Malformed override %s line %llu #2" +msgstr "%s felülbírálás deformált a(z) %llu. sorában #2" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:191 #, c-format -msgid "Preparing to completely remove %s" -msgstr "%s teljes eltávolításának előkészítése" +msgid "Malformed override %s line %llu #3" +msgstr "%s felülbírálás deformált a(z) %llu. sorában #3" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Completely removed %s" -msgstr "%s teljesen eltávolítva" +msgid "Unknown compression algorithm '%s'" +msgstr "„%s” tömörítési algoritmus ismeretlen" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Nem lehet írni ebbe: %s" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "%s tömörített kimenetnek egy tömörítő készletre van szüksége" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Nem sikerült FILE*-ot létrehozni" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Nem sikerült forkolni" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "A művelet megszakadt, mielőtt befejeződhetett volna" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Gyermekfolyamat tömörítése" -#: apt-pkg/deb/dpkgpm.cc:1687 -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" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Belső hiba, %s létrehozása sikertelen" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "függőségi hibák - a csomag beállítatlan maradt" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "IO az alfolyamathoz/fájlhoz nem sikerült" -#: apt-pkg/deb/dpkgpm.cc:1694 -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." +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Olvasási hiba az MD5 kiszámításakor" -#: apt-pkg/deb/dpkgpm.cc:1700 -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" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Hiba %s törlésekor" -#: apt-pkg/deb/dpkgpm.cc:1707 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Nem került kiírásra apport jelentés, mivel a hibaüzenet memóriaelfogyási " -"hibát jelez" +"Használat: apt-internal-solver\n" +"\n" +"Az apt-internal-solver felülettel a jelenlegi belső feloldó külső\n" +"feloldóként használható az APT családhoz hibakeresési vagy hasonló céllal\n" +"\n" +"Kapcsolók:\n" +" -h Ez a súgó szöveg.\n" +" -q Naplózható kimenet - nincs folyamatjelző\n" +" -c=? Ezt a konfigurációs fájlt olvassa be\n" +" -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/" +"tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -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" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Ismeretlen csomagbejegyzés!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Nem került kiírásra apport jelentés, mert a hibaüzenet dpkg I/O hibát jelez" +"Használat: apt-sortpkgs [kapcsolók] fájl1 [fájl2 ...]\n" +"\n" +"Az apt-sortpkgs egy egyszerű eszköz csomagfájlok rendezésére. A -s " +"kapcsolót\n" +"lehet használni annak jelzésére hogy ez milyen típusú fájl.\n" +"\n" +"Kapcsolók:\n" +" -h Ez a súgó szöveg\n" +" -s Forrásfájlrendezést használ\n" +" -c=? Ezt a konfigurációs fájlt olvassa be\n" +" -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/it.po b/po/it.po index 5348110c2..bac0d8272 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2014-05-31 17:04+0100\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Tabella versione:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -366,7 +366,7 @@ 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" @@ -393,80 +393,80 @@ msgstr "" "per recuperare gli ultimi (forse non rilasciati) aggiornamenti del " "pacchetto.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossibile determinare lo spazio libero in %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s è insufficiente" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "È necessario scaricare %sB di sorgenti.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Recupero sorgente %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Recupero di alcuni archivi non riuscito." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Scaricamento completato e in modalità solo scaricamento" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione \"%s\" non riuscito.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando \"%s\" di generazione non riuscito.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Creazione processo figlio non riuscita" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -475,17 +475,17 @@ msgstr "" "Informazioni sull'architettura non disponibili per %s. Consultare apt." "conf(5) APT::Architectures per l'impostazione" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di generazione.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -494,7 +494,7 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché %s non è " "consentito su pacchetti \"%s\"" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -503,14 +503,14 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s " "non può essere trovato" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -519,7 +519,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:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -528,30 +528,30 @@ msgstr "" "La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s " "non ha una versione candidata" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, 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:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Elaborazione delle dipendenze di generazione non riuscita" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog per %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -704,7 +704,7 @@ msgstr "%s era già non bloccato.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "In attesa di %s ma non era presente" @@ -843,16 +843,16 @@ 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:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "File non trovato" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Esecuzione di stat non riuscita" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Impostazione della data di modifica non riuscita" @@ -907,7 +907,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "TYPE non riuscito, il server riporta: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Connessione scaduta" @@ -929,7 +929,7 @@ msgstr "Una risposta ha superato le dimensioni del buffer." msgid "Protocol corruption" msgstr "Protocollo danneggiato" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -991,7 +991,7 @@ msgstr "Connessione al socket dati terminata" msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Si è verificato un problema nel creare l'hash del file" @@ -1000,7 +1000,7 @@ msgstr "Si è verificato un problema nel creare l'hash del file" msgid "Unable to fetch file, server said '%s'" msgstr "Impossibile recuperare il file, il server riporta: \"%s\"" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Socket dati terminato" @@ -1050,7 +1050,7 @@ msgstr "Impossibile connettersi a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Connessione a %s" @@ -1196,43 +1196,17 @@ msgstr "Connessione non riuscita" msgid "Internal error" msgstr "Errore interno" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Trovato " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Scaricamento di:" - -# (ndt) questa non so cosa voglia dire -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ign " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Err " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Recuperati %sB in %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [In lavorazione]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "Elencazione" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Cambio disco: inserire il disco chiamato\n" -" \"%s\"\n" -"nell'unità \"%s\" e premere Invio\n" +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:93 msgid "Correcting dependencies..." @@ -1262,174 +1236,356 @@ msgstr "È utile eseguire \"apt-get -f install\" per correggere ciò." msgid "Unmet dependencies. Try using -f." msgstr "Dipendenze non trovate. Riprovare usando -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" -msgstr "Ordinamento" - -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati." - -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Avviso di autenticazione disabilitato.\n" - -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Alcuni pacchetti non possono essere autenticati" - -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Installare questi pacchetti senza verificarli?" - -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes" +#: 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-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:265 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Impossibile recuperare %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" -"Errore interno, InstallPackages è stato chiamato con un pacchetto " -"danneggiato." +msgid "[installed,upgradable to: %s]" +msgstr "[installato, aggiornabile a: %s]" -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "" -"I pacchetti devono essere rimossi, ma l'azione di rimozione è disabilitata." +#: apt-private/private-output.cc:268 +msgid "[installed,local]" +msgstr "[installato, locale]" -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Errore interno, l'ordinamento non è stato terminato" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "[installato, auto-rimovibile]" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" -msgstr "" -"Le dimensioni non corrispondono. Inviare un'email a: apt@packages.debian.org" +#: apt-private/private-output.cc:272 +msgid "[installed,automatic]" +msgstr "[installato, automatico]" -#. 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 -#: apt-private/private-install.cc:155 -#, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "È necessario scaricare %sB/%sB di archivi.\n" +#: apt-private/private-output.cc:274 +msgid "[installed]" +msgstr "[installato]" -#. 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:160 +#: apt-private/private-output.cc:277 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "È necessario scaricare %sB di archivi.\n" +msgid "[upgradable from: %s]" +msgstr "[aggiornabile da: %s]" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" +msgstr "[configurazione residua]" -#. 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:172 +#: apt-private/private-output.cc:455 #, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n" +msgid "but %s is installed" +msgstr "ma la versione %s è installata" -#: apt-private/private-install.cc:200 +#: apt-private/private-output.cc:457 #, c-format -msgid "You don't have enough free space in %s." -msgstr "Spazio libero in %s insufficiente." +msgid "but %s is to be installed" +msgstr "ma la versione %s sta per essere installata" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "" -"È stata specificata la modalità \"Trivial Only\", ma questa non è " -"un'operazione banale." +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "ma non è installabile" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Sì, esegui come da richiesta." +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "ma è un pacchetto virtuale" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Si sta per compiere un'azione potenzialmente pericolosa.\n" -"Per continuare scrivere la frase \"%s\"\n" -" ?] " +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "ma non è installato" -#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Interrotto." +#: 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-install.cc:243 -msgid "Do you want to continue?" -msgstr "Continuare?" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " oppure" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Scaricamento di alcuni file non riuscito" +#: 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-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Impossibile scaricare alcuni pacchetti. Potrebbe essere utile eseguire \"apt-" -"get update\" o provare l'opzione \"--fix-missing\"." +#: apt-private/private-output.cc:523 +msgid "The following NEW packages will be installed:" +msgstr "I seguenti pacchetti NUOVI saranno installati:" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing su supporti estraibili non è ancora supportato" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "I seguenti pacchetti saranno RIMOSSI:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Impossibile correggere i pacchetti mancanti." +#: 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-install.cc:330 -msgid "Aborting install." -msgstr "Interruzione dell'installazione." +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "I seguenti pacchetti saranno aggiornati:" -#: apt-private/private-install.cc:366 -msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"Il seguente pacchetto è sparito dal sistema poiché\n" -"tutti i file sono stati sovrascritti da altri pacchetti:" -msgstr[1] "" -"I seguenti pacchetti sono spariti dal sistema poiché\n" -"tutti i file sono stati sovrascritti da altri pacchetti:" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" +msgstr "I seguenti pacchetti saranno RETROCESSI:" -#: apt-private/private-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Nota: questo viene svolto automaticamente e volutamente da dpkg." +#: apt-private/private-output.cc:633 +msgid "The following held packages will be changed:" +msgstr "I seguenti pacchetti bloccati saranno cambiati:" -#: apt-private/private-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "" -"Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover" +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (a causa di %s) " -#: apt-private/private-install.cc:499 +#: apt-private/private-output.cc:696 msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" msgstr "" -"Sembra che AutoRemover abbia rovinato qualcosa e questo\n" -"non doveva accadere. Segnalare un bug riguardo apt." - +"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:35 +#, 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:97 +#, 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:101 +msgid "All packages are up to date." +msgstr "" + +#: 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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "" +"Errore interno, InstallPackages è stato chiamato con un pacchetto " +"danneggiato." + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "" +"I pacchetti devono essere rimossi, ma l'azione di rimozione è disabilitata." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Errore interno, l'ordinamento non è stato terminato" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Le dimensioni non corrispondono. Inviare un'email 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "È necessario scaricare %sB/%sB di archivi.\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:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "È necessario scaricare %sB di archivi.\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:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n" + +#. 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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Spazio libero in %s insufficiente." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "" +"È stata specificata la modalità \"Trivial Only\", ma questa non è " +"un'operazione banale." + +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Sì, esegui come da richiesta." + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Si sta per compiere un'azione potenzialmente pericolosa.\n" +"Per continuare scrivere la frase \"%s\"\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Interrotto." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Continuare?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Scaricamento di alcuni file non riuscito" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Impossibile scaricare alcuni pacchetti. Potrebbe essere utile eseguire \"apt-" +"get update\" o provare l'opzione \"--fix-missing\"." + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing su supporti estraibili non è ancora supportato" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Impossibile correggere i pacchetti mancanti." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Interruzione dell'installazione." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"Il seguente pacchetto è sparito dal sistema poiché\n" +"tutti i file sono stati sovrascritti da altri pacchetti:" +msgstr[1] "" +"I seguenti pacchetti sono spariti dal sistema poiché\n" +"tutti i file sono stati sovrascritti da altri pacchetti:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Nota: questo viene svolto automaticamente e volutamente da dpkg." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" +"Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover" + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"Sembra che AutoRemover abbia rovinato qualcosa e questo\n" +"non doveva accadere. Segnalare un bug riguardo apt." + #. #. if (Packages == 1) #. { @@ -1565,208 +1721,26 @@ 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:129 -msgid "Listing" -msgstr "Elencazione" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati." -#: apt-private/private-list.cc:159 -#, 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-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-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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Avviso di autenticazione disabilitato.\n" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Errore di compilazione dell'espressione regolare - %s" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Alcuni pacchetti non possono essere autenticati" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "Ricerca sul testo" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Installare questi pacchetti senza verificarli?" -#: apt-private/private-show.cc:156 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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)" +msgid "Failed to fetch %s %s\n" +msgstr "Impossibile recuperare %s %s\n" #: apt-private/private-sources.cc:58 #, c-format @@ -1779,21 +1753,9 @@ msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" "Il proprio file \"%s\" è stato modificato: eseguire \"apt-get update\"." -#: 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:90 -#, 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:94 -msgid "All packages are up to date." -msgstr "" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" +msgstr "Ricerca sul testo" #: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " @@ -1803,20 +1765,58 @@ msgstr "Calcolo dell'aggiornamento... " msgid "Done" msgstr "Eseguito" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Trovato " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Scaricamento di:" + +# (ndt) questa non so cosa voglia dire +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ign " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Err " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Recuperati %sB in %s (%sB/s)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [In lavorazione]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Cambio disco: inserire il disco chiamato\n" +" \"%s\"\n" +"nell'unità \"%s\" e premere Invio\n" + #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format msgid "Unable to read %s" msgstr "Impossibile leggere %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1850,7 +1850,7 @@ msgstr "[Mirror: %s]" msgid "Failed to create IPC pipe to subprocess" msgstr "Creazione di una pipe IPC verso il sottoprocesso non riuscita" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "Connessione chiusa prematuramente" @@ -1895,646 +1895,568 @@ msgstr "" msgid "Merging available information" msgstr "Unione delle informazioni disponibili" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Uso: apt-extracttemplates FILE1 [FILE2 ...]\n" -"\n" -"apt-extracttemplates è uno strumento per estrarre configurazioni e template\n" -"dai pacchetti debian\n" -"\n" -"Opzioni:\n" -" -h Mostra questo aiuto\n" -" -t Imposta la directory temporanea\n" -" -c=? Legge come configurazione il file specificato\n" -" -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" - -#: cmdline/apt-extracttemplates.cc:254 -#, c-format -msgid "Unable to mkstemp %s" -msgstr "Impossibile eseguire mkstemp %s" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode invocata su un nodo ancora collegato" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "Impossibile scrivere in %s" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Localizzazione dell'elemento hash non riuscita." -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Impossibile trovare la versione di debconf. È installato?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Allocazione della deviazione non riuscita" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "L'elenco dell'estensione del pacchetto è troppo lungo" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Errore interno in AddDiversion" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "Errore nell'elaborare la directory %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "L'elenco dell'estensione del sorgente è troppo lungo" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Errore nella scrittura dell'intestazione nel file \"contents\"" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Tentativo di sovrascrivere una deviazione, %s -> %s e %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "Errore nell'elaborare i contenuti %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Uso: apt-ftparchive [OPZIONI] COMANDO\n" -"Comandi: packages PERCORSO_AL_BINARIO [FILE_OVERRIDE [PREFISSO_PERCORSO]\n" -" sources PERCORSO_AI_SORGENTI [FILE_OVERRIDE [PREFISSO_PERCORSO]\n" -" contents PERCORSO\n" -" release PERCORSO\n" -" generate CONFIGURAZIONE [GRUPPI]\n" -" clean CONFIGURAZIONE\n" -"\n" -"apt-ftparchive genera file di indice per gli archivi Debian. Supporta\n" -"molti stili di generazione da completamente automatici ad alternative\n" -"funzionali per dpkg-scanpackages e dpkg-scansources\n" -"\n" -"apt-ftparchive genera file Packages da un albero di \".deb\". Il file\n" -"Package contiene le informazioni di tutti i campi control da ogni\n" -"pacchetto, così come l'hash MD5 e la dimensione del file. Un file override\n" -"è supportato per forzare i valori di priorità e sezione.\n" -"\n" -"Similmente, apt-ftparchive genera file Sources da un albero di .dscs.\n" -"L'opzione --source-override può essere usata per specificare un file\n" -"di override per i sorgenti\n" -"\n" -"I comandi \"packages\" e \"sources\" devono essere eseguiti nella root \n" -"dell'albero. Il percorso al binario deve puntare alla base della ricerca \n" -"ricorsiva e il file override deve contenere le opzioni di override.\n" -"Il prefisso del percorso è aggiunto al campo filename se presente. Esempio\n" -"di utilizzo dall'archivio Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages \n" -"\n" -"Opzioni:\n" -" -h Mostra questo aiuto\n" -" --md5 Controlla la generazione dell'MD5\n" -" -s=? File override dei sorgenti\n" -" -q Silenzioso\n" -" -d=? Seleziona il database di cache opzionale\n" -" --no-delink Abilita la modalità di debug del delinking\n" -" --contents Controlla la generazione del file \"contents\"\n" -" -c=? Legge come configurazione il file specificato\n" -" -o=? Imposta un'opzione arbitraria di configurazione" +msgid "Double add of diversion %s -> %s" +msgstr "Doppia aggiunta di deviazione %s -> %s" -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Nessuna selezione corrisponde" +#: apt-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "File di configurazione duplicato %s/%s" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Mancano alcuni file nel file group di pacchetti \"%s\"" +msgid "The path %s is too long" +msgstr "Il percorso %s è troppo lungo" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Il database era danneggiato, il file è stato rinominato in %s.old" +msgid "Unpacking %s more than once" +msgstr "Estrazione di %s eseguita più di una volta" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:142 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Il database è vecchio, tentativo di aggiornamento %s" +msgid "The directory %s is diverted" +msgstr "La directory %s è deviata" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +#: apt-inst/extract.cc:152 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -"Il formato del database non è valido. Se è stato eseguito l'aggiornamento da " -"una vecchia versione di apt, rimuovere e ricreare il database." +"Il pacchetto sta cercando di scrivere nell'obiettivo di deviazione %s/%s" -#: ftparchive/cachedb.cc:99 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Impossibile aprire il file del database %s: %s" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Il percorso della deviazione è troppo lungo" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Impossibile eseguire stat su %s" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Esecuzione di readlink su %s non riuscita" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "L'archivio non ha un campo \"control\"" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Impossibile ottenere un cursore" - -# (ndt) messo A per Avviso -# Inizio con la maiuscola dopo i : perché mi sa che in molti -# casi molte stringhe sono così -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "A: Impossibile leggere la directory %s\n" +msgid "Failed to rename %s to %s" +msgstr "Rinomina di %s in %s non riuscita" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "A: Impossibile eseguire stat su %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "La directory %s sta per essere sostituita da una non-directory" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "A: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Localizzazione del nodo nel suo hash bucket non riuscita" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: Gli errori si applicano al file " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Il percorso è troppo lungo" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "Risoluzione di %s non riuscita" +msgid "Overwrite package match with no version for %s" +msgstr "Il pacchetto sovrascritto corrisponde senza versione per %s" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Visita dell'albero non riuscita" +#: apt-inst/extract.cc:438 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:498 #, c-format -msgid "Failed to open %s" -msgstr "Apertura di %s non riuscita" +msgid "Unable to stat %s" +msgstr "Impossibile eseguire stat su %s" -#: ftparchive/writer.cc:278 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " Delink %s [%s]\n" +msgid "Failed to write file %s" +msgstr "Scrittura del file %s non riuscita" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to readlink %s" -msgstr "Esecuzione di readlink su %s non riuscita" +msgid "Failed to close file %s" +msgstr "Chiusura del file %s non riuscita" -#: ftparchive/writer.cc:290 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "Failed to unlink %s" -msgstr "Esecuzione di unlink su %s non riuscita" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Questo non è un archivio DEB valido: membro \"%s\" mancante" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Collegamento di %s a %s non riuscito" +msgid "Internal error, could not locate member %s" +msgstr "Errore interno, impossibile trovare il membro %s" -#: ftparchive/writer.cc:308 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Raggiunto il limite di DeLink di %sB.\n" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "File \"control\" non analizzabile" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "L'archivio non ha un campo \"package\"" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Firma dell'archivio non valida" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s non ha un campo override\n" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Errore nel leggere l'intestazione member dell'archivio" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " il responsabile di %s è %s non %s\n" +msgid "Invalid archive member header %s" +msgstr "Intestazione member dell'archivio %s non valida" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s non ha un campo source override\n" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Intestazione member dell'archivio non valida" -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s non ha neppure un campo binario override\n" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "L'archivio è troppo piccolo" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Allocazione della memoria non riuscita" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Lettura delle intestazioni dell'archivio non riuscita" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Impossibile aprire %s" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Creazione delle pipe non riuscita" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Override %s riga %llu malformato (%s)" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Esecuzione di gzip non riuscita " -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Lettura del file override %s non riuscita" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Archivio danneggiato" -#: ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Override %s riga %llu malformato #1" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Checksum di tar non riuscito, archivio danneggiato" -#: ftparchive/override.cc:178 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Override %s riga %llu malformato #2" +msgid "Unknown TAR header type %u, member %s" +msgstr "Intestazione TAR di tipo %u sconosciuta, member %s" -#: ftparchive/override.cc:191 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Override %s riga %llu malformato #3" +msgid "Progress: [%3i%%]" +msgstr "Avanzamento: [%3i%%]" -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Algoritmo di compressione \"%s\" sconosciuto" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "Esecuzione di dpkg" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/init.cc:146 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "L'output compresso %s necessita di un insieme di compressione" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Creazione di FILE* non riuscita" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Fork non riuscita" +msgid "Packaging system '%s' is not supported" +msgstr "Il sistema di pacchetti \"%s\" non è supportato" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Sottoprocesso compresso" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Errore interno, creazione di %s non riuscita" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "I/O al sottoprocesso/file non riuscito" - -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Lettura durante l'elaborazione MD5 non riuscita" +msgid "Wrote %i records.\n" +msgstr "Scritti %i record.\n" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Problem unlinking %s" -msgstr "Problema nell'unlink di %s" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Scritti %i record con %i file mancanti.\n" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Rinomina di %s in %s non riuscita" - -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Uso: apt-internal-solver\n" -"\n" -"apt-internal-solver è un'interfaccia per l'utilizzo del resolver interno\n" -"come resolver esterno per il debugging degli strumenti APT\n" -"\n" -"Opzioni:\n" -" -h Mostra questo aiuto\n" -" -q Output registrabile, nessun indicatore di avanzamento\n" -" -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 -msgid "Unknown package record!" -msgstr "Record del pacchetto sconosciuto." +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Scritti %i record con %i file senza corrispondenze\n" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"Uso: apt-sortpkgs [OPZIONI] FILE1 [FILE2 ...]\n" -"\n" -"apt-sortpkgs è uno strumento per ordinare i file dei pacchetti.\n" -"L'opzione -s è usata per indicare il tipo di file.\n" -"\n" -"Opzioni:\n" -" -h Mostra questo aiuto\n" -" -s Ordina per pacchetto sorgente\n" -" -c=? Legge come configurazione il file specificato\n" -" -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n" +"Scritti %i record con %i file mancanti e %i file senza corrispondenze\n" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Failed to write file %s" -msgstr "Scrittura del file %s non riuscita" +msgid "Can't find authentication record for: %s" +msgstr "Impossibile trovare il record di autenticazione per %s" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "Failed to close file %s" -msgstr "Chiusura del file %s non riuscita" +msgid "Hash mismatch for: %s" +msgstr "Hash non corrispondente per %s" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "The path %s is too long" -msgstr "Il percorso %s è troppo lungo" +msgid "The method driver %s could not be found." +msgstr "Impossibile trovare un driver per il metodo %s." -#: apt-inst/extract.cc:132 +#: apt-pkg/acquire-worker.cc:118 #, c-format -msgid "Unpacking %s more than once" -msgstr "Estrazione di %s eseguita più di una volta" +msgid "Is the package %s installed?" +msgstr "Il pacchetto %s è installato?" -#: apt-inst/extract.cc:142 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "The directory %s is diverted" -msgstr "La directory %s è deviata" +msgid "Method %s did not start correctly" +msgstr "Il metodo %s non si è avviato correttamente" -#: apt-inst/extract.cc:152 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "" -"Il pacchetto sta cercando di scrivere nell'obiettivo di deviazione %s/%s" +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-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Il percorso della deviazione è troppo lungo" - -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "La directory %s sta per essere sostituita da una non-directory" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "" +"L'elenco dei pacchetti o il file di stato non può essere letto o aperto." -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Localizzazione del nodo nel suo hash bucket non riuscita" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"È consigliato eseguire \"apt-get update\" per correggere questi problemi" -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Il percorso è troppo lungo" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Impossibile leggere l'elenco dei sorgenti." -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Il pacchetto sovrascritto corrisponde senza versione per %s" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Cache dei pacchetti vuota" -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Il file della cache dei pacchetti è danneggiato" -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "Impossibile eseguire stat su %s" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "La versione del file della cache dei pacchetti è incompatibile" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "DropNode invocata su un nodo ancora collegato" +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" +msgstr "Il file cache del pacchetto è danneggiato, è troppo piccolo" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Localizzazione dell'elemento hash non riuscita." +#: apt-pkg/pkgcache.cc:174 +#, c-format +msgid "This APT does not support the versioning system '%s'" +msgstr "Questo APT non supporta il sistema di versione \"%s\"" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Allocazione della deviazione non riuscita" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "" +"Il file della cache dei pacchetti è stato generato per un'altra architettura" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Errore interno in AddDiversion" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Dipende" -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Tentativo di sovrascrivere una deviazione, %s -> %s e %s/%s" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Pre-dipende" -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Doppia aggiunta di deviazione %s -> %s" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Consiglia" -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "File di configurazione duplicato %s/%s" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Raccomanda" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Firma dell'archivio non valida" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Va in conflitto" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Errore nel leggere l'intestazione member dell'archivio" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Sostituisce" -#: apt-inst/contrib/arfile.cc:96 -#, c-format -msgid "Invalid archive member header %s" -msgstr "Intestazione member dell'archivio %s non valida" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Rende obsoleto" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Intestazione member dell'archivio non valida" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Rompe" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "L'archivio è troppo piccolo" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Migliora" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Lettura delle intestazioni dell'archivio non riuscita" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "importante" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Creazione delle pipe non riuscita" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "richiesto" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Esecuzione di gzip non riuscita " +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "standard" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Archivio danneggiato" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "opzionale" -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Checksum di tar non riuscito, archivio danneggiato" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "extra" -#: apt-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Intestazione TAR di tipo %u sconosciuta, member %s" +msgid "Index file type '%s' is not supported" +msgstr "Il file indice di tipo \"%s\" non è supportato" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/sourcelist.cc:127 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Questo non è un archivio DEB valido: membro \"%s\" mancante" +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "La stanza %u nel file delle sorgenti %s non è corretta (analisi URI)" -#: apt-inst/deb/debfile.cc:132 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "Errore interno, impossibile trovare il membro %s" +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-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "File \"control\" 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)" -# (ndt) sarebbe da controllare meglio assieme a quella dopo -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "List directory %spartial is missing." -msgstr "Manca la directory di liste %spartial." +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/acquire.cc:91 +#: apt-pkg/sourcelist.cc:190 #, c-format -msgid "Archives directory %spartial is missing." -msgstr "Manca la directory di archivio %spartial." +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/acquire.cc:99 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "Unable to lock directory %s" -msgstr "Impossibile bloccare la directory %s" +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/acquire.cc:490 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/sourcelist.cc:206 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" +msgstr "La riga %lu nel file %s non è corretta (URI)" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Scaricamento file %li di %li (%s rimanente)" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "La riga %lu nel file %s non è corretta (dist)" -#: apt-pkg/acquire.cc:904 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Retrieving file %li of %li" -msgstr "Scaricamento file %li di %li" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "La riga %lu nel file %s non è corretta (URI parse)" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "rename() non riuscita: %s (%s -> %s)." +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "La riga %lu nel file %s non è corretta (absolute dist)" -#: apt-pkg/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "Somma hash non corrispondente" +#: 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/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "Le dimensioni non corrispondono" +#: apt-pkg/sourcelist.cc:335 +#, c-format +msgid "Opening %s" +msgstr "Apertura di %s" -#: apt-pkg/acquire-item.cc:173 -msgid "Invalid file format" -msgstr "Formato file non valido" +#: 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/acquire-item.cc:1573 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "" +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:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Il file indice di tipo \"%s\" non è supportato" + +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." +msgstr "Impossibile eseguire stat su %s." + +#: apt-pkg/pkgcachegen.cc:93 +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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Si è verificato un errore nell'elaborare %s (%s%d)" + +#: apt-pkg/pkgcachegen.cc:257 +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:260 +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:263 +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:266 +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:576 +#, 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:1211 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s" + +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Lettura elenco dei pacchetti" + +# (ndt) non mi convince per niente, ma vediamo cosa salta fuori +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Il file fornisce" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Impossibile scrivere in %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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:241 +msgid "Send request to solver" +msgstr "Invia la richiesta al solver" + +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "Preparazione alla ricezione della soluzione" + +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "Il solver esterno è terminato senza un errore di messaggio" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "Esecuzione solver esterno" + +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "rename() non riuscita: %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "Somma hash non corrispondente" + +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "Le dimensioni non corrispondono" + +#: apt-pkg/acquire-item.cc:173 +msgid "Invalid file format" +msgstr "Formato file non valido" + +#: apt-pkg/acquire-item.cc:1640 +#, c-format +msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" "Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list " "errata o file danneggiato)" -#: apt-pkg/acquire-item.cc:1589 +#: apt-pkg/acquire-item.cc:1656 #, 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:1631 +#: apt-pkg/acquire-item.cc:1698 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:1669 +#: apt-pkg/acquire-item.cc:1736 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2543,12 +2465,12 @@ msgstr "" "Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per " "questo repository non verranno applicati." -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/acquire-item.cc:1758 #, 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:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2558,12 +2480,12 @@ 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:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "Errore GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2572,14 +2494,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:1925 +#: apt-pkg/acquire-item.cc:1992 #, 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:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2587,129 +2509,103 @@ msgstr "" "I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" " "per il pacchetto %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Impossibile trovare un driver per il metodo %s." +msgid "Vendor block %s contains no fingerprint" +msgstr "Il blocco vendor %s non contiene impronte" -#: apt-pkg/acquire-worker.cc:118 +# (ndt) sarebbe da controllare meglio assieme a quella dopo +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Is the package %s installed?" -msgstr "Il pacchetto %s è installato?" +msgid "List directory %spartial is missing." +msgstr "Manca la directory di liste %spartial." -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Method %s did not start correctly" -msgstr "Il metodo %s non si è avviato correttamente" +msgid "Archives directory %spartial is missing." +msgstr "Manca la directory di archivio %spartial." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 #, 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 "Unable to lock directory %s" +msgstr "Impossibile bloccare la directory %s" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"Il pacchetto %s deve essere reinstallato, ma non è possibile trovarne un " -"archivio." - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo " -"potrebbe essere causato da pacchetti bloccati." +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Scaricamento file %li di %li (%s rimanente)" -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "" -"Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati." +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Scaricamento file %li di %li" -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" msgstr "" -"L'elenco dei pacchetti o il file di stato non può essere letto o aperto." +"È necessario inserire alcuni URI di tipo \"source\" nel file sources.list" -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" +#: 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 "" -"È consigliato eseguire \"apt-get update\" per correggere questi problemi" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Impossibile leggere l'elenco dei sorgenti." +"Il valore \"%s\" non è valido per APT::Default-Release poiché tale release " +"non è disponibile dalle sorgenti" -# (ndt) dovrebbe essere inteso il file Release -#: apt-pkg/cacheset.cc:489 +#: apt-pkg/policy.cc:422 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Release \"%s\" per \"%s\" non trovato." +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "" +"Campo non valido nel file delle preferenze %s, manca l'intestazione \"Package" +"\"" -# (ndt) dovrebbe essere inteso il Version -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Version \"%s\" per \"%s\" non trovato" +msgid "Did not understand pin type %s" +msgstr "Impossibile comprendere il tipo di gancio %s" -#: apt-pkg/cacheset.cc:603 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "Impossibile trovare il task \"%s\"" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Priorità per il gancio non specificata (o zero)" -#: apt-pkg/cacheset.cc:609 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format -msgid "Couldn't find any package by regex '%s'" +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -"Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\"" +"Impossibile eseguire immediatamente la configurazione su \"%s\". Per " +"maggiori informazioni, consultare \"man 5 apt.conf\" alla sezione \"APT::" +"Immediate-Configure\" (%d)." -#: apt-pkg/cacheset.cc:615 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Impossibile trovare alcun pacchetto tramite il glob \"%s\"" +msgid "Could not configure '%s'. " +msgstr "Impossibile configurare \"%s\". " -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" +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 "" -"Impossibile selezionare le versioni dal pacchetto \"%s\" poiché è virtuale" +"L'installazione necessita della rimozione temporanea del pacchetto " +"essenziale %s a causa di un ciclo conflitto/pre-dipendenza. Questa è una " +"situazione critica, ma se si vuole realmente procedere, attivare l'opzione " +"APT::Force-LoopBreak." -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 -#, c-format +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" -"Impossibile selezionare la versione installata o la candidata dal pacchetto " -"\"%s\" poiché non sono presenti" - -#: apt-pkg/cacheset.cc:647 -#, 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:655 -#, 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:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +"Some index files failed to download. They have been ignored, or old ones " +"used instead." msgstr "" -"Impossibile selezionare la versione installata dal pacchetto %s poiché non è " -"installato" - -#: 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." +"Impossibile scaricare alcuni file di indice: saranno ignorati o verranno " +"usati quelli vecchi." #: apt-pkg/cdrom.cc:571 msgid "Unmounting CD-ROM...\n" @@ -2788,10 +2684,26 @@ msgstr "Scrittura nuovo elenco sorgenti\n" msgid "Source list entries for this disc are:\n" msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Impossibile eseguire stat su %s." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Il pacchetto %s deve essere reinstallato, ma non è possibile trovarne un " +"archivio." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo " +"potrebbe essere causato da pacchetti bloccati." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "" +"Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati." #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2819,56 +2731,79 @@ msgstr "Apertura del file di stato %s non riuscita" msgid "Failed to write temporary StateFile %s" msgstr "Scrittura del file temporaneo di stato %s non riuscita" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "Invia lo scenario al solver" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Impossibile analizzare il file di pacchetto %s (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "Invia la richiesta al solver" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Impossibile analizzare il file di pacchetto %s (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "Preparazione alla ricezione della soluzione" +# (ndt) dovrebbe essere inteso il file Release +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Release \"%s\" per \"%s\" non trovato." -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "Il solver esterno è terminato senza un errore di messaggio" +# (ndt) dovrebbe essere inteso il Version +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Version \"%s\" per \"%s\" non trovato" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "Esecuzione solver esterno" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Impossibile trovare il task \"%s\"" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "Scritti %i record.\n" +msgid "Couldn't find any package by regex '%s'" +msgstr "" +"Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\"" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Scritti %i record con %i file mancanti.\n" +msgid "Couldn't find any package by glob '%s'" +msgstr "Impossibile trovare alcun pacchetto tramite il glob \"%s\"" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Scritti %i record con %i file senza corrispondenze\n" +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/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" -"Scritti %i record con %i file mancanti e %i file senza corrispondenze\n" +"Impossibile selezionare la versione installata o la candidata dal pacchetto " +"\"%s\" poiché non sono presenti" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "Impossibile trovare il record di autenticazione per %s" +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/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Hash non corrispondente per %s" +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:663 +#, 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/indexrecords.cc:78 #, c-format @@ -2895,866 +2830,929 @@ msgstr "Voce \"Valid-Until\" nel file Release %s non valida" msgid "Invalid 'Date' entry in Release file %s" msgstr "Voce \"Date\" nel file Release %s non valida" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Il sistema di pacchetti \"%s\" non è supportato" +msgid "%lid %lih %limin %lis" +msgstr "%lig %lih %limin %lis" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" +msgstr "%lih %limin %lis" -#: apt-pkg/install-progress.cc:57 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Progress: [%3i%%]" -msgstr "Avanzamento: [%3i%%]" +msgid "%limin %lis" +msgstr "%limin %lis" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "Esecuzione di dpkg" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" +msgstr "%lis" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" -"Impossibile eseguire immediatamente la configurazione su \"%s\". Per " -"maggiori informazioni, consultare \"man 5 apt.conf\" alla sezione \"APT::" -"Immediate-Configure\" (%d)." +msgid "Selection %s not found" +msgstr "Selezione %s non trovata" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "Could not configure '%s'. " -msgstr "Impossibile configurare \"%s\". " +msgid "Not using locking for read only lock file %s" +msgstr "Blocco disabilitato per il file di blocco in sola lettura %s" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:195 #, 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 "" -"L'installazione necessita della rimozione temporanea del pacchetto " -"essenziale %s a causa di un ciclo conflitto/pre-dipendenza. Questa è una " -"situazione critica, ma se si vuole realmente procedere, attivare l'opzione " -"APT::Force-LoopBreak." +msgid "Could not open lock file %s" +msgstr "Impossibile aprire il file di blocco %s" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Cache dei pacchetti vuota" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Blocco disabilitato per il file di blocco %s montato via nfs" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Il file della cache dei pacchetti è danneggiato" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Impossibile impostare il blocco %s" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "La versione del file della cache dei pacchetti è incompatibile" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" +"L'elenco dei file non può essere creato poiché \"%s\" non è una directory" -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" -msgstr "Il file cache del pacchetto è danneggiato, è troppo piccolo" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" +"Viene ignorato \"%s\" nella directory \"%s\" poiché non è un file regolare" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:412 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Questo APT non supporta il sistema di versione \"%s\"" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" +"Viene ignorato il file \"%s\" nella directory \"%s\" poiché non ha " +"un'estensione" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -"Il file della cache dei pacchetti è stato generato per un'altra architettura" +"Viene ignorato il file \"%s\" nella directory \"%s\" poiché ha un'estensione " +"non valida" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Dipende" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault." -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Pre-dipende" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "Il sottoprocesso %s ha ricevuto il segnale %u." -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Consiglia" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Il sottoprocesso %s ha restituito un codice d'errore (%u)" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Raccomanda" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Il sottoprocesso %s è uscito inaspettatamente" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Va in conflitto" +#: apt-pkg/contrib/fileutl.cc:913 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Si è verificato un problema nel chiudere il file gzip %s" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Sostituisce" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Impossibile aprire il file %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Rende obsoleto" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "Impossibile aprire il descrittore del file %d" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Rompe" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Creazione di un sottoprocesso IPC non riuscita" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Migliora" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Esecuzione non riuscita del compressore " -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "importante" +#: apt-pkg/contrib/fileutl.cc:1514 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "lettura, ancora %llu da leggere, ma non è stato trovato nulla" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "richiesto" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "scrittura, ancora %llu da scrivere, ma non è possibile" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "standard" +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" +msgstr "Si è verificato un problema nel chiudere il file %s" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "opzionale" +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Si è verificato un problema nel rinominare il file %s in %s" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "extra" +#: apt-pkg/contrib/fileutl.cc:1938 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "La cache ha un sistema di gestione delle versioni incompatibile" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Si è verificato un problema nel sincronizzare il file" -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Si è verificato un errore nell'elaborare %s (%s%d)" +msgid "%c%s... Error!" +msgstr "%c%s... Errore" -#: apt-pkg/pkgcachegen.cc:257 -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/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Fatto" -#: apt-pkg/pkgcachegen.cc:260 -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/contrib/progress.cc:181 +msgid "..." +msgstr "..." -#: apt-pkg/pkgcachegen.cc:263 -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." +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... %u%%" -#: apt-pkg/pkgcachegen.cc:266 -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." +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Impossibile eseguire mmap su un file vuoto" -# (ndt) il primo è il nome del pacchetto, il secondo la versione -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/mmap.cc:111 #, 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" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Impossibile duplicare il descrittore del file %i" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/mmap.cc:119 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s" - -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Lettura elenco dei pacchetti" +msgid "Couldn't make mmap of %llu bytes" +msgstr "Impossibile creare mmap di %llu byte" -# (ndt) non mi convince per niente, ma vediamo cosa salta fuori -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Il file fornisce" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Impossibile chiudere mmap" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Errore di I/O nel salvare la cache sorgente" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Impossibile sincronizzare mmap" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Il file indice di tipo \"%s\" non è supportato" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Impossibile eseguire mmap di %lu byte" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Troncamento del file non riuscito" + +#: apt-pkg/contrib/mmap.cc:341 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"Il valore \"%s\" non è valido per APT::Default-Release poiché tale release " -"non è disponibile dalle sorgenti" +"MMap dinamica esaurita. Aumentare la dimensione di APT::Cache-Start. Il " +"valore attuale è: %lu (man 5 apt.conf)." -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." msgstr "" -"Campo non valido nel file delle preferenze %s, manca l'intestazione \"Package" -"\"" +"Impossibile incrementare la dimensione della MMap poiché il limite di %lu " +"byte è stato raggiunto." -#: apt-pkg/policy.cc:444 +# (ndt) lunghetta... +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Impossibile incrementare la dimensione della MMap poiché il " +"ridimensionamento automatico è stato disabilitato dall'utente." + +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "Did not understand pin type %s" -msgstr "Impossibile comprendere il tipo di gancio %s" +msgid "Unable to stat the mount point %s" +msgstr "Impossibile eseguire stat sul punto di mount %s" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Priorità per il gancio non specificata (o zero)" +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Esecuzione di stat sul CD-ROM non riuscita" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/configuration.cc:519 #, 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)" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Tipo di abbreviazione non riconosciuto: \"%c\"" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/configuration.cc:633 #, 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)" +msgid "Opening configuration file %s" +msgstr "Apertura file di configurazione %s" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/configuration.cc:801 #, 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)" +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Errore di sintassi %s:%u: il blocco inizia senza nome" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/configuration.cc:820 #, 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)" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Errore di sintassi %s:%u: tag non corretto" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/configuration.cc:837 #, 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)" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Errore di sintassi %s:%u: caratteri extra dopo il valore" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgid "Syntax error %s:%u: Directives can only be done at the top level" 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/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/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:371 -#, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "La riga %u nel file %s non è corretta (type)" +"Errore di sintassi %s:%u: le direttive possono essere fatte solo al livello " +"più alto" -#: apt-pkg/sourcelist.cc:375 +#: apt-pkg/contrib/configuration.cc:884 #, 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 "Syntax error %s:%u: Too many nested includes" +msgstr "Errore di sintassi %s:%u: troppe inclusioni annidate" -#: apt-pkg/sourcelist.cc:416 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, 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/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "" -"È necessario inserire alcuni URI di tipo \"source\" nel file sources.list" +msgid "Syntax error %s:%u: Included from here" +msgstr "Errore di sintassi %s:%u: incluso da qui" -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/configuration.cc:897 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Impossibile analizzare il file di pacchetto %s (1)" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Errore di sintassi %s:%u: direttiva \"%s\" non supportata" -#: apt-pkg/tagfile.cc:237 +# (ndt) sarebbe da controllare meglio... +#: apt-pkg/contrib/configuration.cc:900 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Impossibile analizzare il file di pacchetto %s (2)" - -#: 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." +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -"Impossibile scaricare alcuni file di indice: saranno ignorati o verranno " -"usati quelli vecchi." +"Errore di sintassi %s:%u: la direttiva clear richiede un albero di opzioni " +"come argomento" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/configuration.cc:950 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Il blocco vendor %s non contiene impronte" +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/cdromutl.cc:65 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "Impossibile eseguire stat sul punto di mount %s" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "Esecuzione di stat sul CD-ROM non riuscita" +msgid "No keyring installed in %s." +msgstr "Nessun portachiavi installato in %s." -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format msgid "Command line option %s is not understood" msgstr "Opzione a riga di comando %s non comprensibile" -#: apt-pkg/contrib/cmndline.cc:168 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format msgid "Command line option %s is not boolean" msgstr "Opzione a riga di comando %s non booleana" -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format msgid "Option %s requires an argument." msgstr "L'opzione %s richiede un argomento." -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Opzione %s: la specifica di configurazione dell'oggetto deve avere un " "=." -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, 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:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "Opzione \"%s\" troppo lunga" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, 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:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "Operazione %s non valida" -#: apt-pkg/contrib/configuration.cc:519 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Tipo di abbreviazione non riconosciuto: \"%c\"" +msgid "Installing %s" +msgstr "Installazione di %s" -#: apt-pkg/contrib/configuration.cc:633 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Opening configuration file %s" -msgstr "Apertura file di configurazione %s" +msgid "Configuring %s" +msgstr "Configurazione di %s" -#: apt-pkg/contrib/configuration.cc:801 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Errore di sintassi %s:%u: il blocco inizia senza nome" +msgid "Removing %s" +msgstr "Rimozione di %s" -#: apt-pkg/contrib/configuration.cc:820 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Errore di sintassi %s:%u: tag non corretto" +msgid "Completely removing %s" +msgstr "Rimozione completa di %s" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Errore di sintassi %s:%u: caratteri extra dopo il valore" +msgid "Noting disappearance of %s" +msgstr "Notata la sparizione di %s" -#: apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/deb/dpkgpm.cc:115 #, 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" +msgid "Running post-installation trigger %s" +msgstr "Esecuzione comando di post installazione %s" -#: apt-pkg/contrib/configuration.cc:884 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Errore di sintassi %s:%u: troppe inclusioni annidate" +msgid "Directory '%s' missing" +msgstr "Directory \"%s\" mancante" -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Errore di sintassi %s:%u: incluso da qui" +msgid "Could not open file '%s'" +msgstr "Impossibile aprire il file \"%s\"" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Errore di sintassi %s:%u: direttiva \"%s\" non supportata" +msgid "Preparing %s" +msgstr "Preparazione di %s" -# (ndt) sarebbe da controllare meglio... -#: apt-pkg/contrib/configuration.cc:900 +#: apt-pkg/deb/dpkgpm.cc:1008 #, 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" +msgid "Unpacking %s" +msgstr "Estrazione di %s" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:1013 #, 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" +msgid "Preparing to configure %s" +msgstr "Preparazione alla configurazione di %s" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Blocco disabilitato per il file di blocco in sola lettura %s" +msgid "Installed %s" +msgstr "Pacchetto %s installato" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "Could not open lock file %s" -msgstr "Impossibile aprire il file di blocco %s" +msgid "Preparing for removal of %s" +msgstr "Preparazione alla rimozione di %s" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Blocco disabilitato per il file di blocco %s montato via nfs" +msgid "Removed %s" +msgstr "Pacchetto %s rimosso" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Could not get lock %s" -msgstr "Impossibile impostare il blocco %s" +msgid "Preparing to completely remove %s" +msgstr "Preparazione alla rimozione completa di %s" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "" -"L'elenco dei file non può essere creato poiché \"%s\" non è una directory" +msgid "Completely removed %s" +msgstr "Pacchetto %s rimosso completamente" -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" -"Viene ignorato \"%s\" nella directory \"%s\" poiché non è un file regolare" +msgid "Can not write log (%s)" +msgstr "Impossibile scrivere il registro (%s)" -#: apt-pkg/contrib/fileutl.cc:412 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "È /dev/pts montato?" + +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "L'operazione è stata interrotta prima di essere completata" + +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" msgstr "" -"Viene ignorato il file \"%s\" nella directory \"%s\" poiché non ha " -"un'estensione" +"Segnalazione apport non scritta poiché è stato raggiunto il valore massimo " +"di MaxReports" -#: apt-pkg/contrib/fileutl.cc:421 -#, c-format +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "Problemi con le dipendenze - Viene lasciato non configurato" + +#: apt-pkg/deb/dpkgpm.cc:1726 msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -"Viene ignorato il file \"%s\" nella directory \"%s\" poiché ha un'estensione " -"non valida" +"Segnalazione apport non scritta poiché il messaggio di errore indica la " +"presenza di un fallimento precedente." -#: apt-pkg/contrib/fileutl.cc:824 -#, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault." +#: apt-pkg/deb/dpkgpm.cc:1732 +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/contrib/fileutl.cc:826 -#, c-format -msgid "Sub-process %s received signal %u." -msgstr "Il sottoprocesso %s ha ricevuto il segnale %u." +#: apt-pkg/deb/dpkgpm.cc:1739 +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/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Il sottoprocesso %s ha restituito un codice d'errore (%u)" +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +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/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 -#, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Il sottoprocesso %s è uscito inaspettatamente" - -#: apt-pkg/contrib/fileutl.cc:913 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Si è verificato un problema nel chiudere il file gzip %s" +#: apt-pkg/deb/dpkgpm.cc:1774 +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/contrib/fileutl.cc:1101 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "Could not open file %s" -msgstr "Impossibile aprire il file %s" +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/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/deb/debsystem.cc:94 #, c-format -msgid "Could not open file descriptor %d" -msgstr "Impossibile aprire il descrittore del file %d" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Creazione di un sottoprocesso IPC non riuscita" - -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Esecuzione non riuscita del compressore " +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" +"Impossibile acquisire il blocco sulla directory di amministrazione (%s). È " +"necessario essere root." -#: apt-pkg/contrib/fileutl.cc:1514 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 #, c-format -msgid "read, still have %llu to read but none left" -msgstr "lettura, ancora %llu da leggere, ma non è stato trovato nulla" +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/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "scrittura, ancora %llu da scrivere, ma non è possibile" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "Non bloccato" -#: apt-pkg/contrib/fileutl.cc:1915 -#, c-format -msgid "Problem closing the file %s" -msgstr "Si è verificato un problema nel chiudere il file %s" +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Uso: apt-extracttemplates FILE1 [FILE2 ...]\n" +"\n" +"apt-extracttemplates è uno strumento per estrarre configurazioni e template\n" +"dai pacchetti debian\n" +"\n" +"Opzioni:\n" +" -h Mostra questo aiuto\n" +" -t Imposta la directory temporanea\n" +" -c=? Legge come configurazione il file specificato\n" +" -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" -#: apt-pkg/contrib/fileutl.cc:1927 +#: cmdline/apt-extracttemplates.cc:254 #, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Si è verificato un problema nel rinominare il file %s in %s" +msgid "Unable to mkstemp %s" +msgstr "Impossibile eseguire mkstemp %s" -#: apt-pkg/contrib/fileutl.cc:1938 -#, c-format -msgid "Problem unlinking the file %s" -msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Impossibile trovare la versione di debconf. È installato?" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Si è verificato un problema nel sincronizzare il file" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "L'elenco dell'estensione del pacchetto è troppo lungo" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: 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 #, c-format -msgid "No keyring installed in %s." -msgstr "Nessun portachiavi installato in %s." +msgid "Error processing directory %s" +msgstr "Errore nell'elaborare la directory %s" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Impossibile eseguire mmap su un file vuoto" +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "L'elenco dell'estensione del sorgente è troppo lungo" -#: apt-pkg/contrib/mmap.cc:111 -#, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Impossibile duplicare il descrittore del file %i" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Errore nella scrittura dell'intestazione nel file \"contents\"" -#: apt-pkg/contrib/mmap.cc:119 +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Impossibile creare mmap di %llu byte" +msgid "Error processing contents %s" +msgstr "Errore nell'elaborare i contenuti %s" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Impossibile chiudere mmap" +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Uso: apt-ftparchive [OPZIONI] COMANDO\n" +"Comandi: packages PERCORSO_AL_BINARIO [FILE_OVERRIDE [PREFISSO_PERCORSO]\n" +" sources PERCORSO_AI_SORGENTI [FILE_OVERRIDE [PREFISSO_PERCORSO]\n" +" contents PERCORSO\n" +" release PERCORSO\n" +" generate CONFIGURAZIONE [GRUPPI]\n" +" clean CONFIGURAZIONE\n" +"\n" +"apt-ftparchive genera file di indice per gli archivi Debian. Supporta\n" +"molti stili di generazione da completamente automatici ad alternative\n" +"funzionali per dpkg-scanpackages e dpkg-scansources\n" +"\n" +"apt-ftparchive genera file Packages da un albero di \".deb\". Il file\n" +"Package contiene le informazioni di tutti i campi control da ogni\n" +"pacchetto, così come l'hash MD5 e la dimensione del file. Un file override\n" +"è supportato per forzare i valori di priorità e sezione.\n" +"\n" +"Similmente, apt-ftparchive genera file Sources da un albero di .dscs.\n" +"L'opzione --source-override può essere usata per specificare un file\n" +"di override per i sorgenti\n" +"\n" +"I comandi \"packages\" e \"sources\" devono essere eseguiti nella root \n" +"dell'albero. Il percorso al binario deve puntare alla base della ricerca \n" +"ricorsiva e il file override deve contenere le opzioni di override.\n" +"Il prefisso del percorso è aggiunto al campo filename se presente. Esempio\n" +"di utilizzo dall'archivio Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages \n" +"\n" +"Opzioni:\n" +" -h Mostra questo aiuto\n" +" --md5 Controlla la generazione dell'MD5\n" +" -s=? File override dei sorgenti\n" +" -q Silenzioso\n" +" -d=? Seleziona il database di cache opzionale\n" +" --no-delink Abilita la modalità di debug del delinking\n" +" --contents Controlla la generazione del file \"contents\"\n" +" -c=? Legge come configurazione il file specificato\n" +" -o=? Imposta un'opzione arbitraria di configurazione" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Impossibile sincronizzare mmap" +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Nessuna selezione corrisponde" -#: apt-pkg/contrib/mmap.cc:290 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Impossibile eseguire mmap di %lu byte" - -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Troncamento del file non riuscito" +msgid "Some files are missing in the package file group `%s'" +msgstr "Mancano alcuni file nel file group di pacchetti \"%s\"" -#: apt-pkg/contrib/mmap.cc:341 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "" -"MMap dinamica esaurita. Aumentare la dimensione di APT::Cache-Start. Il " -"valore attuale è: %lu (man 5 apt.conf)." +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Il database era danneggiato, il file è stato rinominato in %s.old" -#: apt-pkg/contrib/mmap.cc:446 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "" -"Impossibile incrementare la dimensione della MMap poiché il limite di %lu " -"byte è stato raggiunto." +msgid "DB is old, attempting to upgrade %s" +msgstr "Il database è vecchio, tentativo di aggiornamento %s" -# (ndt) lunghetta... -#: apt-pkg/contrib/mmap.cc:449 +#: ftparchive/cachedb.cc:94 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" -"Impossibile incrementare la dimensione della MMap poiché il " -"ridimensionamento automatico è stato disabilitato dall'utente." +"Il formato del database non è valido. Se è stato eseguito l'aggiornamento da " +"una vecchia versione di apt, rimuovere e ricreare il database." -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Errore" +msgid "Unable to open DB file %s: %s" +msgstr "Impossibile aprire il file del database %s: %s" -#: apt-pkg/contrib/progress.cc:150 -#, c-format -msgid "%c%s... Done" -msgstr "%c%s... Fatto" +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Esecuzione di readlink su %s non riuscita" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "..." +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "L'archivio non ha un campo \"control\"" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Impossibile ottenere un cursore" + +# (ndt) messo A per Avviso +# Inizio con la maiuscola dopo i : perché mi sa che in molti +# casi molte stringhe sono così +#: ftparchive/writer.cc:91 #, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... %u%%" +msgid "W: Unable to read directory %s\n" +msgstr "A: Impossibile leggere la directory %s\n" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/writer.cc:96 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%lig %lih %limin %lis" +msgid "W: Unable to stat %s\n" +msgstr "A: Impossibile eseguire stat su %s\n" + +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "A: " -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" -msgstr "%lih %limin %lis" +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: Gli errori si applicano al file " -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%limin %lis" -msgstr "%limin %lis" +msgid "Failed to resolve %s" +msgstr "Risoluzione di %s non riuscita" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 -#, c-format -msgid "%lis" -msgstr "%lis" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Visita dell'albero non riuscita" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:219 #, c-format -msgid "Selection %s not found" -msgstr "Selezione %s non trovata" +msgid "Failed to open %s" +msgstr "Apertura di %s non riuscita" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:278 #, 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 " DeLink %s [%s]\n" +msgstr " Delink %s [%s]\n" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:286 #, 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 "Failed to readlink %s" +msgstr "Esecuzione di readlink su %s non riuscita" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:290 #, 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 "Failed to unlink %s" +msgstr "Esecuzione di unlink su %s non riuscita" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:298 #, c-format -msgid "Installing %s" -msgstr "Installazione di %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Collegamento di %s a %s non riuscito" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:308 #, c-format -msgid "Configuring %s" -msgstr "Configurazione di %s" +msgid " DeLink limit of %sB hit.\n" +msgstr " Raggiunto il limite di DeLink di %sB.\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 -#, c-format -msgid "Removing %s" -msgstr "Rimozione di %s" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "L'archivio non ha un campo \"package\"" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Completely removing %s" -msgstr "Rimozione completa di %s" +msgid " %s has no override entry\n" +msgstr " %s non ha un campo override\n" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Noting disappearance of %s" -msgstr "Notata la sparizione di %s" +msgid " %s maintainer is %s not %s\n" +msgstr " il responsabile di %s è %s non %s\n" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:706 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Esecuzione comando di post installazione %s" +msgid " %s has no source override entry\n" +msgstr " %s non ha un campo source override\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:710 #, c-format -msgid "Directory '%s' missing" -msgstr "Directory \"%s\" mancante" +msgid " %s has no binary override entry either\n" +msgstr " %s non ha neppure un campo binario override\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, c-format -msgid "Could not open file '%s'" -msgstr "Impossibile aprire il file \"%s\"" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Allocazione della memoria non riuscita" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing %s" -msgstr "Preparazione di %s" +msgid "Unable to open %s" +msgstr "Impossibile aprire %s" -#: apt-pkg/deb/dpkgpm.cc:993 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 #, c-format -msgid "Unpacking %s" -msgstr "Estrazione di %s" +msgid "Malformed override %s line %llu (%s)" +msgstr "Override %s riga %llu malformato (%s)" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing to configure %s" -msgstr "Preparazione alla configurazione di %s" +msgid "Failed to read the override file %s" +msgstr "Lettura del file override %s non riuscita" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/override.cc:166 #, c-format -msgid "Installed %s" -msgstr "Pacchetto %s installato" +msgid "Malformed override %s line %llu #1" +msgstr "Override %s riga %llu malformato #1" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:178 #, c-format -msgid "Preparing for removal of %s" -msgstr "Preparazione alla rimozione di %s" +msgid "Malformed override %s line %llu #2" +msgstr "Override %s riga %llu malformato #2" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:191 #, c-format -msgid "Removed %s" -msgstr "Pacchetto %s rimosso" +msgid "Malformed override %s line %llu #3" +msgstr "Override %s riga %llu malformato #3" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Preparazione alla rimozione completa di %s" +msgid "Unknown compression algorithm '%s'" +msgstr "Algoritmo di compressione \"%s\" sconosciuto" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:103 #, c-format -msgid "Completely removed %s" -msgstr "Pacchetto %s rimosso completamente" +msgid "Compressed output %s needs a compression set" +msgstr "L'output compresso %s necessita di un insieme di compressione" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, c-format -msgid "Can not write log (%s)" -msgstr "Impossibile scrivere il registro (%s)" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Creazione di FILE* non riuscita" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "È /dev/pts montato?" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Fork non riuscita" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "stdout è un terminale?" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Sottoprocesso compresso" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "L'operazione è stata interrotta prima di essere completata" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Errore interno, creazione di %s non riuscita" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" -"Segnalazione apport non scritta poiché è stato raggiunto il valore massimo " -"di MaxReports" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "I/O al sottoprocesso/file non riuscito" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "Problemi con le dipendenze - Viene lasciato non configurato" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Lettura durante l'elaborazione MD5 non riuscita" -#: apt-pkg/deb/dpkgpm.cc:1694 -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." +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Problema nell'unlink di %s" -#: apt-pkg/deb/dpkgpm.cc:1700 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates a disk full " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Segnalazione apport non scritta poiché il messaggio di errore indica un " -"errore per disco pieno." +"Uso: apt-internal-solver\n" +"\n" +"apt-internal-solver è un'interfaccia per l'utilizzo del resolver interno\n" +"come resolver esterno per il debugging degli strumenti APT\n" +"\n" +"Opzioni:\n" +" -h Mostra questo aiuto\n" +" -q Output registrabile, nessun indicatore di avanzamento\n" +" -c=? Legge come configurazione il file specificato\n" +" -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1707 -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." +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Record del pacchetto sconosciuto." -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Segnalazione apport non scritta poiché il messaggio di errore indica un " -"errore nel sistema locale." +"Uso: apt-sortpkgs [OPZIONI] FILE1 [FILE2 ...]\n" +"\n" +"apt-sortpkgs è uno strumento per ordinare i file dei pacchetti.\n" +"L'opzione -s è usata per indicare il tipo di file.\n" +"\n" +"Opzioni:\n" +" -h Mostra questo aiuto\n" +" -s Ordina per pacchetto sorgente\n" +" -c=? Legge come configurazione il file specificato\n" +" -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1742 -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 "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 8b02cd5c1..a8b22e295 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.9.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2014-09-27 19:32+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@ -157,7 +157,7 @@ msgid " Version table:" msgstr " バージョンテーブル:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -361,7 +361,7 @@ msgid "Must specify at least one package to fetch source for" msgstr "" "ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "%s のソースパッケージが見つかりません" @@ -388,80 +388,80 @@ msgstr "" "bzr branch %s\n" "を使用してください。\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペースがありません" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: cmdline/apt-get.cc:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "子プロセスが失敗しました" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -470,17 +470,17 @@ msgstr "" "%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt." "conf(5) の APT::Architectures を参照してください。" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド依存情報を取得できません" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド依存情報が指定されていません。\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -489,7 +489,7 @@ msgstr "" "パッケージ %3$s が '%4$s' パッケージで許されていないため、%2$s に対する %1$s " "の依存関係を満たすことができません" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -498,14 +498,14 @@ msgstr "" "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" "ができません" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -514,7 +514,7 @@ msgstr "" "パッケージ %3$s の候補バージョンはバージョンについての要求を満たせないた" "め、%2$s に対する %1$s の依存関係を満たすことができません" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -523,30 +523,30 @@ msgstr "" "パッケージ %3$s の候補バージョンが存在しないため、%2$s に対する %1$s の依存関" "係を満たすことができません" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド依存関係を満たすことができませんでした。" -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "ビルド依存関係の処理に失敗しました" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) の変更履歴" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "サポートされているモジュール:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -701,7 +701,7 @@ msgstr "%s はすでに保留されていません。\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s を待ちましたが、そこにはありませんでした" @@ -839,16 +839,16 @@ msgstr "%s の CD-ROM は使用中のためアンマウントすることがで msgid "Disk not found." msgstr "ディスクが見つかりません。" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "ファイルが見つかりません" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "状態の取得に失敗しました" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "変更時刻の設定に失敗しました" @@ -902,7 +902,7 @@ msgstr "ログインスクリプトのコマンド '%s' 失敗、サーバ応答 msgid "TYPE failed, server said: %s" msgstr "TYPE 失敗、サーバ応答: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "接続タイムアウト" @@ -924,7 +924,7 @@ msgstr "レスポンスがバッファをオーバフローさせました。" msgid "Protocol corruption" msgstr "プロトコルが壊れています" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -985,7 +985,7 @@ msgstr "データソケット接続タイムアウト" msgid "Unable to accept connection" msgstr "接続を accept できません" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" @@ -994,7 +994,7 @@ msgstr "ファイルのハッシュでの問題" msgid "Unable to fetch file, server said '%s'" msgstr "ファイルを取得できません。サーバ応答 '%s'" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "データソケットタイムアウト" @@ -1044,7 +1044,7 @@ msgstr "%s:%s (%s) へ接続できませんでした。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "%s へ接続しています" @@ -1185,42 +1185,17 @@ msgstr "接続失敗" msgid "Internal error" msgstr "内部エラー" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "ヒット " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "取得:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "無視 " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "エラー " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "%sB を %s で取得しました (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [処理中]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "一覧表示" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"メディア変更: \n" -" '%s'\n" -"とラベルの付いたディスクをドライブ '%s' に入れて Enter キーを押してください\n" +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:93 msgid "Correcting dependencies..." @@ -1252,175 +1227,357 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "未解決の依存関係があります。-f オプションを試してください。" -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" -msgstr "ソート中" - -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "警告: 以下のパッケージは認証されていません!" - -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "認証の警告は上書きされました。\n" - -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "いくつかのパッケージを認証できませんでした" - -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "検証なしにこれらのパッケージをインストールしますか?" - -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" +msgstr "不明" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:265 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "%s の取得に失敗しました %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!" +msgid "[installed,upgradable to: %s]" +msgstr "[インストール済み、%s にアップグレード可]" -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。" +#: apt-private/private-output.cc:268 +msgid "[installed,local]" +msgstr "[インストール済み、ローカル]" -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "内部エラー、調整が終わっていません" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "[インストール済み、自動削除可]" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" -msgstr "" -"おっと、サイズがマッチしません。apt@packages.debian.org にメールしてください" +#: apt-private/private-output.cc:272 +msgid "[installed,automatic]" +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 -#: apt-private/private-install.cc:155 -#, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "%2$sB 中 %1$sB のアーカイブを取得する必要があります。\n" +#: apt-private/private-output.cc:274 +msgid "[installed]" +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 -#: apt-private/private-install.cc:160 +#: apt-private/private-output.cc:277 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "%sB のアーカイブを取得する必要があります。\n" +msgid "[upgradable from: %s]" +msgstr "[%s からアップグレード可]" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "この操作後に追加で %sB のディスク容量が消費されます。\n" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" +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 -#: apt-private/private-install.cc:172 +#: apt-private/private-output.cc:455 #, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "この操作後に %sB のディスク容量が解放されます。\n" +msgid "but %s is installed" +msgstr "しかし、%s はインストールされています" -#: apt-private/private-install.cc:200 +#: apt-private/private-output.cc:457 #, c-format -msgid "You don't have enough free space in %s." -msgstr "%s に充分な空きスペースがありません。" +msgid "but %s is to be installed" +msgstr "しかし、%s はインストールされようとしています" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。" +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "しかし、インストールすることができません" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Yes, do as I say!" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "しかし、これは仮想パッケージです" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"重大な問題を引き起こす可能性のあることをしようとしています。\n" -"続行するには、'%s' というフレーズをタイプしてください。\n" -" ?] " +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "しかし、インストールされていません" -#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "中断しました。" +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "しかし、インストールされようとしていません" -#: apt-private/private-install.cc:243 -msgid "Do you want to continue?" -msgstr "続行しますか?" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " または" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "いくつかのファイルの取得に失敗しました" +#: apt-private/private-output.cc:488 apt-private/private-output.cc:500 +msgid "The following packages have unmet dependencies:" +msgstr "以下のパッケージには満たせない依存関係があります:" -#: apt-private/private-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"いくつかのアーカイブを取得できません。apt-get update を実行するか --fix-" -"missing オプションを付けて試してみてください。" +#: apt-private/private-output.cc:523 +msgid "The following NEW packages will be installed:" +msgstr "以下のパッケージが新たにインストールされます:" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "以下のパッケージは「削除」されます:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "足りないパッケージを直すことができません。" +#: apt-private/private-output.cc:571 +msgid "The following packages have been kept back:" +msgstr "以下のパッケージは保留されます:" -#: apt-private/private-install.cc:330 -msgid "Aborting install." -msgstr "インストールを中断します。" +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "以下のパッケージはアップグレードされます:" -#: apt-private/private-install.cc:366 -msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"以下のパッケージは、全ファイルが別のパッケージで上書きされたため、\n" -"システムから消えました:" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" +msgstr "以下のパッケージは「ダウングレード」されます:" -#: apt-private/private-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "注意: これは dpkg により自動でわざと行われれます。" +#: apt-private/private-output.cc:633 +msgid "The following held packages will be changed:" +msgstr "以下の変更禁止パッケージは変更されます:" -#: apt-private/private-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "" -"一連のものを削除するようになっていないので、AutoRemover を開始できません" +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (%s のため) " -#: apt-private/private-install.cc:499 +#: apt-private/private-output.cc:696 msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" msgstr "" -"AutoRemover が、本来起きるべきでない何かを壊したようです。\n" -"apt にバグ報告を送ってください。" +"警告: 以下の不可欠パッケージが削除されます。\n" +"何をしようとしているか本当にわかっていない場合は、実行してはいけません!" -#. -#. if (Packages == 1) -#. { -#. c1out << std::endl; -#. c1out << -#. _("Since you only requested a single operation it is extremely likely that\n" -#. "the package is simply not installable and a bug report against\n" -#. "that package should be filed.") << std::endl; -#. } +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。" + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "内部エラー、調整が終わっていません" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"おっと、サイズがマッチしません。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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of 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 +#: apt-private/private-install.cc:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "%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 +#: apt-private/private-install.cc:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "この操作後に追加で %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 +#: apt-private/private-install.cc:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "この操作後に %sB のディスク容量が解放されます。\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "%s に充分な空きスペースがありません。" + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。" + +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Yes, do as I say!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"重大な問題を引き起こす可能性のあることをしようとしています。\n" +"続行するには、'%s' というフレーズをタイプしてください。\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "中断しました。" + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "続行しますか?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "いくつかのファイルの取得に失敗しました" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"いくつかのアーカイブを取得できません。apt-get update を実行するか --fix-" +"missing オプションを付けて試してみてください。" + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "足りないパッケージを直すことができません。" + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "インストールを中断します。" + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"以下のパッケージは、全ファイルが別のパッケージで上書きされたため、\n" +"システムから消えました:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "注意: これは dpkg により自動でわざと行われれます。" + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" +"一連のものを削除するようになっていないので、AutoRemover を開始できません" + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"AutoRemover が、本来起きるべきでない何かを壊したようです。\n" +"apt にバグ報告を送ってください。" + +#. +#. if (Packages == 1) +#. { +#. c1out << std::endl; +#. c1out << +#. _("Since you only requested a single operation it is extremely likely that\n" +#. "the package is simply not installable and a bug report against\n" +#. "that package should be filed.") << std::endl; +#. } #. #: apt-private/private-install.cc:502 apt-private/private-install.cc:653 msgid "The following information may help to resolve the situation:" @@ -1498,12 +1655,16 @@ msgstr "推奨パッケージ:" #: apt-private/private-install.cc:825 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "%s はすでにインストール済みで upgrade がセットされていないため、インストールをスキップします。\n" +msgstr "" +"%s はすでにインストール済みで upgrade がセットされていないため、インストール" +"をスキップします。\n" #: apt-private/private-install.cc:829 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -msgstr "%s はインストールされておらず、アップグレードだけの要求なので、インストールをスキップします。\n" +msgstr "" +"%s はインストールされておらず、アップグレードだけの要求なので、インストール" +"をスキップします。\n" #: apt-private/private-install.cc:841 #, c-format @@ -1529,213 +1690,35 @@ msgstr "'%4$s' のために '%3$s' のバージョン '%1$s' (%2$s) を選択し #: apt-private/private-install.cc:941 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -msgstr "パッケージ '%s' はインストールされていないため削除もされません。削除したかったのは '%s' でしょうか?\n" +msgstr "" +"パッケージ '%s' はインストールされていないため削除もされません。削除したかっ" +"たのは '%s' でしょうか?\n" #: apt-private/private-install.cc:947 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "パッケージ '%s' はインストールされていないため、削除もされません\n" -#: apt-private/private-list.cc:129 -msgid "Listing" -msgstr "一覧表示" - -#: apt-private/private-list.cc:159 -#, 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-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +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-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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "認証の警告は上書きされました。\n" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "正規表現の展開エラー - %s" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "いくつかのパッケージを認証できませんでした" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "全文検索" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "検証なしにこれらのパッケージをインストールしますか?" -#: apt-private/private-show.cc:156 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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 "実際のパッケージではありません (仮想)" +msgid "Failed to fetch %s %s\n" +msgstr "%s の取得に失敗しました %s\n" #: apt-private/private-sources.cc:58 #, c-format @@ -1748,20 +1731,9 @@ msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" "'%s' ファイルが変更されています。「apt-get update」を実行してください。" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "update コマンドは引数をとりません" - -#: apt-private/private-update.cc:90 -#, 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:94 -msgid "All packages are up to date." -msgstr "パッケージはすべて最新です。" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" +msgstr "全文検索" #: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " @@ -1771,20 +1743,57 @@ msgstr "アップグレードパッケージを検出しています ... " msgid "Done" msgstr "完了" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "ヒット " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "取得:" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "無視 " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "エラー " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "%sB を %s で取得しました (%sB/s)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [処理中]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"メディア変更: \n" +" '%s'\n" +"とラベルの付いたディスクをドライブ '%s' に入れて Enter キーを押してください\n" + #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format msgid "Unable to read %s" msgstr "%s を読み込むことができません" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1818,7 +1827,7 @@ msgstr "[ミラー: %s]" msgid "Failed to create IPC pipe to subprocess" msgstr "子プロセスへの IPC パイプの作成に失敗しました" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "途中で接続がクローズされました" @@ -1856,641 +1865,559 @@ msgstr "が重要です。これを修正して「導入」を再度実行して msgid "Merging available information" msgstr "入手可能情報をマージしています" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"使用方法: apt-extracttemplates ファイル名1 [ファイル名2 ...]\n" -"\n" -"apt-extracttemplates は debian パッケージから設定とテンプレート情報を\n" -"抽出するためのツールです\n" -"\n" -"オプション:\n" -" -h このヘルプを表示する\n" -" -t 一時ディレクトリを指定する\n" -" -c=? 指定した設定ファイルを読み込む\n" -" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" - -#: cmdline/apt-extracttemplates.cc:254 -#, c-format -msgid "Unable to mkstemp %s" -msgstr "mkstemp %s を実行できません" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "リンクされているノードで DropNode が呼ばれました" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "%s に書き込めません" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "ハッシュ要素を特定することができません!" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "" -"debconf のバージョンを取得できません。debconf はインストールされていますか?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "diversion の割り当てに失敗しました" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "パッケージ拡張子リストが長すぎます" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "AddDiversion での内部エラー" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "ディレクトリ %s の処理中にエラーが発生しました" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "ソース拡張子リストが長すぎます" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "%s -> %s と %s/%s の diversion を上書きしようとしています" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "Contents %s の処理中にエラーが発生しました" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"使用方法: apt-ftparchive [オプション] コマンド\n" -"コマンド: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive は Debian アーカイブ用のインデックスファイルを生成しま\n" -"す。全自動のものから、dpkg-scanpackages と dpkg-scansources の代替機能\n" -"となるものまで、多くの生成方法をサポートしています。\n" -"\n" -"apt-ftparchive は .deb のツリーから Packages ファイルを生成します。\n" -"Packages ファイルは MD5 ハッシュやファイルサイズに加えて、各パッケージ\n" -"のすべての制御フィールドの内容を含んでいます。Priority と Section の値\n" -"を強制するために override ファイルがサポートされています。\n" -"\n" -"同様に apt-ftparchive は .dsc のツリーから Sources ファイルを生成しま\n" -"す。--source-override オプションを使用するとソース override ファイルを\n" -"指定できます。\n" -"\n" -"'packages' および 'sources' コマンドはツリーのルートで実行する必要があ\n" -"ります。BinaryPath には再帰検索のベースディレクトリを指定し、override \n" -"ファイルは override フラグを含んでいる必要があります。もし pathprefix \n" -"が存在すればファイル名フィールドに付加されます。debian アーカイブでの\n" -"使用方法の例:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"オプション:\n" -" -h このヘルプを表示する\n" -" --md5 MD5 の生成を制御する\n" -" -s=? ソース override ファイル\n" -" -q 表示を抑制する\n" -" -d=? オプションのキャッシュデータベースを選択する\n" -" --no-delink delinking デバッグモードを有効にする\n" -" --contents contents ファイルの生成を制御する\n" -" -c=? 指定の設定ファイルを読む\n" -" -o=? 任意の設定オプションを設定する" +msgid "Double add of diversion %s -> %s" +msgstr "%s -> %s の diversion が二重に追加されています" -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "選択にマッチするものがありません" +#: apt-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "設定ファイル %s/%s が重複しています" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります" +msgid "The path %s is too long" +msgstr "パス %s は長すぎます" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB が壊れていたため、ファイル名を %s.old に変更しました" +msgid "Unpacking %s more than once" +msgstr "%s を複数回展開しています" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:142 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "DB が古いため、%s のアップグレードを試みます" +msgid "The directory %s is diverted" +msgstr "ディレクトリ %s は divert されています" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +#: apt-inst/extract.cc:152 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -"DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データ" -"ベースを削除し、再作成してください。" +"このパッケージは diversion のターゲットの %s/%s に書き込もうとしています" -#: ftparchive/cachedb.cc:99 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "DB ファイル %s を開くことができません: %s" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "diversion パスが長すぎます" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "%s の状態を取得するのに失敗しました" -#: ftparchive/cachedb.cc:332 -msgid "Failed to read .dsc" -msgstr ".dsc の読み取りに失敗しました" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "アーカイブにコントロールレコードがありません" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "カーソルを取得できません" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "警告: ディレクトリ %s が読めません\n" +msgid "Failed to rename %s to %s" +msgstr "%s を %s に名前変更できませんでした" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "警告: %s の状態を取得できません\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "エラー: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "ディレクトリ %s が非ディレクトリに置換されようとしています" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "警告: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "ハッシュバケツ内でノードを特定するのに失敗しました" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "エラー: エラーが適用されるファイルは " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "パスが長すぎます" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "%s の解決に失敗しました" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "ツリー内での移動に失敗しました" +msgid "Overwrite package match with no version for %s" +msgstr "%s に対するバージョンのないパッケージマッチを上書きします" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to open %s" -msgstr "%s のオープンに失敗しました" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "ファイル %s/%s がパッケージ %s のものを上書きします" -#: ftparchive/writer.cc:278 +#: apt-inst/extract.cc:498 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " リンク %s [%s] を外します\n" +msgid "Unable to stat %s" +msgstr "%s の状態を取得できません" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Failed to readlink %s" -msgstr "%s のリンク読み取りに失敗しました" +msgid "Failed to write file %s" +msgstr "ファイル %s の書き込みに失敗しました" -#: ftparchive/writer.cc:290 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to unlink %s" -msgstr "%s のリンク解除に失敗しました" +msgid "Failed to close file %s" +msgstr "%s のクローズに失敗しました" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** %s を %s にリンクするのに失敗しました" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "'%s' メンバーがないため、正しい DEB アーカイブではありません" -#: ftparchive/writer.cc:308 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " リンクを外す制限の %sB に到達しました。\n" - -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "アーカイブにパッケージフィールドがありませんでした" +msgid "Internal error, could not locate member %s" +msgstr "内部エラー、メンバー %s を特定できません" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s に override エントリがありません\n" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "解析できないコントロールファイル" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " %1$s メンテナは %3$s ではなく %2$s です\n" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "不正なアーカイブ署名" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s にソース override エントリがありません\n" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "アーカイブメンバーヘッダの読み込みに失敗しました" -#: ftparchive/writer.cc:710 +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s にバイナリ override エントリがありません\n" +msgid "Invalid archive member header %s" +msgstr "不正なアーカイブメンバーヘッダ %s" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - メモリの割り当てに失敗しました" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "不正なアーカイブメンバーヘッダ" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "'%s' をオープンできません" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "アーカイブが不足しています" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "不正な override %s %llu 行目 (%s)" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "アーカイブヘッダの読み込みに失敗しました" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "override ファイル %s を読み込むのに失敗しました" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "パイプの生成に失敗しました" -#: ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" -msgstr "不正な override %s %llu 行目 #1" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "gzip の実行に失敗しました" -#: ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %llu #2" -msgstr "不正な override %s %llu 行目 #2" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "壊れたアーカイブ" -#: ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %llu #3" -msgstr "不正な override %s %llu 行目 #3" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "tar チェックサム検証が失敗しました。アーカイブが壊れています" -#: ftparchive/multicompress.cc:73 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "'%s' は未知の圧縮アルゴリズムです" +msgid "Unknown TAR header type %u, member %s" +msgstr "未知の TAR ヘッダタイプ %u、メンバー %s" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "圧縮出力 %s には圧縮セットが必要です" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "FILE* の作成に失敗しました" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "fork に失敗しました" +msgid "Progress: [%3i%%]" +msgstr "進捗: [%3i%%]" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "圧縮子プロセス" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "dpkg を実行しています" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/init.cc:146 #, c-format -msgid "Internal error, failed to create %s" -msgstr "内部エラー、%s の作成に失敗しました" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "子プロセス/ファイルへの IO が失敗しました" +msgid "Packaging system '%s' is not supported" +msgstr "パッケージングシステム '%s' はサポートされていません" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "MD5 の計算中に読み込みに失敗しました" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "適切なパッケージシステムタイプを特定できません" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Problem unlinking %s" -msgstr "%s のリンク解除で問題が発生しました" +msgid "Wrote %i records.\n" +msgstr "%i レコードを書き込みました。\n" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Failed to rename %s to %s" -msgstr "%s を %s に名前変更できませんでした" - -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"使用方法: apt-internal-solver\n" -"\n" -"apt-internal-solver は、デバッグなどの用途で、現在の内部リゾルバを\n" -"APT ファミリの外部リゾルバのように使うためのインターフェイスです。\n" -"\n" -"オプション:\n" -" -h このヘルプを表示する\n" -" -q ログファイルに出力可能な形式にする - プログレス表示をしない\n" -" -c=? 指定した設定ファイルを読み込む\n" -" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "不明なパッケージレコードです!" +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"使用方法: apt-sortpkgs [オプション] ファイル名1 [ファイル名2 ...]\n" -"\n" -"apt-sortpkgs はパッケージファイルをソートするための簡単なツールです。\n" -"-s オプションはファイルの種類を示すために使用されます。\n" -"\n" -"オプション:\n" -" -h このヘルプを表示する\n" -" -s ソースファイルソートを使用する\n" -" -c=? 指定した設定ファイルを読み込む\n" -" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" +"%i レコードを書き込みました。%i 個のファイルが見つからず、%i 個の適合しない" +"ファイルがあります。\n" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Failed to write file %s" -msgstr "ファイル %s の書き込みに失敗しました" +msgid "Can't find authentication record for: %s" +msgstr "認証レコードが見つかりません: %s" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "Failed to close file %s" -msgstr "%s のクローズに失敗しました" +msgid "Hash mismatch for: %s" +msgstr "ハッシュサムが適合しません: %s" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "The path %s is too long" -msgstr "パス %s は長すぎます" +msgid "The method driver %s could not be found." +msgstr "メソッドドライバ %s が見つかりません。" -#: apt-inst/extract.cc:132 +#: apt-pkg/acquire-worker.cc:118 #, c-format -msgid "Unpacking %s more than once" -msgstr "%s を複数回展開しています" +msgid "Is the package %s installed?" +msgstr "パッケージ %s はインストールされていますか?" -#: apt-inst/extract.cc:142 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "The directory %s is diverted" -msgstr "ディレクトリ %s は divert されています" +msgid "Method %s did not start correctly" +msgstr "メソッド %s が正常に開始しませんでした" -#: apt-inst/extract.cc:152 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -"このパッケージは diversion のターゲットの %s/%s に書き込もうとしています" +"'%s' とラベルの付いたディスクをドライブ '%s' に入れて Enter キーを押してくだ" +"さい。" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "diversion パスが長すぎます" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "" +"パッケージリストまたはステータスファイルを解釈またはオープンすることができま" +"せん。" -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "ディレクトリ %s が非ディレクトリに置換されようとしています" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"これらの問題を解決するためには apt-get update を実行する必要があるかもしれま" +"せん" -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "ハッシュバケツ内でノードを特定するのに失敗しました" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "ソースのリストを読むことができません。" -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "パスが長すぎます" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "空のパッケージキャッシュ" -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "%s に対するバージョンのないパッケージマッチを上書きします" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "パッケージキャッシュファイルが壊れています" -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "ファイル %s/%s がパッケージ %s のものを上書きします" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "このパッケージキャッシュファイルは互換性がないバージョンです" -#: apt-inst/extract.cc:498 +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" +msgstr "パッケージキャッシュファイルが壊れています。短かすぎます" + +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Unable to stat %s" -msgstr "%s の状態を取得できません" +msgid "This APT does not support the versioning system '%s'" +msgstr "この APT はバージョニングシステム '%s' をサポートしていません" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "リンクされているノードで DropNode が呼ばれました" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "パッケージキャッシュが異なるアーキテクチャ用に構築されています" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "ハッシュ要素を特定することができません!" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "依存" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "diversion の割り当てに失敗しました" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "先行依存" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "AddDiversion での内部エラー" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "提案" -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "%s -> %s と %s/%s の diversion を上書きしようとしています" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "推奨" -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "%s -> %s の diversion が二重に追加されています" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "競合" -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "設定ファイル %s/%s が重複しています" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "置換" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "不正なアーカイブ署名" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "廃止" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "アーカイブメンバーヘッダの読み込みに失敗しました" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "破壊" -#: apt-inst/contrib/arfile.cc:96 -#, c-format -msgid "Invalid archive member header %s" -msgstr "不正なアーカイブメンバーヘッダ %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "拡張" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "不正なアーカイブメンバーヘッダ" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "重要" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "アーカイブが不足しています" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "要求" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "アーカイブヘッダの読み込みに失敗しました" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "標準" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "パイプの生成に失敗しました" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "任意" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "gzip の実行に失敗しました" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "特別" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "壊れたアーカイブ" +#: apt-pkg/pkgrecords.cc:38 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "インデックスファイルのタイプ '%s' はサポートされていません" -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "tar チェックサム検証が失敗しました。アーカイブが壊れています" +#: 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-inst/contrib/extracttar.cc:308 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "未知の TAR ヘッダタイプ %u、メンバー %s" +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "" +"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] を解釈できません)" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "'%s' メンバーがないため、正しい DEB アーカイブではありません" +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "" +"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] が短かすぎます)" -#: apt-inst/deb/debfile.cc:132 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "内部エラー、メンバー %s を特定できません" +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgstr "" +"ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] は割り当てられていません)" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -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/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "List directory %spartial is missing." -msgstr "リストディレクトリ %spartial が見つかりません。" +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/acquire.cc:91 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Archives directory %spartial is missing." -msgstr "アーカイブディレクトリ %spartial が見つかりません。" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)" -#: apt-pkg/acquire.cc:99 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Unable to lock directory %s" -msgstr "ディレクトリ %s をロックできません" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Clean of %s is not supported" -msgstr "%s の消去はサポートされていません" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "ファイルを取得しています %li/%li (残り %s)" +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)" -#: apt-pkg/acquire.cc:904 +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "Retrieving file %li of %li" -msgstr "ファイルを取得しています %li/%li" +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "名前の変更に失敗しました。%s (%s -> %s)" +msgid "Opening %s" +msgstr "%s をオープンしています" -#: apt-pkg/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "ハッシュサムが適合しません" +#: 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/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "サイズが適合しません" +#: apt-pkg/sourcelist.cc:371 +#, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)" -#: apt-pkg/acquire-item.cc:173 -msgid "Invalid file format" -msgstr "不正なファイル形式" +#: 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/acquire-item.cc:1573 +#: apt-pkg/sourcelist.cc:416 #, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" -msgstr "" -"期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った " -"sources.list エントリか、壊れたファイル)" +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "ソースリスト %3$s の %2$u 個目の節 '%1$s' は不明です" -#: apt-pkg/acquire-item.cc:1589 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 #, c-format -msgid "Unable to find hash sum for '%s' in Release file" -msgstr "Release ファイル中の '%s' のハッシュサムを見つけられません" +msgid "Clean of %s is not supported" +msgstr "%s の消去はサポートされていません" -#: apt-pkg/acquire-item.cc:1631 +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." +msgstr "%s の状態を取得できません。" + +#: apt-pkg/pkgcachegen.cc:93 +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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "%s を処理中にエラーが発生しました (%s%d)" + +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "この APT が対応している以上の数のパッケージが指定されました。" + +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "この APT が対応している以上の数のバージョンが要求されました。" + +#: apt-pkg/pkgcachegen.cc:263 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "この APT が対応している以上の数の説明が要求されました。" + +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "この APT が対応している以上の数の依存関係が発生しました。" + +#: apt-pkg/pkgcachegen.cc:576 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした" + +#: apt-pkg/pkgcachegen.cc:1211 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "ソースパッケージリスト %s の状態を取得できません" + +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "パッケージリストを読み込んでいます" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "ファイル提供情報を収集しています" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "%s に書き込めません" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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:241 +msgid "Send request to solver" +msgstr "ソルバにリクエストを送信" + +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "解決を受け取る準備" + +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "外部ソルバを実行" + +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "名前の変更に失敗しました。%s (%s -> %s)" + +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "ハッシュサムが適合しません" + +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "サイズが適合しません" + +#: apt-pkg/acquire-item.cc:173 +msgid "Invalid file format" +msgstr "不正なファイル形式" + +#: apt-pkg/acquire-item.cc:1640 +#, c-format +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +msgstr "" +"期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った " +"sources.list エントリか、壊れたファイル)" + +#: apt-pkg/acquire-item.cc:1656 +#, c-format +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "Release ファイル中の '%s' のハッシュサムを見つけられません" + +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2499,14 +2426,14 @@ msgstr "" "%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新" "物は適用されません。" -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" "ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し" "ました)" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2516,12 +2443,12 @@ msgstr "" "ファイルが使われます。GPG エラー: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "GPG エラー: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2530,12 +2457,12 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2543,125 +2470,99 @@ msgstr "" "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: " "フィールドがありません。" -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "メソッドドライバ %s が見つかりません。" +msgid "Vendor block %s contains no fingerprint" +msgstr "ベンダブロック %s は鍵指紋を含んでいません" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Is the package %s installed?" -msgstr "パッケージ %s はインストールされていますか?" +msgid "List directory %spartial is missing." +msgstr "リストディレクトリ %spartial が見つかりません。" -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Method %s did not start correctly" -msgstr "メソッド %s が正常に開始しませんでした" +msgid "Archives directory %spartial is missing." +msgstr "アーカイブディレクトリ %spartial が見つかりません。" -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 #, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"'%s' とラベルの付いたディスクをドライブ '%s' に入れて Enter キーを押してくだ" -"さい。" +msgid "Unable to lock directory %s" +msgstr "ディレクトリ %s をロックできません" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見" -"つけることができませんでした。" - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー" -"ジが原因です。" - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。" - -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." -msgstr "" -"パッケージリストまたはステータスファイルを解釈またはオープンすることができま" -"せん。" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "ファイルを取得しています %li/%li (残り %s)" -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "" -"これらの問題を解決するためには apt-get update を実行する必要があるかもしれま" -"せん" +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "ファイルを取得しています %li/%li" -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "ソースのリストを読むことができません。" +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "sources.list に 'ソース' URI を指定する必要があります" -#: apt-pkg/cacheset.cc:489 +#: apt-pkg/policy.cc:83 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした" +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" +msgstr "" +"APT::Default-Release の 値 '%s' は、そのようなリリースをソース中から利用でき" +"ないため、無効です" -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/policy.cc:422 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "" +"不正なレコードがプリファレンスファイル %s に存在します。パッケージヘッダがあ" +"りません" -#: apt-pkg/cacheset.cc:603 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Couldn't find task '%s'" -msgstr "タスク '%s' が見つかりません" +msgid "Did not understand pin type %s" +msgstr "pin タイプ %s を理解できませんでした" -#: apt-pkg/cacheset.cc:609 -#, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "正規表現 '%s' ではパッケージは見つかりませんでした" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "pin で優先度 (または 0) が指定されていません" -#: apt-pkg/cacheset.cc:615 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "'%s' に一致するパッケージは見つかりませんでした" +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" +"'%s' の即時設定は動作しません。詳細については man 5 apt.conf の APT::" +"Immediate-Configure の項を参照してください。(%d)" -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "純粋な仮想パッケージのため、パッケージ '%s' のバージョンを選べません" +msgid "Could not configure '%s'. " +msgstr "'%s' を設定できませんでした。" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:630 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -"パッケージ '%s' のインストール済みまたは候補のバージョンはいずれも存在しない" -"ので選べません" +"このインストールは、競合/先行依存のループが原因で、一時的に重要な不可欠パッ" +"ケージ %s を削除します。これは多くの場合に問題が起こる原因となります。本当に" +"これを行いたいなら、APT::Force-LoopBreak オプションを有効にしてください。" -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" +#: 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 "" -"純粋な仮想パッケージのため、パッケージ '%s' の最新バージョンを選べません" - -#: apt-pkg/cacheset.cc:655 -#, c-format -msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "候補が存在しないので、パッケージ %s の候補バージョンを選べません" - -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" -msgstr "" -"インストールされていないので、パッケージ %s のインストール済みバージョンを選" -"べません。" - -#: 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/cdrom.cc:571 msgid "Unmounting CD-ROM...\n" @@ -2740,10 +2641,25 @@ msgstr "新しいソースリストを書き込んでいます\n" msgid "Source list entries for this disc are:\n" msgstr "このディスクのソースリストのエントリ:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "%s の状態を取得できません。" +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見" +"つけることができませんでした。" + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー" +"ジが原因です。" + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。" #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2771,57 +2687,72 @@ msgstr "状態ファイル %s のオープンに失敗しました" msgid "Failed to write temporary StateFile %s" msgstr "一時状態ファイル %s の書き込みに失敗しました" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "ソルバにシナリオを送信" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "パッケージファイル %s を解釈することができません (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "ソルバにリクエストを送信" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "パッケージファイル %s を解釈することができません (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "解決を受け取る準備" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "外部ソルバを実行" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "タスク '%s' が見つかりません" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "%i レコードを書き込みました。\n" +msgid "Couldn't find any package by regex '%s'" +msgstr "正規表現 '%s' ではパッケージは見つかりませんでした" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n" +msgid "Couldn't find any package by glob '%s'" +msgstr "'%s' に一致するパッケージは見つかりませんでした" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "純粋な仮想パッケージのため、パッケージ '%s' のバージョンを選べません" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" -"%i レコードを書き込みました。%i 個のファイルが見つからず、%i 個の適合しない" -"ファイルがあります。\n" +"パッケージ '%s' のインストール済みまたは候補のバージョンはいずれも存在しない" +"ので選べません" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "認証レコードが見つかりません: %s" +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "" +"純粋な仮想パッケージのため、パッケージ '%s' の最新バージョンを選べません" -#: apt-pkg/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Hash mismatch for: %s" -msgstr "ハッシュサムが適合しません: %s" +msgid "Can't select candidate version from package %s as it has no candidate" +msgstr "候補が存在しないので、パッケージ %s の候補バージョンを選べません" + +#: apt-pkg/cacheset.cc:663 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" +"インストールされていないので、パッケージ %s のインストール済みバージョンを選" +"べません。" #: apt-pkg/indexrecords.cc:78 #, c-format @@ -2848,835 +2779,911 @@ msgstr "Release ファイル %s に無効な 'Valid-Until' エントリがあり msgid "Invalid 'Date' entry in Release file %s" msgstr "Release ファイル %s に無効な 'Date' エントリがあります" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "パッケージングシステム '%s' はサポートされていません" +msgid "%lid %lih %limin %lis" +msgstr "%li日 %li時間 %li分 %li秒" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "適切なパッケージシステムタイプを特定できません" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" +msgstr "%li時間 %li分 %li秒" -#: apt-pkg/install-progress.cc:57 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Progress: [%3i%%]" -msgstr "進捗: [%3i%%]" +msgid "%limin %lis" +msgstr "%li分 %li秒" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "dpkg を実行しています" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" +msgstr "%li秒" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" -"'%s' の即時設定は動作しません。詳細については man 5 apt.conf の APT::" -"Immediate-Configure の項を参照してください。(%d)" +msgid "Selection %s not found" +msgstr "選択された %s が見つかりません" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "Could not configure '%s'. " -msgstr "'%s' を設定できませんでした。" +msgid "Not using locking for read only lock file %s" +msgstr "読み込み専用のロックファイル %s にロックは使用しません" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" -"このインストールは、競合/先行依存のループが原因で、一時的に重要な不可欠パッ" -"ケージ %s を削除します。これは多くの場合に問題が起こる原因となります。本当に" -"これを行いたいなら、APT::Force-LoopBreak オプションを有効にしてください。" +msgid "Could not open lock file %s" +msgstr "ロックファイル %s をオープンできません" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "空のパッケージキャッシュ" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "nfs マウントされたロックファイル %s にはロックを使用しません" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "パッケージキャッシュファイルが壊れています" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "ロック %s が取得できませんでした" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "このパッケージキャッシュファイルは互換性がないバージョンです" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "'%s' がディレクトリではないため、ファイルの一覧を作成できません" -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" -msgstr "パッケージキャッシュファイルが壊れています。短かすぎます" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "ディレクトリ '%2$s' の '%1$s' が通常ファイルではないため、無視します" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:412 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "この APT はバージョニングシステム '%s' をサポートしていません" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" +"ディレクトリ '%2$s' の '%1$s' がファイル名拡張子を持たないため、無視します" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "パッケージキャッシュが異なるアーキテクチャ用に構築されています" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" +"ディレクトリ '%2$s' の '%1$s' が無効なファイル名拡張子を持っているため、無視" +"します" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "依存" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "子プロセス %s がセグメンテーション違反を受け取りました。" -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "先行依存" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "子プロセス %s がシグナル %u を受け取りました。" -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "提案" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "子プロセス %s がエラーコード (%u) を返しました" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "推奨" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "子プロセス %s が予期せず終了しました" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "競合" +#: apt-pkg/contrib/fileutl.cc:913 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "gzip ファイル %s のクローズ中に問題が発生しました" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "置換" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "ファイル %s をオープンできませんでした" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "廃止" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "ファイルデスクリプタ %d を開けませんでした" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "破壊" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "子プロセス IPC の生成に失敗しました" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "拡張" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "以下の圧縮ツールの実行に失敗しました: " -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "重要" +#: apt-pkg/contrib/fileutl.cc:1514 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "読み込みが %llu 残っているはずですが、何も残っていません" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "要求" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "あと %llu 書き込む必要がありますが、書き込むことができませんでした" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "標準" +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" +msgstr "ファイル %s のクローズ中に問題が発生しました" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "任意" +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "%s から %s へのファイル名変更中に問題が発生しました" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "特別" +#: apt-pkg/contrib/fileutl.cc:1938 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "ファイル %s の削除中に問題が発生しました" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "キャッシュに非互換なバージョニングシステムがあります" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "%s を処理中にエラーが発生しました (%s%d)" +msgid "%c%s... Error!" +msgstr "%c%s... エラー!" -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "この APT が対応している以上の数のパッケージが指定されました。" +#: apt-pkg/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... 完了" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "この APT が対応している以上の数のバージョンが要求されました。" +#: apt-pkg/contrib/progress.cc:181 +msgid "..." +msgstr "..." -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "この APT が対応している以上の数の説明が要求されました。" +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... %u%%" -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "この APT が対応している以上の数の依存関係が発生しました。" +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "空のファイルを mmap できません" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした" +msgid "Couldn't duplicate file descriptor %i" +msgstr "ファイルデスクリプタ %i は重複できません" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/mmap.cc:119 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "ソースパッケージリスト %s の状態を取得できません" - -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "パッケージリストを読み込んでいます" +msgid "Couldn't make mmap of %llu bytes" +msgstr "%llu バイトの mmap ができませんでした" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "ファイル提供情報を収集しています" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "mmap をクローズできません" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "ソースキャッシュの保存中に IO エラーが発生しました" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "mmap を同期できません" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "インデックスファイルのタイプ '%s' はサポートされていません" +msgid "Couldn't make mmap of %lu bytes" +msgstr "%lu バイトの mmap ができませんでした" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "ファイルの切り詰めに失敗しました" + +#: apt-pkg/contrib/mmap.cc:341 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"APT::Default-Release の 値 '%s' は、そのようなリリースをソース中から利用でき" -"ないため、無効です" +"動的 MMap が範囲を越えました。APT::Cache-Start の大きさを増やしてください。現" +"在値は %lu です (man 5 apt.conf を参照)。" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "%lu バイトの上限に達しているため、MMap のサイズを増やせません。" + +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" -"不正なレコードがプリファレンスファイル %s に存在します。パッケージヘッダがあ" -"りません" +"自動増加がユーザによって無効にされているため、MMap のサイズを増やせません。" -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "Did not understand pin type %s" -msgstr "pin タイプ %s を理解できませんでした" +msgid "Unable to stat the mount point %s" +msgstr "マウントポイント %s の状態を取得できません" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "pin で優先度 (または 0) が指定されていません" +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "CD-ROM の状態を取得するのに失敗しました" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/configuration.cc:519 #, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "ソースリスト %2$s の %1$u 個目の区切りが不正です (URI parse)" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "理解できない省略形式です: '%c'" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/configuration.cc:633 #, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "" -"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] を解釈できません)" +msgid "Opening configuration file %s" +msgstr "設定ファイル %s をオープンできませんでした" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/configuration.cc:801 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "" -"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] が短かすぎます)" +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/configuration.cc:820 #, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "" -"ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] は割り当てられていません)" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "文法エラー %s:%u: 不正なタグです" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/configuration.cc:837 #, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s にキーがありません)" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/configuration.cc:877 #, 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 に値がありません)" +msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgstr "文法エラー %s:%u: 命令はトップレベルでのみ実行できます" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "文法エラー %s:%u: インクルードのネストが多すぎます" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)" +msgid "Syntax error %s:%u: Included from here" +msgstr "文法エラー %s:%u: ここからインクルードされています" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/configuration.cc:897 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "文法エラー %s:%u: 未対応の命令 '%s'" -#: apt-pkg/sourcelist.cc:217 +#: apt-pkg/contrib/configuration.cc:900 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)" +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" +msgstr "" +"文法エラー %s:%u: clear ディレクティブは、引数としてオプションツリーを必要と" +"します" -#: apt-pkg/sourcelist.cc:224 +#: apt-pkg/contrib/configuration.cc:950 #, 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: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/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "sources.list に 'ソース' URI を指定する必要があります" - -#: apt-pkg/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "パッケージファイル %s を解釈することができません (1)" - -#: apt-pkg/tagfile.cc:237 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "パッケージファイル %s を解釈することができません (2)" - -#: 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/vendorlist.cc:85 -#, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "ベンダブロック %s は鍵指紋を含んでいません" +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります" -#: apt-pkg/contrib/cdromutl.cc:65 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "マウントポイント %s の状態を取得できません" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "CD-ROM の状態を取得するのに失敗しました" +msgid "No keyring installed in %s." +msgstr "%s にキーリングがインストールされていません。" -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "コマンドラインオプション '%c' [%s から] は不明です。" -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format msgid "Command line option %s is not understood" msgstr "コマンドラインオプション %s を理解できません" -#: apt-pkg/contrib/cmndline.cc:168 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format msgid "Command line option %s is not boolean" msgstr "コマンドラインオプション %s は boolean ではありません" -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format msgid "Option %s requires an argument." msgstr "オプション %s には引数が必要です。" -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "オプション %s: 設定項目には =<値> を指定する必要があります。" -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "オプション %s には '%s' ではなく整数の引数が必要です" -#: apt-pkg/contrib/cmndline.cc:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "オプション '%s' は長すぎます" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s を解釈することができません。true か false を試してください。" -#: apt-pkg/contrib/cmndline.cc:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "不正な操作 %s" -#: apt-pkg/contrib/configuration.cc:519 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "理解できない省略形式です: '%c'" +msgid "Installing %s" +msgstr "%s をインストールしています" -#: apt-pkg/contrib/configuration.cc:633 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Opening configuration file %s" -msgstr "設定ファイル %s をオープンできませんでした" +msgid "Configuring %s" +msgstr "%s を設定しています" -#: apt-pkg/contrib/configuration.cc:801 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。" +msgid "Removing %s" +msgstr "%s を削除しています" -#: apt-pkg/contrib/configuration.cc:820 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "文法エラー %s:%u: 不正なタグです" +msgid "Completely removing %s" +msgstr "%s を完全に削除しています" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています" +msgid "Noting disappearance of %s" +msgstr "%s の消失を記録しています" -#: apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/deb/dpkgpm.cc:115 #, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "文法エラー %s:%u: 命令はトップレベルでのみ実行できます" +msgid "Running post-installation trigger %s" +msgstr "インストール後トリガ %s を実行しています" -#: apt-pkg/contrib/configuration.cc:884 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "文法エラー %s:%u: インクルードのネストが多すぎます" +msgid "Directory '%s' missing" +msgstr "ディレクトリ '%s' が見つかりません" -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "文法エラー %s:%u: ここからインクルードされています" +msgid "Could not open file '%s'" +msgstr "ファイル '%s' をオープンできませんでした" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "文法エラー %s:%u: 未対応の命令 '%s'" +msgid "Preparing %s" +msgstr "%s を準備しています" -#: apt-pkg/contrib/configuration.cc:900 +#: apt-pkg/deb/dpkgpm.cc:1008 #, c-format -msgid "Syntax error %s:%u: clear directive requires an option tree as argument" -msgstr "" -"文法エラー %s:%u: clear ディレクティブは、引数としてオプションツリーを必要と" -"します" +msgid "Unpacking %s" +msgstr "%s を展開しています" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります" +msgid "Preparing to configure %s" +msgstr "%s の設定を準備しています" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "読み込み専用のロックファイル %s にロックは使用しません" +msgid "Installed %s" +msgstr "%s をインストールしました" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "Could not open lock file %s" -msgstr "ロックファイル %s をオープンできません" +msgid "Preparing for removal of %s" +msgstr "%s の削除を準備しています" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "nfs マウントされたロックファイル %s にはロックを使用しません" +msgid "Removed %s" +msgstr "%s を削除しました" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Could not get lock %s" -msgstr "ロック %s が取得できませんでした" +msgid "Preparing to completely remove %s" +msgstr "%s を完全に削除する準備をしています" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "'%s' がディレクトリではないため、ファイルの一覧を作成できません" +msgid "Completely removed %s" +msgstr "%s を完全に削除しました" -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "ディレクトリ '%2$s' の '%1$s' が通常ファイルではないため、無視します" +msgid "Can not write log (%s)" +msgstr "ログを書き込めません (%s)" -#: apt-pkg/contrib/fileutl.cc:412 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" -"ディレクトリ '%2$s' の '%1$s' がファイル名拡張子を持たないため、無視します" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "/dev/pts はマウントされていますか?" -#: apt-pkg/contrib/fileutl.cc:421 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "操作はそれが完了する前に中断されました" + +#: apt-pkg/deb/dpkgpm.cc:1719 +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:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "依存関係の問題 - 未設定のままにしています" + +#: apt-pkg/deb/dpkgpm.cc:1726 msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -"ディレクトリ '%2$s' の '%1$s' が無効なファイル名拡張子を持っているため、無視" -"します" - -#: apt-pkg/contrib/fileutl.cc:824 -#, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "子プロセス %s がセグメンテーション違反を受け取りました。" +"エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート" +"は書き込まれません。" -#: apt-pkg/contrib/fileutl.cc:826 -#, c-format -msgid "Sub-process %s received signal %u." -msgstr "子プロセス %s がシグナル %u を受け取りました。" +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" +"エラーメッセージはディスクフルエラーであることを示しているので、レポートは書" +"き込まれません。" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "子プロセス %s がエラーコード (%u) を返しました" +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" +"エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き" +"込まれません。" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 -#, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "子プロセス %s が予期せず終了しました" +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" +"エラーメッセージはローカルシステムの問題であることを示しているので、レポート" +"は書き込まれません。" -#: apt-pkg/contrib/fileutl.cc:913 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "gzip ファイル %s のクローズ中に問題が発生しました" +#: apt-pkg/deb/dpkgpm.cc:1774 +msgid "" +"No apport report written because the error message indicates a dpkg I/O error" +msgstr "" +"エラーメッセージは dpkg I/O エラーであることを示しているので、レポートは書き" +"込まれません。" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "Could not open file %s" -msgstr "ファイル %s をオープンできませんでした" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"管理用ディレクトリ (%s) をロックできません。これを使う別のプロセスが動いてい" +"ませんか?" -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/deb/debsystem.cc:94 #, c-format -msgid "Could not open file descriptor %d" -msgstr "ファイルデスクリプタ %d を開けませんでした" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "子プロセス IPC の生成に失敗しました" - -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "以下の圧縮ツールの実行に失敗しました: " +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" +"管理用ディレクトリ (%s) をロックできません。root 権限で実行していますか?" -#: apt-pkg/contrib/fileutl.cc:1514 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 #, c-format -msgid "read, still have %llu to read but none left" -msgstr "読み込みが %llu 残っているはずですが、何も残っていません" +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgstr "" +"dpkg は中断されました。問題を修正するには '%s' を手動で実行する必要がありま" +"す。" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "あと %llu 書き込む必要がありますが、書き込むことができませんでした" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "ロックされていません" -#: apt-pkg/contrib/fileutl.cc:1915 -#, c-format -msgid "Problem closing the file %s" -msgstr "ファイル %s のクローズ中に問題が発生しました" +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"使用方法: apt-extracttemplates ファイル名1 [ファイル名2 ...]\n" +"\n" +"apt-extracttemplates は debian パッケージから設定とテンプレート情報を\n" +"抽出するためのツールです\n" +"\n" +"オプション:\n" +" -h このヘルプを表示する\n" +" -t 一時ディレクトリを指定する\n" +" -c=? 指定した設定ファイルを読み込む\n" +" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: apt-pkg/contrib/fileutl.cc:1927 +#: cmdline/apt-extracttemplates.cc:254 #, c-format -msgid "Problem renaming the file %s to %s" -msgstr "%s から %s へのファイル名変更中に問題が発生しました" +msgid "Unable to mkstemp %s" +msgstr "mkstemp %s を実行できません" -#: apt-pkg/contrib/fileutl.cc:1938 -#, c-format -msgid "Problem unlinking the file %s" -msgstr "ファイル %s の削除中に問題が発生しました" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "" +"debconf のバージョンを取得できません。debconf はインストールされていますか?" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "ファイルの同期中に問題が発生しました" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "パッケージ拡張子リストが長すぎます" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: 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 #, c-format -msgid "No keyring installed in %s." -msgstr "%s にキーリングがインストールされていません。" +msgid "Error processing directory %s" +msgstr "ディレクトリ %s の処理中にエラーが発生しました" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "空のファイルを mmap できません" +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "ソース拡張子リストが長すぎます" -#: apt-pkg/contrib/mmap.cc:111 -#, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "ファイルデスクリプタ %i は重複できません" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました" -#: apt-pkg/contrib/mmap.cc:119 +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "%llu バイトの mmap ができませんでした" +msgid "Error processing contents %s" +msgstr "Contents %s の処理中にエラーが発生しました" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "mmap をクローズできません" +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"使用方法: apt-ftparchive [オプション] コマンド\n" +"コマンド: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive は Debian アーカイブ用のインデックスファイルを生成しま\n" +"す。全自動のものから、dpkg-scanpackages と dpkg-scansources の代替機能\n" +"となるものまで、多くの生成方法をサポートしています。\n" +"\n" +"apt-ftparchive は .deb のツリーから Packages ファイルを生成します。\n" +"Packages ファイルは MD5 ハッシュやファイルサイズに加えて、各パッケージ\n" +"のすべての制御フィールドの内容を含んでいます。Priority と Section の値\n" +"を強制するために override ファイルがサポートされています。\n" +"\n" +"同様に apt-ftparchive は .dsc のツリーから Sources ファイルを生成しま\n" +"す。--source-override オプションを使用するとソース override ファイルを\n" +"指定できます。\n" +"\n" +"'packages' および 'sources' コマンドはツリーのルートで実行する必要があ\n" +"ります。BinaryPath には再帰検索のベースディレクトリを指定し、override \n" +"ファイルは override フラグを含んでいる必要があります。もし pathprefix \n" +"が存在すればファイル名フィールドに付加されます。debian アーカイブでの\n" +"使用方法の例:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"オプション:\n" +" -h このヘルプを表示する\n" +" --md5 MD5 の生成を制御する\n" +" -s=? ソース override ファイル\n" +" -q 表示を抑制する\n" +" -d=? オプションのキャッシュデータベースを選択する\n" +" --no-delink delinking デバッグモードを有効にする\n" +" --contents contents ファイルの生成を制御する\n" +" -c=? 指定の設定ファイルを読む\n" +" -o=? 任意の設定オプションを設定する" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "mmap を同期できません" +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "選択にマッチするものがありません" -#: apt-pkg/contrib/mmap.cc:290 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "%lu バイトの mmap ができませんでした" - -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "ファイルの切り詰めに失敗しました" +msgid "Some files are missing in the package file group `%s'" +msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります" -#: apt-pkg/contrib/mmap.cc:341 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "" -"動的 MMap が範囲を越えました。APT::Cache-Start の大きさを増やしてください。現" -"在値は %lu です (man 5 apt.conf を参照)。" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB が壊れていたため、ファイル名を %s.old に変更しました" -#: apt-pkg/contrib/mmap.cc:446 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "%lu バイトの上限に達しているため、MMap のサイズを増やせません。" +msgid "DB is old, attempting to upgrade %s" +msgstr "DB が古いため、%s のアップグレードを試みます" -#: apt-pkg/contrib/mmap.cc:449 +#: ftparchive/cachedb.cc:94 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" -"自動増加がユーザによって無効にされているため、MMap のサイズを増やせません。" +"DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データ" +"ベースを削除し、再作成してください。" -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... エラー!" +msgid "Unable to open DB file %s: %s" +msgstr "DB ファイル %s を開くことができません: %s" -#: apt-pkg/contrib/progress.cc:150 -#, c-format -msgid "%c%s... Done" -msgstr "%c%s... 完了" +#: ftparchive/cachedb.cc:332 +msgid "Failed to read .dsc" +msgstr ".dsc の読み取りに失敗しました" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "..." +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "アーカイブにコントロールレコードがありません" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "カーソルを取得できません" + +#: ftparchive/writer.cc:91 #, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... %u%%" +msgid "W: Unable to read directory %s\n" +msgstr "警告: ディレクトリ %s が読めません\n" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/writer.cc:96 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%li日 %li時間 %li分 %li秒" +msgid "W: Unable to stat %s\n" +msgstr "警告: %s の状態を取得できません\n" + +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "エラー: " + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "警告: " -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" -msgstr "%li時間 %li分 %li秒" +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "エラー: エラーが適用されるファイルは " -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%limin %lis" -msgstr "%li分 %li秒" +msgid "Failed to resolve %s" +msgstr "%s の解決に失敗しました" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 -#, c-format -msgid "%lis" -msgstr "%li秒" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "ツリー内での移動に失敗しました" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:219 #, c-format -msgid "Selection %s not found" -msgstr "選択された %s が見つかりません" +msgid "Failed to open %s" +msgstr "%s のオープンに失敗しました" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:278 #, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" -"管理用ディレクトリ (%s) をロックできません。これを使う別のプロセスが動いてい" -"ませんか?" +msgid " DeLink %s [%s]\n" +msgstr " リンク %s [%s] を外します\n" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:286 #, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "" -"管理用ディレクトリ (%s) をロックできません。root 権限で実行していますか?" +msgid "Failed to readlink %s" +msgstr "%s のリンク読み取りに失敗しました" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:290 #, 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 "Failed to unlink %s" +msgstr "%s のリンク解除に失敗しました" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:298 #, c-format -msgid "Installing %s" -msgstr "%s をインストールしています" +msgid "*** Failed to link %s to %s" +msgstr "*** %s を %s にリンクするのに失敗しました" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:308 #, c-format -msgid "Configuring %s" -msgstr "%s を設定しています" +msgid " DeLink limit of %sB hit.\n" +msgstr " リンクを外す制限の %sB に到達しました。\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 -#, c-format -msgid "Removing %s" -msgstr "%s を削除しています" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "アーカイブにパッケージフィールドがありませんでした" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Completely removing %s" -msgstr "%s を完全に削除しています" +msgid " %s has no override entry\n" +msgstr " %s に override エントリがありません\n" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Noting disappearance of %s" -msgstr "%s の消失を記録しています" +msgid " %s maintainer is %s not %s\n" +msgstr " %1$s メンテナは %3$s ではなく %2$s です\n" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:706 #, c-format -msgid "Running post-installation trigger %s" -msgstr "インストール後トリガ %s を実行しています" +msgid " %s has no source override entry\n" +msgstr " %s にソース override エントリがありません\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:710 #, c-format -msgid "Directory '%s' missing" -msgstr "ディレクトリ '%s' が見つかりません" +msgid " %s has no binary override entry either\n" +msgstr " %s にバイナリ override エントリがありません\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, c-format -msgid "Could not open file '%s'" -msgstr "ファイル '%s' をオープンできませんでした" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - メモリの割り当てに失敗しました" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing %s" -msgstr "%s を準備しています" +msgid "Unable to open %s" +msgstr "'%s' をオープンできません" -#: apt-pkg/deb/dpkgpm.cc:993 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 #, c-format -msgid "Unpacking %s" -msgstr "%s を展開しています" +msgid "Malformed override %s line %llu (%s)" +msgstr "不正な override %s %llu 行目 (%s)" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing to configure %s" -msgstr "%s の設定を準備しています" +msgid "Failed to read the override file %s" +msgstr "override ファイル %s を読み込むのに失敗しました" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/override.cc:166 #, c-format -msgid "Installed %s" -msgstr "%s をインストールしました" +msgid "Malformed override %s line %llu #1" +msgstr "不正な override %s %llu 行目 #1" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:178 #, c-format -msgid "Preparing for removal of %s" -msgstr "%s の削除を準備しています" +msgid "Malformed override %s line %llu #2" +msgstr "不正な override %s %llu 行目 #2" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:191 #, c-format -msgid "Removed %s" -msgstr "%s を削除しました" +msgid "Malformed override %s line %llu #3" +msgstr "不正な override %s %llu 行目 #3" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Preparing to completely remove %s" -msgstr "%s を完全に削除する準備をしています" +msgid "Unknown compression algorithm '%s'" +msgstr "'%s' は未知の圧縮アルゴリズムです" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:103 #, c-format -msgid "Completely removed %s" -msgstr "%s を完全に削除しました" +msgid "Compressed output %s needs a compression set" +msgstr "圧縮出力 %s には圧縮セットが必要です" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, c-format -msgid "Can not write log (%s)" -msgstr "ログを書き込めません (%s)" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "FILE* の作成に失敗しました" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "/dev/pts はマウントされていますか?" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "fork に失敗しました" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "標準出力はターミナルですか?" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "圧縮子プロセス" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "操作はそれが完了する前に中断されました" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "内部エラー、%s の作成に失敗しました" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "MaxReports にすでに達しているため、レポートは書き込まれません" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "子プロセス/ファイルへの IO が失敗しました" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "依存関係の問題 - 未設定のままにしています" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "MD5 の計算中に読み込みに失敗しました" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" -"エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート" -"は書き込まれません。" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "%s のリンク解除で問題が発生しました" -#: apt-pkg/deb/dpkgpm.cc:1700 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates a disk full " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"エラーメッセージはディスクフルエラーであることを示しているので、レポートは書" -"き込まれません。" +"使用方法: apt-internal-solver\n" +"\n" +"apt-internal-solver は、デバッグなどの用途で、現在の内部リゾルバを\n" +"APT ファミリの外部リゾルバのように使うためのインターフェイスです。\n" +"\n" +"オプション:\n" +" -h このヘルプを表示する\n" +" -q ログファイルに出力可能な形式にする - プログレス表示をしない\n" +" -c=? 指定した設定ファイルを読み込む\n" +" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: apt-pkg/deb/dpkgpm.cc:1707 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" -"エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き" -"込まれません。" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "不明なパッケージレコードです!" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"エラーメッセージはローカルシステムの問題であることを示しているので、レポート" -"は書き込まれません。" +"使用方法: apt-sortpkgs [オプション] ファイル名1 [ファイル名2 ...]\n" +"\n" +"apt-sortpkgs はパッケージファイルをソートするための簡単なツールです。\n" +"-s オプションはファイルの種類を示すために使用されます。\n" +"\n" +"オプション:\n" +" -h このヘルプを表示する\n" +" -s ソースファイルソートを使用する\n" +" -c=? 指定した設定ファイルを読み込む\n" +" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: apt-pkg/deb/dpkgpm.cc:1742 -msgid "" -"No apport report written because the error message indicates a dpkg I/O error" -msgstr "" -"エラーメッセージは dpkg I/O エラーであることを示しているので、レポートは書き" -"込まれません。" +#~ msgid "Is stdout a terminal?" +#~ msgstr "標準出力はターミナルですか?" #~ msgid "ioctl(TIOCGWINSZ) failed" #~ msgstr "ioctl(TIOCGWINSZ) に失敗しました" diff --git a/po/km.po b/po/km.po index 9202b6072..162f54ff7 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -163,7 +163,7 @@ msgid " Version table:" msgstr " តារាង​កំណែ ៖" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -361,7 +361,7 @@ msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យ msgid "Must specify at least one package to fetch source for" msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ" @@ -381,114 +381,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "ទៅប្រមូល​ប្រភព​ %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។" -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n" -#: cmdline/apt-get.cc:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, 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:1290 +#: cmdline/apt-get.cc:1294 #, 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:1313 +#: cmdline/apt-get.cc:1317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1356 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -497,37 +497,37 @@ msgstr "" "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​" "តម្រូវការ​កំណែបានឡើយ" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1362 #, 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:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។" -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ " -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -666,7 +666,7 @@ msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទ #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ" @@ -760,16 +760,16 @@ msgstr "មិនអាចអាន់ម៉ោន ស៊ីឌី​-រ៉ូ msgid "Disk not found." msgstr "រក​ថាសមិ​ន​ឃើញ​ ។" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "រកឯកសារ​មិន​ឃើញ​" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "បរាជ័យ​ក្នុងការថ្លែង" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​" @@ -822,7 +822,7 @@ msgstr "ពាក្យ​បញ្ជា​ស្គ្រីប​ចូល​ msgid "TYPE failed, server said: %s" msgstr "TYPE បានបរាជ័យ​ ម៉ាស៊ីន​បម្រើ​បាននិយាយ​ ៖ %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​" @@ -844,7 +844,7 @@ msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន msgid "Protocol corruption" msgstr "ការបង្ខូច​ពិធីការ​" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -905,7 +905,7 @@ msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័ msgid "Unable to accept connection" msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ" @@ -914,7 +914,7 @@ msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ" msgid "Unable to fetch file, server said '%s'" msgstr "មិន​អាច​ទៅ​ប្រមូល​យក​ឯកសារ​បានឡើយ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "រន្ធ​ទិន្នន័យ​បាន​អស់​ពេល​" @@ -964,7 +964,7 @@ msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​ %s #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "កំពុង​តភ្ជាប់​ទៅកាន់ %s" @@ -1102,42 +1102,17 @@ msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​" msgid "Internal error" msgstr "កំហុស​ខាង​ក្នុង​" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "វាយ​" - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "យក​ ៖" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ign " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Err " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "បាន​ទៅ​ប្រមូល​ %sB ក្នុង​ %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [កំពុង​ធ្វើការ​]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"ផ្លាស់ប្តូរ​មេឌៀ ៖ សូម​បញ្ចូល​ថាស​ដែល​មាន​ស្លាក\n" -" '%s'\n" -"ក្នុង​ដ្រាយ​ '%s' ហើយ​ចុច​បញ្ចូល\n" +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:93 msgid "Correcting dependencies..." @@ -1167,35 +1142,210 @@ msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get msgid "Unmet dependencies. Try using -f." msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ -f ។" -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "ព្រមាន​ ៖ មិនអាច​ធ្វើការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់ខាងក្រោមបានឡើយ !" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [បានដំឡើង​]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "បានបដិសេធ​ការព្រមាន​ការផ្ទៀងផ្ទាត់ភាព​ត្រឹមត្រូវ ។\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [បានដំឡើង​]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "មិនអាច​ផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់​មួយចំនួន​បានឡើយ​" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 +#: apt-private/private-output.cc:272 #, fuzzy -msgid "Install these packages without verification?" -msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោយគ្មានការពិនិត្យ​បញ្ជាក់ [y/N] ? " +msgid "[installed,automatic]" +msgstr " [បានដំឡើង​]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "មាន​បញ្ហា​ ហើយ -y ត្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [បានដំឡើង​]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n" +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:35 +#, 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:97 +#, 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:101 +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:82 msgid "Internal error, InstallPackages was called with broken packages!" @@ -1246,7 +1396,11 @@ msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ msgid "You don't have enough free space in %s." msgstr "អ្នក​គ្មាន​ទំហំ​​ទំនេរ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "មាន​បញ្ហា​ ហើយ -y ត្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 msgid "Trivial Only specified but this is not a trivial operation." msgstr "បានបញ្ជាក់​តែប្រតិបត្តិការដែលមិនសំខាន់ប៉ុណ្ណោះ ប៉ុន្តែ​នេះមិនមែនជាប្រតិបត្តិការមិនសំខាន់នោះទេ ។" @@ -1447,927 +1601,679 @@ msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s msgid "Package '%s' is not installed, so not removed\n" msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n" -#: apt-private/private-list.cc:129 -msgid "Listing" -msgstr "" - -#: apt-private/private-list.cc:159 -#, 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-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:36 +msgid "WARNING: The following packages cannot be authenticated!" +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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "បានបដិសេធ​ការព្រមាន​ការផ្ទៀងផ្ទាត់ភាព​ត្រឹមត្រូវ ។\n" -#: apt-private/private-output.cc:265 -#, fuzzy, c-format -msgid "[installed,upgradable to: %s]" -msgstr " [បានដំឡើង​]" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "មិនអាច​ផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់​មួយចំនួន​បានឡើយ​" -#: apt-private/private-output.cc:268 +#: apt-private/private-download.cc:50 #, fuzzy -msgid "[installed,local]" -msgstr " [បានដំឡើង​]" - -#: apt-private/private-output.cc:270 -msgid "[installed,auto-removable]" -msgstr "" +msgid "Install these packages without verification?" +msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោយគ្មានការពិនិត្យ​បញ្ជាក់ [y/N] ? " -#: apt-private/private-output.cc:272 -#, fuzzy -msgid "[installed,automatic]" -msgstr " [បានដំឡើង​]" +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n" -#: apt-private/private-output.cc:274 -#, fuzzy -msgid "[installed]" -msgstr " [បានដំឡើង​]" +#: apt-private/private-sources.cc:58 +#, fuzzy, c-format +msgid "Failed to parse %s. Edit again? " +msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s" -#: apt-private/private-output.cc:277 +#: apt-private/private-sources.cc:70 #, c-format -msgid "[upgradable from: %s]" +msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-output.cc:281 -msgid "[residual-config]" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" 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-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... " -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "ធ្វើរួច​" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "វាយ​" -#: apt-private/private-output.cc:571 -msgid "The following packages have been kept back:" -msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖" +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "យក​ ៖" -#: apt-private/private-output.cc:592 -msgid "The following packages will be upgraded:" -msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖" +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ign " -#: apt-private/private-output.cc:613 -msgid "The following packages will be DOWNGRADED:" -msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖" +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Err " -#: apt-private/private-output.cc:633 -msgid "The following held packages will be changed:" -msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖" +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "បាន​ទៅ​ប្រមូល​ %sB ក្នុង​ %s (%sB/s)\n" -#: apt-private/private-output.cc:688 +#: apt-private/acqprogress.cc:236 #, c-format -msgid "%s (due to %s) " -msgstr "%s (ដោយ​សារតែ​ %s) " +msgid " [Working]" +msgstr " [កំពុង​ធ្វើការ​]" -#: apt-private/private-output.cc:696 +#: apt-private/acqprogress.cc:297 +#, c-format msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" msgstr "" -"ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n" -"ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !" +"ផ្លាស់ប្តូរ​មេឌៀ ៖ សូម​បញ្ចូល​ថាស​ដែល​មាន​ស្លាក\n" +" '%s'\n" +"ក្នុង​ដ្រាយ​ '%s' ហើយ​ចុច​បញ្ចូល\n" -#: apt-private/private-output.cc:727 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី " +msgid "Unable to read %s" +msgstr "មិន​អាច​អាន​ %s បានឡើយ" -#: apt-private/private-output.cc:731 +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 #, c-format -msgid "%lu reinstalled, " -msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ " +msgid "Unable to change to %s" +msgstr "មិនអាច​ប្ដូរទៅ %s បានឡើយ" -#: apt-private/private-output.cc:733 +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 #, c-format -msgid "%lu downgraded, " -msgstr "%lu ​ត្រូវបានបន្ទាប់ " +msgid "No mirror file '%s' found " +msgstr "" -#: apt-private/private-output.cc:735 -#, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 +#, fuzzy, c-format +msgid "Can not read mirror file '%s'" +msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: apt-private/private-output.cc:739 -#, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n" +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#. 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]" +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" 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 "" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​បំពង់​ IPC សម្រាប់​ដំណើរ​ការ​រង​" -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:778 -msgid "Y" -msgstr "Y" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "បាន​បិទ​ការ​តភ្ជាប់​មុន​ពេល" -#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:784 -msgid "N" -msgstr "" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "ការ​កំណត់​លំនាំ​ដើម​មិន​ល្អ !" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Regex កំហុស​ការចងក្រង​ - %s" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "សង្កត់​ បញ្ចូល ​ដើម្បី​បន្ត ។" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" 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] "" +#: dselect/install:102 +#, fuzzy +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "កំហុ​ស​មួយ​ចំនួន​បាន​កើត​ឡើង​ខណៈពេល​ពន្លា​កញ្ចប់ ។ ខ្ញុំ​នឹង​កំណត់រចនាសម្ប័ន្ធ" -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" -msgstr "" +#: dselect/install:103 +#, fuzzy +msgid "will be configured. This may result in duplicate errors" +msgstr "កញ្ចប់​ដែល​បាន​ដំឡើង​ ។ នេះ​ប្រហែល​ជា​លទ្ធផល​កំហុស​ស្ទួន​" -#: apt-private/private-sources.cc:58 -#, fuzzy, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s" +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "ឬ​ កំហុសដែលបង្ក​ដោយ​ការ​បាត់បង់​ភាពអាស្រ័យ​ ។ ​មិន​អី​ទេ​ គ្រាន់​តែ​ជា​កំហុស " -#: apt-private/private-sources.cc:70 -#, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "" +#: dselect/install:105 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "នៅខាងលើ​សារ​នេះ​គឺ​សំខាន់​ណាស់​ ។ សូម​ជួសជុល​ពួកវា​ ហើយ​រត់​ការដំឡើង​ម្តងទៀត​" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ" +#: dselect/update:30 +msgid "Merging available information" +msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា" -#: apt-private/private-update.cc:90 -#, 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-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "ទម្លាក់​ថ្នាំង​ដែល​បាន​ហៅ​លើ​ថ្នាំងដែល​នៅតែតភ្ជាប់" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." -msgstr "" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "បរាជ័យ​ក្នុងការ​ដាក់ទីតាំង​ធាតុ​ដែលរាយប៉ាយ !" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... " +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "បរាជ័យ​ក្នុងការ​បម្រុងទុក​ការបង្វែរ" -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "ធ្វើរួច​" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "កំហុស​ខាងក្នុង នៅក្នុង AddDiversion" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Unable to read %s" -msgstr "មិន​អាច​អាន​ %s បានឡើយ" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "កំពុង​ព្យាយាម​សរសេរ​ជាន់​ពីលើ​ការបង្វែរ %s -> %s និង​ %s/%s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Unable to change to %s" -msgstr "មិនអាច​ប្ដូរទៅ %s បានឡើយ" +msgid "Double add of diversion %s -> %s" +msgstr "ការបន្ថែម​ស្ទួន នៃការបង្វែរ​ %s -> %s" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 +#: apt-inst/filelist.cc:549 #, c-format -msgid "No mirror file '%s' found " -msgstr "" - -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:287 -#, fuzzy, c-format -msgid "Can not read mirror file '%s'" -msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" - -#: methods/mirror.cc:315 -#, fuzzy, c-format -msgid "No entry found in mirror file '%s'" -msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" +msgid "Duplicate conf file %s/%s" +msgstr "ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​ស្ទួន​ %s/%s" -#: methods/mirror.cc:445 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "[Mirror: %s]" -msgstr "" +msgid "The path %s is too long" +msgstr "ផ្លូវ​ %s វែង​ពេក" -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​បំពង់​ IPC សម្រាប់​ដំណើរ​ការ​រង​" +#: apt-inst/extract.cc:132 +#, c-format +msgid "Unpacking %s more than once" +msgstr "កំពុង​ពន្លា​ %s ច្រើន​ជាង​ម្តង​" -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" -msgstr "បាន​បិទ​ការ​តភ្ជាប់​មុន​ពេល" +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "ថត​ %s ត្រូវបាន​បង្វែរ" -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "ការ​កំណត់​លំនាំ​ដើម​មិន​ល្អ !" +#: apt-inst/extract.cc:152 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "កញ្ចប់ ​កំពុង​ព្យាយាម​សរសេរ​ទៅកាន់​គោលដៅ​បង្វែរ​ %s/%s" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "សង្កត់​ បញ្ចូល ​ដើម្បី​បន្ត ។" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "ផ្លូវ​បង្វែរ វែងពេក" -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "" +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 +#, c-format +msgid "Failed to stat %s" +msgstr "បាន​បរាជ័យ​ក្នុង​ការថ្លែង %s" -#: dselect/install:102 -#, fuzzy -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "កំហុ​ស​មួយ​ចំនួន​បាន​កើត​ឡើង​ខណៈពេល​ពន្លា​កញ្ចប់ ។ ខ្ញុំ​នឹង​កំណត់រចនាសម្ប័ន្ធ" +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s" -#: dselect/install:103 -#, fuzzy -msgid "will be configured. This may result in duplicate errors" -msgstr "កញ្ចប់​ដែល​បាន​ដំឡើង​ ។ នេះ​ប្រហែល​ជា​លទ្ធផល​កំហុស​ស្ទួន​" +#: apt-inst/extract.cc:249 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "ថត​ %s ត្រូវ​បាន​ជំនួស​ដោយ​មិនមែន​ជា​ថត​" -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "ឬ​ កំហុសដែលបង្ក​ដោយ​ការ​បាត់បង់​ភាពអាស្រ័យ​ ។ ​មិន​អី​ទេ​ គ្រាន់​តែ​ជា​កំហុស " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "បរាជ័យ​ក្នុងការ​ដាក់ថ្នាំង​នៅក្នុង​ធុង​រាយប៉ាយ​របស់វា" -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" -msgstr "នៅខាងលើ​សារ​នេះ​គឺ​សំខាន់​ណាស់​ ។ សូម​ជួសជុល​ពួកវា​ ហើយ​រត់​ការដំឡើង​ម្តងទៀត​" +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "ផ្លូវ​វែង​ពេក" -#: dselect/update:30 -msgid "Merging available information" -msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា" +#: apt-inst/extract.cc:421 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "សរសេរ​ជាន់​លើកញ្ចប់ផ្គួផ្គង​ដោយ​គ្មាន​កំណែ​សម្រាប់ %s" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates ជាឧបករណ៍ដើម្បី​ស្រង់​ព័ត៌មាន​ការ​រចនាសម្ព័ន្ធ​​និង​ពុម្ព​\n" -"ពី​កញ្ចប់​​ដេបៀន \n" -"\n" -"ជម្រើស ៖ ​\n" -" -h អត្ថបទ​ជំនួយ​\n" -" -t កំណត់​ថត​បណ្ដោះ​អាសន្ន\n" -" -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n" -" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n" +#: apt-inst/extract.cc:438 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "ឯកសារ​ %s/%s សរសេរជាន់​ពីលើ​មួយ​ក្នុង​កញ្ចប់ %s" -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" +#: apt-inst/extract.cc:498 +#, c-format +msgid "Unable to stat %s" msgstr "មិន​អាច​ថ្លែង %s បានឡើយ" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Unable to write to %s" -msgstr "មិន​អាច​សរសេរ​ទៅ %s" +msgid "Failed to write file %s" +msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "មិន​អាច​ទទួល​យក​កំណែ​ debconf  ។ តើ​ debconf បានដំឡើង​ឬ ?" +#: apt-inst/dirstream.cc:105 +#, c-format +msgid "Failed to close file %s" +msgstr "បរាជ័យ​ក្នុងការ​បិទឯកសារ %s" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "បញ្ជី​ផ្នែក​បន្ថែម​កញ្ចប់​វែង​ពេក" +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "នេះ​ជាមិនមែនជា​ប័ណ្ណសារ​ DEB ​ត្រឹមត្រូវទេ បាត់បង់សមាជិក​ '%s'​" -#: 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 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "Error processing directory %s" -msgstr "​កំហុស​ដំណើរការ​ថត​ %s" +msgid "Internal error, could not locate member %s" +msgstr "កំហុស​ខាងក្នុង ​មិន​អាច​កំណត់​ទីតាំង​សមាជិក​ %s បានឡើយ" -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "បញ្ជី​ផ្នែក​បន្ថែម​ប្រភព​វែង​ពេក" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "ឯកសារត្រួតពិនិត្យ​ដែលមិនអាច​ញែកបាន" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "កំហុស​សរសេរ​បឋម​កថា​ទៅ​ឯកសារ​មាតិកា" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "ហត្ថលេខា​ប័ណ្ណសា​រមិន​ត្រឹមត្រូវ​" -#: ftparchive/apt-ftparchive.cc:431 -#, c-format -msgid "Error processing contents %s" -msgstr "កំហុស​ដំណើរការ​មាតិកា​ %s" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "កំហុស​ក្នុងការ​អានបឋមកថា​សមាជិក​ប័ណ្ណសារ" -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"ការប្រើប្រាស់ ៖ ពាក្យ​បញ្ជា​ apt-ftparchive [ជម្រើស] \n" -"ពាក្យ​បញ្ជា​ ៖ កញ្ចប់ binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" ផ្លូវ​មាតិកា​\n" -" ផ្លូវ​ផ្សាយ​ចេញ \n" -" កំណត់​រចនាស្ព័ន្ធបង្កើត​ [groups]\n" -" ​​កំណត់​រចនាសម្ព័ន្ធសំអាត​​\n" -"\n" -"apt-ftparchive បង្កើត​​ឯកសារ​លិបិក្រម​សម្រាប់​ប័ណ្ណសារ​​ដេបៀន  ។ វា​គាំទ្រ​រចនាប័ទ្ម​នៃ​ការបង្កើតដោយ​" -"ស្វ័យប្រវត្តិ​\n" -"ដើម្បី​ធ្វើការ​ជំនួស​\n" -" dpkg-scanpackages និង dpkg-scansources\n" -"\n" -"apt-ftparchive ដែល​បង្កើត​​​​ឯកសារ​ញ្ចប់​ ពី​មែកធាង​ .debs ។ ឯកសារ​កញ្ចប់មាន​\n" -"​មាតិកា​នៃ វត្ថុបញ្ជា​​វាល​ទាំងអស់ ដែល​បាន​មក​ពី​កញ្ចប់​និមួយ​ៗដូចជា​ MD5 hash និង​ ទំហំ​ឯកសារ​ ។ ឯកសារ​" -"បដិសេធ​​មិន​គាំទ្រ​ \n" -"ដើម្បី​បង្ខំ​តម្លៃ​អាទិភាព​និង សម័យ​ ។\n" -"\n" -"ភាព​ដូច​គ្នា​នៃ​ apt-ftparchive បង្កើត​ឯកសារ​ប្រភព​ពី​មែកធាង​ .dscs ។\n" -"ជម្រើស​បដិសេធ​ប្រភព​អាច​ត្រូវ​បាន​ប្រើ​សម្រាប់​បញ្ចាក់ឯកសារ​បដិសេធ src \n" -"\n" -" បញ្ជា​'កញ្ចប់​' និង​ 'ប្រភព' ត្រូវ​​តែ​រត់​ជា​ root \n" -" ។ BinaryPath ត្រូវ​ចង្អុល​​ទៅ​កាន់​មូលដ្ឋាន​ស្វែងរក​ហៅ​ខ្លួនឯង​ ហើយ​ \n" -"ឯកសារ​បដិសេធ​ត្រូវមាន​ទង​បដិសេធ  ។ ផ្លូវ​បរិបទ​ត្រូវ​បាន​បន្ថែម​​ទៅ​ក្នុង​វាល​ឈ្មោះ​​ឯកសារ​បើ​វា​មាន​  ។ " -"ឧទាហរណ៍​ ការប្រើប្រាស់​ពី​ប័ណ្ណសារ​ \n" -"ដេបៀន  ៖\n" -" apt-ftparchive កញ្ចប់​dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"ជម្រើស​ ៖\n" -" -h អត្ថបទ​ជំនួយ​នេះ​\n" -" --md5 Control MD5 ការបបង្កើត​\n" -" -s=? ឯកសារ​បដិសេធ​ប្រភព​\n" -" -q Quiet\n" -" -d=? ជ្រើស​ជម្រើសលាក់​ទុ​ក​ទិន្នន័យ​\n" -" --គ្មាន​-delink អនុញ្ញាត​ delinking របៀប​បំបាត់​កំហុស​\n" -" --មាតិកា ពិនិត្យ​ការបង្កើត​ឯកសារ​មាតិកា\n" -" -c=? អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ​\n" -" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "គ្មាន​ការ​ជ្រើស​​ដែល​ផ្គួផ្គង​" - -#: ftparchive/apt-ftparchive.cc:907 -#, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "ឯកសារ​មួយ​ចំនួន​បាត់បងពី​ក្រុម​ឯកសារ​កញ្ចប់​ `%s'" - -#: ftparchive/cachedb.cc:65 -#, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB បាន​ខូច​, ឯកសារ​បាន​ប្តូរ​ឈ្មោះ​ទៅ​ជា​ %s.old ។" +#: apt-inst/contrib/arfile.cc:96 +#, fuzzy, c-format +msgid "Invalid archive member header %s" +msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ" -#: ftparchive/cachedb.cc:83 -#, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "DB ចាស់​, កំពុង​ព្យាយាម​ធ្វើ​ឲ្យ %s ប្រសើរ​ឡើង" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ" -#: ftparchive/cachedb.cc:94 -#, fuzzy -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"ទ្រង់ទ្រាយ​មូលដ្ឋាន​ទិន្នន័យ​មិន​ត្រឹមត្រូវ ។ ប្រសិន​បើ​អ្នក​បាន​ធ្វើ​ឲ្យ​វា​ប្រសើឡើង​ពី​កំណែ​ចាស់​របស់ apt សូម​យក​" -"មូលដ្ឋាន​ទិន្នន័យ​ចេញ និង​បង្កើត​មូលដ្ឋាន​ទិន្នន័យ​ឡើង​វិញ ។" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "ប័ណ្ណសារ ខ្លីពេក" -#: ftparchive/cachedb.cc:99 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "មិន​អាច​បើក​ឯកសារ​ DB បានទេ %s: %s" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "បរាជ័យ​ក្នុងការ​អាន​បឋមកថា​ប័ណ្ណសារ" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 -#, c-format -msgid "Failed to stat %s" -msgstr "បាន​បរាជ័យ​ក្នុង​ការថ្លែង %s" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "បាន​បរាជ័យក្នុង​ការ​បង្កើត​បំពង់​" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "បាន​បរាជ័យក្នុង​ការ​ប្រតិបត្តិ gzip" -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រា​ត្រួត​ពិនិត្យ​ទេ​" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "ប័ណ្ណសារ​បាន​ខូច​" -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច​" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Tar ឆេកសាំ​បាន​បរាជ័យ ប័ណ្ណសារ​បាន​ខូច" -#: ftparchive/writer.cc:91 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: មិន​អាច​អាន​ថត %s បាន​ឡើយ\n" +msgid "Unknown TAR header type %u, member %s" +msgstr "មិន​ស្គាល់​ប្រភេទ​បឋមកថា​ TAR %u ដែលជា​សមាជិក​ %s" -#: ftparchive/writer.cc:96 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "W ៖ មិន​អាច​ថ្លែង %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " - -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "W: " +msgid "Progress: [%3i%%]" +msgstr "" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: កំហុស​អនុវត្ត​លើ​ឯកសារ​" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-pkg/init.cc:146 #, c-format -msgid "Failed to resolve %s" -msgstr "បរាជ័យ​ក្នុង​ការ​ដោះស្រាយ %s" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "មែក​ធាង បាន​បរាជ័យ" +msgid "Packaging system '%s' is not supported" +msgstr "មិន​គាំទ្រ​ប្រព័ន្ធ​កញ្ចប់'%s' ឡើយ" -#: ftparchive/writer.cc:219 -#, c-format -msgid "Failed to open %s" -msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "មិនអាច​កំណត់​ប្រភេទ​ប្រព័ន្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ" -#: ftparchive/writer.cc:278 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgid "Wrote %i records.\n" +msgstr "បានសរសេរ %i កំណត់ត្រា ។\n" -#: ftparchive/writer.cc:286 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Failed to readlink %s" -msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s" +msgid "Wrote %i records with %i missing files.\n" +msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់ ។\n" -#: ftparchive/writer.cc:290 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "Failed to unlink %s" -msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ដាច់ %s" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n" -#: ftparchive/writer.cc:298 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត​ %s ទៅ %s" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n" -#: ftparchive/writer.cc:308 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n" +msgid "Can't find authentication record for: %s" +msgstr "" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​" +#: apt-pkg/indexcopy.cc:521 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid " %s has no override entry\n" -msgstr " %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n" +msgid "The method driver %s could not be found." +msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ត្រ %s ឡើយ ។" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n" +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n" -#: ftparchive/writer.cc:706 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid " %s has no source override entry\n" -msgstr " %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n" +msgid "Method %s did not start correctly" +msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​" -#: ftparchive/writer.cc:710 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n" +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - បរាជ័យ​ក្នុង​ការ​​បម្រុង​​ទុក​សតិ​" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថានភាព​មិន​អាចត្រូវបាន​​ញែក ​​ឬ ត្រូវបាន​បើកបានឡើយ​​ ។" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "មិន​អាចបើក​ %s បានឡើយ" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់សម័យ apt-get ដើម្បី​កែ​បញ្ហា​ទាំងនេះ" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អានឯកសារ​បដិសេធ %s" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "ឃ្លាំង​កញ្ចប់​ទទេ​" -#: ftparchive/override.cc:166 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​" -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #2" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "ឯកសារ​ឃ្លាំងសម្ងាត់​​កញ្ចប់​ជាកំណែ​មិន​ត្រូវគ្នា​" -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #3" +#: apt-pkg/pkgcache.cc:169 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​" -#: ftparchive/multicompress.cc:73 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "មិន​ស្គាល់​ក្បួន​ដោះស្រាយ​ការបង្ហាប់​ '%s'" +msgid "This APT does not support the versioning system '%s'" +msgstr "APT នេះ មិនគាំទ្រ​ប្រព័ន្ធ​ ការធ្វើកំណែនេះទេ​ '%s'" -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "​ទិន្នផល​ដែល​បាន​បង្ហាប់​​ %s ត្រូវ​ការ​កំណត់​ការបង្ហាប់​" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "ឃ្លាំង​សម្ងាត់​កញ្ចប់ត្រូវ​បានស្ថាបនា់​សម្រាប់ស្ថាបត្យករ​ខុស​ៗគ្នា​​" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ FILE*" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "អាស្រ័យ​" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "បាន​បរាជ័យ​ក្នុងការ​ដាក់ជា​ពីរផ្នែក​" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "អាស្រ័យជា​មុន" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "បង្ហាប់កូន" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "ផ្ដល់យោបល់​" -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "កំហុស​ខាងក្នុង​ បរាជ័យ​ក្នុង​ការ​បង្កើត​ %s" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "ផ្តល់​អនុសាសន៍​" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "IO សម្រាប់​ដំណើរការ​រង​/ឯកសារ​ បាន​បរាជ័យ​" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "ប៉ះទង្គិច" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "បាន​បរាជ័យ​ក្នុង​ការអាន​ នៅពេល​គណនា MD5" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "ជំនួស​" -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "លែង​ប្រើ" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "" -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" msgstr "" -"ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates ជាឧបករណ៍ដើម្បី​ស្រង់​ព័ត៌មាន​ការ​រចនាសម្ព័ន្ធ​​និង​ពុម្ព​\n" -"ពី​កញ្ចប់​​ដេបៀន \n" -"\n" -"ជម្រើស ៖ ​\n" -" -h អត្ថបទ​ជំនួយ​\n" -" -t កំណត់​ថត​បណ្ដោះ​អាសន្ន\n" -" -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n" -" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "មិន​ស្គាល់​កំណត់​ត្រា​កញ្ចប់ !" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "សំខាន់​" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"ការប្រើប្រាស់ ៖ apt-sortpkgs [ជម្រើស] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs ជា​ឧបករណ៍​ធម្មតា​ដើម្បី​តម្រៀប​ឯកសារ​កញ្ចប់ ។ ជម្រើស​ -s បាន​ប្រើ​\n" -"សម្រាប់​ចង្អុល​ប្រភេទ​នៃ​​​ឯកសារ​អ្វីមួយដែល​មាន​ ។\n" -"\n" -"ជម្រើស​\n" -" -h អត្ថបទ​ជំនួយ​នេះ​\n" -" -s ប្រើ​ការ​តម្រៀប​ឯកសារ​ប្រភព\n" -" -c=? អាន​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធនេះ​\n" -" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "បាន​ទាមទារ" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" -msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "គំរូ" -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "បរាជ័យ​ក្នុងការ​បិទឯកសារ %s" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "ស្រេចចិត្ត" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "ផ្លូវ​ %s វែង​ពេក" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "បន្ថែម" -#: apt-inst/extract.cc:132 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Unpacking %s more than once" -msgstr "កំពុង​ពន្លា​ %s ច្រើន​ជាង​ម្តង​" +msgid "Index file type '%s' is not supported" +msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​" -#: apt-inst/extract.cc:142 -#, c-format -msgid "The directory %s is diverted" -msgstr "ថត​ %s ត្រូវបាន​បង្វែរ" +#: apt-pkg/sourcelist.cc:127 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)" -#: apt-inst/extract.cc:152 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "កញ្ចប់ ​កំពុង​ព្យាយាម​សរសេរ​ទៅកាន់​គោលដៅ​បង្វែរ​ %s/%s" +#: apt-pkg/sourcelist.cc:170 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -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-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "ថត​ %s ត្រូវ​បាន​ជំនួស​ដោយ​មិនមែន​ជា​ថត​" +#: 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-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "បរាជ័យ​ក្នុងការ​ដាក់ថ្នាំង​នៅក្នុង​ធុង​រាយប៉ាយ​របស់វា" +#: 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-inst/extract.cc:293 -msgid "The path is too long" -msgstr "ផ្លូវ​វែង​ពេក" +#: 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-inst/extract.cc:421 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Overwrite package match with no version for %s" -msgstr "សរសេរ​ជាន់​លើកញ្ចប់ផ្គួផ្គង​ដោយ​គ្មាន​កំណែ​សម្រាប់ %s" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "បន្ទាត់ Malformed %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)" -#: apt-inst/extract.cc:438 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "ឯកសារ​ %s/%s សរសេរជាន់​ពីលើ​មួយ​ក្នុង​កញ្ចប់ %s" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)" -#: apt-inst/extract.cc:498 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Unable to stat %s" -msgstr "មិន​អាច​ថ្លែង %s បានឡើយ" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "ទម្លាក់​ថ្នាំង​ដែល​បាន​ហៅ​លើ​ថ្នាំងដែល​នៅតែតភ្ជាប់" +#: apt-pkg/sourcelist.cc:217 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "បរាជ័យ​ក្នុងការ​ដាក់ទីតាំង​ធាតុ​ដែលរាយប៉ាយ !" - -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "បរាជ័យ​ក្នុងការ​បម្រុងទុក​ការបង្វែរ" - -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "កំហុស​ខាងក្នុង នៅក្នុង AddDiversion" +#: apt-pkg/sourcelist.cc:224 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" -#: apt-inst/filelist.cc:477 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "កំពុង​ព្យាយាម​សរសេរ​ជាន់​ពីលើ​ការបង្វែរ %s -> %s និង​ %s/%s" +msgid "Opening %s" +msgstr "កំពុង​បើក​ %s" -#: apt-inst/filelist.cc:506 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "ការបន្ថែម​ស្ទួន នៃការបង្វែរ​ %s -> %s" +msgid "Line %u too long in source list %s." +msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។" -#: apt-inst/filelist.cc:549 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​ស្ទួន​ %s/%s" +msgid "Malformed line %u in source list %s (type)" +msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "ហត្ថលេខា​ប័ណ្ណសា​រមិន​ត្រឹមត្រូវ​" +#: 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-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "កំហុស​ក្នុងការ​អានបឋមកថា​សមាជិក​ប័ណ្ណសារ" +#: 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-inst/contrib/arfile.cc:96 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 #, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ" +msgid "Clean of %s is not supported" +msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ" +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." +msgstr "មិនអាច​ថ្លែង %s បានឡើយ ។" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "ប័ណ្ណសារ ខ្លីពេក" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "ឃ្លាំងសម្ងាត់​មិន​ត្រូវ​គ្នា​នឹង ប្រព័ន្ធ ធ្វើកំណែ" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "បាន​បរាជ័យក្នុង​ការ​បង្កើត​បំពង់​" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​​  ។" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "បាន​បរាជ័យក្នុង​ការ​ប្រតិបត្តិ gzip" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "ប័ណ្ណសារ​បាន​ខូច​" +#: apt-pkg/pkgcachegen.cc:263 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។" -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Tar ឆេកសាំ​បាន​បរាជ័យ ប័ណ្ណសារ​បាន​ខូច" +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។" -#: apt-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "មិន​ស្គាល់​ប្រភេទ​បឋមកថា​ TAR %u ដែលជា​សមាជិក​ %s" +msgid "Package %s %s was not found while processing file dependencies" +msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "នេះ​ជាមិនមែនជា​ប័ណ្ណសារ​ DEB ​ត្រឹមត្រូវទេ បាត់បង់សមាជិក​ '%s'​" +msgid "Couldn't stat source package list %s" +msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s" -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "កំហុស​ខាងក្នុង ​មិន​អាច​កំណត់​ទីតាំង​សមាជិក​ %s បានឡើយ" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "ឯកសារត្រួតពិនិត្យ​ដែលមិនអាច​ញែកបាន" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, fuzzy, c-format -msgid "List directory %spartial is missing." -msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។" +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "មិន​អាច​សរសេរ​ទៅ %s" -#: apt-pkg/acquire.cc:91 -#, fuzzy, c-format -msgid "Archives directory %spartial is missing." -msgstr "ថត​ប័ណ្ណសារ​ %spartial គឺ​បាត់បង់​ ។" +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​" -#: apt-pkg/acquire.cc:99 -#, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ" +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "កំពុង​ទៅ​យក​ឯកសារ %li នៃ %li (នៅសល់ %s)" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "កំពុង​ទៅយក​ឯកសារ %li នៃ %li" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2388,35 +2294,35 @@ msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​" msgid "Invalid file format" msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, 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:1589 +#: apt-pkg/acquire-item.cc:1656 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/acquire-item.cc:1631 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2424,12 +2330,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2438,123 +2344,104 @@ msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ " "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។" -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ត្រ %s ឡើយ ។" +msgid "Vendor block %s contains no fingerprint" +msgstr "ប្លុក​ក្រុមហ៊ុន​លក់​ %s គ្មាន​ស្នាម​ផ្តិត​ម្រាម​ដៃ" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n" +msgid "List directory %spartial is missing." +msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។" -#: apt-pkg/acquire-worker.cc:169 -#, c-format -msgid "Method %s did not start correctly" -msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​" +#: apt-pkg/acquire.cc:91 +#, fuzzy, c-format +msgid "Archives directory %spartial is missing." +msgstr "ថត​ប័ណ្ណសារ​ %spartial គឺ​បាត់បង់​ ។" -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 +#, fuzzy, c-format +msgid "Unable to lock directory %s" +msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ" + +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "កំពុង​ទៅ​យក​ឯកសារ %li នៃ %li (នៅសល់ %s)" -#: apt-pkg/algorithms.cc:265 +#: apt-pkg/acquire.cc:904 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "កញ្ចប់ %s ត្រូវការឲ្យដំឡើង ប៉ុន្តែ​ ខ្ញុំ​មិន​អាច​រក​ប័ណ្ណសារ​សម្រាប់​វា​បាន​ទេ​ ។" +msgid "Retrieving file %li of %li" +msgstr "កំពុង​ទៅយក​ឯកសារ %li នៃ %li" -#: apt-pkg/algorithms.cc:1086 +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក" + +#: apt-pkg/policy.cc:83 +#, c-format msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -"កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើត នេះ​ប្រហែលជា បង្កដោយកញ្ចប់​" -"ដែលបាន​ទុក ។" - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។" - -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." -msgstr "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថានភាព​មិន​អាចត្រូវបាន​​ញែក ​​ឬ ត្រូវបាន​បើកបានឡើយ​​ ។" - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់សម័យ apt-get ដើម្បី​កែ​បញ្ហា​ទាំងនេះ" -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។" +#: apt-pkg/policy.cc:422 +#, fuzzy, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "កំណត់ត្រា​មិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារចំណង់ចំណូលចិត្ត មិនមាន​បឋមកថា​កញ្ចប់ទេ" -#: apt-pkg/cacheset.cc:489 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ" +msgid "Did not understand pin type %s" +msgstr "មិន​បាន​យល់​ពី​ប្រភេទ​ម្ជុល %s ឡើយ" -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'" - -#: apt-pkg/cacheset.cc:603 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" - -#: apt-pkg/cacheset.cc:609 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" - -#: apt-pkg/cacheset.cc:615 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" - -#: apt-pkg/cacheset.cc:626 -#, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "គ្មាន​អទិភាព (ឬ សូន្យ​) បានបញ្ជាក់​សម្រាប់​ម្ជុល​ទេ" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" +"ការរត់​ការដំឡើង​នេះ នឹងទាមទារ​ឲ្យយកកញ្ចប់ចាំបាច់ %s បណ្ដោះអាសន្ន ដោយសារ រង្វិល ការប៉ះទង្គិច/" +"ភាពអាស្រ័យជាមុន ។ ជាញឹកញាប់គឺ មិនត្រឹមត្រូវ ប៉ុន្តែ ប្រសិនបើអ្នក​ពិតជាចង់ធ្វើវា ធ្វើឲ្យជម្រើស APT::" +"Force-LoopBreak សកម្ម ។" -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +#: 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:497 apt-pkg/sourcelist.cc:347 -#, c-format -msgid "Line %u too long in source list %s." -msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។" +"ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវាត្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។" #: apt-pkg/cdrom.cc:571 #, fuzzy @@ -2630,10 +2517,23 @@ msgstr "កំពុងសរសេរ​បញ្ជី​ប្រភព​ថ msgid "Source list entries for this disc are:\n" msgstr "ធាតុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នេះគឺ ៖\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "មិនអាច​ថ្លែង %s បានឡើយ ។" +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "កញ្ចប់ %s ត្រូវការឲ្យដំឡើង ប៉ុន្តែ​ ខ្ញុំ​មិន​អាច​រក​ប័ណ្ណសារ​សម្រាប់​វា​បាន​ទេ​ ។" + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើត នេះ​ប្រហែលជា បង្កដោយកញ្ចប់​" +"ដែលបាន​ទុក ។" + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។" #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2662,55 +2562,67 @@ msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s" msgid "Failed to write temporary StateFile %s" msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 -#, c-format -msgid "Wrote %i records.\n" -msgstr "បានសរសេរ %i កំណត់ត្រា ។\n" +#: apt-pkg/cacheset.cc:609 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់ ។\n" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "MD5Sum មិន​ផ្គួផ្គង​" +#: apt-pkg/cacheset.cc:663 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" #: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format @@ -2737,317 +2649,222 @@ msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ msgid "Invalid 'Date' entry in Release file %s" msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "មិន​គាំទ្រ​ប្រព័ន្ធ​កញ្ចប់'%s' ឡើយ" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "មិនអាច​កំណត់​ប្រភេទ​ប្រព័ន្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ" +msgid "%lid %lih %limin %lis" +msgstr "" -#: apt-pkg/install-progress.cc:57 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Progress: [%3i%%]" +msgid "%lih %limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 +#, c-format +msgid "%limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "%lis" msgstr "" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" +#: apt-pkg/contrib/strutl.cc:1258 +#, c-format +msgid "Selection %s not found" +msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" -"ការរត់​ការដំឡើង​នេះ នឹងទាមទារ​ឲ្យយកកញ្ចប់ចាំបាច់ %s បណ្ដោះអាសន្ន ដោយសារ រង្វិល ការប៉ះទង្គិច/" -"ភាពអាស្រ័យជាមុន ។ ជាញឹកញាប់គឺ មិនត្រឹមត្រូវ ប៉ុន្តែ ប្រសិនបើអ្នក​ពិតជាចង់ធ្វើវា ធ្វើឲ្យជម្រើស APT::" -"Force-LoopBreak សកម្ម ។" +msgid "Not using locking for read only lock file %s" +msgstr "មិន​ប្រើប្រាស់​ការចាក់សោ សម្រាប់តែឯកសារចាក់សោ​ដែលបានតែអានប៉ុណ្ណោះ %s" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "ឃ្លាំង​កញ្ចប់​ទទេ​" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "មិន​អាច​បើក​ឯកសារ​ចាក់សោ​ %s បានឡើយ" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "មិនប្រើ​ការចាក់សោ សម្រាប់ nfs ឯកសារ​ចាក់សោដែលបានម៉ោន%s" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "ឯកសារ​ឃ្លាំងសម្ងាត់​​កញ្ចប់​ជាកំណែ​មិន​ត្រូវគ្នា​" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "មិន​អាច​ចាក់សោ %s បានឡើយ" -#: apt-pkg/pkgcache.cc:169 -#, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:394 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "APT នេះ មិនគាំទ្រ​ប្រព័ន្ធ​ ការធ្វើកំណែនេះទេ​ '%s'" +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "ឃ្លាំង​សម្ងាត់​កញ្ចប់ត្រូវ​បានស្ថាបនា់​សម្រាប់ស្ថាបត្យករ​ខុស​ៗគ្នា​​" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "អាស្រ័យ​" - -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "អាស្រ័យជា​មុន" - -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "ផ្ដល់យោបល់​" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "ផ្តល់​អនុសាសន៍​" - -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "ប៉ះទង្គិច" - -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "ជំនួស​" - -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "លែង​ប្រើ" - -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "" - -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "សំខាន់​" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "បាន​ទាមទារ" +#: apt-pkg/contrib/fileutl.cc:826 +#, fuzzy, c-format +msgid "Sub-process %s received signal %u." +msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "គំរូ" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "ស្រេចចិត្ត" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ " -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "បន្ថែម" +#: apt-pkg/contrib/fileutl.cc:913 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "ឃ្លាំងសម្ងាត់​មិន​ត្រូវ​គ្នា​នឹង ប្រព័ន្ធ ធ្វើកំណែ" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "មិន​អាច​បើក​ឯកសារ​ %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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 #, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)" - -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​​  ។" +msgid "Could not open file descriptor %d" +msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ដំណើរការ​រង​ IPC" -#: apt-pkg/pkgcachegen.cc:263 -#, fuzzy -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ​កម្មវិធី​បង្ហាប់ " -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។" +#: apt-pkg/contrib/fileutl.cc:1514 +#, fuzzy, c-format +msgid "read, still have %llu to read but none left" +msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់" -#: apt-pkg/pkgcachegen.cc:576 -#, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, fuzzy, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​" -#: apt-pkg/pkgcachegen.cc:1211 -#, c-format -msgid "Couldn't stat source package list %s" -msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s" +#: apt-pkg/contrib/fileutl.cc:1915 +#, fuzzy, c-format +msgid "Problem closing the file %s" +msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់" +#: apt-pkg/contrib/fileutl.cc:1927 +#, fuzzy, c-format +msgid "Problem renaming the file %s to %s" +msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ" +#: apt-pkg/contrib/fileutl.cc:1938 +#, fuzzy, c-format +msgid "Problem unlinking the file %s" +msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​" +msgid "%c%s... Error!" +msgstr "%c%s... កំហុស ​!" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +msgid "%c%s... Done" +msgstr "%c%s... ធ្វើរួច​" + +#: apt-pkg/contrib/progress.cc:181 +msgid "..." msgstr "" -#: apt-pkg/policy.cc:422 +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "កំណត់ត្រា​មិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារចំណង់ចំណូលចិត្ត មិនមាន​បឋមកថា​កញ្ចប់ទេ" - -#: apt-pkg/policy.cc:444 -#, c-format -msgid "Did not understand pin type %s" -msgstr "មិន​បាន​យល់​ពី​ប្រភេទ​ម្ជុល %s ឡើយ" +msgid "%c%s... %u%%" +msgstr "%c%s... ធ្វើរួច​" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "គ្មាន​អទិភាព (ឬ សូន្យ​) បានបញ្ជាក់​សម្រាប់​ម្ជុល​ទេ" +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "មិនអាច mmap ឯកសារទទេ​បានឡើយ" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/mmap.cc:111 #, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)" +msgid "Couldn't duplicate file descriptor %i" +msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/mmap.cc:119 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)" +msgid "Couldn't make mmap of %llu bytes" +msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ" -#: 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/contrib/mmap.cc:146 +#, fuzzy +msgid "Unable to close mmap" +msgstr "មិន​អាចបើក​ %s បានឡើយ" -#: 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/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "មិន​អាច​ហៅ​ " -#: 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/contrib/mmap.cc:290 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ" -#: 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/contrib/mmap.cc:322 +#, fuzzy +msgid "Failed to truncate file" +msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/contrib/mmap.cc:341 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "បន្ទាត់ Malformed %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)" +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" -#: 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 (ប្រភេទ​)" - -#: 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/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក" - -#: apt-pkg/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ" - -#: apt-pkg/tagfile.cc:237 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ" - -#: 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/vendorlist.cc:85 -#, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "ប្លុក​ក្រុមហ៊ុន​លក់​ %s គ្មាន​ស្នាម​ផ្តិត​ម្រាម​ដៃ" - -#: apt-pkg/contrib/cdromutl.cc:65 +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" + +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "មិនអាច​ថ្លែង ចំណុចម៉ោន %s បានឡើយ" @@ -3056,52 +2873,6 @@ msgstr "មិនអាច​ថ្លែង ចំណុចម៉ោន %s ប msgid "Failed to stat the cdrom" msgstr "បរាជ័យក្នុងការ​ថ្លែង ស៊ីឌីរ៉ូម" -#: apt-pkg/contrib/cmndline.cc:121 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "ជម្រើស​បន្ទាត់​ពាក្យបញ្ជា '%c' [from %s] មិនស្គាល់ឡើយ ។" - -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "មិនយល់​ពី​ជម្រើស​បន្ទាត់​ពាក្យ​បញ្ជា %s ឡើយ" - -#: apt-pkg/contrib/cmndline.cc:168 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "ជម្រើស​បន្ទាត់ពាក្យ​បញ្ជា​ %s មិនមែនជាប៊ូលីនទេ" - -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "ជម្រើស​ %s ត្រូវការ​អាគុយម៉ង់មួយ ។" - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "ជម្រើស %s ៖ ការបញ្ជាក់​ធាតុ​កំណត់រចនាសម្ព័ន្ធត្រូវតែមាន = មួយ ។" - -#: apt-pkg/contrib/cmndline.cc:278 -#, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "ជម្រើស​ %s ត្រូវ​ការ​អាគុយម៉ង់​ចំនួន​គត់​ មិន​មែន​ '%s'" - -#: apt-pkg/contrib/cmndline.cc:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "ជម្រើស​ '%s' វែងពេក" - -#: apt-pkg/contrib/cmndline.cc:341 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "មិនបានយល់អំពី​ការស្គាល់​ %s ឡើយ សូមព្យាយមយក​ ពិត​ ​​​ឫ មិន​ពិត ។" - -#: apt-pkg/contrib/cmndline.cc:391 -#, c-format -msgid "Invalid operation %s" -msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s" - #: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" @@ -3157,387 +2928,611 @@ msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ សេ msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ សារឥតបានការ​បន្ថែម ដែលនៅខាងចុង​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:190 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។" + +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "មិន​ប្រើប្រាស់​ការចាក់សោ សម្រាប់តែឯកសារចាក់សោ​ដែលបានតែអានប៉ុណ្ណោះ %s" +msgid "Command line option '%c' [from %s] is not known." +msgstr "ជម្រើស​បន្ទាត់​ពាក្យបញ្ជា '%c' [from %s] មិនស្គាល់ឡើយ ។" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Could not open lock file %s" -msgstr "មិន​អាច​បើក​ឯកសារ​ចាក់សោ​ %s បានឡើយ" +msgid "Command line option %s is not understood" +msgstr "មិនយល់​ពី​ជម្រើស​បន្ទាត់​ពាក្យ​បញ្ជា %s ឡើយ" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "មិនប្រើ​ការចាក់សោ សម្រាប់ nfs ឯកសារ​ចាក់សោដែលបានម៉ោន%s" +msgid "Command line option %s is not boolean" +msgstr "ជម្រើស​បន្ទាត់ពាក្យ​បញ្ជា​ %s មិនមែនជាប៊ូលីនទេ" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "Could not get lock %s" -msgstr "មិន​អាច​ចាក់សោ %s បានឡើយ" +msgid "Option %s requires an argument." +msgstr "ជម្រើស​ %s ត្រូវការ​អាគុយម៉ង់មួយ ។" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "" +msgid "Option %s: Configuration item specification must have an =." +msgstr "ជម្រើស %s ៖ ការបញ្ជាក់​ធាតុ​កំណត់រចនាសម្ព័ន្ធត្រូវតែមាន = មួយ ។" -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "ជម្រើស​ %s ត្រូវ​ការ​អាគុយម៉ង់​ចំនួន​គត់​ មិន​មែន​ '%s'" -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" +msgid "Option '%s' is too long" +msgstr "ជម្រើស​ '%s' វែងពេក" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" +msgid "Sense %s is not understood, try true or false." +msgstr "មិនបានយល់អំពី​ការស្គាល់​ %s ឡើយ សូមព្យាយមយក​ ពិត​ ​​​ឫ មិន​ពិត ។" -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។" +msgid "Invalid operation %s" +msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s" -#: apt-pkg/contrib/fileutl.cc:826 +#: apt-pkg/deb/dpkgpm.cc:110 #, fuzzy, c-format -msgid "Sub-process %s received signal %u." -msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។" +msgid "Installing %s" +msgstr "បាន​ដំឡើង %s" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)" +msgid "Configuring %s" +msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ " +msgid "Removing %s" +msgstr "កំពុង​យក %s ចេញ" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/dpkgpm.cc:113 #, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ" +msgid "Completely removing %s" +msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Could not open file %s" -msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" - -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 -#, fuzzy, c-format -msgid "Could not open file descriptor %d" -msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ដំណើរការ​រង​ IPC" +msgid "Noting disappearance of %s" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ​កម្មវិធី​បង្ហាប់ " +#: apt-pkg/deb/dpkgpm.cc:115 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1514 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format -msgid "read, still have %llu to read but none left" -msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់" +msgid "Directory '%s' missing" +msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, fuzzy, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​" +msgid "Could not open file '%s'" +msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:1915 -#, fuzzy, c-format -msgid "Problem closing the file %s" -msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ" +#: apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Preparing %s" +msgstr "កំពុងរៀបចំ​ %s" -#: apt-pkg/contrib/fileutl.cc:1927 -#, fuzzy, c-format -msgid "Problem renaming the file %s to %s" -msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr "កំពុង​ស្រាយ %s" -#: apt-pkg/contrib/fileutl.cc:1938 -#, fuzzy, c-format -msgid "Problem unlinking the file %s" -msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ" +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing to configure %s" +msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr "បាន​ដំឡើង %s" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។" +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចេញ​នៃ %s" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "មិនអាច mmap ឯកសារទទេ​បានឡើយ" +#: apt-pkg/deb/dpkgpm.cc:1022 +#, c-format +msgid "Removed %s" +msgstr "បាន​យក %s ចេញ" -#: apt-pkg/contrib/mmap.cc:111 -#, fuzzy, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ" +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង" -#: apt-pkg/contrib/mmap.cc:119 +#: apt-pkg/deb/dpkgpm.cc:1028 +#, c-format +msgid "Completely removed %s" +msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ" +msgid "Can not write log (%s)" +msgstr "មិន​អាច​សរសេរ​ទៅ %s" -#: apt-pkg/contrib/mmap.cc:146 -#, fuzzy -msgid "Unable to close mmap" -msgstr "មិន​អាចបើក​ %s បានឡើយ" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -#, fuzzy -msgid "Unable to synchronize mmap" -msgstr "មិន​អាច​ហៅ​ " +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "" -#: apt-pkg/contrib/mmap.cc:322 -#, fuzzy -msgid "Failed to truncate file" -msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "" -#: apt-pkg/contrib/mmap.cc:341 +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"Unable to lock the administration directory (%s), is another process using " +"it?" msgstr "" -#: apt-pkg/contrib/mmap.cc:446 +#: 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 "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +"dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/contrib/mmap.cc:449 +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "" + +#: cmdline/apt-extracttemplates.cc:224 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates ជាឧបករណ៍ដើម្បី​ស្រង់​ព័ត៌មាន​ការ​រចនាសម្ព័ន្ធ​​និង​ពុម្ព​\n" +"ពី​កញ្ចប់​​ដេបៀន \n" +"\n" +"ជម្រើស ៖ ​\n" +" -h អត្ថបទ​ជំនួយ​\n" +" -t កំណត់​ថត​បណ្ដោះ​អាសន្ន\n" +" -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n" +" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n" -#: apt-pkg/contrib/progress.cc:148 +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "មិន​អាច​ថ្លែង %s បានឡើយ" + +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "មិន​អាច​ទទួល​យក​កំណែ​ debconf  ។ តើ​ debconf បានដំឡើង​ឬ ?" + +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +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 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... កំហុស ​!" +msgid "Error processing directory %s" +msgstr "​កំហុស​ដំណើរការ​ថត​ %s" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "បញ្ជី​ផ្នែក​បន្ថែម​ប្រភព​វែង​ពេក" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "កំហុស​សរសេរ​បឋម​កថា​ទៅ​ឯកសារ​មាតិកា" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... ធ្វើរួច​" +msgid "Error processing contents %s" +msgstr "កំហុស​ដំណើរការ​មាតិកា​ %s" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"ការប្រើប្រាស់ ៖ ពាក្យ​បញ្ជា​ apt-ftparchive [ជម្រើស] \n" +"ពាក្យ​បញ្ជា​ ៖ កញ្ចប់ binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" ផ្លូវ​មាតិកា​\n" +" ផ្លូវ​ផ្សាយ​ចេញ \n" +" កំណត់​រចនាស្ព័ន្ធបង្កើត​ [groups]\n" +" ​​កំណត់​រចនាសម្ព័ន្ធសំអាត​​\n" +"\n" +"apt-ftparchive បង្កើត​​ឯកសារ​លិបិក្រម​សម្រាប់​ប័ណ្ណសារ​​ដេបៀន  ។ វា​គាំទ្រ​រចនាប័ទ្ម​នៃ​ការបង្កើតដោយ​" +"ស្វ័យប្រវត្តិ​\n" +"ដើម្បី​ធ្វើការ​ជំនួស​\n" +" dpkg-scanpackages និង dpkg-scansources\n" +"\n" +"apt-ftparchive ដែល​បង្កើត​​​​ឯកសារ​ញ្ចប់​ ពី​មែកធាង​ .debs ។ ឯកសារ​កញ្ចប់មាន​\n" +"​មាតិកា​នៃ វត្ថុបញ្ជា​​វាល​ទាំងអស់ ដែល​បាន​មក​ពី​កញ្ចប់​និមួយ​ៗដូចជា​ MD5 hash និង​ ទំហំ​ឯកសារ​ ។ ឯកសារ​" +"បដិសេធ​​មិន​គាំទ្រ​ \n" +"ដើម្បី​បង្ខំ​តម្លៃ​អាទិភាព​និង សម័យ​ ។\n" +"\n" +"ភាព​ដូច​គ្នា​នៃ​ apt-ftparchive បង្កើត​ឯកសារ​ប្រភព​ពី​មែកធាង​ .dscs ។\n" +"ជម្រើស​បដិសេធ​ប្រភព​អាច​ត្រូវ​បាន​ប្រើ​សម្រាប់​បញ្ចាក់ឯកសារ​បដិសេធ src \n" +"\n" +" បញ្ជា​'កញ្ចប់​' និង​ 'ប្រភព' ត្រូវ​​តែ​រត់​ជា​ root \n" +" ។ BinaryPath ត្រូវ​ចង្អុល​​ទៅ​កាន់​មូលដ្ឋាន​ស្វែងរក​ហៅ​ខ្លួនឯង​ ហើយ​ \n" +"ឯកសារ​បដិសេធ​ត្រូវមាន​ទង​បដិសេធ  ។ ផ្លូវ​បរិបទ​ត្រូវ​បាន​បន្ថែម​​ទៅ​ក្នុង​វាល​ឈ្មោះ​​ឯកសារ​បើ​វា​មាន​  ។ " +"ឧទាហរណ៍​ ការប្រើប្រាស់​ពី​ប័ណ្ណសារ​ \n" +"ដេបៀន  ៖\n" +" apt-ftparchive កញ្ចប់​dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"ជម្រើស​ ៖\n" +" -h អត្ថបទ​ជំនួយ​នេះ​\n" +" --md5 Control MD5 ការបបង្កើត​\n" +" -s=? ឯកសារ​បដិសេធ​ប្រភព​\n" +" -q Quiet\n" +" -d=? ជ្រើស​ជម្រើសលាក់​ទុ​ក​ទិន្នន័យ​\n" +" --គ្មាន​-delink អនុញ្ញាត​ delinking របៀប​បំបាត់​កំហុស​\n" +" --មាតិកា ពិនិត្យ​ការបង្កើត​ឯកសារ​មាតិកា\n" +" -c=? អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ​\n" +" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត" + +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "គ្មាន​ការ​ជ្រើស​​ដែល​ផ្គួផ្គង​" + +#: ftparchive/apt-ftparchive.cc:907 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "ឯកសារ​មួយ​ចំនួន​បាត់បងពី​ក្រុម​ឯកសារ​កញ្ចប់​ `%s'" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB បាន​ខូច​, ឯកសារ​បាន​ប្តូរ​ឈ្មោះ​ទៅ​ជា​ %s.old ។" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "DB ចាស់​, កំពុង​ព្យាយាម​ធ្វើ​ឲ្យ %s ប្រសើរ​ឡើង" + +#: ftparchive/cachedb.cc:94 +#, fuzzy +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" +"ទ្រង់ទ្រាយ​មូលដ្ឋាន​ទិន្នន័យ​មិន​ត្រឹមត្រូវ ។ ប្រសិន​បើ​អ្នក​បាន​ធ្វើ​ឲ្យ​វា​ប្រសើឡើង​ពី​កំណែ​ចាស់​របស់ apt សូម​យក​" +"មូលដ្ឋាន​ទិន្នន័យ​ចេញ និង​បង្កើត​មូលដ្ឋាន​ទិន្នន័យ​ឡើង​វិញ ។" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... ធ្វើរួច​" +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "មិន​អាច​បើក​ឯកសារ​ DB បានទេ %s: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រា​ត្រួត​ពិនិត្យ​ទេ​" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច​" + +#: ftparchive/writer.cc:91 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "W: មិន​អាច​អាន​ថត %s បាន​ឡើយ\n" + +#: ftparchive/writer.cc:96 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "W ៖ មិន​អាច​ថ្លែង %s\n" + +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "W: " + +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: កំហុស​អនុវត្ត​លើ​ឯកសារ​" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "" +msgid "Failed to resolve %s" +msgstr "បរាជ័យ​ក្នុង​ការ​ដោះស្រាយ %s" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" -msgstr "" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "មែក​ធាង បាន​បរាជ័យ" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/writer.cc:219 #, c-format -msgid "%limin %lis" -msgstr "" +msgid "Failed to open %s" +msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:278 #, c-format -msgid "%lis" -msgstr "" +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:286 #, c-format -msgid "Selection %s not found" -msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ" +msgid "Failed to readlink %s" +msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:290 #, 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 "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ" +msgid "Failed to unlink %s" +msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ដាច់ %s" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:298 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "" +msgid "*** Failed to link %s to %s" +msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត​ %s ទៅ %s" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "" +#: ftparchive/writer.cc:308 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n" -#: apt-pkg/deb/dpkgpm.cc:95 -#, fuzzy, c-format -msgid "Installing %s" -msgstr "បាន​ដំឡើង %s" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Configuring %s" -msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s" +msgid " %s has no override entry\n" +msgstr " %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Removing %s" -msgstr "កំពុង​យក %s ចេញ" - -#: apt-pkg/deb/dpkgpm.cc:98 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង" +msgid " %s maintainer is %s not %s\n" +msgstr " អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:706 #, c-format -msgid "Noting disappearance of %s" -msgstr "" +msgid " %s has no source override entry\n" +msgstr " %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:710 #, c-format -msgid "Running post-installation trigger %s" -msgstr "" - -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 -#, fuzzy, c-format -msgid "Directory '%s' missing" -msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។" +msgid " %s has no binary override entry either\n" +msgstr " %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - បរាជ័យ​ក្នុង​ការ​​បម្រុង​​ទុក​សតិ​" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing %s" -msgstr "កំពុងរៀបចំ​ %s" +msgid "Unable to open %s" +msgstr "មិន​អាចបើក​ %s បានឡើយ" -#: apt-pkg/deb/dpkgpm.cc:993 -#, c-format -msgid "Unpacking %s" -msgstr "កំពុង​ស្រាយ %s" +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing to configure %s" -msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s" +msgid "Failed to read the override file %s" +msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អានឯកសារ​បដិសេធ %s" -#: apt-pkg/deb/dpkgpm.cc:1000 -#, c-format -msgid "Installed %s" -msgstr "បាន​ដំឡើង %s" +#: ftparchive/override.cc:166 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #1" +msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1005 -#, c-format -msgid "Preparing for removal of %s" -msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចេញ​នៃ %s" +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #2" -#: apt-pkg/deb/dpkgpm.cc:1007 -#, c-format -msgid "Removed %s" -msgstr "បាន​យក %s ចេញ" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #3" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Preparing to completely remove %s" -msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង" +msgid "Unknown compression algorithm '%s'" +msgstr "មិន​ស្គាល់​ក្បួន​ដោះស្រាយ​ការបង្ហាប់​ '%s'" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:103 #, c-format -msgid "Completely removed %s" -msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង" - -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "មិន​អាច​សរសេរ​ទៅ %s" +msgid "Compressed output %s needs a compression set" +msgstr "​ទិន្នផល​ដែល​បាន​បង្ហាប់​​ %s ត្រូវ​ការ​កំណត់​ការបង្ហាប់​" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ FILE*" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "បាន​បរាជ័យ​ក្នុងការ​ដាក់ជា​ពីរផ្នែក​" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "បង្ហាប់កូន" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "កំហុស​ខាងក្នុង​ បរាជ័យ​ក្នុង​ការ​បង្កើត​ %s" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "IO សម្រាប់​ដំណើរការ​រង​/ឯកសារ​ បាន​បរាជ័យ​" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "បាន​បរាជ័យ​ក្នុង​ការអាន​ នៅពេល​គណនា MD5" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ %s" -#: apt-pkg/deb/dpkgpm.cc:1707 +#: cmdline/apt-internal-solver.cc:49 +#, fuzzy msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates ជាឧបករណ៍ដើម្បី​ស្រង់​ព័ត៌មាន​ការ​រចនាសម្ព័ន្ធ​​និង​ពុម្ព​\n" +"ពី​កញ្ចប់​​ដេបៀន \n" +"\n" +"ជម្រើស ៖ ​\n" +" -h អត្ថបទ​ជំនួយ​\n" +" -t កំណត់​ថត​បណ្ដោះ​អាសន្ន\n" +" -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n" +" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" -msgstr "" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "មិន​ស្គាល់​កំណត់​ត្រា​កញ្ចប់ !" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"ការប្រើប្រាស់ ៖ apt-sortpkgs [ជម្រើស] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs ជា​ឧបករណ៍​ធម្មតា​ដើម្បី​តម្រៀប​ឯកសារ​កញ្ចប់ ។ ជម្រើស​ -s បាន​ប្រើ​\n" +"សម្រាប់​ចង្អុល​ប្រភេទ​នៃ​​​ឯកសារ​អ្វីមួយដែល​មាន​ ។\n" +"\n" +"ជម្រើស​\n" +" -h អត្ថបទ​ជំនួយ​នេះ​\n" +" -s ប្រើ​ការ​តម្រៀប​ឯកសារ​ប្រភព\n" +" -c=? អាន​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធនេះ​\n" +" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/ko.po b/po/ko.po index c1b756cf7..3f138c4ca 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2010-08-30 02:31+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -153,7 +153,7 @@ msgid " Version table:" msgstr " 버전 테이블:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -351,7 +351,7 @@ msgstr "다운로드 디렉터리를 잠글 수 없습니다" msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 패키지를 찾을 수 없습니다" @@ -376,95 +376,95 @@ msgstr "" "다음과 같이 하십시오:\n" "bzr get %s\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는데 실패했습니다." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s 패키지에 빌드 의존성이 없습니다.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -473,7 +473,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -482,14 +482,14 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -498,7 +498,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1362 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -507,30 +507,30 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는데 실패했습니다" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s(%s)에 연결하는 중입니다" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -672,7 +672,7 @@ msgstr "%s 패키지는 이미 최신 버전입니다.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다" @@ -766,16 +766,16 @@ msgstr "%s 안의 CD-ROM을 마운트 해제할 수 없습니다. 사용 중일 msgid "Disk not found." msgstr "디스크가 없습니다." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "파일이 없습니다" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "파일 정보를 읽는데 실패했습니다" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "파일 변경 시각을 설정하는데 실패했습니다" @@ -829,7 +829,7 @@ msgstr "로그인 스크립트 명령 '%s' 실패, 서버에서는: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE 실패, 서버에서는: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "연결 시간 초과" @@ -851,7 +851,7 @@ msgstr "응답이 버퍼 크기를 넘어갔습니다." msgid "Protocol corruption" msgstr "프로토콜이 틀렸습니다" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -912,7 +912,7 @@ msgstr "데이터 소켓 연결 시간 초과" msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" @@ -921,7 +921,7 @@ msgstr "파일 해싱에 문제가 있습니다" msgid "Unable to fetch file, server said '%s'" msgstr "파일을 가져올 수 없습니다. 서버 왈, '%s'" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "데이터 소켓에 제한 시간이 초과했습니다" @@ -971,7 +971,7 @@ msgstr "%s:%s에 연결할 수 없습니다 (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "%s에 연결하는 중입니다" @@ -1109,42 +1109,16 @@ msgstr "연결이 실패했습니다" msgid "Internal error" msgstr "내부 오류" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "기존 " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "받기:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "무시" - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "오류 " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "내려받기 %s바이트, 소요시간 %s (%s바이트/초)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [작업중]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"미디어 바꾸기: '%2$s' 드라이브에 다음 레이블이 달린\n" -"디스크를 넣고 enter를 누르십시오\n" -" '%1$s'\n" +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:93 msgid "Correcting dependencies..." @@ -1175,166 +1149,348 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "경고: 다음 패키지를 인증할 수 없습니다!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [설치함]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "인증 경고를 무시합니다.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [설치함]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "인증할 수 없는 패키지가 있습니다" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "확인하지 않고 패키지를 설치하시겠습니까?" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [설치함]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [설치함]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "%s 파일을 받는데 실패했습니다 %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습니다!" - -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "패키지를 제거해야 하지만 제거가 금지되어 있습니다." - -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다" +msgid "[upgradable from: %s]" +msgstr "" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" msgstr "" -"이상하게도 크기가 서로 다릅니다. 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 -#: apt-private/private-install.cc:155 +#: apt-private/private-output.cc:455 #, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "%s바이트/%s바이트 아카이브를 받아야 합니다.\n" +msgid "but %s is installed" +msgstr "하지만 %s 패키지를 설치했습니다" -#. 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:160 +#: apt-private/private-output.cc:457 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "%s바이트 아카이브를 받아야 합니다.\n" +msgid "but %s is to be installed" +msgstr "하지만 %s 패키지를 설치할 것입니다" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "이 작업 후 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n" +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +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 -#: apt-private/private-install.cc:172 -#, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "하지만 가상 패키지입니다" -#: apt-private/private-install.cc:200 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "%s 안에 충분한 여유 공간이 없습니다." +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "하지만 설치하지 않았습니다" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "" -"사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 " -"아닙니다." +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "하지만 %s 패키지를 설치하지 않을 것입니다" -# 입력을 받아야 한다. 한글 입력을 못 할 수 있으므로 원문 그대로 사용. -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Yes, do as I say!" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " 혹은" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"시스템에 무언가 해가 되는 작업을 하려고 합니다.\n" -"계속하시려면 다음 문구를 입력하십시오: '%s'\n" -" ?] " +#: apt-private/private-output.cc:488 apt-private/private-output.cc:500 +msgid "The following packages have unmet dependencies:" +msgstr "다음 패키지의 의존성이 맞지 않습니다:" -#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "중단." +#: apt-private/private-output.cc:523 +msgid "The following NEW packages will be installed:" +msgstr "다음 새 패키지를 설치할 것입니다:" -#: apt-private/private-install.cc:243 -msgid "Do you want to continue?" -msgstr "계속 하시겠습니까?" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "다음 패키지를 지울 것입니다:" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "일부 파일을 받는데 실패했습니다" +#: apt-private/private-output.cc:571 +msgid "The following packages have been kept back:" +msgstr "다음 패키지를 과거 버전으로 유지합니다:" -#: apt-private/private-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-" -"missing 옵션을 줘서 실행해야 할 것입니다." +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "다음 패키지를 업그레이드할 것입니다:" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" +msgstr "다음 패키지를 다운그레이드할 것입니다:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "빠진 패키지를 바로잡을 수 없습니다." +#: apt-private/private-output.cc:633 +msgid "The following held packages will be changed:" +msgstr "고정되었던 다음 패키지를 바꿀 것입니다:" -#: apt-private/private-install.cc:330 -msgid "Aborting install." -msgstr "설치를 중단합니다." +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (%s때문에) " -#: apt-private/private-install.cc:366 +#: apt-private/private-output.cc:696 msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"다음 패키지는 패키지의 파일을 모두 다른 패키지가\n" -"덮어썼기 때문에 사라졌습니다:" +"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-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "주의: dpkg에서 자동으로 의도적으로 수행했습니다." +#: apt-private/private-output.cc:727 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu개 업그레이드, %lu개 새로 설치, " -#: apt-private/private-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다" +#: apt-private/private-output.cc:731 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu개 다시 설치, " -#: apt-private/private-install.cc:499 -msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." -msgstr "" +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습니다!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "패키지를 제거해야 하지만 제거가 금지되어 있습니다." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"이상하게도 크기가 서로 다릅니다. 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of 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 +#: apt-private/private-install.cc:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "%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 +#: apt-private/private-install.cc:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "이 작업 후 %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 +#: apt-private/private-install.cc:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "%s 안에 충분한 여유 공간이 없습니다." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "" +"사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 " +"아닙니다." + +# 입력을 받아야 한다. 한글 입력을 못 할 수 있으므로 원문 그대로 사용. +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Yes, do as I say!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"시스템에 무언가 해가 되는 작업을 하려고 합니다.\n" +"계속하시려면 다음 문구를 입력하십시오: '%s'\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "중단." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "계속 하시겠습니까?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "일부 파일을 받는데 실패했습니다" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-" +"missing 옵션을 줘서 실행해야 할 것입니다." + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "빠진 패키지를 바로잡을 수 없습니다." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "설치를 중단합니다." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"다음 패키지는 패키지의 파일을 모두 다른 패키지가\n" +"덮어썼기 때문에 사라졌습니다:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "주의: dpkg에서 자동으로 의도적으로 수행했습니다." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다" + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" "AutoRemover가 뭔가를 망가뜨린 것으로 보입니다. 이 문제는 실제 일어나서는\n" "안 됩니다. apt에 대해 버그 보고를 하십시오." @@ -1459,208 +1615,26 @@ msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n" msgid "Package '%s' is not installed, so not removed\n" msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n" -#: apt-private/private-list.cc:129 -msgid "Listing" -msgstr "" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "경고: 다음 패키지를 인증할 수 없습니다!" -#: apt-private/private-list.cc:159 -#, 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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "인증 경고를 무시합니다.\n" -#: 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:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +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-download.cc:50 +msgid "Install these packages without verification?" +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:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "정규식 컴파일 오류 - %s" - -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" - -#: apt-private/private-show.cc:156 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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 "" +msgid "Failed to fetch %s %s\n" +msgstr "%s 파일을 받는데 실패했습니다 %s\n" #: apt-private/private-sources.cc:58 #, fuzzy, c-format @@ -1672,19 +1646,8 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "update 명령은 인수를 받지 않습니다" - -#: apt-private/private-update.cc:90 -#, 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:94 -msgid "All packages are up to date." +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" #: apt-private/private-upgrade.cc:25 @@ -1695,20 +1658,57 @@ msgstr "업그레이드를 계산하는 중입니다... " msgid "Done" msgstr "완료" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "기존 " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "받기:" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "무시" + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "오류 " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "내려받기 %s바이트, 소요시간 %s (%s바이트/초)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [작업중]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"미디어 바꾸기: '%2$s' 드라이브에 다음 레이블이 달린\n" +"디스크를 넣고 enter를 누르십시오\n" +" '%1$s'\n" + #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format msgid "Unable to read %s" msgstr "%s을(를) 읽을 수 없습니다" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1742,7 +1742,7 @@ msgstr "[미러 사이트: %s]" msgid "Failed to create IPC pipe to subprocess" msgstr "하위 프로세스에 대한 IPC 파이프를 만드는데 실패했습니다" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "연결이 너무 빨리 끊어졌습니다" @@ -1781,514 +1781,124 @@ msgstr "오류만 중요합니다. 이 오류를 고친 다음에 설치(I)를 msgid "Merging available information" msgstr "이용 가능 패키지 정보를 합칩니다" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"사용법: apt-extracttemplates 파일1 [파일2 ...]\n" -"\n" -"apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n" -"도구입니다\n" -"\n" -"옵션:\n" -" -h 이 도움말\n" -" -t 임시 디렉토리 설정\n" -" -c=? 설정 파일을 읽습니다\n" -" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode가 아직 연결되어 있는 노드에 대해 호출되었습니다" -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "%s의 정보를 읽을 수 없습니다" - -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "%s에 쓸 수 없습니다" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "해시 항목을 찾는데 실패했습니다" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "diversion을 할당하는데 실패했습니다" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "패키지 확장 목록이 너무 깁니다" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "AddDiversion에서 내부 오류" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "%s 디렉터리를 처리하는데 오류가 발생했습니다" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "소스 확장 목록이 너무 깁니다" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "컨텐츠 파일에 헤더를 쓰는데 오류가 발생했습니다" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "전환된 파일을 덮어 쓰려고 합니다 (%s -> %s 및 %s/%s)" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "%s 컨텐츠를 처리하는데 오류가 발생했습니다" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"사용법: apt-ftparchive [옵션] 명령\n" -"명령: packages 바이너리경로 [override파일 [경로앞부분]]\n" -" sources 소스경로 [override파일 [경로앞부분]]\n" -" contents 경로\n" -" release 경로\n" -" generate 설정 [그룹]\n" -" clean 설정\n" -"\n" -"apt-ftparchive는 데비안 아카이브용 인덱스 파일을 만듭니다. 이 프로그램은\n" -"여러 종류의 인덱스 파일 만드는 작업을 지원합니다 -- 완전 자동화 작업부터\n" -"dpkg-scanpackages와 dpkg-scansources의 기능을 대체하기도 합니다.\n" -"\n" -"apt-ftparchive는 .deb 파일의 트리에서부터 Package 파일을 만듭니다.\n" -"Package 파일에는 각 패키지의 모든 제어 필드는 물론 MD5 해시와 파일\n" -"크기도 들어 있습니다. override 파일을 이용해 Priority와 Section의 값을 \n" -"강제로 설정할 수 있습니다\n" -"\n" -"이와 비슷하게 apt-ftparchive는 .dsc 파일의 트리에서 Sources 파일을\n" -"만듭니다. --source-override 옵션을 이용해 소스 override 파일을\n" -"지정할 수 있습니다.\n" -"\n" -"'packages'와 'sources' 명령은 해당 트리의 맨 위에서 실행해야 합니다.\n" -"\"바이너리경로\"는 검색할 때의 기준 위치를 가리키며 \"override파일\"에는\n" -"override 플래그들을 담고 있습니다. \"경로앞부분\"은 각 파일 이름\n" -"필드의 앞에 더해 집니다. 데비안 아카이브에 있는 예를 하나 들자면:\n" -"\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"옵션:\n" -" -h 이 도움말\n" -" --md5 MD5 만들기 작업을 제어합니다\n" -" -s=? 소스 override 파일\n" -" -q 조용히\n" -" -d=? 캐시 데이터베이스를 직접 설정합니다\n" -" --no-delink 디버깅 모드 지우기를 사용합니다\n" -" --contents 컨텐츠 파일을 만드는 적업을 제어합니다\n" -" -c=? 이 설정 파일을 읽습니다\n" -" -o=? 임의의 옵션을 설정합니다" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "맞는 패키지가 없습니다" +msgid "Double add of diversion %s -> %s" +msgstr "전환된 파일을 두 번 추가합니다 (%s -> %s)" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "`%s' 패키지 파일 그룹에 몇몇 파일이 빠졌습니다" +msgid "Duplicate conf file %s/%s" +msgstr "%s/%s 설정 파일이 중복되었습니다" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB가 망가졌습니다. 파일 이름을 %s.old로 바꿉니다" +msgid "The path %s is too long" +msgstr "경로 %s이(가) 너무 깁니다" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다" +msgid "Unpacking %s more than once" +msgstr "%s을(를) 두 번 이상 풀었습니다" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"DB 형식이 잘못되었습니다. APT 예전 버전에서 업그레이드했다면, 데이터베이스를 " -"지우고 다시 만드십시오." +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "%s 디렉터리가 전환되었습니다" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "DB 파일, %s 파일을 열 수 없습니다: %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "이 패키지에서 전환된 대상에 쓰려고 합니다 (%s/%s)" + +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "전환하는 경로가 너무 깁니다" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "%s의 정보를 읽는데 실패했습니다" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "%s 파일에 readlink하는데 실패했습니다" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "아카이브에 컨트롤 기록이 없습니다" - -# FIXME: 왠 커서?? -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "커서를 가져올 수 없습니다" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "경고: %s 디렉터리를 읽을 수 없습니다\n" +msgid "Failed to rename %s to %s" +msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "경고: %s의 정보를 읽을 수 없습니다\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "오류: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "%s 디렉터리를 디렉터리가 아닌 파일로 덮어쓰려고 합니다" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "경고: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "해시 버킷에서 노드를 찾는데 실패했습니다" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "오류: 다음 파일에 적용하는데 오류가 발생했습니다: " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "경로가 너무 깁니다" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "%s의 경로를 알아내는데 실패했습니다" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "트리에서 이동이 실패했습니다" +msgid "Overwrite package match with no version for %s" +msgstr "덮어 쓰는 패키지가 %s 패키지의 어떤 버전과도 맞지 않습니다" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to open %s" -msgstr "%s 파일을 여는데 실패했습니다" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "%s/%s 파일은 %s 패키지에 있는 파일을 덮어 씁니다" -# FIXME: ?? -#: ftparchive/writer.cc:278 +#: apt-inst/extract.cc:498 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " 링크 %s [%s] 없애기\n" +msgid "Unable to stat %s" +msgstr "%s의 정보를 읽을 수 없습니다" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Failed to readlink %s" -msgstr "%s 파일에 readlink하는데 실패했습니다" +msgid "Failed to write file %s" +msgstr "%s 파일을 쓰는데 실패했습니다" -#: ftparchive/writer.cc:290 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to unlink %s" -msgstr "%s 파일을 지우는데 실패했습니다" +msgid "Failed to close file %s" +msgstr "%s 파일을 닫는데 실패했습니다" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** %s 파일을 %s에 링크하는데 실패했습니다" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "올바른 DEB 아카이브가 아닙니다. '%s' 멤버가 없습니다" -#: ftparchive/writer.cc:308 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n" +msgid "Internal error, could not locate member %s" +msgstr "내부 오류, %s 멤버를 찾을 수 없습니다" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "아카이브에 패키지 필드가 없습니다" - -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s에는 override 항목이 없습니다\n" - -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " %s 관리자가 %s입니다 (%s 아님)\n" - -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s에는 source override 항목이 없습니다\n" - -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s에는 binary override 항목이 없습니다\n" - -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - 메모리를 할당하는데 실패했습니다" - -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "%s 열 수 없습니다" - -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다" - -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "%s override 파일을 읽는데 실패했습니다" - -#: ftparchive/override.cc:166 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다" - -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "override %s의 %lu번 줄 #2가 잘못되었습니다" - -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다" - -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "'%s' 압축 알고리즘을 알 수 없습니다" - -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "압축된 출력물 %s에는 압축 세트가 필요합니다" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "FILE*를 만드는데 실패했습니다" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "fork하는데 실패했습니다" - -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "압축 하위 프로세스" - -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "내부 오류, %s 만드는데 실패했습니다" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "하위 프로세스/파일에 입출력하는데 실패했습니다" - -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "MD5를 계산하는 동안 읽는데 실패했습니다" - -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "%s의 링크를 해제하는데 문제가 있습니다" - -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다" - -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"사용법: apt-extracttemplates 파일1 [파일2 ...]\n" -"\n" -"apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n" -"도구입니다\n" -"\n" -"옵션:\n" -" -h 이 도움말\n" -" -t 임시 디렉토리 설정\n" -" -c=? 설정 파일을 읽습니다\n" -" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "알 수 없는 패키지 기록!" - -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"사용법: apt-sortpkgs [옵션] 파일1 [파일2 ...]\n" -"\n" -"apt-sortpkgs는 패키지 파일을 정렬하는 간단한 도구입니다. -s 옵션은 무슨 파일" -"인지\n" -"알아 내는데 쓰입니다.\n" -"\n" -"옵션:\n" -" -h 이 도움말\n" -" -s 소스 파일 정렬을 사용합니다\n" -" -c=? 이 설정 파일을 읽습니다\n" -" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" - -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" -msgstr "%s 파일을 쓰는데 실패했습니다" - -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "%s 파일을 닫는데 실패했습니다" - -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "경로 %s이(가) 너무 깁니다" - -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" -msgstr "%s을(를) 두 번 이상 풀었습니다" - -#: apt-inst/extract.cc:142 -#, c-format -msgid "The directory %s is diverted" -msgstr "%s 디렉터리가 전환되었습니다" - -#: apt-inst/extract.cc:152 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "이 패키지에서 전환된 대상에 쓰려고 합니다 (%s/%s)" - -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "전환하는 경로가 너무 깁니다" - -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "%s 디렉터리를 디렉터리가 아닌 파일로 덮어쓰려고 합니다" - -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "해시 버킷에서 노드를 찾는데 실패했습니다" - -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "경로가 너무 깁니다" - -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "덮어 쓰는 패키지가 %s 패키지의 어떤 버전과도 맞지 않습니다" - -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "%s/%s 파일은 %s 패키지에 있는 파일을 덮어 씁니다" - -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "%s의 정보를 읽을 수 없습니다" - -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "DropNode가 아직 연결되어 있는 노드에 대해 호출되었습니다" - -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "해시 항목을 찾는데 실패했습니다" - -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "diversion을 할당하는데 실패했습니다" - -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "AddDiversion에서 내부 오류" - -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "전환된 파일을 덮어 쓰려고 합니다 (%s -> %s 및 %s/%s)" - -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "전환된 파일을 두 번 추가합니다 (%s -> %s)" - -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "%s/%s 설정 파일이 중복되었습니다" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "control 파일을 파싱할 수 없습니다" #: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" @@ -2336,134 +1946,53 @@ msgstr "tar 체크섬 실패, 아카이브가 손상되었습니다" msgid "Unknown TAR header type %u, member %s" msgstr "알 수 없는 TAR 헤더 타입 %u, 멤버 %s" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "올바른 DEB 아카이브가 아닙니다. '%s' 멤버가 없습니다" - -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "내부 오류, %s 멤버를 찾을 수 없습니다" - -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "control 파일을 파싱할 수 없습니다" - -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, c-format -msgid "List directory %spartial is missing." -msgstr "목록 디렉터리 %spartial이 빠졌습니다." - -#: apt-pkg/acquire.cc:91 -#, c-format -msgid "Archives directory %spartial is missing." -msgstr "아카이브 디렉터리 %spartial이 빠졌습니다." - -#: apt-pkg/acquire.cc:99 -#, c-format -msgid "Unable to lock directory %s" -msgstr "%s 디렉터리를 잠글 수 없습니다" - -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다" - -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "파일 받아오는 중: %2$li 중 %1$li (%3$s 남았음)" - -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "파일 받아오는 중: %2$li 중 %1$li" - -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "해시 합이 맞지 않습니다" - -#: apt-pkg/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "크기가 맞지 않습니다" - -#: apt-pkg/acquire-item.cc:173 -#, fuzzy -msgid "Invalid file format" -msgstr "잘못된 작업 %s" - -#: apt-pkg/acquire-item.cc:1573 -#, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" +msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/acquire-item.cc:1589 -#, fuzzy, c-format -msgid "Unable to find hash sum for '%s' in Release file" -msgstr "Release 파일 %s 파일을 파싱할 수 없습니다" - -#: apt-pkg/acquire-item.cc:1631 -msgid "There is no public key available for the following key IDs:\n" -msgstr "다음 키 ID의 공개키가 없습니다:\n" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "dpkg 실행하는 중입니다" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/init.cc:146 #, c-format -msgid "" -"Release file for %s is expired (invalid since %s). Updates for this " -"repository will not be applied." -msgstr "" +msgid "Packaging system '%s' is not supported" +msgstr "'%s' 패키지 시스템을 지원하지 않습니다" -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "올바른 패키지 시스템 타입을 알아낼 수 없습니다" + +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)" +msgid "Wrote %i records.\n" +msgstr "레코드 %i개를 썼습니다.\n" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "" -"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" -msgstr "" -"디지털 서명 확인에 오류가 발생했습니다. 저장고를 업데이트하지 않고\n" -"예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n" -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "GPG error: %s: %s" -msgstr "GPG 오류: %s: %s" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, 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 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" -"니다. (아키텍쳐가 빠졌기 때문입니다)" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Can't find a source to download version '%s' of '%s'" -msgstr "" +msgid "Can't find authentication record for: %s" +msgstr "다음의 인증 기록을 찾을 수 없습니다: %s" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "" -"The package index files are corrupted. No Filename: field for package %s." -msgstr "" -"패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다." +msgid "Hash mismatch for: %s" +msgstr "다음의 해시가 다릅니다: %s" #: apt-pkg/acquire-worker.cc:116 #, c-format @@ -2486,25 +2015,6 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 넣고 Enter를 누르십시오." -#: apt-pkg/algorithms.cc:265 -#, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"%s 패키지를 다시 설치해야 하지만, 이 패키지의 아카이브를 찾을 수 없습니다." - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"오류, pkgProblemResolver::Resolve가 망가졌습니다. 고정 패키지때문에 발생할 수" -"도 있습니다." - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다." - #: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "패키지 목록이나 상태 파일을 파싱할 수 없거나 열 수 없습니다." @@ -2517,170 +2027,246 @@ msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습 msgid "The list of sources could not be read." msgstr "소스 목록을 읽을 수 없습니다." -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다" - -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "패키지 캐시가 비어 있습니다" -#: apt-pkg/cacheset.cc:603 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "'%s' 작업을 찾을 수 없습니다" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "패키지 캐시 파일이 손상되었습니다" -#: apt-pkg/cacheset.cc:609 -#, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "'%s' 정규식에 해당하는 패키지가 없습니다" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "패키지 캐시 파일이 호환되지 않는 버전입니다" -#: apt-pkg/cacheset.cc:615 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "'%s' 정규식에 해당하는 패키지가 없습니다" +#: apt-pkg/pkgcache.cc:169 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "패키지 캐시 파일이 손상되었습니다" -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "'%s' 패키지는 가상 패키지이므로 버전을 선택할 수 없습니다" +msgid "This APT does not support the versioning system '%s'" +msgstr "이 APT는 '%s' 버전 시스템을 지원하지 않습니다" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 -#, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" -"'%s' 패키지에서 설치한 버전이나 후보 버전을 선택할 수 없습니다. 둘 다 아닙니" -"다." +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "패키지 캐시가 다른 아키텍쳐용입니다." -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "'%s' 패키지에서 최신 버전을 선택할 수 없습니다. 가상 패키지입니다." +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "의존" -#: apt-pkg/cacheset.cc:655 -#, c-format -msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보가 없습니다." +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "미리의존" -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" -msgstr "'%s' 패키지에서 설치한 버전을 선택할 수 없습니다. 설치하지 않았습니다." +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "제안" -#: 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/pkgcache.cc:322 +msgid "Recommends" +msgstr "추천" -#: apt-pkg/cdrom.cc:571 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM을 마운트 해제하는 중입니다...\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "충돌" -#: apt-pkg/cdrom.cc:586 -#, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "CD-ROM 마운트 위치 %s 사용\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "대체" -#: apt-pkg/cdrom.cc:599 -msgid "Waiting for disc...\n" -msgstr "디스크를 기다리는 중입니다...\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "없앰" -#: apt-pkg/cdrom.cc:609 -msgid "Mounting CD-ROM...\n" -msgstr "CD-ROM 마운트하는 중입니다...\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "망가뜨림" -#: apt-pkg/cdrom.cc:620 -msgid "Identifying... " -msgstr "알아보는 중입니다... " +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "향상" -#: apt-pkg/cdrom.cc:662 -#, c-format -msgid "Stored label: %s\n" -msgstr "저장된 레이블: %s\n" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "중요" -#: apt-pkg/cdrom.cc:680 -msgid "Scanning disc for index files...\n" -msgstr "디스크에서 색인 파일을 찾는 중입니다...\n" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "필수" -#: apt-pkg/cdrom.cc:734 +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "표준" + +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "옵션" + +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "별도" + +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "" -"Found %zu package indexes, %zu source indexes, %zu translation indexes and " -"%zu signatures\n" -msgstr "패키지 색인 %zu개, 소스 색인 %zu개, 번역 색인 %zu개, 서명 %zu개 발견\n" +msgid "Index file type '%s' is not supported" +msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다" -#: apt-pkg/cdrom.cc:744 -msgid "" -"Unable to locate any package files, perhaps this is not a Debian Disc or the " -"wrong architecture?" -msgstr "" -"패키지 파일이 하나도 없습니다. 아마도 데비안 디스크가 아니거나 아키텍처가 잘" -"못된 것 같습니다?" +#: 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/cdrom.cc:771 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "Found label '%s'\n" -msgstr "레이블 발견: %s \n" +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 파싱 불가)" -#: apt-pkg/cdrom.cc:800 -msgid "That is not a valid name, try again.\n" -msgstr "올바른 이름이 아닙니다. 다시 시도하십시오.\n" +#: 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/cdrom.cc:817 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "" -"This disc is called: \n" -"'%s'\n" +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 "" -"이 디스크는 다음과 같습니다: \n" -"'%s'\n" +"소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] %4$s 키에 값이 없음)" -#: apt-pkg/cdrom.cc:819 -msgid "Copying package lists..." -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/cdrom.cc:863 -msgid "Writing new source list\n" -msgstr "새 소스 리스트를 쓰는 중입니다\n" +#: apt-pkg/sourcelist.cc:208 +#, c-format +msgid "Malformed line %lu in source list %s (dist)" +msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)" -#: apt-pkg/cdrom.cc:874 -msgid "Source list entries for this disc are:\n" -msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n" +#: 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:490 +#, fuzzy, 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/depcache.cc:138 apt-pkg/depcache.cc:167 -msgid "Building dependency tree" -msgstr "의존성 트리를 만드는 중입니다" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "캐시의 버전 시스템이 호환되지 않습니다" -#: apt-pkg/depcache.cc:139 -msgid "Candidate versions" -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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)" -#: apt-pkg/depcache.cc:168 -msgid "Dependency generation" -msgstr "의존성 만들기" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다." -#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 -msgid "Reading state information" -msgstr "상태 정보를 읽는 중입니다" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다." -#: apt-pkg/depcache.cc:250 +#: apt-pkg/pkgcachegen.cc:263 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다." + +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다." + +#: apt-pkg/pkgcachegen.cc:576 #, 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:1211 #, 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:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "패키지 목록을 읽는 중입니다" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "파일에서 제공하는 것을 모으는 중입니다" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "%s에 쓸 수 없습니다" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다" #: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 msgid "Send scenario to solver" @@ -2702,78 +2288,144 @@ msgstr "" msgid "Execute external solver" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 -#, c-format -msgid "Wrote %i records.\n" -msgstr "레코드 %i개를 썼습니다.\n" - -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n" +msgid "rename failed, %s (%s -> %s)." +msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 -#, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n" +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "해시 합이 맞지 않습니다" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 -#, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n" +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "크기가 맞지 않습니다" -#: apt-pkg/indexcopy.cc:515 -#, c-format -msgid "Can't find authentication record for: %s" -msgstr "다음의 인증 기록을 찾을 수 없습니다: %s" +#: apt-pkg/acquire-item.cc:173 +#, fuzzy +msgid "Invalid file format" +msgstr "잘못된 작업 %s" -#: apt-pkg/indexcopy.cc:521 +#: apt-pkg/acquire-item.cc:1640 #, c-format -msgid "Hash mismatch for: %s" -msgstr "다음의 해시가 다릅니다: %s" +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +msgstr "" -#: apt-pkg/indexrecords.cc:78 -#, c-format -msgid "Unable to parse Release file %s" +#: apt-pkg/acquire-item.cc:1656 +#, fuzzy, c-format +msgid "Unable to find hash sum for '%s' in Release file" msgstr "Release 파일 %s 파일을 파싱할 수 없습니다" -#: apt-pkg/indexrecords.cc:86 -#, c-format -msgid "No sections in Release file %s" -msgstr "Release 파일 %s에 섹션이 없습니다" +#: apt-pkg/acquire-item.cc:1698 +msgid "There is no public key available for the following key IDs:\n" +msgstr "다음 키 ID의 공개키가 없습니다:\n" -#: apt-pkg/indexrecords.cc:117 +#: apt-pkg/acquire-item.cc:1736 #, c-format -msgid "No Hash entry in Release file %s" -msgstr "Release 파일 %s에 Hash 항목이 없습니다" +msgid "" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." +msgstr "" -#: apt-pkg/indexrecords.cc:130 +#: apt-pkg/acquire-item.cc:1758 #, c-format -msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다" +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)" -#: apt-pkg/indexrecords.cc:149 +#: apt-pkg/acquire-item.cc:1788 #, c-format -msgid "Invalid 'Date' entry in Release file %s" -msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다" +msgid "" +"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" +msgstr "" +"디지털 서명 확인에 오류가 발생했습니다. 저장고를 업데이트하지 않고\n" +"예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n" -#: apt-pkg/init.cc:146 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "'%s' 패키지 시스템을 지원하지 않습니다" +msgid "GPG error: %s: %s" +msgstr "GPG 오류: %s: %s" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "올바른 패키지 시스템 타입을 알아낼 수 없습니다" +#: apt-pkg/acquire-item.cc:1926 +#, c-format +msgid "" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package. (due to missing arch)" +msgstr "" +"%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" +"니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/install-progress.cc:57 +#: apt-pkg/acquire-item.cc:1992 #, c-format -msgid "Progress: [%3i%%]" +msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "dpkg 실행하는 중입니다" +#: apt-pkg/acquire-item.cc:2050 +#, c-format +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "" +"패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다." + +#: apt-pkg/vendorlist.cc:85 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "벤더 블럭 %s의 핑거프린트가 없습니다" + +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#, c-format +msgid "List directory %spartial is missing." +msgstr "목록 디렉터리 %spartial이 빠졌습니다." + +#: apt-pkg/acquire.cc:91 +#, c-format +msgid "Archives directory %spartial is missing." +msgstr "아카이브 디렉터리 %spartial이 빠졌습니다." + +#: apt-pkg/acquire.cc:99 +#, c-format +msgid "Unable to lock directory %s" +msgstr "%s 디렉터리를 잠글 수 없습니다" + +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 +#, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "파일 받아오는 중: %2$li 중 %1$li (%3$s 남았음)" + +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "파일 받아오는 중: %2$li 중 %1$li" + +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "sources.list에 '소스' URI를 써 넣어야 합니다" + +#: 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 "" + +#: apt-pkg/policy.cc:422 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "기본 설정 파일 %s에 잘못된 데이터가 있습니다. Package 헤더가 없습니다" + +#: apt-pkg/policy.cc:444 +#, c-format +msgid "Did not understand pin type %s" +msgstr "핀 타입 %s이(가) 무엇인지 이해할 수 없습니다" + +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다" #: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format @@ -2800,417 +2452,284 @@ msgstr "" "잠깐 제거해야 합니다. 이 패키지를 제거하는 건 좋지 않지만, 정말 지우려면 " "APT::Force-LoopBreak 옵션을 켜십시오." -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "패키지 캐시가 비어 있습니다" - -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "패키지 캐시 파일이 손상되었습니다" - -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "패키지 캐시 파일이 호환되지 않는 버전입니다" - -#: apt-pkg/pkgcache.cc:169 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "패키지 캐시 파일이 손상되었습니다" +msgid "" +"Some index files failed to download. They have been ignored, or old ones " +"used instead." +msgstr "" +"일부 인덱스 파일을 다운로드하는데 실패했습니다. 해당 파일을 무시하거나 과거" +"의 버전을 대신 사용합니다." -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/cdrom.cc:571 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM을 마운트 해제하는 중입니다...\n" + +#: apt-pkg/cdrom.cc:586 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "이 APT는 '%s' 버전 시스템을 지원하지 않습니다" +msgid "Using CD-ROM mount point %s\n" +msgstr "CD-ROM 마운트 위치 %s 사용\n" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "패키지 캐시가 다른 아키텍쳐용입니다." +#: apt-pkg/cdrom.cc:599 +msgid "Waiting for disc...\n" +msgstr "디스크를 기다리는 중입니다...\n" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "의존" +#: apt-pkg/cdrom.cc:609 +msgid "Mounting CD-ROM...\n" +msgstr "CD-ROM 마운트하는 중입니다...\n" -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "미리의존" +#: apt-pkg/cdrom.cc:620 +msgid "Identifying... " +msgstr "알아보는 중입니다... " -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "제안" +#: apt-pkg/cdrom.cc:662 +#, c-format +msgid "Stored label: %s\n" +msgstr "저장된 레이블: %s\n" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "추천" +#: apt-pkg/cdrom.cc:680 +msgid "Scanning disc for index files...\n" +msgstr "디스크에서 색인 파일을 찾는 중입니다...\n" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "충돌" +#: apt-pkg/cdrom.cc:734 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" +msgstr "패키지 색인 %zu개, 소스 색인 %zu개, 번역 색인 %zu개, 서명 %zu개 발견\n" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "대체" +#: apt-pkg/cdrom.cc:744 +msgid "" +"Unable to locate any package files, perhaps this is not a Debian Disc or the " +"wrong architecture?" +msgstr "" +"패키지 파일이 하나도 없습니다. 아마도 데비안 디스크가 아니거나 아키텍처가 잘" +"못된 것 같습니다?" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "없앰" +#: apt-pkg/cdrom.cc:771 +#, c-format +msgid "Found label '%s'\n" +msgstr "레이블 발견: %s \n" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "망가뜨림" +#: apt-pkg/cdrom.cc:800 +msgid "That is not a valid name, try again.\n" +msgstr "올바른 이름이 아닙니다. 다시 시도하십시오.\n" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "향상" +#: apt-pkg/cdrom.cc:817 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"이 디스크는 다음과 같습니다: \n" +"'%s'\n" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "중요" +#: apt-pkg/cdrom.cc:819 +msgid "Copying package lists..." +msgstr "패키지 목록을 복사하는 중입니다..." -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "필수" +#: apt-pkg/cdrom.cc:863 +msgid "Writing new source list\n" +msgstr "새 소스 리스트를 쓰는 중입니다\n" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "표준" +#: apt-pkg/cdrom.cc:874 +msgid "Source list entries for this disc are:\n" +msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "옵션" +#: apt-pkg/algorithms.cc:265 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"%s 패키지를 다시 설치해야 하지만, 이 패키지의 아카이브를 찾을 수 없습니다." -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "별도" +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"오류, pkgProblemResolver::Resolve가 망가졌습니다. 고정 패키지때문에 발생할 수" +"도 있습니다." -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "캐시의 버전 시스템이 호환되지 않습니다" +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 -#, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)" - -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다." +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 +msgid "Building dependency tree" +msgstr "의존성 트리를 만드는 중입니다" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다." +#: apt-pkg/depcache.cc:139 +msgid "Candidate versions" +msgstr "후보 버전" -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다." +#: apt-pkg/depcache.cc:168 +msgid "Dependency generation" +msgstr "의존성 만들기" -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다." +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 +msgid "Reading state information" +msgstr "상태 정보를 읽는 중입니다" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/depcache.cc:250 #, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다" +msgid "Failed to open StateFile %s" +msgstr "상태파일 %s 여는데 실패했습니다" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/depcache.cc:256 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다" - -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "패키지 목록을 읽는 중입니다" - -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "파일에서 제공하는 것을 모으는 중입니다" +msgid "Failed to write temporary StateFile %s" +msgstr "임시 상태파일 %s 쓰는데 실패했습니다" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/tagfile.cc:237 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다" +msgid "Unable to parse package file %s (2)" +msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)" -#: apt-pkg/policy.cc:83 +#: apt-pkg/cacheset.cc:489 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" -msgstr "" +msgid "Release '%s' for '%s' was not found" +msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다" -#: apt-pkg/policy.cc:422 +#: apt-pkg/cacheset.cc:492 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "기본 설정 파일 %s에 잘못된 데이터가 있습니다. Package 헤더가 없습니다" +msgid "Version '%s' for '%s' was not found" +msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다" -#: apt-pkg/policy.cc:444 +#: apt-pkg/cacheset.cc:603 #, c-format -msgid "Did not understand pin type %s" -msgstr "핀 타입 %s이(가) 무엇인지 이해할 수 없습니다" +msgid "Couldn't find task '%s'" +msgstr "'%s' 작업을 찾을 수 없습니다" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다" +#: apt-pkg/cacheset.cc:609 +#, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "'%s' 정규식에 해당하는 패키지가 없습니다" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/cacheset.cc:615 #, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" +msgid "Couldn't find any package by glob '%s'" +msgstr "'%s' 정규식에 해당하는 패키지가 없습니다" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 파싱 불가)" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "'%s' 패키지는 가상 패키지이므로 버전을 선택할 수 없습니다" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 너무 짧음)" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"'%s' 패키지에서 설치한 버전이나 후보 버전을 선택할 수 없습니다. 둘 다 아닙니" +"다." -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 대입이 아님)" +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "'%s' 패키지에서 최신 버전을 선택할 수 없습니다. 가상 패키지입니다." -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 키가 없음)" +msgid "Can't select candidate version from package %s as it has no candidate" +msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보가 없습니다." -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/cacheset.cc:663 #, 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 키에 값이 없음)" +msgid "Can't select installed version from package %s as it is not installed" +msgstr "'%s' 패키지에서 설치한 버전을 선택할 수 없습니다. 설치하지 않았습니다." -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/indexrecords.cc:78 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)" +msgid "Unable to parse Release file %s" +msgstr "Release 파일 %s 파일을 파싱할 수 없습니다" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/indexrecords.cc:86 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)" +msgid "No sections in Release file %s" +msgstr "Release 파일 %s에 섹션이 없습니다" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/indexrecords.cc:117 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" +msgid "No Hash entry in Release file %s" +msgstr "Release 파일 %s에 Hash 항목이 없습니다" -#: apt-pkg/sourcelist.cc:217 +#: apt-pkg/indexrecords.cc:130 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)" +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다" -#: apt-pkg/sourcelist.cc:224 +#: apt-pkg/indexrecords.cc:149 #, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)" +msgid "Invalid 'Date' entry in Release file %s" +msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다" -#: apt-pkg/sourcelist.cc:335 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Opening %s" -msgstr "%s 파일을 여는 중입니다" +msgid "%lid %lih %limin %lis" +msgstr "%li일 %li시간 %li분 %li초" -#: apt-pkg/sourcelist.cc:371 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)" +msgid "%lih %limin %lis" +msgstr "%li시간 %li분 %li초" -#: apt-pkg/sourcelist.cc:375 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, 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/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "sources.list에 '소스' URI를 써 넣어야 합니다" +msgid "%limin %lis" +msgstr "%li분 %li초" -#: apt-pkg/tagfile.cc:140 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)" +msgid "%lis" +msgstr "%li초" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)" - -#: 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 "" -"일부 인덱스 파일을 다운로드하는데 실패했습니다. 해당 파일을 무시하거나 과거" -"의 버전을 대신 사용합니다." +msgid "Selection %s not found" +msgstr "선택한 %s이(가) 없습니다" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "벤더 블럭 %s의 핑거프린트가 없습니다" +msgid "Not using locking for read only lock file %s" +msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/cdromutl.cc:65 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "CD-ROM의 정보를 읽을 수 없습니다" +msgid "Could not open lock file %s" +msgstr "잠금 파일 %s 파일을 열 수 없습니다" -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/fileutl.cc:218 #, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "명령행 옵션 '%c' 옵션을 [%s에서] 알 수 없습니다." +msgid "Not using locking for nfs mounted lock file %s" +msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/fileutl.cc:223 #, c-format -msgid "Command line option %s is not understood" -msgstr "명령행 옵션 '%s' 옵션을 알 수 없습니다" +msgid "Could not get lock %s" +msgstr "%s 잠금 파일을 얻을 수 없습니다" -#: apt-pkg/contrib/cmndline.cc:168 +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 #, c-format -msgid "Command line option %s is not boolean" -msgstr "명령행 옵션 '%s' 옵션은 불리언이 아닙니다" +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/fileutl.cc:394 #, c-format -msgid "Option %s requires an argument." -msgstr "%s 옵션에는 인수가 필요합니다." +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "%s 옵션: 설정 항목 지정은 =<값> 형태여야 합니다." - -#: apt-pkg/contrib/cmndline.cc:278 -#, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "%s 옵션에는 정수 인수가 필요합니다. '%s'이(가) 아닙니다" - -#: apt-pkg/contrib/cmndline.cc:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "'%s' 옵션이 너무 깁니다" - -#: apt-pkg/contrib/cmndline.cc:341 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "%s 센스를 이해할 수 없습니다. 참 아니면 거짓으로 해 보십시오." - -#: apt-pkg/contrib/cmndline.cc:391 -#, c-format -msgid "Invalid operation %s" -msgstr "잘못된 작업 %s" - -#: apt-pkg/contrib/configuration.cc:519 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "이 타입 줄임말을 알 수 없습니다: '%c'" - -#: apt-pkg/contrib/configuration.cc:633 -#, c-format -msgid "Opening configuration file %s" -msgstr "설정 파일 %s 파일을 여는 중입니다" - -#: apt-pkg/contrib/configuration.cc:801 -#, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "문법 오류 %s:%u: 블럭이 이름으로 시작하지 않습니다." - -#: apt-pkg/contrib/configuration.cc:820 -#, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "문법 오류 %s:%u: 태그의 형식이 잘못되었습니다" - -#: apt-pkg/contrib/configuration.cc:837 -#, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "문법 오류 %s:%u: 값 뒤에 쓰레기 데이터가 더 있습니다" - -#: apt-pkg/contrib/configuration.cc:877 -#, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계에서만 쓸 수 있습니다" - -#: apt-pkg/contrib/configuration.cc:884 -#, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "문법 오류 %s:%u: include가 너무 많이 겹쳐 있습니다" - -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 -#, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "문법 오류 %s:%u: 여기서 include됩니다" - -#: apt-pkg/contrib/configuration.cc:897 -#, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'" - -#: apt-pkg/contrib/configuration.cc:900 -#, 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:950 -#, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다" - -#: apt-pkg/contrib/fileutl.cc:190 -#, c-format -msgid "Not using locking for read only lock file %s" -msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" - -#: apt-pkg/contrib/fileutl.cc:195 -#, c-format -msgid "Could not open lock file %s" -msgstr "잠금 파일 %s 파일을 열 수 없습니다" - -#: apt-pkg/contrib/fileutl.cc:218 -#, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" - -#: apt-pkg/contrib/fileutl.cc:223 -#, c-format -msgid "Could not get lock %s" -msgstr "%s 잠금 파일을 얻을 수 없습니다" - -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 -#, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:394 -#, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/fileutl.cc:412 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" @@ -3293,11 +2812,25 @@ msgstr "%s 파일을 삭제하는데 문제가 있습니다" msgid "Problem syncing the file" msgstr "파일을 동기화하는데 문제가 있습니다" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "No keyring installed in %s." -msgstr "%s에 키 모음을 설치하지 않았습니다." +msgid "%c%s... Error!" +msgstr "%c%s... 오류!" + +#: apt-pkg/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... 완료" + +#: apt-pkg/contrib/progress.cc:181 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... 완료" #: apt-pkg/contrib/mmap.cc:79 msgid "Can't mmap an empty file" @@ -3352,224 +2885,686 @@ msgid "" msgstr "" "mmap 크기를 늘릴 수 없습니다. 자동으로 늘리는 기능을 사용자가 금지했습니다." -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... 오류!" +msgid "Unable to stat the mount point %s" +msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다" -#: apt-pkg/contrib/progress.cc:150 +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "CD-ROM의 정보를 읽을 수 없습니다" + +#: apt-pkg/contrib/configuration.cc:519 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... 완료" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "이 타입 줄임말을 알 수 없습니다: '%c'" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "" +#: apt-pkg/contrib/configuration.cc:633 +#, c-format +msgid "Opening configuration file %s" +msgstr "설정 파일 %s 파일을 여는 중입니다" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... 완료" +#: apt-pkg/contrib/configuration.cc:801 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "문법 오류 %s:%u: 블럭이 이름으로 시작하지 않습니다." -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: apt-pkg/contrib/configuration.cc:820 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%li일 %li시간 %li분 %li초" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "문법 오류 %s:%u: 태그의 형식이 잘못되었습니다" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: apt-pkg/contrib/configuration.cc:837 #, c-format -msgid "%lih %limin %lis" -msgstr "%li시간 %li분 %li초" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "문법 오류 %s:%u: 값 뒤에 쓰레기 데이터가 더 있습니다" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "%limin %lis" -msgstr "%li분 %li초" +msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계에서만 쓸 수 있습니다" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "%lis" -msgstr "%li초" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "문법 오류 %s:%u: include가 너무 많이 겹쳐 있습니다" -#: apt-pkg/contrib/strutl.cc:1258 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format -msgid "Selection %s not found" -msgstr "선택한 %s이(가) 없습니다" +msgid "Syntax error %s:%u: Included from here" +msgstr "문법 오류 %s:%u: 여기서 include됩니다" + +#: apt-pkg/contrib/configuration.cc:897 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'" + +#: apt-pkg/contrib/configuration.cc:900 +#, 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:950 +#, c-format +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, c-format +msgid "No keyring installed in %s." +msgstr "%s에 키 모음을 설치하지 않았습니다." + +#: apt-pkg/contrib/cmndline.cc:124 +#, 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 +#, c-format +msgid "Command line option %s is not understood" +msgstr "명령행 옵션 '%s' 옵션을 알 수 없습니다" + +#: apt-pkg/contrib/cmndline.cc:171 +#, c-format +msgid "Command line option %s is not boolean" +msgstr "명령행 옵션 '%s' 옵션은 불리언이 아닙니다" + +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 +#, c-format +msgid "Option %s requires an argument." +msgstr "%s 옵션에는 인수가 필요합니다." + +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 +#, c-format +msgid "Option %s: Configuration item specification must have an =." +msgstr "%s 옵션: 설정 항목 지정은 =<값> 형태여야 합니다." + +#: apt-pkg/contrib/cmndline.cc:281 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" +msgstr "%s 옵션에는 정수 인수가 필요합니다. '%s'이(가) 아닙니다" + +#: apt-pkg/contrib/cmndline.cc:312 +#, c-format +msgid "Option '%s' is too long" +msgstr "'%s' 옵션이 너무 깁니다" + +#: apt-pkg/contrib/cmndline.cc:344 +#, c-format +msgid "Sense %s is not understood, try true or false." +msgstr "%s 센스를 이해할 수 없습니다. 참 아니면 거짓으로 해 보십시오." + +#: apt-pkg/contrib/cmndline.cc:394 +#, c-format +msgid "Invalid operation %s" +msgstr "잘못된 작업 %s" + +#: apt-pkg/deb/dpkgpm.cc:110 +#, c-format +msgid "Installing %s" +msgstr "%s 설치하는 중입니다" + +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 +#, c-format +msgid "Configuring %s" +msgstr "%s 설정 중입니다" + +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 +#, c-format +msgid "Removing %s" +msgstr "%s 패키지를 지우는 중입니다" + +#: apt-pkg/deb/dpkgpm.cc:113 +#, c-format +msgid "Completely removing %s" +msgstr "%s 패키지를 완전히 지우는 중입니다" + +#: apt-pkg/deb/dpkgpm.cc:114 +#, c-format +msgid "Noting disappearance of %s" +msgstr "%s 사라짐 발견했습니다" + +#: apt-pkg/deb/dpkgpm.cc:115 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "설치 후 트리거 %s 실행하는 중입니다" + +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 +#, c-format +msgid "Directory '%s' missing" +msgstr "디렉터리 '%s' 없습니다." + +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 +#, c-format +msgid "Could not open file '%s'" +msgstr "'%s' 파일을 열 수 없습니다" + +#: apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Preparing %s" +msgstr "%s 준비 중입니다" + +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr "%s 푸는 중입니다" + +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing to configure %s" +msgstr "%s 패키지를 설정할 준비하는 중입니다" + +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr "%s 설치" + +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "%s 패키지를 지울 준비하는 중입니다" + +#: apt-pkg/deb/dpkgpm.cc:1022 +#, c-format +msgid "Removed %s" +msgstr "%s 지움" + +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다" + +#: apt-pkg/deb/dpkgpm.cc:1028 +#, c-format +msgid "Completely removed %s" +msgstr "%s 패키지를 완전히 지웠습니다" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "%s에 쓸 수 없습니다" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1719 +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:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다" + +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" +"보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수" +"적인 오류입니다." + +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" +"보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다." + +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다." + +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +#, fuzzy +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" +"보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다." + +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "잠기지 않음" + +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"사용법: apt-extracttemplates 파일1 [파일2 ...]\n" +"\n" +"apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n" +"도구입니다\n" +"\n" +"옵션:\n" +" -h 이 도움말\n" +" -t 임시 디렉토리 설정\n" +" -c=? 설정 파일을 읽습니다\n" +" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "%s의 정보를 읽을 수 없습니다" + +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?" + +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +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 +#, c-format +msgid "Error processing directory %s" +msgstr "%s 디렉터리를 처리하는데 오류가 발생했습니다" + +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "소스 확장 목록이 너무 깁니다" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "컨텐츠 파일에 헤더를 쓰는데 오류가 발생했습니다" + +#: ftparchive/apt-ftparchive.cc:431 +#, c-format +msgid "Error processing contents %s" +msgstr "%s 컨텐츠를 처리하는데 오류가 발생했습니다" + +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"사용법: apt-ftparchive [옵션] 명령\n" +"명령: packages 바이너리경로 [override파일 [경로앞부분]]\n" +" sources 소스경로 [override파일 [경로앞부분]]\n" +" contents 경로\n" +" release 경로\n" +" generate 설정 [그룹]\n" +" clean 설정\n" +"\n" +"apt-ftparchive는 데비안 아카이브용 인덱스 파일을 만듭니다. 이 프로그램은\n" +"여러 종류의 인덱스 파일 만드는 작업을 지원합니다 -- 완전 자동화 작업부터\n" +"dpkg-scanpackages와 dpkg-scansources의 기능을 대체하기도 합니다.\n" +"\n" +"apt-ftparchive는 .deb 파일의 트리에서부터 Package 파일을 만듭니다.\n" +"Package 파일에는 각 패키지의 모든 제어 필드는 물론 MD5 해시와 파일\n" +"크기도 들어 있습니다. override 파일을 이용해 Priority와 Section의 값을 \n" +"강제로 설정할 수 있습니다\n" +"\n" +"이와 비슷하게 apt-ftparchive는 .dsc 파일의 트리에서 Sources 파일을\n" +"만듭니다. --source-override 옵션을 이용해 소스 override 파일을\n" +"지정할 수 있습니다.\n" +"\n" +"'packages'와 'sources' 명령은 해당 트리의 맨 위에서 실행해야 합니다.\n" +"\"바이너리경로\"는 검색할 때의 기준 위치를 가리키며 \"override파일\"에는\n" +"override 플래그들을 담고 있습니다. \"경로앞부분\"은 각 파일 이름\n" +"필드의 앞에 더해 집니다. 데비안 아카이브에 있는 예를 하나 들자면:\n" +"\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"옵션:\n" +" -h 이 도움말\n" +" --md5 MD5 만들기 작업을 제어합니다\n" +" -s=? 소스 override 파일\n" +" -q 조용히\n" +" -d=? 캐시 데이터베이스를 직접 설정합니다\n" +" --no-delink 디버깅 모드 지우기를 사용합니다\n" +" --contents 컨텐츠 파일을 만드는 적업을 제어합니다\n" +" -c=? 이 설정 파일을 읽습니다\n" +" -o=? 임의의 옵션을 설정합니다" + +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "맞는 패키지가 없습니다" + +#: ftparchive/apt-ftparchive.cc:907 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "`%s' 패키지 파일 그룹에 몇몇 파일이 빠졌습니다" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB가 망가졌습니다. 파일 이름을 %s.old로 바꿉니다" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다" + +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"DB 형식이 잘못되었습니다. APT 예전 버전에서 업그레이드했다면, 데이터베이스를 " +"지우고 다시 만드십시오." + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "DB 파일, %s 파일을 열 수 없습니다: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "%s 파일에 readlink하는데 실패했습니다" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "아카이브에 컨트롤 기록이 없습니다" + +# FIXME: 왠 커서?? +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "커서를 가져올 수 없습니다" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:91 #, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" -"관리 디렉터리를 (%s) 잠글 수 없습니다. 다른 프로세스가 사용하고 있지 않습니" -"까?" +msgid "W: Unable to read directory %s\n" +msgstr "경고: %s 디렉터리를 읽을 수 없습니다\n" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:96 #, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "관리 디렉터리를 (%s) 잠글 수 없습니다. 루트 사용자가 맞습니까?" +msgid "W: Unable to stat %s\n" +msgstr "경고: %s의 정보를 읽을 수 없습니다\n" -#. 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' 명령을 실행해 문제점을 바로잡으십시오." +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "오류: " -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "잠기지 않음" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "경고: " -#: apt-pkg/deb/dpkgpm.cc:95 -#, c-format -msgid "Installing %s" -msgstr "%s 설치하는 중입니다" +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "오류: 다음 파일에 적용하는데 오류가 발생했습니다: " -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "Configuring %s" -msgstr "%s 설정 중입니다" +msgid "Failed to resolve %s" +msgstr "%s의 경로를 알아내는데 실패했습니다" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 -#, c-format -msgid "Removing %s" -msgstr "%s 패키지를 지우는 중입니다" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "트리에서 이동이 실패했습니다" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:219 #, c-format -msgid "Completely removing %s" -msgstr "%s 패키지를 완전히 지우는 중입니다" +msgid "Failed to open %s" +msgstr "%s 파일을 여는데 실패했습니다" -#: apt-pkg/deb/dpkgpm.cc:99 +# FIXME: ?? +#: ftparchive/writer.cc:278 #, c-format -msgid "Noting disappearance of %s" -msgstr "%s 사라짐 발견했습니다" +msgid " DeLink %s [%s]\n" +msgstr " 링크 %s [%s] 없애기\n" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:286 #, c-format -msgid "Running post-installation trigger %s" -msgstr "설치 후 트리거 %s 실행하는 중입니다" +msgid "Failed to readlink %s" +msgstr "%s 파일에 readlink하는데 실패했습니다" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:290 #, c-format -msgid "Directory '%s' missing" -msgstr "디렉터리 '%s' 없습니다." +msgid "Failed to unlink %s" +msgstr "%s 파일을 지우는데 실패했습니다" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:298 #, c-format -msgid "Could not open file '%s'" -msgstr "'%s' 파일을 열 수 없습니다" +msgid "*** Failed to link %s to %s" +msgstr "*** %s 파일을 %s에 링크하는데 실패했습니다" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:308 #, c-format -msgid "Preparing %s" -msgstr "%s 준비 중입니다" +msgid " DeLink limit of %sB hit.\n" +msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n" -#: apt-pkg/deb/dpkgpm.cc:993 -#, c-format -msgid "Unpacking %s" -msgstr "%s 푸는 중입니다" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "아카이브에 패키지 필드가 없습니다" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Preparing to configure %s" -msgstr "%s 패키지를 설정할 준비하는 중입니다" +msgid " %s has no override entry\n" +msgstr " %s에는 override 항목이 없습니다\n" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Installed %s" -msgstr "%s 설치" +msgid " %s maintainer is %s not %s\n" +msgstr " %s 관리자가 %s입니다 (%s 아님)\n" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing for removal of %s" -msgstr "%s 패키지를 지울 준비하는 중입니다" +msgid " %s has no source override entry\n" +msgstr " %s에는 source override 항목이 없습니다\n" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/writer.cc:710 #, c-format -msgid "Removed %s" -msgstr "%s 지움" +msgid " %s has no binary override entry either\n" +msgstr " %s에는 binary override 항목이 없습니다\n" + +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - 메모리를 할당하는데 실패했습니다" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing to completely remove %s" -msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다" +msgid "Unable to open %s" +msgstr "%s 열 수 없습니다" -#: apt-pkg/deb/dpkgpm.cc:1013 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다" + +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Completely removed %s" -msgstr "%s 패키지를 완전히 지웠습니다" +msgid "Failed to read the override file %s" +msgstr "%s override 파일을 읽는데 실패했습니다" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/override.cc:166 #, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "%s에 쓸 수 없습니다" +msgid "Malformed override %s line %llu #1" +msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "override %s의 %lu번 줄 #2가 잘못되었습니다" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" +#: ftparchive/multicompress.cc:73 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "'%s' 압축 알고리즘을 알 수 없습니다" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "보고서를 작성하지 않습니다. 이미 MaxReports 값에 도달했습니다." +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "압축된 출력물 %s에는 압축 세트가 필요합니다" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "FILE*를 만드는데 실패했습니다" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" -"보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수" -"적인 오류입니다." +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "fork하는데 실패했습니다" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" -"보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다." +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "압축 하위 프로세스" -#: apt-pkg/deb/dpkgpm.cc:1707 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다." +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "내부 오류, %s 만드는데 실패했습니다" + +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "하위 프로세스/파일에 입출력하는데 실패했습니다" + +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "MD5를 계산하는 동안 읽는데 실패했습니다" + +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "%s의 링크를 해제하는데 문제가 있습니다" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-internal-solver.cc:49 #, fuzzy msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다." +"사용법: apt-extracttemplates 파일1 [파일2 ...]\n" +"\n" +"apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n" +"도구입니다\n" +"\n" +"옵션:\n" +" -h 이 도움말\n" +" -t 임시 디렉토리 설정\n" +" -c=? 설정 파일을 읽습니다\n" +" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "알 수 없는 패키지 기록!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"보고서를 작성하지 않습니다. 오류 메시지에 따르면 dpkg 입출력 오류입니다." +"사용법: apt-sortpkgs [옵션] 파일1 [파일2 ...]\n" +"\n" +"apt-sortpkgs는 패키지 파일을 정렬하는 간단한 도구입니다. -s 옵션은 무슨 파일" +"인지\n" +"알아 내는데 쓰입니다.\n" +"\n" +"옵션:\n" +" -h 이 도움말\n" +" -s 소스 파일 정렬을 사용합니다\n" +" -c=? 이 설정 파일을 읽습니다\n" +" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/ku.po b/po/ku.po index 5f5512065..1e3cc4a53 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: ku \n" @@ -161,7 +161,7 @@ msgid " Version table:" msgstr " Tabloya guhertoyan:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -323,7 +323,7 @@ msgstr "Pelrêça daxistinê nayê quflekirin" msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "" @@ -343,151 +343,151 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nikarî cihê vala li %s tesbît bike" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Cihê vala li %s têre nake" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Çavkanîna %s bîne\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Anîna çend arşîvan biserneket." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1356 #, 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:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Girêdan bi %s (%s) re pêk tê" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -586,7 +586,7 @@ msgstr "%s jixwe guhertoya nûtirîn e.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -678,17 +678,17 @@ msgstr "" msgid "Disk not found." msgstr "Dîsk nehate dîtin." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Pel nehate dîtin" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 #, fuzzy msgid "Failed to stat" msgstr "%s venebû" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "" @@ -740,7 +740,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "" @@ -762,7 +762,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -823,7 +823,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "" @@ -832,7 +832,7 @@ msgstr "" msgid "Unable to fetch file, server said '%s'" msgstr "Danegira %s nehate vekirin: %s" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "" @@ -883,7 +883,7 @@ msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Bi %s re tê girêdan" @@ -1022,39 +1022,17 @@ msgstr "Girêdan pêk nehatiye" msgid "Internal error" msgstr "Çewtiya hundirîn" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "" - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Anîn:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " +#: apt-private/private-list.cc:129 +msgid "Listing" msgstr "" -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Çewt" - -#: apt-private/acqprogress.cc:146 -#, fuzzy, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "%s hatine anîn..." - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Dixebite]" - -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" +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:93 msgid "Correcting dependencies..." @@ -1084,34 +1062,209 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "" -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" +#: 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-download.cc:40 -msgid "Authentication warning overridden.\n" +#: 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-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" +#: 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-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" +#: 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-download.cc:91 apt-pkg/update.cc:77 +#: 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 "Failed to fetch %s %s\n" -msgstr "Anîna %s %s biserneket\n" +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:35 +#, 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:97 +#, 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:101 +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:82 msgid "Internal error, InstallPackages was called with broken packages!" @@ -1162,6 +1315,10 @@ msgstr "" msgid "You don't have enough free space in %s." msgstr "Cihê vala li %s têre nake." +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "" + #: apt-private/private-install.cc:216 apt-private/private-install.cc:238 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" @@ -1351,254 +1508,97 @@ msgstr "" msgid "Package '%s' is not installed, so not removed\n" msgstr "" -#: apt-private/private-list.cc:129 -msgid "Listing" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: apt-private/private-list.cc:159 -#, 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-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-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]" +#: apt-private/private-download.cc:40 +msgid "Authentication warning overridden.\n" 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]" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" msgstr "" -#: apt-private/private-output.cc:281 -msgid "[residual-config]" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" 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 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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 "" +msgid "Failed to fetch %s %s\n" +msgstr "Anîna %s %s biserneket\n" -#: apt-private/private-output.cc:633 -msgid "The following held packages will be changed:" -msgstr "" +#: apt-private/private-sources.cc:58 +#, fuzzy, c-format +msgid "Failed to parse %s. Edit again? " +msgstr "%s ji hev nehate veçirandin" -#: apt-private/private-output.cc:688 +#: apt-private/private-sources.cc:70 #, 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!" +msgid "Your '%s' file changed, please run 'apt-get update'." 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" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" 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 "" +#: apt-private/private-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "Bilindkirin tê hesibandin..." -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:778 -msgid "Y" -msgstr "E" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "Temam" -#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:784 -msgid "N" +#: apt-private/acqprogress.cc:66 +msgid "Hit " msgstr "" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "" +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Anîn:" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" +#: apt-private/acqprogress.cc:121 +msgid "Ign " 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/acqprogress.cc:125 +msgid "Err " +msgstr "Çewt" -#: apt-private/private-sources.cc:58 +#: apt-private/acqprogress.cc:146 #, fuzzy, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "%s ji hev nehate veçirandin" +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "%s hatine anîn..." -#: apt-private/private-sources.cc:70 +#: apt-private/acqprogress.cc:236 #, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "" - -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "" +msgid " [Working]" +msgstr " [Dixebite]" -#: apt-private/private-update.cc:90 +#: apt-private/acqprogress.cc:297 #, 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:94 -msgid "All packages are up to date." +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" msgstr "" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "Bilindkirin tê hesibandin..." - -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "Temam" - #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format msgid "Unable to read %s" msgstr "Nikare %s bixwîne" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1632,7 +1632,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "Girêdan zû hatiye girtin" @@ -1670,548 +1670,512 @@ msgstr "" msgid "Merging available information" msgstr "" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" msgstr "" -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Nivîsandin ji bo %s ne pêkane" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "Nivîsandin ji bo %s ne pêkane" - -#: cmdline/apt-extracttemplates.cc:300 -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 -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 -#, c-format -msgid "Error processing directory %s" -msgstr "Di şixulandina pêrista %s de çewtî" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" +#: apt-inst/filelist.cc:459 +#, fuzzy +msgid "Failed to allocate diversion" +msgstr "%s venebû" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing contents %s" -msgstr "Dema şixulandina naveroka %s çewtî" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" +#: apt-inst/filelist.cc:506 +#, c-format +msgid "Double add of diversion %s -> %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, 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" +msgid "Duplicate conf file %s/%s" +msgstr "" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB xerabe ye, navê dosyeyê weke %s.old hate guherandin" +msgid "The path %s is too long" +msgstr "Rêça %s zêde dirêj e" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide" - -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +msgid "Unpacking %s more than once" msgstr "" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:142 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Danegira %s nehate vekirin: %s" +msgid "The directory %s is diverted" +msgstr "" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:152 #, c-format -msgid "Failed to stat %s" +msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: ftparchive/cachedb.cc:332 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 #, fuzzy -msgid "Failed to read .dsc" -msgstr "Rakirina %s biserneket" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Tomara kontrola arşîvê tuneye" +msgid "The diversion path is too long" +msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 +#, c-format +msgid "Failed to stat %s" msgstr "" -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: pelrêça %s nayê xwendin\n" +msgid "Failed to rename %s to %s" +msgstr "" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" +msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "W: " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Rêç zêde dirêj e" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " +#: apt-inst/extract.cc:421 +#, c-format +msgid "Overwrite package match with no version for %s" msgstr "" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to resolve %s" -msgstr "%s ji hev nehate veçirandin" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" +msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: ftparchive/writer.cc:219 -#, c-format -msgid "Failed to open %s" -msgstr "%s venebû" +#: apt-inst/extract.cc:498 +#, fuzzy, c-format +msgid "Unable to stat %s" +msgstr "Nivîsandin ji bo %s ne pêkane" -#: ftparchive/writer.cc:278 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid " DeLink %s [%s]\n" -msgstr "" +msgid "Failed to write file %s" +msgstr "Nivîsîna pelê %s biserneket" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to readlink %s" -msgstr "" +msgid "Failed to close file %s" +msgstr "Girtina pelê %s biserneket" -#: ftparchive/writer.cc:290 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "Failed to unlink %s" +msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "*** Failed to link %s to %s" +msgid "Internal error, could not locate member %s" msgstr "" -#: ftparchive/writer.cc:308 -#, c-format -msgid " DeLink limit of %sB hit.\n" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" msgstr "" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Di arşîvê de qada pakêtê tuneye" - -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" msgstr "" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" msgstr "" -#: ftparchive/writer.cc:706 +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid " %s has no source override entry\n" +msgid "Invalid archive member header %s" msgstr "" -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" msgstr "" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Arşîv zêde kin e" + +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" msgstr "" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "%s venebû" +#: apt-inst/contrib/extracttar.cc:124 +#, fuzzy +msgid "Failed to create pipes" +msgstr "%s ji hev nehate veçirandin" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, c-format -msgid "Malformed override %s line %llu (%s)" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Xebitandina gzip biserneket" + +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" msgstr "" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" msgstr "" -#: ftparchive/override.cc:166 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Malformed override %s line %llu #1" +msgid "Unknown TAR header type %u, member %s" msgstr "" -#: ftparchive/override.cc:178 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Malformed override %s line %llu #2" +msgid "Progress: [%3i%%]" msgstr "" -#: ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %llu #3" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" msgstr "" -#: ftparchive/multicompress.cc:73 +#: apt-pkg/init.cc:146 #, c-format -msgid "Unknown compression algorithm '%s'" +msgid "Packaging system '%s' is not supported" msgstr "" -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" msgstr "" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "" +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#, c-format +msgid "Wrote %i records.\n" +msgstr "%i tomar hatin nivîsîn.\n" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#, c-format +msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "Internal error, failed to create %s" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" +#: apt-pkg/indexcopy.cc:515 +#, c-format +msgid "Can't find authentication record for: %s" msgstr "" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" +#: apt-pkg/indexcopy.cc:521 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Hash Sum li hev nayên" + +#: apt-pkg/acquire-worker.cc:116 +#, c-format +msgid "The method driver %s could not be found." msgstr "" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/acquire-worker.cc:118 #, c-format -msgid "Problem unlinking %s" +msgid "Is the package %s installed?" msgstr "" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "Failed to rename %s to %s" +msgid "Method %s did not start correctly" msgstr "" -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/acquire-worker.cc:455 +#, 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 "" -"Bikaranîn: apt-config [vebijark] ferman\n" -"apt-config, amûra xwendina dosyeya mîhengên APTê ye\n" -"\n" -"Ferman\n" -" shell - moda shell\n" -" dump - Mîhengan nîşan dide\n" -"\n" -"Vebijark:\n" -" -h Ev dosyeya alîkariyê ye.\n" -" -c=? Dosyeya mîhengan nîşan dide\n" -" -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 -msgid "Unknown package record!" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." msgstr "" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" -msgstr "Nivîsîna pelê %s biserneket" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "" -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "Girtina pelê %s biserneket" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "Rêça %s zêde dirêj e" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "" -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" msgstr "" -#: apt-inst/extract.cc:142 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "The directory %s is diverted" +msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-inst/extract.cc:152 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" msgstr "" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -#, fuzzy -msgid "The diversion path is too long" -msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Bindest" -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "PêşBindest" -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Pêşniyaz dike" -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Rêç zêde dirêj e" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Tawsiye dike" -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Nakokî" -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Dikeve şunve" -#: apt-inst/extract.cc:498 -#, fuzzy, c-format -msgid "Unable to stat %s" -msgstr "Nivîsandin ji bo %s ne pêkane" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Kevin dike" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Dişkîne" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" msgstr "" -#: apt-inst/filelist.cc:459 -#, fuzzy -msgid "Failed to allocate diversion" -msgstr "%s venebû" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "girîng" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "pêwist" + +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "standard" + +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "opsiyonel" + +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "ekstra" + +#: apt-pkg/pkgrecords.cc:38 +#, c-format +msgid "Index file type '%s' is not supported" msgstr "" -#: apt-inst/filelist.cc:477 +#: apt-pkg/sourcelist.cc:127 #, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" -#: apt-inst/filelist.cc:506 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "Double add of diversion %s -> %s" +msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-inst/filelist.cc:549 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "Duplicate conf file %s/%s" +msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" +#: apt-pkg/sourcelist.cc:184 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" +#: apt-pkg/sourcelist.cc:190 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-inst/contrib/arfile.cc:96 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "Invalid archive member header %s" +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" +#: apt-pkg/sourcelist.cc:206 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Arşîv zêde kin e" - -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" +#: apt-pkg/sourcelist.cc:208 +#, c-format +msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-inst/contrib/extracttar.cc:124 -#, fuzzy -msgid "Failed to create pipes" -msgstr "%s ji hev nehate veçirandin" +#: apt-pkg/sourcelist.cc:211 +#, c-format +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Xebitandina gzip biserneket" +#: apt-pkg/sourcelist.cc:217 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" +#: apt-pkg/sourcelist.cc:224 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" +#: apt-pkg/sourcelist.cc:335 +#, c-format +msgid "Opening %s" +msgstr "%s tê vekirin" + +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 +#, c-format +msgid "Line %u too long in source list %s." msgstr "" -#: apt-inst/contrib/extracttar.cc:308 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "Unknown TAR header type %u, member %s" +msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/sourcelist.cc:375 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-inst/deb/debfile.cc:132 +#: apt-pkg/sourcelist.cc:416 #, c-format -msgid "Internal error, could not locate member %s" +msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 +#, c-format +msgid "Clean of %s is not supported" msgstr "" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/clean.cc:64 #, fuzzy, c-format -msgid "List directory %spartial is missing." -msgstr "Peldanka '%s' kêm e" +msgid "Unable to stat %s." +msgstr "Nivîsandin ji bo %s ne pêkane" -#: apt-pkg/acquire.cc:91 -#, fuzzy, c-format -msgid "Archives directory %spartial is missing." -msgstr "Peldanka '%s' kêm e" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "" -#: apt-pkg/acquire.cc:99 +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "W: pelrêça %s nayê xwendin\n" +msgid "Error occurred while processing %s (%s%d)" +msgstr "Dema şixulandina naveroka %s çewtî" + +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 +#: apt-pkg/pkgcachegen.cc:263 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Clean of %s is not supported" +msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "Retrieving file %li of %li (%s remaining)" +msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/acquire.cc:904 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Lîsteya pakêtan tê xwendin" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "Retrieving file %li of %li" -msgstr "Pel tê anîn %li ji %li" +msgid "Unable to write to %s" +msgstr "Nivîsandin ji bo %s ne pêkane" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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:241 +msgid "Send request to solver" +msgstr "" + +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "" + +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2230,35 +2194,35 @@ msgstr "Mezinahî li hev nayên" msgid "Invalid file format" msgstr "" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, 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:1589 +#: apt-pkg/acquire-item.cc:1656 #, 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:1631 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2266,132 +2230,110 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, 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:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." +msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/acquire-worker.cc:118 -#, c-format -msgid "Is the package %s installed?" -msgstr "" +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#, fuzzy, c-format +msgid "List directory %spartial is missing." +msgstr "Peldanka '%s' kêm e" -#: apt-pkg/acquire-worker.cc:169 -#, c-format -msgid "Method %s did not start correctly" -msgstr "" +#: apt-pkg/acquire.cc:91 +#, fuzzy, c-format +msgid "Archives directory %spartial is missing." +msgstr "Peldanka '%s' kêm e" -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 #, 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" +msgid "Unable to lock directory %s" +msgstr "W: pelrêça %s nayê xwendin\n" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Pel tê anîn %li ji %li" -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." +#: 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 "" -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" +#: apt-pkg/policy.cc:422 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." +#: apt-pkg/policy.cc:444 +#, c-format +msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format -msgid "Version '%s' for '%s' was not found" +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/cacheset.cc:603 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "Peywira %s nehate dîtin" - -#: apt-pkg/cacheset.cc:609 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Nikarî pakêta %s bibîne" - -#: apt-pkg/cacheset.cc:615 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Nikarî pakêta %s bibîne" +msgid "Could not configure '%s'. " +msgstr "Nikarî pelê %s veke" -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 -#, c-format +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" - -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" - -#: apt-pkg/cacheset.cc:655 -#, c-format -msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "" - -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" -msgstr "" - -#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347 -#, c-format -msgid "Line %u too long in source list %s." +"Some index files failed to download. They have been ignored, or old ones " +"used instead." msgstr "" #: apt-pkg/cdrom.cc:571 @@ -2467,10 +2409,21 @@ msgstr "" msgid "Source list entries for this disc are:\n" 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/algorithms.cc:265 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "" #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2498,55 +2451,67 @@ msgstr "Vekirina StateFile %s biserneket" msgid "Failed to write temporary StateFile %s" msgstr "%s ji hev nehate veçirandin" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" +#: apt-pkg/tagfile.cc:140 +#, fuzzy, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/tagfile.cc:237 +#, fuzzy, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" msgstr "" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" msgstr "" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "Peywira %s nehate dîtin" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 -#, c-format -msgid "Wrote %i records.\n" -msgstr "%i tomar hatin nivîsîn.\n" +#: apt-pkg/cacheset.cc:609 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "Nikarî pakêta %s bibîne" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Nikarî pakêta %s bibîne" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" +msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "Hash Sum li hev nayên" +#: apt-pkg/cacheset.cc:663 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" #: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format @@ -2573,799 +2538,829 @@ msgstr "" msgid "Invalid 'Date' entry in Release file %s" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" +msgid "%lid %lih %limin %lis" msgstr "" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:57 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Progress: [%3i%%]" +msgid "%limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "Selection %s not found" +msgstr "Hilbijartina %s nehatiye dîtin" + +#: apt-pkg/contrib/fileutl.cc:190 +#, c-format +msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "Nikarî pelê %s veke" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "Nikarî qufila pelê %s veke" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:218 #, 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." +msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" msgstr "" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:421 #, c-format -msgid "This APT does not support the versioning system '%s'" +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Bindest" - -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "PêşBindest" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "" -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Pêşniyaz dike" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Tawsiye dike" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Nakokî" +#: apt-pkg/contrib/fileutl.cc:913 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Dikeve şunve" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Nikarî pelê %s veke" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Kevin dike" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, fuzzy, c-format +msgid "Could not open file descriptor %d" +msgstr "Nikarî pelê %s veke" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Dişkîne" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "girîng" +#: apt-pkg/contrib/fileutl.cc:1514 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "pêwist" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "standard" - -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "opsiyonel" - -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "ekstra" - -#: apt-pkg/pkgcachegen.cc:93 -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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Dema şixulandina naveroka %s çewtî" - -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "" +msgid "Problem closing the file %s" +msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "" +#: apt-pkg/contrib/fileutl.cc:1927 +#, fuzzy, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "" +#: apt-pkg/contrib/fileutl.cc:1938 +#, fuzzy, c-format +msgid "Problem unlinking the file %s" +msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "" +msgid "%c%s... Error!" +msgstr "%c%s... Çewtî!" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "" - -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Lîsteya pakêtan tê xwendin" +msgid "%c%s... Done" +msgstr "%c%s... Çêbû" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" +#: apt-pkg/contrib/progress.cc:181 +msgid "..." msgstr "" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "" +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Çêbû" -#: apt-pkg/pkgrecords.cc:38 -#, c-format -msgid "Index file type '%s' is not supported" +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +msgid "Couldn't duplicate file descriptor %i" msgstr "" -#: apt-pkg/policy.cc:422 -#, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "" +#: apt-pkg/contrib/mmap.cc:119 +#, fuzzy, c-format +msgid "Couldn't make mmap of %llu bytes" +msgstr "Nikarî li %s biguherîne" -#: apt-pkg/policy.cc:444 -#, c-format -msgid "Did not understand pin type %s" -msgstr "" +#: apt-pkg/contrib/mmap.cc:146 +#, fuzzy +msgid "Unable to close mmap" +msgstr "%s venebû" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "%s venebû" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" +msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/sourcelist.cc:170 -#, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "" +#: apt-pkg/contrib/mmap.cc:322 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Nivîsîna pelê %s biserneket" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/mmap.cc:341 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." msgstr "" -#: apt-pkg/sourcelist.cc:190 -#, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." 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/contrib/cdromutl.cc:65 +#, fuzzy, c-format +msgid "Unable to stat the mount point %s" +msgstr "Nivîsandin ji bo %s ne pêkane" -#: apt-pkg/sourcelist.cc:206 -#, c-format -msgid "Malformed line %lu in source list %s (URI)" +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/configuration.cc:519 #, c-format -msgid "Malformed line %lu in source list %s (dist)" +msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/configuration.cc:633 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" +msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/sourcelist.cc:217 +#: apt-pkg/contrib/configuration.cc:801 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" +msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/sourcelist.cc:224 +#: apt-pkg/contrib/configuration.cc:820 #, c-format -msgid "Malformed line %lu in source list %s (dist parse)" +msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/sourcelist.cc:335 +#: apt-pkg/contrib/configuration.cc:837 #, c-format -msgid "Opening %s" -msgstr "%s tê vekirin" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "" -#: apt-pkg/sourcelist.cc:371 +#: apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "Malformed line %u in source list %s (type)" +msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/sourcelist.cc:375 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "Type '%s' is not known on line %u in source list %s" +msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/sourcelist.cc:416 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format -msgid "Type '%s' is not known on stanza %u in source list %s" +msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" +#: apt-pkg/contrib/configuration.cc:897 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/tagfile.cc:140 -#, fuzzy, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Pakêt nehate dîtin %s" - -#: apt-pkg/tagfile.cc:237 -#, fuzzy, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Pakêt nehate dîtin %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." +#: apt-pkg/contrib/configuration.cc:900 +#, c-format +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/configuration.cc:950 #, c-format -msgid "Vendor block %s contains no fingerprint" +msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:65 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, fuzzy, c-format -msgid "Unable to stat the mount point %s" -msgstr "Nivîsandin ji bo %s ne pêkane" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "" +msgid "No keyring installed in %s." +msgstr "Sazkirin tê betalkirin." -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "" -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format msgid "Command line option %s is not understood" msgstr "" -#: apt-pkg/contrib/cmndline.cc:168 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format msgid "Option %s requires an argument." msgstr "" -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "Opsiyona '%s' zêde dirêj e" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:519 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "" +#: apt-pkg/deb/dpkgpm.cc:110 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "%s hatine sazkirin" -#: apt-pkg/contrib/configuration.cc:633 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Opening configuration file %s" -msgstr "" +msgid "Configuring %s" +msgstr "%s tê mîhengkirin" -#: apt-pkg/contrib/configuration.cc:801 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "" +msgid "Removing %s" +msgstr "%s tê rakirin" -#: apt-pkg/contrib/configuration.cc:820 +#: apt-pkg/deb/dpkgpm.cc:113 +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "%s bi tevahî hatine rakirin" + +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Syntax error %s:%u: Malformed tag" +msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:115 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" +msgid "Running post-installation trigger %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:877 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "" +msgid "Directory '%s' missing" +msgstr "Peldanka '%s' kêm e" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 +#, fuzzy, c-format +msgid "Could not open file '%s'" +msgstr "Nikarî pelê %s veke" + +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "" +msgid "Preparing %s" +msgstr "%s tê amadekirin" -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#: apt-pkg/deb/dpkgpm.cc:1008 #, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "" +msgid "Unpacking %s" +msgstr "%s tê derxistin" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "" +msgid "Preparing to configure %s" +msgstr "Mîhengkirina %s tê amadekirin" -#: apt-pkg/contrib/configuration.cc:900 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Syntax error %s:%u: clear directive requires an option tree as argument" -msgstr "" +msgid "Installed %s" +msgstr "%s hatine sazkirin" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "" +msgid "Preparing for removal of %s" +msgstr "Rakirina %s tê amadekirin" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "" +msgid "Removed %s" +msgstr "%s hatine rakirin" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Could not open lock file %s" -msgstr "Nikarî qufila pelê %s veke" +msgid "Preparing to completely remove %s" +msgstr "Bi tevahî rakirina %s tê amadekirin" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "Not using locking for nfs mounted lock file %s" +msgid "Completely removed %s" +msgstr "%s bi tevahî hatine rakirin" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Nivîsandin ji bo %s ne pêkane" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/contrib/fileutl.cc:223 -#, c-format -msgid "Could not get lock %s" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 -#, c-format -msgid "List of files can't be created as '%s' is not a directory" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" msgstr "" -#: apt-pkg/contrib/fileutl.cc:394 -#, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/contrib/fileutl.cc:412 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -#: apt-pkg/contrib/fileutl.cc:421 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1732 msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +"No apport report written because the error message indicates a disk full " +"error" msgstr "" -#: apt-pkg/contrib/fileutl.cc:824 -#, c-format -msgid "Sub-process %s received a segmentation fault." +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" msgstr "" -#: apt-pkg/contrib/fileutl.cc:826 -#, c-format -msgid "Sub-process %s received signal %u." +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" msgstr "" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" +#: apt-pkg/deb/dpkgpm.cc:1774 +msgid "" +"No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "Sub-process %s exited unexpectedly" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" msgstr "" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Di girtina pelî de pirsgirêkek derket" +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Pelrêça daxistinê nayê quflekirin" -#: apt-pkg/contrib/fileutl.cc:1101 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 #, c-format -msgid "Could not open file %s" -msgstr "Nikarî pelê %s veke" - -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 -#, fuzzy, c-format -msgid "Could not open file descriptor %d" -msgstr "Nikarî pelê %s veke" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/contrib/fileutl.cc:1514 -#, c-format -msgid "read, still have %llu to read but none left" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, c-format -msgid "write, still have %llu to write but couldn't" +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1915 +#: cmdline/apt-extracttemplates.cc:254 #, fuzzy, c-format -msgid "Problem closing the file %s" -msgstr "Di girtina pelî de pirsgirêkek derket" +msgid "Unable to mkstemp %s" +msgstr "Nivîsandin ji bo %s ne pêkane" -#: apt-pkg/contrib/fileutl.cc:1927 -#, fuzzy, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Di girtina pelî de pirsgirêkek derket" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?" -#: apt-pkg/contrib/fileutl.cc:1938 -#, fuzzy, c-format -msgid "Problem unlinking the file %s" -msgstr "Di girtina pelî de pirsgirêkek derket" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "Lîsteya dirêjahiya pakêtê zêde dirêj e" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -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 +#, c-format +msgid "Error processing directory %s" +msgstr "Di şixulandina pêrista %s de çewtî" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Sazkirin tê betalkirin." +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" -#: apt-pkg/contrib/mmap.cc:111 +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "" - -#: apt-pkg/contrib/mmap.cc:119 -#, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Nikarî li %s biguherîne" - -#: apt-pkg/contrib/mmap.cc:146 -#, fuzzy -msgid "Unable to close mmap" -msgstr "%s venebû" +msgid "Error processing contents %s" +msgstr "Dema şixulandina naveroka %s çewtî" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -#, fuzzy -msgid "Unable to synchronize mmap" -msgstr "%s venebû" +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" msgstr "" -#: apt-pkg/contrib/mmap.cc:322 -#, fuzzy -msgid "Failed to truncate file" -msgstr "Nivîsîna pelê %s biserneket" +#: ftparchive/apt-ftparchive.cc:907 +#, 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" -#: apt-pkg/contrib/mmap.cc:341 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB xerabe ye, navê dosyeyê weke %s.old hate guherandin" -#: apt-pkg/contrib/mmap.cc:446 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "" +msgid "DB is old, attempting to upgrade %s" +msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide" -#: apt-pkg/contrib/mmap.cc:449 +#: ftparchive/cachedb.cc:94 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Çewtî!" +msgid "Unable to open DB file %s: %s" +msgstr "Danegira %s nehate vekirin: %s" -#: apt-pkg/contrib/progress.cc:150 -#, c-format -msgid "%c%s... Done" -msgstr "%c%s... Çêbû" +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Rakirina %s biserneket" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "" +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Tomara kontrola arşîvê tuneye" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Çêbû" +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/writer.cc:91 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "" +msgid "W: Unable to read directory %s\n" +msgstr "W: pelrêça %s nayê xwendin\n" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/writer.cc:96 #, c-format -msgid "%lih %limin %lis" +msgid "W: Unable to stat %s\n" msgstr "" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 -#, c-format -msgid "%limin %lis" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "W: " + +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " msgstr "" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%lis" +msgid "Failed to resolve %s" +msgstr "%s ji hev nehate veçirandin" + +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" msgstr "" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:219 #, c-format -msgid "Selection %s not found" -msgstr "Hilbijartina %s nehatiye dîtin" +msgid "Failed to open %s" +msgstr "%s venebû" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:278 #, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +msgid " DeLink %s [%s]\n" 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 +#: ftparchive/writer.cc:286 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgid "Failed to readlink %s" msgstr "" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" +#: ftparchive/writer.cc:290 +#, c-format +msgid "Failed to unlink %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:95 -#, fuzzy, c-format -msgid "Installing %s" -msgstr "%s hatine sazkirin" - -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:298 #, c-format -msgid "Configuring %s" -msgstr "%s tê mîhengkirin" +msgid "*** Failed to link %s to %s" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:308 #, c-format -msgid "Removing %s" -msgstr "%s tê rakirin" +msgid " DeLink limit of %sB hit.\n" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:98 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "%s bi tevahî hatine rakirin" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Di arşîvê de qada pakêtê tuneye" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Noting disappearance of %s" +msgid " %s has no override entry\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Running post-installation trigger %s" +msgid " %s maintainer is %s not %s\n" msgstr "" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:706 #, c-format -msgid "Directory '%s' missing" -msgstr "Peldanka '%s' kêm e" - -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "Nikarî pelê %s veke" +msgid " %s has no source override entry\n" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:710 #, c-format -msgid "Preparing %s" -msgstr "%s tê amadekirin" +msgid " %s has no binary override entry either\n" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "" + +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Unpacking %s" -msgstr "%s tê derxistin" +msgid "Unable to open %s" +msgstr "%s venebû" -#: apt-pkg/deb/dpkgpm.cc:998 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 #, c-format -msgid "Preparing to configure %s" -msgstr "Mîhengkirina %s tê amadekirin" +msgid "Malformed override %s line %llu (%s)" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Installed %s" -msgstr "%s hatine sazkirin" +msgid "Failed to read the override file %s" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:166 #, c-format -msgid "Preparing for removal of %s" -msgstr "Rakirina %s tê amadekirin" +msgid "Malformed override %s line %llu #1" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:178 #, c-format -msgid "Removed %s" -msgstr "%s hatine rakirin" +msgid "Malformed override %s line %llu #2" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:191 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Bi tevahî rakirina %s tê amadekirin" +msgid "Malformed override %s line %llu #3" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Completely removed %s" -msgstr "%s bi tevahî hatine rakirin" +msgid "Unknown compression algorithm '%s'" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Nivîsandin ji bo %s ne pêkane" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" msgstr "" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1707 +#: cmdline/apt-internal-solver.cc:49 +#, fuzzy msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Bikaranîn: apt-config [vebijark] ferman\n" +"apt-config, amûra xwendina dosyeya mîhengên APTê ye\n" +"\n" +"Ferman\n" +" shell - moda shell\n" +" dump - Mîhengan nîşan dide\n" +"\n" +"Vebijark:\n" +" -h Ev dosyeya alîkariyê ye.\n" +" -c=? Dosyeya mîhengan nîşan dide\n" +" -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. " +"mînak -o dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" #~ msgid "%s not a valid DEB package." diff --git a/po/lt.po b/po/lt.po index 2f6d71365..b6ef62cad 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" @@ -161,7 +161,7 @@ msgid " Version table:" msgstr " Versijų lentelė:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -322,7 +322,7 @@ msgstr "Nepavyko užrakinti parsiuntimų aplanko" 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Nepavyko surasti išeities teksto paketo, skirto %s" @@ -342,95 +342,95 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Praleidžiama jau parsiųsta byla „%s“\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nepavyko nustatyti %s laisvos vietos" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Neturite pakankamai laisvos vietos %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Reikia parsiųsti %sB išeities archyvų.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Parsiunčiamas archyvas %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Nepavyko gauti kai kurių arhcyvų." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Pavyko parsiųsti tik parsiuntimo režime" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Klaida procese-palikuonyje" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -438,7 +438,7 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -446,14 +446,14 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -462,7 +462,7 @@ msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos " "versijos %s paketo" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1362 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -470,30 +470,30 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nepavyko patenkinti %s priklausomybės %s: %s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Jungiamasi prie %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Palaikomi moduliai:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -593,7 +593,7 @@ msgstr "%s ir taip jau yra naujausias.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@ -685,16 +685,16 @@ msgstr "Nepavyko atjungti CD-ROM įrenginyje %s, galbūt jis vis dar naudojamas. msgid "Disk not found." msgstr "Diskas nerastas." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Failas nerastas" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "" @@ -746,7 +746,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Jungiamasi per ilgai" @@ -768,7 +768,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -829,7 +829,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "" @@ -838,7 +838,7 @@ msgstr "" msgid "Unable to fetch file, server said '%s'" msgstr "Nepavyko atsiųsti failo, serveris atsakė „%s“" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "" @@ -888,7 +888,7 @@ msgstr "Nepavyko prisijungti prie %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Jungiamasi prie %s" @@ -1025,42 +1025,17 @@ msgstr "Prisijungti nepavyko" msgid "Internal error" msgstr "Vidinė klaida" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Imamas " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Gauti:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ignoruotas " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Klaida " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Parsiųsta %sB iš %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Vykdoma]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Laikmenos keitimas: įdėkite diską, pažymėtą\n" -" „%s“,\n" -"į įrenginį „%s“ ir paspauskite enter\n" +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:93 msgid "Correcting dependencies..." @@ -1091,34 +1066,210 @@ msgstr "Įvykdykite „apt-get -f install“, jei norite ištaisyti šias klaida msgid "Unmet dependencies. Try using -f." msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "DĖMESIO: Šie paketai negali būti autentifikuoti!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Įdiegtas]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" +#: 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-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Nepavyko autentikuoti kai kurių paketų" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Įdiegtas]" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Įdiegti šiuos paketus be patvirtinimo?" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Įdiegtas]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes" +#: apt-private/private-output.cc:277 +#, c-format +msgid "[upgradable from: %s]" +msgstr "" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:281 +msgid "[residual-config]" +msgstr "" + +#: apt-private/private-output.cc:455 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Nepavyko parsiųsti %s %s\n" +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:35 +#, 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:97 +#, 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:101 +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:82 msgid "Internal error, InstallPackages was called with broken packages!" @@ -1169,8 +1320,12 @@ msgstr "Po šios operacijos bus atlaisvinta %sB disko vietos.\n" msgid "You don't have enough free space in %s." msgstr "%s nėra pakankamai laisvos vietos." -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." msgstr "" #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be @@ -1372,939 +1527,682 @@ 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:129 -msgid "Listing" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "DĖMESIO: Šie paketai negali būti autentifikuoti!" + +#: apt-private/private-download.cc:40 +msgid "Authentication warning overridden.\n" msgstr "" -#: apt-private/private-list.cc:159 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Nepavyko autentikuoti kai kurių paketų" + +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Įdiegti šiuos paketus be patvirtinimo?" + +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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] "" +msgid "Failed to fetch %s %s\n" +msgstr "Nepavyko parsiųsti %s %s\n" -#: 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!" +#: apt-private/private-sources.cc:58 +#, fuzzy, c-format +msgid "Failed to parse %s. Edit again? " +msgstr "Nepavyko pervadinti %s į %s" + +#: apt-private/private-sources.cc:70 +#, c-format +msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 -#: apt-private/private-show.cc:89 -msgid "unknown" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" -#: apt-private/private-output.cc:265 -#, fuzzy, c-format -msgid "[installed,upgradable to: %s]" -msgstr " [Įdiegtas]" +#: apt-private/private-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "Skaičiuojami atnaujinimai... " -#: apt-private/private-output.cc:268 -#, fuzzy -msgid "[installed,local]" -msgstr " [Įdiegtas]" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "Įvykdyta" -#: apt-private/private-output.cc:270 -msgid "[installed,auto-removable]" -msgstr "" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Imamas " -#: apt-private/private-output.cc:272 -#, fuzzy -msgid "[installed,automatic]" -msgstr " [Įdiegtas]" +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Gauti:" -#: apt-private/private-output.cc:274 -#, fuzzy -msgid "[installed]" -msgstr " [Įdiegtas]" +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ignoruotas " -#: apt-private/private-output.cc:277 +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Klaida " + +#: apt-private/acqprogress.cc:146 #, c-format -msgid "[upgradable from: %s]" -msgstr "" +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Parsiųsta %sB iš %s (%sB/s)\n" -#: apt-private/private-output.cc:281 -msgid "[residual-config]" -msgstr "" +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Vykdoma]" -#: apt-private/private-output.cc:455 +#: apt-private/acqprogress.cc:297 #, c-format -msgid "but %s is installed" -msgstr "bet %s yra įdiegtas" +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Laikmenos keitimas: įdėkite diską, pažymėtą\n" +" „%s“,\n" +"į įrenginį „%s“ ir paspauskite enter\n" -#: apt-private/private-output.cc:457 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "but %s is to be installed" -msgstr "bet %s bus įdiegtas" +msgid "Unable to read %s" +msgstr "Nepavyko perskaityti %s" -#: apt-private/private-output.cc:464 -msgid "but it is not installable" -msgstr "tačiau jis negali būti įdiegtas" +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 +#, c-format +msgid "Unable to change to %s" +msgstr "Nepavyko pakeisti į %s" -#: apt-private/private-output.cc:466 -msgid "but it is a virtual package" -msgstr "bet tai yra virtualus paketas" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" -#: apt-private/private-output.cc:469 -msgid "but it is not installed" -msgstr "bet jis nėra įdiegtas" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 +#, fuzzy, c-format +msgid "Can not read mirror file '%s'" +msgstr "Nepavyko atverti failo %s" -#: apt-private/private-output.cc:469 -msgid "but it is not going to be installed" -msgstr "bet jis nebus įdiegtas" +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Nepavyko atverti failo %s" -#: apt-private/private-output.cc:474 -msgid " or" -msgstr " arba" +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" +msgstr "" -#: 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ų:" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Nepavyko subprocesui sukurti IPC gijos" -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "Bus įdiegti šie NAUJI paketai:" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "Bus PAŠALINTI šie paketai:" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "Blogi standartiniai nustatymai!" -#: apt-private/private-output.cc:571 -msgid "The following packages have been kept back:" -msgstr "Šių paketų atnaujinimas sulaikomas:" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "Jei norite tęsti, spauskite Enter." -#: apt-private/private-output.cc:592 -msgid "The following packages will be upgraded:" -msgstr "Bus atnaujinti šie paketai:" +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" -#: apt-private/private-output.cc:613 -msgid "The following packages will be DOWNGRADED:" -msgstr "Bus PAKEISTI SENESNIAIS šie paketai:" +#: dselect/install:102 +#, fuzzy +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "Išpakuojant įvyko klaidų. Bandysiu konfigūruoti" -#: apt-private/private-output.cc:633 -msgid "The following held packages will be changed:" -msgstr "Bus pakeisti šie sulaikyti paketai:" +#: dselect/install:103 +#, fuzzy +msgid "will be configured. This may result in duplicate errors" +msgstr "paketus, kurie buvo įdiegti. Tai gali sukelti pasikartojančias klaidas" -#: apt-private/private-output.cc:688 -#, c-format -msgid "%s (due to %s) " -msgstr "%s (dėl %s) " +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" +"arba klaidas, atsiradusias dėl trūkstamų priklausomybių. Viskas gerai, tik " +"klaidos," -#: apt-private/private-output.cc:696 +#: dselect/install:105 msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" -"Įspėjimas: Šie būtini paketai bus pašalinti.\n" -"Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!" +"esančios aukščiau šios žinutės, yra svarbios. Prašome jas ištaisyti ir vėl " +"paleisti [I]nstall" -#: apt-private/private-output.cc:727 -#, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu atnaujinti, %lu naujai įdiegti, " +#: dselect/update:30 +msgid "Merging available information" +msgstr "Sujungiama turima informaija" -#: apt-private/private-output.cc:731 -#, c-format -msgid "%lu reinstalled, " -msgstr "%lu įdiegti iš naujo, " +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "" -#: apt-private/private-output.cc:733 -#, c-format -msgid "%lu downgraded, " -msgstr "%lu pasendinti, " +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "" -#: 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-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "" -#: apt-private/private-output.cc:739 -#, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu nepilnai įdiegti ar pašalinti.\n" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +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 "[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" +#: apt-inst/filelist.cc:477 +#, c-format +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Regex compilation error - %s" +msgid "Double add of diversion %s -> %s" msgstr "" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" +#: apt-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-private/private-show.cc:156 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, 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] "" +msgid "The path %s is too long" +msgstr "Kelias %s per ilgas" -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" +#: apt-inst/extract.cc:132 +#, c-format +msgid "Unpacking %s more than once" msgstr "" -#: apt-private/private-sources.cc:58 -#, fuzzy, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "Nepavyko pervadinti %s į %s" +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "" -#: apt-private/private-sources.cc:70 +#: apt-inst/extract.cc:152 #, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." +msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Atnaujinimo komandai argumentų nereikia" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "" -#: apt-private/private-update.cc:90 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, 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] "" +msgid "Failed to stat %s" +msgstr "Nepavyko patikrinti %s" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "Nepavyko pervadinti %s į %s" + +#: apt-inst/extract.cc:249 +#, c-format +msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "Skaičiuojami atnaujinimai... " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "" -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "Įvykdyta" +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Kelias per ilgas" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: apt-inst/extract.cc:421 #, c-format -msgid "Unable to read %s" -msgstr "Nepavyko perskaityti %s" +msgid "Overwrite package match with no version for %s" +msgstr "" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/extract.cc:438 #, c-format -msgid "Unable to change to %s" -msgstr "Nepavyko pakeisti į %s" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 +#: apt-inst/extract.cc:498 #, c-format -msgid "No mirror file '%s' found " +msgid "Unable to stat %s" msgstr "" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:287 -#, fuzzy, c-format -msgid "Can not read mirror file '%s'" -msgstr "Nepavyko atverti failo %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 "" -#: methods/mirror.cc:315 -#, fuzzy, c-format -msgid "No entry found in mirror file '%s'" -msgstr "Nepavyko atverti failo %s" +#: apt-inst/dirstream.cc:105 +#, c-format +msgid "Failed to close file %s" +msgstr "" -#: methods/mirror.cc:445 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "[Mirror: %s]" +msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "Nepavyko subprocesui sukurti IPC gijos" +#: apt-inst/deb/debfile.cc:132 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "Vidinė klaida, nepavyko aptikti nario %s" -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" msgstr "" -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "Blogi standartiniai nustatymai!" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "Jei norite tęsti, spauskite Enter." +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "" -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" +#: apt-inst/contrib/arfile.cc:96 +#, c-format +msgid "Invalid archive member header %s" msgstr "" -#: dselect/install:102 -#, fuzzy -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "Išpakuojant įvyko klaidų. Bandysiu konfigūruoti" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "" -#: dselect/install:103 -#, fuzzy -msgid "will be configured. This may result in duplicate errors" -msgstr "paketus, kurie buvo įdiegti. Tai gali sukelti pasikartojančias klaidas" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Archyvas per trumpas" -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "" -"arba klaidas, atsiradusias dėl trūkstamų priklausomybių. Viskas gerai, tik " -"klaidos," +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Nepavyko perskaityti archyvo antraščių" -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" msgstr "" -"esančios aukščiau šios žinutės, yra svarbios. Prašome jas ištaisyti ir vėl " -"paleisti [I]nstall" - -#: dselect/update:30 -msgid "Merging available information" -msgstr "Sujungiama turima informaija" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " msgstr "" -"Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n" -"\n" -"apt-extracttemplates tai įrankis skirtas konfigūracijų, bei šablonų " -"informacijos išskleidimui\n" -"iš debian paketų\n" -"\n" -"Parametrai:\n" -" -h Šis pagalbos tekstas\n" -" -t Nustatyti laikinąjį aplanką\n" -" -c=? Nuskaityti šį konfigūracijų failą\n" -" -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Nepavyko sukurti %s" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Sugadintas archyvas" + +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Tar kontrolinė suma klaidinga, archyvas sugadintas" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Unable to write to %s" -msgstr "Nepavyko įrašyti į %s" +msgid "Unknown TAR header type %u, member %s" +msgstr "Nežinomas TAR antraštės tipas %u. narys %s" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Nepavyko sužinoti debconf versijos. Ar įdiegtas debconf?" +#: apt-pkg/install-progress.cc:57 +#, c-format +msgid "Progress: [%3i%%]" +msgstr "" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Paketo plėtinių sąrašas yra per ilgas" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +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 +#: apt-pkg/init.cc:146 #, c-format -msgid "Error processing directory %s" -msgstr "Klaida apdorojant aplanką %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Šaltinio plėtinys yra per ilgas" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Klaida įrašant antraštę į turinio failą" - -#: ftparchive/apt-ftparchive.cc:431 -#, c-format -msgid "Error processing contents %s" -msgstr "Klaida apdorojant turinį %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" +msgid "Packaging system '%s' is not supported" msgstr "" -"Naudojimas: apt-ftparchive [parametrai] komanda\n" -"Komandos: dvejatainių paketų kelias [perrašomasfailas [keliopriešdėlis]]\n" -" sources aplankas [perrašomasfailas [kelippriešdėlis]]\n" -" contents kelias\n" -" release kelias\n" -" generate parametras [grupės]\n" -" clean parametras\n" -"\n" -"apt-ftparchive generuoja indeksų failus, skirtus Debian archyvams. Palaikomi " -"keli \n" -"generavimo stiliai, įskaitant nuo pilnai automatizuoto iki funkcinių " -"pakeitimų\n" -"skirtų dpkg-scanpackages ir dpkg-scansources\n" -"\n" -"apt-ftparchive sugeneruoja paketų failus iš .debs medžio. Paketo failas turi " -"visus\n" -"kontrolinius kiekvieno paketo laukus, o taip pat ir MD5 hešą bei failų " -"dydžius. Perrašomasis\n" -"failas palaikomas tam, kad būtų priverstinai nustatytos Pirmenybių bei " -"Sekcijų reikšmės.\n" -"\n" -"Panašiai apt-ftparchive sugeneruoja ir Išeities failus iš .dscs medžio.\n" -"--source-override nuostata gali būti naudojama nustatant išeities " -"perrašomąjį failą\n" -"\n" -"\"Paketų\" bei \"Išeičių\" komandos turėtų būti paleistos failų medžio " -"šaknyje. BinaryPath turėtų\n" -"nurodyti kelią į rekursinės paieškos pagrindą bei perrašytas failas turėtų " -"turėti perrašymo žymes.\n" -"Keliopriešdėlis tai yra prirašomas prie failo vardų laikų jei tokių yra. " -"Vartosenos pavyzdys\n" -"naudojant Debian archyvą:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Nuostatos:\n" -" -h Šis pagalbos tekstas\n" -" --md5 Valdyti MD5 generavimą\n" -" -s=? Šaltinio perrašomas failas\n" -" -q Tylėti\n" -" -d=? Pasirinkti papildomą kešo duomenų bazę\n" -" --no-delink Įjungti atjungiamąjį derinimo rėžimą\n" -" -c=? Perskaityti šį nuostatų failą\n" -" -o=? Nustatyti savarankišką konfigūracijos nuostatą" -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Nėra atitikmenų" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Kai kurių failų nėra paketų grupėje „%s“" +msgid "Wrote %i records.\n" +msgstr "" -#: ftparchive/cachedb.cc:65 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Duomenų bazė pažeista, failas pervardintas į %s.old" +msgid "Wrote %i records with %i missing files.\n" +msgstr "" -#: ftparchive/cachedb.cc:83 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Duomenų bazė yra sena, bandoma atnaujinti %s" - -#: ftparchive/cachedb.cc:94 -#, fuzzy -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +msgid "Wrote %i records with %i mismatched files\n" msgstr "" -"Duomenų bazės formatas yra netinkamas. Jei jūs atsinaujinote iš senesnės " -"versijos, prašome pašalinkite ir perkurkite duomenų bazę." -#: ftparchive/cachedb.cc:99 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Nepavyko atverti DB failo %s: %s" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Failed to stat %s" -msgstr "Nepavyko patikrinti %s" +msgid "Can't find authentication record for: %s" +msgstr "" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Nepavyko nuskaityti nuorodos %s" +#: apt-pkg/indexcopy.cc:521 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Maišos sumos nesutapimas" -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" +#: apt-pkg/acquire-worker.cc:116 +#, c-format +msgid "The method driver %s could not be found." msgstr "" -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "" +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n" -#: ftparchive/writer.cc:91 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "Į: Nepavyko perskaityti aplanko %s\n" +msgid "Method %s did not start correctly" +msgstr "" -#: ftparchive/writer.cc:96 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "Į: Nepavyko patikrinti %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "K: " - -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "Į: " +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "Įdėkite diską „%s“ į įrenginį „%s“ ir paspauskite Enter." -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "K: Klaidos failui " +#: 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." -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 -#, c-format -msgid "Failed to resolve %s" -msgstr "Nepavyko išspręsti %s" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"Greičiausiai norėsite paleisti „apt-get update“, kad šios problemos būtų " +"ištaisytos" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Judesys medyje nepavyko" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Nepavyko perskaityti šaltinių sąrašo." -#: ftparchive/writer.cc:219 -#, c-format -msgid "Failed to open %s" -msgstr "Nepavyko atverti %s" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "" -#: ftparchive/writer.cc:278 -#, c-format -msgid " DeLink %s [%s]\n" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" msgstr "" -#: ftparchive/writer.cc:286 -#, c-format -msgid "Failed to readlink %s" -msgstr "Nepavyko nuskaityti nuorodos %s" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "" -#: ftparchive/writer.cc:290 -#, c-format -msgid "Failed to unlink %s" -msgstr "Nepavyko atsieti nuorodos %s" +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" +msgstr "" -#: ftparchive/writer.cc:298 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Nepavyko susieti %s su %s" +msgid "This APT does not support the versioning system '%s'" +msgstr "" -#: ftparchive/writer.cc:308 -#, c-format -msgid " DeLink limit of %sB hit.\n" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" msgstr "" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Archyvas neturėjo paketo lauko" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Priklauso" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s neturi perrašymo įrašo\n" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Priešpriklauso" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, 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:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr "" - -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr "" - -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Nepavyko išskirti atminties" - -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Nepavyko atverti %s" - -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1" - -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Nepavyko nuskaityti perrašymo failo %s" - -#: ftparchive/override.cc:166 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Siūlo" -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Rekomenduoja" -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Konfliktuoja" -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Nežinomas suspaudimo algoritmas „%s“" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Pakeičia" -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Suspaustai išvesčiai %s reikia suspaudimo rinkinio" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Pakeičia" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Nepavyko sukurti FILE*" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Sugadina" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" msgstr "" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "Svarbu" -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "Vidinė klaida, nepavyko sukurti %s" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "privaloma" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Nepavyko Nusk/Įraš į subprocesą/failą" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "standartinis" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Skaitymo klaida skaičiuojant MD5" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "nebūtinas" -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "papildomas" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Nepavyko pervadinti %s į %s" - -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n" -"\n" -"apt-extracttemplates tai įrankis skirtas konfigūracijų, bei šablonų " -"informacijos išskleidimui\n" -"iš debian paketų\n" -"\n" -"Parametrai:\n" -" -h Šis pagalbos tekstas\n" -" -t Nustatyti laikinąjį aplanką\n" -" -c=? Nuskaityti šį konfigūracijų failą\n" -" -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Nežinomas paketo įrašas!" - -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgid "Index file type '%s' is not supported" msgstr "" -"Naudojimas: apt-sortpkgs [parametrai] byla1 [byla2 ...]\n" -"\n" -"apt-sortpkgs - tai paprastas įrankis skirtas paketų rūšiavimui. -s nuostata " -"naudojama\n" -"norint nusakyti bylos tipą.\n" -"\n" -"Parametrai:\n" -" -h Šis pagalbos tekstas\n" -" -s Naudoti išeities kodo bylos rūšiavimą\n" -" -c=? Nuskaityti šią konfigūracijos bylą\n" -" -o=? Nurodyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/sourcelist.cc:127 #, c-format -msgid "Failed to write file %s" +msgid "Malformed stanza %u in source list %s (URI parse)" msgstr "" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "Failed to close file %s" +msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "Kelias %s per ilgas" - -#: apt-inst/extract.cc:132 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "Unpacking %s more than once" +msgid "Malformed line %lu in source list %s ([option] too short)" msgstr "" -#: apt-inst/extract.cc:142 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "The directory %s is diverted" +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -#: apt-inst/extract.cc:152 +#: apt-pkg/sourcelist.cc:190 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" +msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" +#: apt-pkg/sourcelist.cc:193 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" -#: apt-inst/extract.cc:249 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "The directory %s is being replaced by a non-directory" +msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" +#: apt-pkg/sourcelist.cc:208 +#, c-format +msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Kelias per ilgas" - -#: apt-inst/extract.cc:421 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Overwrite package match with no version for %s" +msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-inst/extract.cc:438 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "File %s/%s overwrites the one in the package %s" +msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-inst/extract.cc:498 +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "Unable to stat %s" +msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "" +#: apt-pkg/sourcelist.cc:335 +#, c-format +msgid "Opening %s" +msgstr "Atveriama %s" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 +#, c-format +msgid "Line %u too long in source list %s." msgstr "" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" +#: apt-pkg/sourcelist.cc:371 +#, c-format +msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" +#: apt-pkg/sourcelist.cc:375 +#, c-format +msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-inst/filelist.cc:477 +#: apt-pkg/sourcelist.cc:416 #, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "" -#: apt-inst/filelist.cc:506 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 #, c-format -msgid "Double add of diversion %s -> %s" +msgid "Clean of %s is not supported" msgstr "" -#: apt-inst/filelist.cc:549 +#: apt-pkg/clean.cc:64 #, c-format -msgid "Duplicate conf file %s/%s" +msgid "Unable to stat %s." msgstr "" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Klaida apdorojant turinį %s" -#: apt-inst/contrib/arfile.cc:96 -#, c-format -msgid "Invalid archive member header %s" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Archyvas per trumpas" - -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Nepavyko perskaityti archyvo antraščių" - -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" +#: apt-pkg/pkgcachegen.cc:263 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Sugadintas archyvas" - -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Tar kontrolinė suma klaidinga, archyvas sugadintas" - -#: apt-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Nežinomas TAR antraštės tipas %u. narys %s" +msgid "Package %s %s was not found while processing file dependencies" +msgstr "" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" +msgid "Couldn't stat source package list %s" msgstr "" -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "Vidinė klaida, nepavyko aptikti nario %s" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Skaitomi paketų sąrašai" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" msgstr "" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, fuzzy, c-format -msgid "List directory %spartial is missing." -msgstr "Trūksta aplanko „%s“" +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Nepavyko įrašyti į %s" -#: apt-pkg/acquire.cc:91 -#, fuzzy, c-format -msgid "Archives directory %spartial is missing." -msgstr "Trūksta aplanko „%s“" +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "" -#: apt-pkg/acquire.cc:99 -#, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "Nepavyko užrakinti sąrašo aplanko" +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, c-format -msgid "Clean of %s is not supported" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" msgstr "" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Parsiunčiamas %li failas iš %li (liko %s)" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "Parsiunčiamas %li failas iš %li" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2324,35 +2222,35 @@ msgstr "Neatitinka dydžiai" msgid "Invalid file format" msgstr "Klaidingas veiksmas %s" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, 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:1589 +#: apt-pkg/acquire-item.cc:1656 #, 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:1631 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2360,135 +2258,114 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "GPG klaida: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, 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:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." +msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n" +msgid "List directory %spartial is missing." +msgstr "Trūksta aplanko „%s“" -#: apt-pkg/acquire-worker.cc:169 -#, c-format -msgid "Method %s did not start correctly" -msgstr "" +#: apt-pkg/acquire.cc:91 +#, fuzzy, c-format +msgid "Archives directory %spartial is missing." +msgstr "Trūksta aplanko „%s“" -#: apt-pkg/acquire-worker.cc:455 -#, 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/acquire.cc:99 +#, fuzzy, c-format +msgid "Unable to lock directory %s" +msgstr "Nepavyko užrakinti sąrašo aplanko" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Parsiunčiamas %li failas iš %li (liko %s)" -#: 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." +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Parsiunčiamas %li failas iš %li" -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" msgstr "" -"Greičiausiai norėsite paleisti „apt-get update“, kad šios problemos būtų " -"ištaisytos" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Nepavyko perskaityti šaltinių sąrašo." - -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“" -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/policy.cc:83 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Nebuvo rasta „%s“ versija paketui „%s“" - -#: apt-pkg/cacheset.cc:603 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "Nepavyko rasti užduoties %s" - -#: apt-pkg/cacheset.cc:609 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Nepavyko rasti paketo %s" - -#: apt-pkg/cacheset.cc:615 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Nepavyko rasti paketo %s" +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" +msgstr "" -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/policy.cc:422 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" +msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/policy.cc:444 #, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/cacheset.cc:663 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "Nepavyko atverti failo %s" + +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select installed version from package %s as it is not installed" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/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" @@ -2563,10 +2440,21 @@ msgstr "Rašomas naujas šaltinių sąrašas\n" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "" +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "" #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2594,56 +2482,68 @@ msgstr "" msgid "Failed to write temporary StateFile %s" msgstr "" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Nebuvo rasta „%s“ versija paketui „%s“" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "Nepavyko rasti užduoties %s" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "Nepavyko rasti paketo %s" + +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Nepavyko rasti paketo %s" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records.\n" +msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i missing files.\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i mismatched files\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:663 #, c-format -msgid "Can't find authentication record for: %s" +msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "Maišos sumos nesutapimas" - #: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" @@ -2669,803 +2569,898 @@ msgstr "Pastaba: pažymimas %s vietoje %s\n" msgid "Invalid 'Date' entry in Release file %s" msgstr "Nepavyko atverti DB failo %s: %s" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" +msgid "%lid %lih %limin %lis" msgstr "" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:57 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Progress: [%3i%%]" +msgid "%limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "Selection %s not found" msgstr "" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "Nepavyko atverti failo %s" - -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:190 #, 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." +msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "Nepavyko atverti rakinimo failo %s" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Nepavyko rezervuoti rakinimo failo %s" + +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:412 #, c-format -msgid "This APT does not support the versioning system '%s'" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Priklauso" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Procesas %s gavo segmentavimo klaidą" -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Priešpriklauso" +#: apt-pkg/contrib/fileutl.cc:826 +#, fuzzy, c-format +msgid "Sub-process %s received signal %u." +msgstr "Procesas %s gavo segmentavimo klaidą" -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Siūlo" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Procesas %s grąžino klaidos kodą (%u)" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Rekomenduoja" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Procesas %s netikėtai išėjo" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Konfliktuoja" +#: apt-pkg/contrib/fileutl.cc:913 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Klaida užveriant failą" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Pakeičia" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Nepavyko atverti failo %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Pakeičia" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, fuzzy, c-format +msgid "Could not open file descriptor %d" +msgstr "Nepavyko atverti failo %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Sugadina" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Nepavyko sukurti subproceso IPC" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Nepavyko paleisti suspaudėjo " + +#: apt-pkg/contrib/fileutl.cc:1514 +#, c-format +msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "Svarbu" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "privaloma" +#: apt-pkg/contrib/fileutl.cc:1915 +#, fuzzy, c-format +msgid "Problem closing the file %s" +msgstr "Klaida užveriant failą" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "standartinis" +#: apt-pkg/contrib/fileutl.cc:1927 +#, fuzzy, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Klaida sinchronizuojant failą" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "nebūtinas" +#: apt-pkg/contrib/fileutl.cc:1938 +#, fuzzy, c-format +msgid "Problem unlinking the file %s" +msgstr "Klaida užveriant failą" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "papildomas" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Klaida sinchronizuojant failą" -#: apt-pkg/pkgcachegen.cc:93 -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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 -#, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Klaida apdorojant turinį %s" - -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "" - -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "" - -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "" - -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "" - -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "" +msgid "%c%s... Error!" +msgstr "%c%s... Klaida!" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "" - -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Skaitomi paketų sąrašai" +msgid "%c%s... Done" +msgstr "%c%s... Baigta" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" +#: apt-pkg/contrib/progress.cc:181 +msgid "..." msgstr "" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "" +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Baigta" -#: apt-pkg/pkgrecords.cc:38 -#, c-format -msgid "Index file type '%s' is not supported" +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +msgid "Couldn't duplicate file descriptor %i" msgstr "" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:119 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" +msgid "Couldn't make mmap of %llu bytes" msgstr "" -#: apt-pkg/policy.cc:444 -#, c-format -msgid "Did not understand pin type %s" -msgstr "" +#: apt-pkg/contrib/mmap.cc:146 +#, fuzzy +msgid "Unable to close mmap" +msgstr "Nepavyko atverti %s" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "Nepavyko pakeisti į %s" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" +msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/sourcelist.cc:170 -#, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "" +#: apt-pkg/contrib/mmap.cc:322 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Nepavyko patikrinti %s" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/mmap.cc:341 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." msgstr "" -#: apt-pkg/sourcelist.cc:190 -#, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/sourcelist.cc:206 -#, c-format -msgid "Malformed line %lu in source list %s (URI)" +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/configuration.cc:519 #, c-format -msgid "Malformed line %lu in source list %s (dist)" +msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/configuration.cc:633 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" +msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/sourcelist.cc:217 +#: apt-pkg/contrib/configuration.cc:801 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" +msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/sourcelist.cc:224 +#: apt-pkg/contrib/configuration.cc:820 #, c-format -msgid "Malformed line %lu in source list %s (dist parse)" +msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/sourcelist.cc:335 -#, c-format -msgid "Opening %s" -msgstr "Atveriama %s" - -#: apt-pkg/sourcelist.cc:371 +#: apt-pkg/contrib/configuration.cc:837 #, c-format -msgid "Malformed line %u in source list %s (type)" +msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/sourcelist.cc:375 +#: apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "Type '%s' is not known on line %u in source list %s" +msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/sourcelist.cc:416 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "Type '%s' is not known on stanza %u in source list %s" -msgstr "" - -#: apt-pkg/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" +msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format -msgid "Unable to parse package file %s (1)" +msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/configuration.cc:897 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "" - -#: 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." +msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -"Kai kurių indeksų failų nepavyko parsiųsti, jie buvo ignoruoti arba vietoje " -"jų panaudoti seni." -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/configuration.cc:900 #, c-format -msgid "Vendor block %s contains no fingerprint" +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:65 +#: apt-pkg/contrib/configuration.cc:950 #, c-format -msgid "Unable to stat the mount point %s" +msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Diegimas nutraukiamas." -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "" -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format msgid "Command line option %s is not understood" msgstr "" -#: apt-pkg/contrib/cmndline.cc:168 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format msgid "Option %s requires an argument." msgstr "Parametrui %s reikia argumento." -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "Klaidingas veiksmas %s" -#: apt-pkg/contrib/configuration.cc:519 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "" +#: apt-pkg/deb/dpkgpm.cc:110 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "Įdiegta %s" -#: apt-pkg/contrib/configuration.cc:633 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Opening configuration file %s" -msgstr "" +msgid "Configuring %s" +msgstr "Konfigūruojamas %s" -#: apt-pkg/contrib/configuration.cc:801 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "" +msgid "Removing %s" +msgstr "Šalinamas %s" -#: apt-pkg/contrib/configuration.cc:820 -#, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "" +#: apt-pkg/deb/dpkgpm.cc:113 +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "Visiškai pašalintas %s" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" +msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/deb/dpkgpm.cc:115 #, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgid "Running post-installation trigger %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:884 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "" +msgid "Directory '%s' missing" +msgstr "Trūksta aplanko „%s“" -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 -#, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "" +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 +#, fuzzy, c-format +msgid "Could not open file '%s'" +msgstr "Nepavyko atverti failo %s" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "" +msgid "Preparing %s" +msgstr "Ruošiamas %s" -#: apt-pkg/contrib/configuration.cc:900 +#: apt-pkg/deb/dpkgpm.cc:1008 #, c-format -msgid "Syntax error %s:%u: clear directive requires an option tree as argument" -msgstr "" +msgid "Unpacking %s" +msgstr "Išpakuojamas %s" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "" +msgid "Preparing to configure %s" +msgstr "Ruošiamasi konfigūruoti %s" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "" +msgid "Installed %s" +msgstr "Įdiegta %s" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "Could not open lock file %s" -msgstr "Nepavyko atverti rakinimo failo %s" +msgid "Preparing for removal of %s" +msgstr "Ruošiamasi %s pašalinimui" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "" +msgid "Removed %s" +msgstr "Pašalintas %s" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Could not get lock %s" -msgstr "Nepavyko rezervuoti rakinimo failo %s" +msgid "Preparing to completely remove %s" +msgstr "Ruošiamasi visiškai pašalinti %s" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "List of files can't be created as '%s' is not a directory" +msgid "Completely removed %s" +msgstr "Visiškai pašalintas %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Nepavyko įrašyti į %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/contrib/fileutl.cc:394 -#, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/contrib/fileutl.cc:412 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" msgstr "" -#: apt-pkg/contrib/fileutl.cc:421 -#, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/contrib/fileutl.cc:824 -#, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Procesas %s gavo segmentavimo klaidą" +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" -#: apt-pkg/contrib/fileutl.cc:826 -#, fuzzy, c-format -msgid "Sub-process %s received signal %u." -msgstr "Procesas %s gavo segmentavimo klaidą" +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Procesas %s grąžino klaidos kodą (%u)" +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 -#, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Procesas %s netikėtai išėjo" +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:913 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Klaida užveriant failą" +#: apt-pkg/deb/dpkgpm.cc:1774 +msgid "" +"No apport report written because the error message indicates a dpkg I/O error" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "Could not open file %s" -msgstr "Nepavyko atverti failo %s" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/deb/debsystem.cc:94 #, fuzzy, c-format -msgid "Could not open file descriptor %d" -msgstr "Nepavyko atverti failo %s" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Nepavyko sukurti subproceso IPC" - -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Nepavyko paleisti suspaudėjo " +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Nepavyko užrakinti sąrašo aplanko" -#: apt-pkg/contrib/fileutl.cc:1514 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 #, c-format -msgid "read, still have %llu to read but none left" +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, c-format -msgid "write, still have %llu to write but couldn't" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1915 -#, fuzzy, c-format -msgid "Problem closing the file %s" -msgstr "Klaida užveriant failą" +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n" +"\n" +"apt-extracttemplates tai įrankis skirtas konfigūracijų, bei šablonų " +"informacijos išskleidimui\n" +"iš debian paketų\n" +"\n" +"Parametrai:\n" +" -h Šis pagalbos tekstas\n" +" -t Nustatyti laikinąjį aplanką\n" +" -c=? Nuskaityti šį konfigūracijų failą\n" +" -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n" -#: apt-pkg/contrib/fileutl.cc:1927 +#: cmdline/apt-extracttemplates.cc:254 #, fuzzy, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Klaida sinchronizuojant failą" +msgid "Unable to mkstemp %s" +msgstr "Nepavyko sukurti %s" -#: apt-pkg/contrib/fileutl.cc:1938 -#, fuzzy, c-format -msgid "Problem unlinking the file %s" -msgstr "Klaida užveriant failą" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Nepavyko sužinoti debconf versijos. Ar įdiegtas debconf?" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Klaida sinchronizuojant failą" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "Paketo plėtinių sąrašas yra per ilgas" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Diegimas nutraukiamas." +#: 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 +#, c-format +msgid "Error processing directory %s" +msgstr "Klaida apdorojant aplanką %s" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "" +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Šaltinio plėtinys yra per ilgas" -#: apt-pkg/contrib/mmap.cc:111 -#, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Klaida įrašant antraštę į turinio failą" -#: apt-pkg/contrib/mmap.cc:119 +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "" +msgid "Error processing contents %s" +msgstr "Klaida apdorojant turinį %s" -#: apt-pkg/contrib/mmap.cc:146 -#, fuzzy -msgid "Unable to close mmap" -msgstr "Nepavyko atverti %s" +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Naudojimas: apt-ftparchive [parametrai] komanda\n" +"Komandos: dvejatainių paketų kelias [perrašomasfailas [keliopriešdėlis]]\n" +" sources aplankas [perrašomasfailas [kelippriešdėlis]]\n" +" contents kelias\n" +" release kelias\n" +" generate parametras [grupės]\n" +" clean parametras\n" +"\n" +"apt-ftparchive generuoja indeksų failus, skirtus Debian archyvams. Palaikomi " +"keli \n" +"generavimo stiliai, įskaitant nuo pilnai automatizuoto iki funkcinių " +"pakeitimų\n" +"skirtų dpkg-scanpackages ir dpkg-scansources\n" +"\n" +"apt-ftparchive sugeneruoja paketų failus iš .debs medžio. Paketo failas turi " +"visus\n" +"kontrolinius kiekvieno paketo laukus, o taip pat ir MD5 hešą bei failų " +"dydžius. Perrašomasis\n" +"failas palaikomas tam, kad būtų priverstinai nustatytos Pirmenybių bei " +"Sekcijų reikšmės.\n" +"\n" +"Panašiai apt-ftparchive sugeneruoja ir Išeities failus iš .dscs medžio.\n" +"--source-override nuostata gali būti naudojama nustatant išeities " +"perrašomąjį failą\n" +"\n" +"\"Paketų\" bei \"Išeičių\" komandos turėtų būti paleistos failų medžio " +"šaknyje. BinaryPath turėtų\n" +"nurodyti kelią į rekursinės paieškos pagrindą bei perrašytas failas turėtų " +"turėti perrašymo žymes.\n" +"Keliopriešdėlis tai yra prirašomas prie failo vardų laikų jei tokių yra. " +"Vartosenos pavyzdys\n" +"naudojant Debian archyvą:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Nuostatos:\n" +" -h Šis pagalbos tekstas\n" +" --md5 Valdyti MD5 generavimą\n" +" -s=? Šaltinio perrašomas failas\n" +" -q Tylėti\n" +" -d=? Pasirinkti papildomą kešo duomenų bazę\n" +" --no-delink Įjungti atjungiamąjį derinimo rėžimą\n" +" -c=? Perskaityti šį nuostatų failą\n" +" -o=? Nustatyti savarankišką konfigūracijos nuostatą" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -#, fuzzy -msgid "Unable to synchronize mmap" -msgstr "Nepavyko pakeisti į %s" +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Nėra atitikmenų" -#: apt-pkg/contrib/mmap.cc:290 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "" +msgid "Some files are missing in the package file group `%s'" +msgstr "Kai kurių failų nėra paketų grupėje „%s“" -#: apt-pkg/contrib/mmap.cc:322 -#, fuzzy -msgid "Failed to truncate file" -msgstr "Nepavyko patikrinti %s" +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Duomenų bazė pažeista, failas pervardintas į %s.old" -#: apt-pkg/contrib/mmap.cc:341 +#: ftparchive/cachedb.cc:83 #, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "Duomenų bazė yra sena, bandoma atnaujinti %s" + +#: ftparchive/cachedb.cc:94 +#, fuzzy msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" +"Duomenų bazės formatas yra netinkamas. Jei jūs atsinaujinote iš senesnės " +"versijos, prašome pašalinkite ir perkurkite duomenų bazę." -#: apt-pkg/contrib/mmap.cc:446 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +msgid "Unable to open DB file %s: %s" +msgstr "Nepavyko atverti DB failo %s: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Nepavyko nuskaityti nuorodos %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" msgstr "" -#: apt-pkg/contrib/mmap.cc:449 -msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" msgstr "" -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/writer.cc:91 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Klaida!" +msgid "W: Unable to read directory %s\n" +msgstr "Į: Nepavyko perskaityti aplanko %s\n" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/writer.cc:96 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Baigta" +msgid "W: Unable to stat %s\n" +msgstr "Į: Nepavyko patikrinti %s\n" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "K: " -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Baigta" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "Į: " -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "" +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "K: Klaidos failui " -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%lih %limin %lis" -msgstr "" +msgid "Failed to resolve %s" +msgstr "Nepavyko išspręsti %s" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 -#, c-format -msgid "%limin %lis" -msgstr "" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Judesys medyje nepavyko" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:219 #, c-format -msgid "%lis" -msgstr "" +msgid "Failed to open %s" +msgstr "Nepavyko atverti %s" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:278 #, c-format -msgid "Selection %s not found" +msgid " DeLink %s [%s]\n" msgstr "" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:286 #, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" +msgid "Failed to readlink %s" +msgstr "Nepavyko nuskaityti nuorodos %s" -#: 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" +#: ftparchive/writer.cc:290 +#, c-format +msgid "Failed to unlink %s" +msgstr "Nepavyko atsieti nuorodos %s" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:298 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "" +msgid "*** Failed to link %s to %s" +msgstr "*** Nepavyko susieti %s su %s" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" +#: ftparchive/writer.cc:308 +#, c-format +msgid " DeLink limit of %sB hit.\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:95 -#, fuzzy, c-format -msgid "Installing %s" -msgstr "Įdiegta %s" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Archyvas neturėjo paketo lauko" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Configuring %s" -msgstr "Konfigūruojamas %s" +msgid " %s has no override entry\n" +msgstr " %s neturi perrašymo įrašo\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Removing %s" -msgstr "Šalinamas %s" - -#: apt-pkg/deb/dpkgpm.cc:98 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "Visiškai pašalintas %s" +msgid " %s maintainer is %s not %s\n" +msgstr " %s prižiūrėtojas yra %s, o ne %s\n" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:706 #, c-format -msgid "Noting disappearance of %s" +msgid " %s has no source override entry\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:710 #, c-format -msgid "Running post-installation trigger %s" +msgid " %s has no binary override entry either\n" msgstr "" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 -#, c-format -msgid "Directory '%s' missing" -msgstr "Trūksta aplanko „%s“" - -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "Nepavyko atverti failo %s" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Nepavyko išskirti atminties" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing %s" -msgstr "Ruošiamas %s" +msgid "Unable to open %s" +msgstr "Nepavyko atverti %s" -#: apt-pkg/deb/dpkgpm.cc:993 -#, c-format -msgid "Unpacking %s" -msgstr "Išpakuojamas %s" +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing to configure %s" -msgstr "Ruošiamasi konfigūruoti %s" +msgid "Failed to read the override file %s" +msgstr "Nepavyko nuskaityti perrašymo failo %s" -#: apt-pkg/deb/dpkgpm.cc:1000 -#, c-format -msgid "Installed %s" -msgstr "Įdiegta %s" +#: ftparchive/override.cc:166 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #1" +msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1005 -#, c-format -msgid "Preparing for removal of %s" -msgstr "Ruošiamasi %s pašalinimui" +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2" -#: apt-pkg/deb/dpkgpm.cc:1007 -#, c-format -msgid "Removed %s" -msgstr "Pašalintas %s" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Ruošiamasi visiškai pašalinti %s" +msgid "Unknown compression algorithm '%s'" +msgstr "Nežinomas suspaudimo algoritmas „%s“" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:103 #, c-format -msgid "Completely removed %s" -msgstr "Visiškai pašalintas %s" - -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Nepavyko įrašyti į %s" +msgid "Compressed output %s needs a compression set" +msgstr "Suspaustai išvesčiai %s reikia suspaudimo rinkinio" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Nepavyko sukurti FILE*" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Vidinė klaida, nepavyko sukurti %s" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "Nepavyko Nusk/Įraš į subprocesą/failą" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Skaitymo klaida skaičiuojant MD5" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1707 +#: cmdline/apt-internal-solver.cc:49 +#, fuzzy msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n" +"\n" +"apt-extracttemplates tai įrankis skirtas konfigūracijų, bei šablonų " +"informacijos išskleidimui\n" +"iš debian paketų\n" +"\n" +"Parametrai:\n" +" -h Šis pagalbos tekstas\n" +" -t Nustatyti laikinąjį aplanką\n" +" -c=? Nuskaityti šį konfigūracijų failą\n" +" -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" -msgstr "" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Nežinomas paketo įrašas!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Naudojimas: apt-sortpkgs [parametrai] byla1 [byla2 ...]\n" +"\n" +"apt-sortpkgs - tai paprastas įrankis skirtas paketų rūšiavimui. -s nuostata " +"naudojama\n" +"norint nusakyti bylos tipą.\n" +"\n" +"Parametrai:\n" +" -h Šis pagalbos tekstas\n" +" -s Naudoti išeities kodo bylos rūšiavimą\n" +" -c=? Nuskaityti šią konfigūracijos bylą\n" +" -o=? Nurodyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/mr.po b/po/mr.po index 25134d605..991c09316 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -157,7 +157,7 @@ msgid " Version table:" msgstr "आवृत्ती कोष्टक:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -355,7 +355,7 @@ msgstr "डाऊनलोड डिरेक्टरी कुलूपबं msgid "Must specify at least one package to fetch source for" msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे" @@ -375,114 +375,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "%s मध्ये पुरेशी जागा नाही" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "%s उगम घ्या\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "काही अर्काईव्हज आणण्यास असमर्थ." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n" -#: cmdline/apt-get.cc:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "चाईल्ड प्रक्रिया अयशस्वी" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, 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:1290 +#: cmdline/apt-get.cc:1294 #, 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:1313 +#: cmdline/apt-get.cc:1317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1356 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -491,37 +491,37 @@ msgstr "" "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s " "डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1362 #, 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:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही." -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ " -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) ला जोडत आहे" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -662,7 +662,7 @@ msgstr "%s ही आधीच नविन आवृत्ती आहे.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s साठी थांबलो पण ते तेथे नव्हते" @@ -756,16 +756,16 @@ msgstr "%s मधील सीडी-रॉम अनमाऊंट करण msgid "Disk not found." msgstr "डिस्क सापडत नाही" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "फाईल सापडली नाही" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "स्टॅट करण्यास असमर्थ" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ" @@ -819,7 +819,7 @@ msgstr "सर्व्हरने %s सांगितले, '%s' लॉग msgid "TYPE failed, server said: %s" msgstr "सर्व्हरने %s सांगितले: टाईप असमर्थ:" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "वेळेअभावी संबंध जोडता येत नाही" @@ -841,7 +841,7 @@ msgstr "प्रतिसाधाने बफर भरुन गेले." msgid "Protocol corruption" msgstr "प्रोटोकॉल खराब झाले" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -902,7 +902,7 @@ msgstr "डेटा सॉकेट जोडणी वेळेअभावी msgid "Unable to accept connection" msgstr "जोडणी स्विकारण्यास असमर्थ" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "फाईल हॅश करण्यात त्रुटी" @@ -911,7 +911,7 @@ msgstr "फाईल हॅश करण्यात त्रुटी" msgid "Unable to fetch file, server said '%s'" msgstr "सर्व्हरने %s सांगितले, फाईल मिळवण्यास असमर्थ" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "डेटा सॉकेट वेळेअभावी तुटले" @@ -961,7 +961,7 @@ msgstr "%s:%s (%s) ला जोडू शकत नाही" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "%s ला जोडत आहे" @@ -1100,42 +1100,17 @@ msgstr "जोडणी अयशस्वी" msgid "Internal error" msgstr "अंतर्गत त्रुटी" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "दाबा" - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "मिळवा:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "आय.जी.एन." - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "दोष इ.आर.आर." - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "%s (%sB/s) मध्ये %sB मिळविला\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr "[काम करत आहे]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"माध्यम बदल: कृपया नाव घातलेली सीडी घाला\n" -"%s'\n" -"'%s' ड्राईव्ह मध्ये व एंटर कळ दाबा\n" +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:93 msgid "Correcting dependencies..." @@ -1165,35 +1140,210 @@ msgstr "हे बरोबर करण्यासाठी तुम्हा msgid "Unmet dependencies. Try using -f." msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा " -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! " +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr "[संस्थापित केले]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "प्रमाणीकरणाची धोक्याची सूचना दुर्लक्षित करा.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr "[संस्थापित केले]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "काही पॅकेजेसचे प्रमाणिकरण होऊ शकत नाही" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 +#: apt-private/private-output.cc:272 #, fuzzy -msgid "Install these packages without verification?" -msgstr "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]?" +msgid "[installed,automatic]" +msgstr "[संस्थापित केले]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr "[संस्थापित केले]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "%s %s आणणे असफल\n" +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:35 +#, 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:97 +#, 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:101 +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:82 msgid "Internal error, InstallPackages was called with broken packages!" @@ -1244,7 +1394,11 @@ msgstr "या क्रियेनंतर, %sB डिस्क जागा msgid "You don't have enough free space in %s." msgstr "%s मध्ये तुमच्याकडे पुरेशी जागा नाही." -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 msgid "Trivial Only specified but this is not a trivial operation." msgstr "क्षुल्लक फक्त निर्देशित केले आहे पण हे क्षुल्लक कृति/ऑपरेशन नाही." @@ -1451,929 +1605,684 @@ msgstr "%s पॅकेज संस्थापित केलेले ना msgid "Package '%s' is not installed, so not removed\n" msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n" -#: apt-private/private-list.cc:129 -msgid "Listing" -msgstr "" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! " -#: apt-private/private-list.cc:159 +#: apt-private/private-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "प्रमाणीकरणाची धोक्याची सूचना दुर्लक्षित करा.\n" + +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "काही पॅकेजेसचे प्रमाणिकरण होऊ शकत नाही" + +#: apt-private/private-download.cc:50 +#, fuzzy +msgid "Install these packages without verification?" +msgstr "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]?" + +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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] "" +msgid "Failed to fetch %s %s\n" +msgstr "%s %s आणणे असफल\n" -#: 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!" +#: apt-private/private-sources.cc:58 +#, fuzzy, c-format +msgid "Failed to parse %s. Edit again? " +msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ " + +#: apt-private/private-sources.cc:70 +#, c-format +msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 -#: apt-private/private-show.cc:89 -msgid "unknown" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" -#: apt-private/private-output.cc:265 -#, fuzzy, c-format -msgid "[installed,upgradable to: %s]" -msgstr "[संस्थापित केले]" +#: apt-private/private-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "पुढिल आवृत्तीची गणती करीत आहे..." -#: apt-private/private-output.cc:268 -#, fuzzy -msgid "[installed,local]" -msgstr "[संस्थापित केले]" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "झाले" -#: apt-private/private-output.cc:270 -msgid "[installed,auto-removable]" -msgstr "" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "दाबा" -#: apt-private/private-output.cc:272 -#, fuzzy -msgid "[installed,automatic]" -msgstr "[संस्थापित केले]" +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "मिळवा:" -#: apt-private/private-output.cc:274 -#, fuzzy -msgid "[installed]" -msgstr "[संस्थापित केले]" +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "आय.जी.एन." -#: apt-private/private-output.cc:277 +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "दोष इ.आर.आर." + +#: apt-private/acqprogress.cc:146 #, c-format -msgid "[upgradable from: %s]" -msgstr "" +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "%s (%sB/s) मध्ये %sB मिळविला\n" -#: apt-private/private-output.cc:281 -msgid "[residual-config]" -msgstr "" +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr "[काम करत आहे]" -#: apt-private/private-output.cc:455 +#: apt-private/acqprogress.cc:297 #, c-format -msgid "but %s is installed" -msgstr "पण %s संस्थापित झाले" +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"माध्यम बदल: कृपया नाव घातलेली सीडी घाला\n" +"%s'\n" +"'%s' ड्राईव्ह मध्ये व एंटर कळ दाबा\n" -#: apt-private/private-output.cc:457 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "but %s is to be installed" -msgstr "पण %s संस्थापित करायचे आहे" +msgid "Unable to read %s" +msgstr "%s वाचण्यास असमर्थ" -#: apt-private/private-output.cc:464 -msgid "but it is not installable" -msgstr "पण ते संस्थापित करण्याजोगे नाही" +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 +#, c-format +msgid "Unable to change to %s" +msgstr "%s मध्ये बदलण्यास असमर्थ" -#: apt-private/private-output.cc:466 -msgid "but it is a virtual package" -msgstr "पण ते आभासी पॅकेज आहे" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" -#: apt-private/private-output.cc:469 -msgid "but it is not installed" -msgstr "पण ते संस्थापित केले नाही" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 +#, fuzzy, c-format +msgid "Can not read mirror file '%s'" +msgstr "%s फाईल उघडता येत नाही" -#: apt-private/private-output.cc:469 -msgid "but it is not going to be installed" -msgstr "पण ते संस्थापित होणार नाही" +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "%s फाईल उघडता येत नाही" -#: apt-private/private-output.cc:474 -msgid " or" -msgstr "किंवा" +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" +msgstr "" -#: apt-private/private-output.cc:488 apt-private/private-output.cc:500 -msgid "The following packages have unmet dependencies:" -msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "उपक्रियेचा आयपीसी वाहिनी तयार करण्यास असमर्थ" -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "खालील नविन पॅकेजेस संस्थापित होतील:" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "जोडणी अकाली बंद झाली" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "चूकीचे मूलभूत निश्चितीकरण!" -#: apt-private/private-output.cc:571 -msgid "The following packages have been kept back:" -msgstr "खालील पॅकेजेस परत ठेवली गेली:" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "पुढे जाण्यासाठी एंटर दाबा." -#: apt-private/private-output.cc:592 -msgid "The following packages will be upgraded:" -msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:" +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "पुर्वी डाऊनलोड केलेल्या .deb संचयिका आपल्याला खोडून टाकायच्या आहेत का?" -#: apt-private/private-output.cc:613 -msgid "The following packages will be DOWNGRADED:" -msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:" +#: dselect/install:102 +#, fuzzy +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "काही त्रुटी ह्या उघडत असताना घडल्या.मी संरचित करणार आहे" -#: apt-private/private-output.cc:633 -msgid "The following held packages will be changed:" -msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:" +#: dselect/install:103 +#, fuzzy +msgid "will be configured. This may result in duplicate errors" +msgstr "पॅकेजेस जी संस्थापित झाली आहे.याचा निकाल दुप्पट त्रुटी म्हणून होऊ शकतो" -#: apt-private/private-output.cc:688 -#, c-format -msgid "%s (due to %s) " -msgstr "%s (च्या मुळे %s)" +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "किंवा डिपेंडन्सीज नसल्यामुळे त्रुटी झाल्या. हे ठीक आहे, फक्त त्रुटी" -#: apt-private/private-output.cc:696 +#: dselect/install:105 msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" -"धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n" -"तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!" +"ह्यावर संदेश खूप महत्त्वाचे आहेत.कृपया त्यांना नीट करा व संस्थापित करा पुन्हा चालवा/सुरू करा" -#: apt-private/private-output.cc:727 -#, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले," +#: dselect/update:30 +msgid "Merging available information" +msgstr "उपलब्ध माहितीचे एकत्रीकरण करत आहे" -#: apt-private/private-output.cc:731 -#, c-format -msgid "%lu reinstalled, " -msgstr "%lu पुनर्संस्थापित केले," +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "सुटा करण्यासाठी बोलावलेला/आणलेला सांधा(ड्रापनोड)अजुनही जुळलेलाच सांधा(लिंकनोड) आहे" -#: apt-private/private-output.cc:733 -#, c-format -msgid "%lu downgraded, " -msgstr "%lu मागील आवृत्तीकृत केले," +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "हॅश एलिमेंट शोधूने काढण्यास असमर्थ!" -#: apt-private/private-output.cc:735 +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "नेमून दिलेल्यात फेरबदल करण्यास अयशस्वी" + +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "AddDiversion/ऍड डायव्हर्जन मध्ये आंतरिक दोष" + +#: apt-inst/filelist.cc:477 #, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "डायव्हर्जन पुनः लिहिण्यास प्रयत्न करत आहे,%s -> %s and %s/%s" -#: apt-private/private-output.cc:739 +#: apt-inst/filelist.cc:506 #, 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 "होय" +msgid "Double add of diversion %s -> %s" +msgstr "%s -> %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-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "%s/%s संचिरित संचिकाची दुसरी प्रत/नक्कल" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "Regex compilation error - %s" -msgstr "रिजेक्स कंपायलेशन त्रुटी -%s " +msgid "The path %s is too long" +msgstr "मार्ग %s हा खूप लांब आहे" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-inst/extract.cc:132 +#, c-format +msgid "Unpacking %s more than once" +msgstr "%s एकापेक्षा जास्त वेळा उघडत आहे" -#: apt-private/private-show.cc:156 +#: apt-inst/extract.cc:142 #, 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] "" +msgid "The directory %s is diverted" +msgstr "%s संचिका डायव्हर्ट केली आहे/वळवली आहे" -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" -msgstr "" +#: apt-inst/extract.cc:152 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "डायव्हर्जन इच्छित %s/%s मध्ये लिहिण्याचा पॅकेज प्रयत्न करत आहे" -#: apt-private/private-sources.cc:58 -#, fuzzy, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ " +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "डायव्हर्जन मार्ग हा खूप लांब आहे" -#: apt-private/private-sources.cc:70 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "" +msgid "Failed to stat %s" +msgstr "%s स्टेट करण्यास असमर्थ" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही." +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ " -#: apt-private/private-update.cc:90 +#: apt-inst/extract.cc:249 #, 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] "" +msgid "The directory %s is being replaced by a non-directory" +msgstr "%s संचिका ही संचिका नसलेल्या संचिकेबरोबर बदललेली आहे" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." -msgstr "" +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "नोडचे त्याच्या हॅश बकेटमध्ये/बादलीत स्थान निश्चित करण्यास असमर्थ" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "पुढिल आवृत्तीची गणती करीत आहे..." +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "मार्ग खूप लांब आहे" -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "झाले" +#: apt-inst/extract.cc:421 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "%s च्या आवृत्तीशी पुनः लिहिलेल्या पॅकेज जुळत नाही" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: apt-inst/extract.cc:438 #, c-format -msgid "Unable to read %s" -msgstr "%s वाचण्यास असमर्थ" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "File %s/%s, %s पॅकेज मधल्या एका वर पुनर्लिखित होते" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/extract.cc:498 #, c-format -msgid "Unable to change to %s" -msgstr "%s मध्ये बदलण्यास असमर्थ" +msgid "Unable to stat %s" +msgstr "%s स्टॅट करण्यास असमर्थ" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "No mirror file '%s' found " -msgstr "" +msgid "Failed to write file %s" +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 -msgid "Can not read mirror file '%s'" -msgstr "%s फाईल उघडता येत नाही" +#: apt-inst/dirstream.cc:105 +#, c-format +msgid "Failed to close file %s" +msgstr "%s फाईल बंद करण्यास असमर्थ" -#: methods/mirror.cc:315 -#, fuzzy, c-format -msgid "No entry found in mirror file '%s'" -msgstr "%s फाईल उघडता येत नाही" +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "हा वैध DEB अर्काईव्ह नाही,'%s' मेंबर उपलब्ध नाही" -#: methods/mirror.cc:445 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "[Mirror: %s]" -msgstr "" +msgid "Internal error, could not locate member %s" +msgstr "अंतर्गत त्रुटी,%s मेंबर शोधू शकत नाही" -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "उपक्रियेचा आयपीसी वाहिनी तयार करण्यास असमर्थ" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "अनपार्सेबल नियंत्रण फाईल" -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" -msgstr "जोडणी अकाली बंद झाली" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "अयोग्य अर्काईव्ह ओळख सही" -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "चूकीचे मूलभूत निश्चितीकरण!" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "अर्काईव्ह मेंबर शीर्षक वाचण्यास त्रुटी" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "पुढे जाण्यासाठी एंटर दाबा." +#: apt-inst/contrib/arfile.cc:96 +#, fuzzy, c-format +msgid "Invalid archive member header %s" +msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक" -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "पुर्वी डाऊनलोड केलेल्या .deb संचयिका आपल्याला खोडून टाकायच्या आहेत का?" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक" -#: dselect/install:102 -#, fuzzy -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "काही त्रुटी ह्या उघडत असताना घडल्या.मी संरचित करणार आहे" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "अर्काईव्ह खूप छोटे आहे" -#: dselect/install:103 -#, fuzzy -msgid "will be configured. This may result in duplicate errors" -msgstr "पॅकेजेस जी संस्थापित झाली आहे.याचा निकाल दुप्पट त्रुटी म्हणून होऊ शकतो" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "अर्काईव्ह शीर्षके वाचणे असफल" -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "किंवा डिपेंडन्सीज नसल्यामुळे त्रुटी झाल्या. हे ठीक आहे, फक्त त्रुटी" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "पाईप तयार करण्यास असमर्थ" -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" -msgstr "" -"ह्यावर संदेश खूप महत्त्वाचे आहेत.कृपया त्यांना नीट करा व संस्थापित करा पुन्हा चालवा/सुरू करा" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "exec gzip करण्यास असमर्थ" -#: dselect/update:30 -msgid "Merging available information" -msgstr "उपलब्ध माहितीचे एकत्रीकरण करत आहे" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "बिघडलेली अर्काईव्हज" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n" -" \n" -"ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n" -"डेबियन पॅकेजेस मधून \n" -"\n" -"पर्याय : \n" -" -h हा साह्याकारी मजकूर \n" -" -t टेंप डिर निर्धारित करा \n" -" -c=? ही संरचना संचिका वाचा \n" -" -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "टार(टेपअर्काईव्ह) चेकसम चुकला, बिघडलेली अर्काईव्ह" -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "%s स्टॅट करण्यास असमर्थ" +#: apt-inst/contrib/extracttar.cc:308 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "अपरिचित TAR शीर्षक प्रकार %u, मेंबर %s" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Unable to write to %s" -msgstr "%s मध्ये लिहिण्यास असमर्थ " +msgid "Progress: [%3i%%]" +msgstr "" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "debconf आवृत्ती मिळू शकत नाही,debconf अधिष्ठापित झाली काय?" - -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "पॅकेजेसची विस्तारित यादी खूप मोठी आहे" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +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 +#: apt-pkg/init.cc:146 #, c-format -msgid "Error processing directory %s" -msgstr "त्रुटी प्रक्रिया मार्गदर्शिका%s " - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "उगमस्थानाची विस्तारित यादी खूप मोठी आहे" +msgid "Packaging system '%s' is not supported" +msgstr "'%s' पॅकेजींग प्रणाली सहाय्यकारी नाही" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "शीर्षक संचिकेमधून मजकूर संचिकेत लिहिण्यात त्रुटी" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "योग्य असा पॅकेजिंग प्रणाली प्रकार निश्चित करण्यास असमर्थ " -#: ftparchive/apt-ftparchive.cc:431 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Error processing contents %s" -msgstr "त्रुटी प्रक्रिया मजकूर %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"वापर: apt-ftparchive [options] command\n" -"आज्ञा: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive डेबियन फाईलसंचासाठी अनुक्रम संचिका निर्माण करतो.तो\n" -" dpkg-scanpackages व dpkg-scansources करिता निर्मितीच्या संपूर्ण\n" -" स्वंयंचलित ते कार्यकारी बदलावांपर्यंत अनेक शैलींना पाठबळ देतो\n" -"\n" -"apt-ftparchive हा .debsच्या तरुरचनेपासून पॅकेज संचिका निर्माण करतो \n" -"पॅकेज संचिकेमध्ये प्रत्येक पॅकेज तसेच MD5 हॅश व संचिकाआकारामधील सर्व \n" -" नियंत्रक क्षेत्रांची माहिती असते.अग्रक्रम आणि विभाग यांच्या मूल्यांचा प्रभाव \n" -"वाढविण्यासाठी ओव्हरराईड संचिकेला पुष्टि दिलेली असते \n" -"\n" -"तसेच apt-ftparchive हा .dscs च्या तरूरचनेपासून उगमस्थान संचिका निर्माण करतो \n" -"--source-override पर्यायाचा उपयोग एखाद्या src ओव्हरराईड संचिका नेमकेपणाने दाखविण्यास " -"होतो \n" -"\n" -" 'packages' आणि 'sources' आज्ञावली तरूरचनेच्या मुळाशी दिल्या जाव्यात \n" -"द्वयंक मार्गाचा निर्देश पुनरावर्ती शोधाच्या पाऱ्याकडे केलेला असावा आणि \n" -" ओव्हरराईड संचिकेमध्ये ओव्हरराईड संकेत (फ्लॅग्ज) असावेत आणि \n" -" संचिकानामक्षेत्रे असल्यास Pathprefix त्यांना जोडलेले असावेत.\n" -"डेबियन archiveमधील नमुन्यादाखल उपयोग : \n" -"apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"पर्याय : \n" -" -h हा साह्याकारी मजकूर \n" -"--md5 MD5 ची निर्मिती नियंत्रित करा \n" -" -s= उगमस्थान ओव्हरराईड संचिका \n" -" -q शांत \n" -" -d= पर्यायी दृतिकादायी डेटाबेस निवडा \n" -" --no-delink दुवा तोडणारा डिबग मार्ग समर्थ करा \n" -" ---contents माहिती संचिकेची निर्मिती नियंत्रित करा \n" -" -c=? ही संरचना संचिका वाचा \n" -" -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "निवडक भाग जुळत नाही" +msgid "Wrote %i records.\n" +msgstr "%i माहितीसंच लिहिले.\n" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "`%s' पॅकेज संचिका समुहातील काही संचिका गहाळ आहेत" +msgid "Wrote %i records with %i missing files.\n" +msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच लिहिले.\n" -#: ftparchive/cachedb.cc:65 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB खराब झाली होती, संचिका %s.old म्हणून पुनर्नामांकित केली" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n" -#: ftparchive/cachedb.cc:83 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "DB जुने आहे,%s पुढच्या आवृतीसाठी प्रयत्न करत आहे" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n" -#: ftparchive/cachedb.cc:94 -#, fuzzy -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +#: apt-pkg/indexcopy.cc:515 +#, c-format +msgid "Can't find authentication record for: %s" msgstr "" -"DB स्वरुप वैध नाही. जर तुम्ही apt च्या जुन्या आवृत्तीपासून पुढिल आवृत्तीकृत करत असाल तर, " -"कृपया माहितीसंच काढून टाका आणि पुनर्निर्मित करा" -#: ftparchive/cachedb.cc:99 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "%s: %s DB संचिका उघडण्यास असमर्थ" +#: apt-pkg/indexcopy.cc:521 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "हॅश बेरीज जुळत नाही" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "Failed to stat %s" -msgstr "%s स्टेट करण्यास असमर्थ" - -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "%s वाचणारा दुवा असमर्थ" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "अर्काईव्ह मध्ये नियंत्रण माहिती संच नाही" +msgid "The method driver %s could not be found." +msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. " -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "संकेतक घेण्यास असमर्थ" +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n" -#: ftparchive/writer.cc:91 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "धोक्याची सूचना:%s संचयिका वाचण्यास असमर्थ \n" +msgid "Method %s did not start correctly" +msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही" -#: ftparchive/writer.cc:96 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "धो.सू.:%s स्टेट करण्यास असमर्थ\n" +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा." -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E:" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "पॅकेजच्या याद्या किंवा संचिकेची स्थिती स्पष्ट होऊ शकत नाही किंवा ती उघडू शकत नाही." -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "धो.सू.:" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "तुम्ही ह्या समस्यांचे निवारण करण्यासाठी apt-get update प्रोग्राम चालू करु शकता" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "ई: संचिकेला लागू होणाऱ्या चुका" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "उगमांच्या याद्या वाचता येणार नाहीत." -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 -#, c-format -msgid "Failed to resolve %s" -msgstr "%s सोडवण्यास असमर्थ" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "पॅकेज अस्थाई स्मृतिकोष" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "ट्री चालणे असमर्थ" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे" -#: ftparchive/writer.cc:219 -#, c-format -msgid "Failed to open %s" -msgstr "%s उघडण्यास असमर्थ" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल ही विजोड आवृत्ती आहे" -#: ftparchive/writer.cc:278 -#, c-format -msgid " DeLink %s [%s]\n" -msgstr "%s [%s] डी दुवा\n" +#: apt-pkg/pkgcache.cc:169 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे" -#: ftparchive/writer.cc:286 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Failed to readlink %s" -msgstr "%s वाचणारा दुवा असमर्थ" +msgid "This APT does not support the versioning system '%s'" +msgstr "'%s' आवृत्तीकरण प्रणालीला हे APT तांत्रिक मदत देऊ शकत नाही" -#: ftparchive/writer.cc:290 -#, c-format -msgid "Failed to unlink %s" -msgstr "%s दुवा काढण्यास असमर्थ" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "पॅकेज अस्थाई स्मृतीकोष वेगळ्या वास्तुविद्ये साठी बनवला गेला" -#: ftparchive/writer.cc:298 -#, c-format -msgid "*** Failed to link %s to %s" -msgstr "%s चा %s दुवा साधण्यास असमर्थ" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "अवलंबित" -#: ftparchive/writer.cc:308 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr "%sB हीट ची डिलींक मर्यादा\n" - -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "अर्काईव्ह ला पॅकेज जागा नाही" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "पूर्व अवलंबित" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "सुचवणे" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "शिफारस" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "परस्परविरोध" -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "परत त्याठिकाणी आणा" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc-स्मरणस्थळ शोधण्यास असमर्थ" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "अप्रचलित" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "%s उघडण्यास असमर्थ" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "तोडले" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "%s दुर्लक्षित संचिका वाचण्यास असमर्थ" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "अत्यावश्यक" -#: ftparchive/override.cc:166 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "आवश्यक" -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #2" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "मानक" -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #3" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "एच्छिक" -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "माहित नसलेली/ले संक्षेप पद्धती/अलगोरिथम '%s'" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "अधिक" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "%s संकलित आऊटपुट/निर्गत साठी संक्षेप संचाची गरज" +msgid "Index file type '%s' is not supported" +msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "संचिका * तयार करण्यास असमर्थ" +#: apt-pkg/sourcelist.cc:127 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "नविन प्रक्रिया(प्रोसेस) निर्माण करण्यास असमर्थ" +#: apt-pkg/sourcelist.cc:170 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "चॉईल्ड(प्रोसेस)ला संकलित करा" +#: apt-pkg/sourcelist.cc:173 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा" -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "अंतर्गत त्रुटी, %s तयार करण्यास असमर्थ" +#: apt-pkg/sourcelist.cc:184 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "IO ची उपक्रिया/संचिका असमर्थ " +#: apt-pkg/sourcelist.cc:190 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "MD5 कामप्युटींग करतांना वाचण्यासाठी असमर्थ" +#: 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 वाईट/व्यंग रेषा" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Problem unlinking %s" -msgstr "%s दुवा मोकळा/सुटा करण्यास अडचण" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "स्त्रोत सुची %2$s (यूआरआय) मध्ये %1$lu वाईट/व्यंग रेषा" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Failed to rename %s to %s" -msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ " - -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n" -" \n" -"ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n" -"डेबियन पॅकेजेस मधून \n" -"\n" -"पर्याय : \n" -" -h हा साह्याकारी मजकूर \n" -" -t टेंप डिर निर्धारित करा \n" -" -c=? ही संरचना संचिका वाचा \n" -" -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "अनोळखी पॅकेज माहिती संच!" - -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"वापर:apt-sortpkgs [पर्याय] फाईल१[फाईल २...]\n" -"\n" -" apt-sortpkgs हे पॅकेज फाईल्सचं वर्गीकरण करणारी एक साधी आज्ञावली आहे. -s पर्याय हा " -"फाईल\n" -"कुठल्या प्रकारची आहे हे दाखवण्यासाठी वापरतात.\n" -"\n" -"पर्याय\n" -" -h हा मदत मजकूर\n" -" -s उगमस्थान फाईल वापरा\n" -" -c=? ही संरचना फाईल वाचा\n" -" -o=?- अनियंत्रित संरचना पर्याय निश्चित करा,eg -o dir::cache=/tmp\n" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "स्त्रोत सुची %2$s (डिआयएसटी) मध्ये %1$lu वाईट/व्यंग रेषा" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Failed to write file %s" -msgstr "%s फाईल मध्ये लिहिण्यास असमर्थ" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "स्त्रोत सुची %2$s (यूआरआय पार्स) मध्ये %1$lu वाईट/व्यंग रेषा" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "Failed to close file %s" -msgstr "%s फाईल बंद करण्यास असमर्थ" +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "स्त्रोत सुची %2$s (absolute dist) मध्ये %1$lu वाईट/व्यंग रेषा" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "The path %s is too long" -msgstr "मार्ग %s हा खूप लांब आहे" +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "स्त्रोत सुची %2$s (डीआयएसटी पार्स) मध्ये %1$lu वाईट/व्यंग रेषा" -#: apt-inst/extract.cc:132 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "Unpacking %s more than once" -msgstr "%s एकापेक्षा जास्त वेळा उघडत आहे" +msgid "Opening %s" +msgstr "%s उघडत आहे" -#: apt-inst/extract.cc:142 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "The directory %s is diverted" -msgstr "%s संचिका डायव्हर्ट केली आहे/वळवली आहे" +msgid "Line %u too long in source list %s." +msgstr "%2$s स्त्रोत सुचीमध्ये ओळ %1$u खूप लांब आहे." -#: apt-inst/extract.cc:152 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "डायव्हर्जन इच्छित %s/%s मध्ये लिहिण्याचा पॅकेज प्रयत्न करत आहे" - -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "डायव्हर्जन मार्ग हा खूप लांब आहे" +msgid "Malformed line %u in source list %s (type)" +msgstr "स्त्रोत सुची %2$s (प्रकार) मध्ये %1$u वाईट/व्यंग रेषा" -#: apt-inst/extract.cc:249 +#: apt-pkg/sourcelist.cc:375 #, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "%s संचिका ही संचिका नसलेल्या संचिकेबरोबर बदललेली आहे" +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "नोडचे त्याच्या हॅश बकेटमध्ये/बादलीत स्थान निश्चित करण्यास असमर्थ" - -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "मार्ग खूप लांब आहे" +#: 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-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "%s च्या आवृत्तीशी पुनः लिहिलेल्या पॅकेज जुळत नाही" +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही" -#: apt-inst/extract.cc:438 +#: apt-pkg/clean.cc:64 #, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "File %s/%s, %s पॅकेज मधल्या एका वर पुनर्लिखित होते" +msgid "Unable to stat %s." +msgstr "%s स्टॅट करण्यात असमर्थ. " -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "%s स्टॅट करण्यास असमर्थ" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "अस्थायी स्मृतिकोष मध्ये विसंगत आवृतीकरण प्रणाली आहे" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "हॅश एलिमेंट शोधूने काढण्यास असमर्थ!" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "" +"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही पॅकेज नांवांच्या संख्येची मर्यादा ओलांडली " +"आहे." -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "नेमून दिलेल्यात फेरबदल करण्यास अयशस्वी" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "" +"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही आवृत्त्या संख्येची मर्यादा ओलांडली आहे." -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "AddDiversion/ऍड डायव्हर्जन मध्ये आंतरिक दोष" +#: apt-pkg/pkgcachegen.cc:263 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "अरेवा!, तुम्ही तर ह्या ऍप्टच्या कार्यक्षमतेपेक्षाही विवरण संख्येची मर्यादा ओलांडली आहे." -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "डायव्हर्जन पुनः लिहिण्यास प्रयत्न करत आहे,%s -> %s and %s/%s" +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "" +"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा " +"ओलांडली आहे." -#: apt-inst/filelist.cc:506 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "%s -> %s डायव्हर्जन दुप्पट मिळवा" +msgid "Package %s %s was not found while processing file dependencies" +msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही " -#: apt-inst/filelist.cc:549 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "%s/%s संचिरित संचिकाची दुसरी प्रत/नक्कल" - -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "अयोग्य अर्काईव्ह ओळख सही" - -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "अर्काईव्ह मेंबर शीर्षक वाचण्यास त्रुटी" - -#: apt-inst/contrib/arfile.cc:96 -#, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक" - -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक" - -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "अर्काईव्ह खूप छोटे आहे" - -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "अर्काईव्ह शीर्षके वाचणे असफल" - -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "पाईप तयार करण्यास असमर्थ" - -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "exec gzip करण्यास असमर्थ" - -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "बिघडलेली अर्काईव्हज" - -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "टार(टेपअर्काईव्ह) चेकसम चुकला, बिघडलेली अर्काईव्ह" +msgid "Couldn't stat source package list %s" +msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही" -#: apt-inst/contrib/extracttar.cc:308 -#, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "अपरिचित TAR शीर्षक प्रकार %u, मेंबर %s" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "पॅकेज याद्या वाचत आहोत" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 -#, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "हा वैध DEB अर्काईव्ह नाही,'%s' मेंबर उपलब्ध नाही" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे" -#: apt-inst/deb/debfile.cc:132 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "अंतर्गत त्रुटी,%s मेंबर शोधू शकत नाही" - -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "अनपार्सेबल नियंत्रण फाईल" +msgid "Unable to write to %s" +msgstr "%s मध्ये लिहिण्यास असमर्थ " -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, fuzzy, c-format -msgid "List directory %spartial is missing." -msgstr "संचयिका यादीत %s पार्शल हरवले आहे." +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे" -#: apt-pkg/acquire.cc:91 -#, fuzzy, c-format -msgid "Archives directory %spartial is missing." -msgstr "ऑर्काइव्ह संचयिका %spartial गायब आहे." +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "" -#: apt-pkg/acquire.cc:99 -#, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "%li ची %li(%s राहिलेले) संचिका पुन:प्राप्त करीत आहे" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "%li ची %li संचिका पुन:प्राप्त करीत आहे" +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2393,35 +2302,35 @@ msgstr "आकार जुळतनाही" msgid "Invalid file format" msgstr "%s अवैध क्रिया" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, 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:1589 +#: apt-pkg/acquire-item.cc:1656 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/acquire-item.cc:1631 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2429,12 +2338,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2443,12 +2352,12 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) " -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2456,113 +2365,94 @@ msgstr "" "पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/" "ठिकाण %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. " +msgid "Vendor block %s contains no fingerprint" +msgstr "विक्रेता गट %s मध्ये बोटाचे ठसे नाहीत" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n" +msgid "List directory %spartial is missing." +msgstr "संचयिका यादीत %s पार्शल हरवले आहे." -#: apt-pkg/acquire-worker.cc:169 -#, c-format -msgid "Method %s did not start correctly" -msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही" +#: apt-pkg/acquire.cc:91 +#, fuzzy, c-format +msgid "Archives directory %spartial is missing." +msgstr "ऑर्काइव्ह संचयिका %spartial गायब आहे." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 +#, fuzzy, c-format +msgid "Unable to lock directory %s" +msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ" + +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा." +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "%li ची %li(%s राहिलेले) संचिका पुन:प्राप्त करीत आहे" -#: apt-pkg/algorithms.cc:265 +#: apt-pkg/acquire.cc:904 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"%s पॅकेज पुनः:अधिष्ठापित करण्याची गरज आहे, परंतु मला त्यासाठी ऑर्काइव्ह सापडू शकले नाही." +msgid "Retrieving file %li of %li" +msgstr "%li ची %li संचिका पुन:प्राप्त करीत आहे" -#: apt-pkg/algorithms.cc:1086 +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "तुम्ही तुमच्या उगमस्थान यादीत URI घाला" + +#: apt-pkg/policy.cc:83 +#, c-format msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -"दोष,पॅकेज समस्या निवारक::निवारण करतांना अडथळा निर्माण झाला, ह्याचे कारण स्थगित " -"पॅकेजेस असू शकते." -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे." +#: apt-pkg/policy.cc:422 +#, fuzzy, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "पसंतीच्या संचिकेत अवैध माहितीसंच, पॅकेजला शीर्षक नाही " -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." -msgstr "पॅकेजच्या याद्या किंवा संचिकेची स्थिती स्पष्ट होऊ शकत नाही किंवा ती उघडू शकत नाही." - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "तुम्ही ह्या समस्यांचे निवारण करण्यासाठी apt-get update प्रोग्राम चालू करु शकता" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "उगमांच्या याद्या वाचता येणार नाहीत." - -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही" - -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही" - -#: apt-pkg/cacheset.cc:603 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "%s कार्य सापडू शकले नाही" - -#: apt-pkg/cacheset.cc:609 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "%s पॅकेज सापडू शकले नाही" - -#: apt-pkg/cacheset.cc:615 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "%s पॅकेज सापडू शकले नाही" +msgid "Did not understand pin type %s" +msgstr "%s पिनचा प्रकार समजलेला नाही" -#: apt-pkg/cacheset.cc:626 -#, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "पिन करिता प्राधान्य/अग्रक्रम (किंवा शून्य)निर्देशीत केलेला नाही" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" +"ह्याचे आधिष्ठापन सुरु करण्यासाठी अत्यावश्यक तात्पुरते काढुन टाकण्याची गरज आहे%s पॅकेज " +"गुंतागुंतीमुळे/Pre-Depends पूर्व अवलंबित आवर्तन.हे नेहमीच वाईट असते, पण जर तुम्हाला ते खरोखर " +"करावयाचे असेल तर,APT::Force-LoopBreak पर्याय कार्यान्वित करा." -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +#: 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:497 apt-pkg/sourcelist.cc:347 -#, c-format -msgid "Line %u too long in source list %s." -msgstr "%2$s स्त्रोत सुचीमध्ये ओळ %1$u खूप लांब आहे." +"काही अनुक्रमणिका संचयिका डाऊनलोड करण्यास असमर्थ,त्या दुर्लक्षित झाल्या, किंवा " +"त्याऐवजी जुन्या वापरल्या गेल्या." #: apt-pkg/cdrom.cc:571 msgid "Unmounting CD-ROM...\n" @@ -2639,10 +2529,24 @@ msgstr "नविन स्त्रोत सूची लिहित आह msgid "Source list entries for this disc are:\n" msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "%s स्टॅट करण्यात असमर्थ. " +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"%s पॅकेज पुनः:अधिष्ठापित करण्याची गरज आहे, परंतु मला त्यासाठी ऑर्काइव्ह सापडू शकले नाही." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"दोष,पॅकेज समस्या निवारक::निवारण करतांना अडथळा निर्माण झाला, ह्याचे कारण स्थगित " +"पॅकेजेस असू शकते." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे." #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2670,55 +2574,67 @@ msgstr "%s StateFile उघडणे असफल" msgid "Failed to write temporary StateFile %s" msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "%s कार्य सापडू शकले नाही" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 -#, c-format -msgid "Wrote %i records.\n" -msgstr "%i माहितीसंच लिहिले.\n" +#: apt-pkg/cacheset.cc:609 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "%s पॅकेज सापडू शकले नाही" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "%s पॅकेज सापडू शकले नाही" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच लिहिले.\n" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "हॅश बेरीज जुळत नाही" +#: apt-pkg/cacheset.cc:663 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" #: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format @@ -2745,320 +2661,219 @@ msgstr "%s डायव्हर्जन फाईलमध्ये अवै msgid "Invalid 'Date' entry in Release file %s" msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "'%s' पॅकेजींग प्रणाली सहाय्यकारी नाही" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "योग्य असा पॅकेजिंग प्रणाली प्रकार निश्चित करण्यास असमर्थ " +msgid "%lid %lih %limin %lis" +msgstr "" -#: apt-pkg/install-progress.cc:57 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Progress: [%3i%%]" +msgid "%lih %limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 +#, c-format +msgid "%limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "%lis" msgstr "" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "%s फाईल उघडता येत नाही" +#: apt-pkg/contrib/strutl.cc:1258 +#, c-format +msgid "Selection %s not found" +msgstr "%s निवडक भाग सापडत नाही" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" -"ह्याचे आधिष्ठापन सुरु करण्यासाठी अत्यावश्यक तात्पुरते काढुन टाकण्याची गरज आहे%s पॅकेज " -"गुंतागुंतीमुळे/Pre-Depends पूर्व अवलंबित आवर्तन.हे नेहमीच वाईट असते, पण जर तुम्हाला ते खरोखर " -"करावयाचे असेल तर,APT::Force-LoopBreak पर्याय कार्यान्वित करा." +msgid "Not using locking for read only lock file %s" +msgstr "फक्त वाचण्यासाठी कुलूप संचिका %s साठी कुलूपबंदचा वापर करीत नाही" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "पॅकेज अस्थाई स्मृतिकोष" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "%s कुलूप फाईल उघडता येत नाही" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "%s nfs(नेटवर्क फाईल सिस्टीम) माऊंटेड कुलुप फाईल ला कुलुप /बंद करता येत नाही" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल ही विजोड आवृत्ती आहे" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "%s कुलुप मिळवता येत नाही" -#: apt-pkg/pkgcache.cc:169 -#, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे" - -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "'%s' आवृत्तीकरण प्रणालीला हे APT तांत्रिक मदत देऊ शकत नाही" - -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "पॅकेज अस्थाई स्मृतीकोष वेगळ्या वास्तुविद्ये साठी बनवला गेला" - -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "अवलंबित" - -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "पूर्व अवलंबित" - -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "सुचवणे" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "शिफारस" - -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "परस्परविरोध" - -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "परत त्याठिकाणी आणा" - -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "अप्रचलित" - -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "तोडले" - -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "" - -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "अत्यावश्यक" - -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "आवश्यक" - -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "मानक" - -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "एच्छिक" - -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "अधिक" - -#: apt-pkg/pkgcachegen.cc:93 -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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 -#, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला" - -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." +msgid "List of files can't be created as '%s' is not a directory" msgstr "" -"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही पॅकेज नांवांच्या संख्येची मर्यादा ओलांडली " -"आहे." -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही आवृत्त्या संख्येची मर्यादा ओलांडली आहे." - -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "अरेवा!, तुम्ही तर ह्या ऍप्टच्या कार्यक्षमतेपेक्षाही विवरण संख्येची मर्यादा ओलांडली आहे." -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा " -"ओलांडली आहे." -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/fileutl.cc:421 #, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही " +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/fileutl.cc:824 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही" - -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "पॅकेज याद्या वाचत आहोत" - -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे" +msgid "Sub-process %s received a segmentation fault." +msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला." -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे" +#: apt-pkg/contrib/fileutl.cc:826 +#, fuzzy, c-format +msgid "Sub-process %s received signal %u." +msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला." -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही" +msgid "Sub-process %s returned an error code (%u)" +msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" -msgstr "" +msgid "Sub-process %s exited unexpectedly" +msgstr "%s उपक्रिया अचानकपणे बाहेर पडली" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/fileutl.cc:913 #, fuzzy, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "पसंतीच्या संचिकेत अवैध माहितीसंच, पॅकेजला शीर्षक नाही " +msgid "Problem closing the gzip file %s" +msgstr "फाईल बंद करण्यात अडचण" -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/fileutl.cc:1101 #, c-format -msgid "Did not understand pin type %s" -msgstr "%s पिनचा प्रकार समजलेला नाही" - -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "पिन करिता प्राधान्य/अग्रक्रम (किंवा शून्य)निर्देशीत केलेला नाही" +msgid "Could not open file %s" +msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 #, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा" +msgid "Could not open file descriptor %d" +msgstr "%s साठी पाईप उघडता येत नाही" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "आयपीसी उपक्रिया तयार करण्यास असमर्थ" + +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "दाबक(संकलितकर्ता) कर्यान्वित करण्यास असमर्थ" + +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" +msgid "read, still have %llu to read but none left" +msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा" +msgid "write, still have %llu to write but couldn't" +msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" +msgid "Problem closing the file %s" +msgstr "फाईल बंद करण्यात अडचण" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" +msgid "Problem renaming the file %s to %s" +msgstr "संचिकेची syncing समस्या" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" -msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" +msgid "Problem unlinking the file %s" +msgstr "फाईल अनलिंकिंग करण्यात अडचण" -#: apt-pkg/sourcelist.cc:206 -#, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "स्त्रोत सुची %2$s (यूआरआय) मध्ये %1$lu वाईट/व्यंग रेषा" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "संचिकेची syncing समस्या" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "स्त्रोत सुची %2$s (डिआयएसटी) मध्ये %1$lu वाईट/व्यंग रेषा" +msgid "%c%s... Error!" +msgstr "%c%s... चूक/त्रुटी!" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "स्त्रोत सुची %2$s (यूआरआय पार्स) मध्ये %1$lu वाईट/व्यंग रेषा" +msgid "%c%s... Done" +msgstr "%c%s... झाले" -#: 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/contrib/progress.cc:181 +msgid "..." +msgstr "" -#: apt-pkg/sourcelist.cc:224 -#, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "स्त्रोत सुची %2$s (डीआयएसटी पार्स) मध्ये %1$lu वाईट/व्यंग रेषा" +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... झाले" -#: apt-pkg/sourcelist.cc:335 -#, c-format -msgid "Opening %s" -msgstr "%s उघडत आहे" +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "रिकामी फाईल mmap करता येणार नाही" -#: 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/contrib/mmap.cc:111 +#, fuzzy, c-format +msgid "Couldn't duplicate file descriptor %i" +msgstr "%s साठी पाईप उघडता येत नाही" -#: apt-pkg/sourcelist.cc:416 +#: apt-pkg/contrib/mmap.cc:119 #, fuzzy, c-format -msgid "Type '%s' is not known on stanza %u in source list %s" -msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " +msgid "Couldn't make mmap of %llu bytes" +msgstr "mmap चे %lu बाईटस् करता येणार नाहीत" -#: apt-pkg/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "तुम्ही तुमच्या उगमस्थान यादीत URI घाला" +#: apt-pkg/contrib/mmap.cc:146 +#, fuzzy +msgid "Unable to close mmap" +msgstr "%s उघडण्यास असमर्थ" -#: apt-pkg/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "जारी करण्यास करण्यास असमर्थ" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ" +msgid "Couldn't make mmap of %lu bytes" +msgstr "mmap चे %lu बाईटस् करता येणार नाहीत" -#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 -#, fuzzy +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "फाईल छोटी करणे असफल" + +#: apt-pkg/contrib/mmap.cc:341 +#, c-format msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"काही अनुक्रमणिका संचयिका डाऊनलोड करण्यास असमर्थ,त्या दुर्लक्षित झाल्या, किंवा " -"त्याऐवजी जुन्या वापरल्या गेल्या." -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "विक्रेता गट %s मध्ये बोटाचे ठसे नाहीत" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" + +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" #: apt-pkg/contrib/cdromutl.cc:65 #, c-format @@ -3069,52 +2884,6 @@ msgstr "%s माऊंट पॉईंट स्टॅट करण्यास msgid "Failed to stat the cdrom" msgstr "सीडी-रॉम स्टॅट करण्यास असमर्थ" -#: apt-pkg/contrib/cmndline.cc:121 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "आदेश रेखा पर्याय '%c' [पासून %s] हे माहित नाही." - -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "आदेश रेखा पर्याय %s नीट समजला नाही" - -#: apt-pkg/contrib/cmndline.cc:168 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "आदेश रेखा पर्याय %s हे बूलियन नाही" - -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "पर्याय %s साठी ऑर्गुमेंट पाहिजे" - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "पर्याय %s: संरचितेच्या यादीतील कलमांचा तपशीलाला असलेच पाहिजे ते =<मूल्य>." - -#: apt-pkg/contrib/cmndline.cc:278 -#, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "%s पर्याय ला पूर्णांक ऑर्गुमेंट पाहिजे,'%s' नको" - -#: apt-pkg/contrib/cmndline.cc:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "'%s' पर्याय खूप लांब आहे" - -#: apt-pkg/contrib/cmndline.cc:341 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "%s संवेदना हे समजत नाही, चूक की बरोबर चा प्रयत्न करा." - -#: apt-pkg/contrib/cmndline.cc:391 -#, c-format -msgid "Invalid operation %s" -msgstr "%s अवैध क्रिया" - #: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" @@ -3170,386 +2939,612 @@ msgstr "रचनेच्या नियमांचा दोष %s:%u: द msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "नियम रचनेचा दोष %s:%u: फाईलच्या अंती अधिक जंक" -#: apt-pkg/contrib/fileutl.cc:190 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "संस्थापन खंडित करत आहे." + +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "फक्त वाचण्यासाठी कुलूप संचिका %s साठी कुलूपबंदचा वापर करीत नाही" +msgid "Command line option '%c' [from %s] is not known." +msgstr "आदेश रेखा पर्याय '%c' [पासून %s] हे माहित नाही." -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Could not open lock file %s" -msgstr "%s कुलूप फाईल उघडता येत नाही" +msgid "Command line option %s is not understood" +msgstr "आदेश रेखा पर्याय %s नीट समजला नाही" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "%s nfs(नेटवर्क फाईल सिस्टीम) माऊंटेड कुलुप फाईल ला कुलुप /बंद करता येत नाही" +msgid "Command line option %s is not boolean" +msgstr "आदेश रेखा पर्याय %s हे बूलियन नाही" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "Could not get lock %s" -msgstr "%s कुलुप मिळवता येत नाही" +msgid "Option %s requires an argument." +msgstr "पर्याय %s साठी ऑर्गुमेंट पाहिजे" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "" +msgid "Option %s: Configuration item specification must have an =." +msgstr "पर्याय %s: संरचितेच्या यादीतील कलमांचा तपशीलाला असलेच पाहिजे ते =<मूल्य>." -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "%s पर्याय ला पूर्णांक ऑर्गुमेंट पाहिजे,'%s' नको" -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" +msgid "Option '%s' is too long" +msgstr "'%s' पर्याय खूप लांब आहे" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" +msgid "Sense %s is not understood, try true or false." +msgstr "%s संवेदना हे समजत नाही, चूक की बरोबर चा प्रयत्न करा." -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला." +msgid "Invalid operation %s" +msgstr "%s अवैध क्रिया" -#: apt-pkg/contrib/fileutl.cc:826 -#, fuzzy, c-format -msgid "Sub-process %s received signal %u." -msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला." +#: apt-pkg/deb/dpkgpm.cc:110 +#, c-format +msgid "Installing %s" +msgstr "%s संस्थापित होत आहे" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे" +msgid "Configuring %s" +msgstr "%s संरचित होत आहे" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "%s उपक्रिया अचानकपणे बाहेर पडली" +msgid "Removing %s" +msgstr "%s काढून टाकत आहे" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/dpkgpm.cc:113 #, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "फाईल बंद करण्यात अडचण" +msgid "Completely removing %s" +msgstr "%s संपूर्ण काढून टाकले" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Could not open file %s" -msgstr "%s फाईल उघडता येत नाही" - -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 -#, fuzzy, c-format -msgid "Could not open file descriptor %d" -msgstr "%s साठी पाईप उघडता येत नाही" +msgid "Noting disappearance of %s" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "आयपीसी उपक्रिया तयार करण्यास असमर्थ" +#: apt-pkg/deb/dpkgpm.cc:115 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "संस्थापना-पश्चात ट्रिगर %s चालवत आहे" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "दाबक(संकलितकर्ता) कर्यान्वित करण्यास असमर्थ" +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 +#, c-format +msgid "Directory '%s' missing" +msgstr "'%s' संचयिका गहाळ आहे" -#: apt-pkg/contrib/fileutl.cc:1514 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, fuzzy, c-format -msgid "read, still have %llu to read but none left" -msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही" +msgid "Could not open file '%s'" +msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, fuzzy, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही" +#: apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Preparing %s" +msgstr "%s तयार करित आहे" -#: apt-pkg/contrib/fileutl.cc:1915 -#, fuzzy, c-format -msgid "Problem closing the file %s" -msgstr "फाईल बंद करण्यात अडचण" +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr "%s सुटे/मोकळे करीत आहे " -#: apt-pkg/contrib/fileutl.cc:1927 -#, fuzzy, c-format -msgid "Problem renaming the file %s to %s" -msgstr "संचिकेची syncing समस्या" +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing to configure %s" +msgstr "%s संरचने साठी तयार करत आहे" -#: apt-pkg/contrib/fileutl.cc:1938 -#, fuzzy, c-format -msgid "Problem unlinking the file %s" -msgstr "फाईल अनलिंकिंग करण्यात अडचण" +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr "%s संस्थापित झाले" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "संचिकेची syncing समस्या" +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "संस्थापन खंडित करत आहे." +#: apt-pkg/deb/dpkgpm.cc:1022 +#, c-format +msgid "Removed %s" +msgstr "%s काढून टाकले" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "रिकामी फाईल mmap करता येणार नाही" +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे" -#: apt-pkg/contrib/mmap.cc:111 +#: apt-pkg/deb/dpkgpm.cc:1028 +#, c-format +msgid "Completely removed %s" +msgstr "%s संपूर्ण काढून टाकले" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, fuzzy, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "%s साठी पाईप उघडता येत नाही" +msgid "Can not write log (%s)" +msgstr "%s मध्ये लिहिण्यास असमर्थ " -#: apt-pkg/contrib/mmap.cc:119 -#, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "mmap चे %lu बाईटस् करता येणार नाहीत" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" -#: apt-pkg/contrib/mmap.cc:146 -#, fuzzy -msgid "Unable to close mmap" -msgstr "%s उघडण्यास असमर्थ" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -#, fuzzy -msgid "Unable to synchronize mmap" -msgstr "जारी करण्यास करण्यास असमर्थ" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "mmap चे %lu बाईटस् करता येणार नाहीत" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "फाईल छोटी करणे असफल" +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" -#: apt-pkg/contrib/mmap.cc:341 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1732 msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"No apport report written because the error message indicates a disk full " +"error" msgstr "" -#: apt-pkg/contrib/mmap.cc:446 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1739 msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +"No apport report written because the error message indicates a out of memory " +"error" msgstr "" -#: apt-pkg/contrib/mmap.cc:449 +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"No apport report written because the error message indicates an issue on the " +"local system" msgstr "" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "%c%s... Error!" -msgstr "%c%s... चूक/त्रुटी!" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" -#: apt-pkg/contrib/progress.cc:150 +#: 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 "%c%s... Done" -msgstr "%c%s... झाले" +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgstr "" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" msgstr "" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n" +" \n" +"ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n" +"डेबियन पॅकेजेस मधून \n" +"\n" +"पर्याय : \n" +" -h हा साह्याकारी मजकूर \n" +" -t टेंप डिर निर्धारित करा \n" +" -c=? ही संरचना संचिका वाचा \n" +" -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:254 #, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... झाले" +msgid "Unable to mkstemp %s" +msgstr "%s स्टॅट करण्यास असमर्थ" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "debconf आवृत्ती मिळू शकत नाही,debconf अधिष्ठापित झाली काय?" + +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +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 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "" +msgid "Error processing directory %s" +msgstr "त्रुटी प्रक्रिया मार्गदर्शिका%s " -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "उगमस्थानाची विस्तारित यादी खूप मोठी आहे" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "शीर्षक संचिकेमधून मजकूर संचिकेत लिहिण्यात त्रुटी" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "%lih %limin %lis" +msgid "Error processing contents %s" +msgstr "त्रुटी प्रक्रिया मजकूर %s" + +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" +"वापर: apt-ftparchive [options] command\n" +"आज्ञा: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive डेबियन फाईलसंचासाठी अनुक्रम संचिका निर्माण करतो.तो\n" +" dpkg-scanpackages व dpkg-scansources करिता निर्मितीच्या संपूर्ण\n" +" स्वंयंचलित ते कार्यकारी बदलावांपर्यंत अनेक शैलींना पाठबळ देतो\n" +"\n" +"apt-ftparchive हा .debsच्या तरुरचनेपासून पॅकेज संचिका निर्माण करतो \n" +"पॅकेज संचिकेमध्ये प्रत्येक पॅकेज तसेच MD5 हॅश व संचिकाआकारामधील सर्व \n" +" नियंत्रक क्षेत्रांची माहिती असते.अग्रक्रम आणि विभाग यांच्या मूल्यांचा प्रभाव \n" +"वाढविण्यासाठी ओव्हरराईड संचिकेला पुष्टि दिलेली असते \n" +"\n" +"तसेच apt-ftparchive हा .dscs च्या तरूरचनेपासून उगमस्थान संचिका निर्माण करतो \n" +"--source-override पर्यायाचा उपयोग एखाद्या src ओव्हरराईड संचिका नेमकेपणाने दाखविण्यास " +"होतो \n" +"\n" +" 'packages' आणि 'sources' आज्ञावली तरूरचनेच्या मुळाशी दिल्या जाव्यात \n" +"द्वयंक मार्गाचा निर्देश पुनरावर्ती शोधाच्या पाऱ्याकडे केलेला असावा आणि \n" +" ओव्हरराईड संचिकेमध्ये ओव्हरराईड संकेत (फ्लॅग्ज) असावेत आणि \n" +" संचिकानामक्षेत्रे असल्यास Pathprefix त्यांना जोडलेले असावेत.\n" +"डेबियन archiveमधील नमुन्यादाखल उपयोग : \n" +"apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"पर्याय : \n" +" -h हा साह्याकारी मजकूर \n" +"--md5 MD5 ची निर्मिती नियंत्रित करा \n" +" -s= उगमस्थान ओव्हरराईड संचिका \n" +" -q शांत \n" +" -d= पर्यायी दृतिकादायी डेटाबेस निवडा \n" +" --no-delink दुवा तोडणारा डिबग मार्ग समर्थ करा \n" +" ---contents माहिती संचिकेची निर्मिती नियंत्रित करा \n" +" -c=? ही संरचना संचिका वाचा \n" +" -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "निवडक भाग जुळत नाही" + +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "%limin %lis" +msgid "Some files are missing in the package file group `%s'" +msgstr "`%s' पॅकेज संचिका समुहातील काही संचिका गहाळ आहेत" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB खराब झाली होती, संचिका %s.old म्हणून पुनर्नामांकित केली" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "DB जुने आहे,%s पुढच्या आवृतीसाठी प्रयत्न करत आहे" + +#: ftparchive/cachedb.cc:94 +#, fuzzy +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" +"DB स्वरुप वैध नाही. जर तुम्ही apt च्या जुन्या आवृत्तीपासून पुढिल आवृत्तीकृत करत असाल तर, " +"कृपया माहितीसंच काढून टाका आणि पुनर्निर्मित करा" + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "%s: %s DB संचिका उघडण्यास असमर्थ" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "%s वाचणारा दुवा असमर्थ" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "अर्काईव्ह मध्ये नियंत्रण माहिती संच नाही" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "संकेतक घेण्यास असमर्थ" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:91 #, c-format -msgid "%lis" -msgstr "" +msgid "W: Unable to read directory %s\n" +msgstr "धोक्याची सूचना:%s संचयिका वाचण्यास असमर्थ \n" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:96 #, c-format -msgid "Selection %s not found" -msgstr "%s निवडक भाग सापडत नाही" +msgid "W: Unable to stat %s\n" +msgstr "धो.सू.:%s स्टेट करण्यास असमर्थ\n" -#: apt-pkg/deb/debsystem.cc:91 -#, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E:" -#: apt-pkg/deb/debsystem.cc:94 -#, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "धो.सू.:" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "ई: संचिकेला लागू होणाऱ्या चुका" + +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "" +msgid "Failed to resolve %s" +msgstr "%s सोडवण्यास असमर्थ" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "ट्री चालणे असमर्थ" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:219 #, c-format -msgid "Installing %s" -msgstr "%s संस्थापित होत आहे" +msgid "Failed to open %s" +msgstr "%s उघडण्यास असमर्थ" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:278 #, c-format -msgid "Configuring %s" -msgstr "%s संरचित होत आहे" +msgid " DeLink %s [%s]\n" +msgstr "%s [%s] डी दुवा\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:286 #, c-format -msgid "Removing %s" -msgstr "%s काढून टाकत आहे" - -#: apt-pkg/deb/dpkgpm.cc:98 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "%s संपूर्ण काढून टाकले" +msgid "Failed to readlink %s" +msgstr "%s वाचणारा दुवा असमर्थ" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:290 #, c-format -msgid "Noting disappearance of %s" -msgstr "" +msgid "Failed to unlink %s" +msgstr "%s दुवा काढण्यास असमर्थ" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:298 #, c-format -msgid "Running post-installation trigger %s" -msgstr "संस्थापना-पश्चात ट्रिगर %s चालवत आहे" +msgid "*** Failed to link %s to %s" +msgstr "%s चा %s दुवा साधण्यास असमर्थ" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:308 #, c-format -msgid "Directory '%s' missing" -msgstr "'%s' संचयिका गहाळ आहे" +msgid " DeLink limit of %sB hit.\n" +msgstr "%sB हीट ची डिलींक मर्यादा\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "%s फाईल उघडता येत नाही" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "अर्काईव्ह ला पॅकेज जागा नाही" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Preparing %s" -msgstr "%s तयार करित आहे" +msgid " %s has no override entry\n" +msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Unpacking %s" -msgstr "%s सुटे/मोकळे करीत आहे " +msgid " %s maintainer is %s not %s\n" +msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing to configure %s" -msgstr "%s संरचने साठी तयार करत आहे" +msgid " %s has no source override entry\n" +msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/writer.cc:710 #, c-format -msgid "Installed %s" -msgstr "%s संस्थापित झाले" +msgid " %s has no binary override entry either\n" +msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n" -#: apt-pkg/deb/dpkgpm.cc:1005 -#, c-format -msgid "Preparing for removal of %s" -msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc-स्मरणस्थळ शोधण्यास असमर्थ" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Removed %s" -msgstr "%s काढून टाकले" +msgid "Unable to open %s" +msgstr "%s उघडण्यास असमर्थ" -#: apt-pkg/deb/dpkgpm.cc:1012 -#, c-format -msgid "Preparing to completely remove %s" -msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे" +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Completely removed %s" -msgstr "%s संपूर्ण काढून टाकले" +msgid "Failed to read the override file %s" +msgstr "%s दुर्लक्षित संचिका वाचण्यास असमर्थ" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/override.cc:166 #, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "%s मध्ये लिहिण्यास असमर्थ " +msgid "Malformed override %s line %llu #1" +msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #2" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #3" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" +#: ftparchive/multicompress.cc:73 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "माहित नसलेली/ले संक्षेप पद्धती/अलगोरिथम '%s'" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "%s संकलित आऊटपुट/निर्गत साठी संक्षेप संचाची गरज" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "संचिका * तयार करण्यास असमर्थ" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "नविन प्रक्रिया(प्रोसेस) निर्माण करण्यास असमर्थ" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "चॉईल्ड(प्रोसेस)ला संकलित करा" -#: apt-pkg/deb/dpkgpm.cc:1707 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "अंतर्गत त्रुटी, %s तयार करण्यास असमर्थ" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "IO ची उपक्रिया/संचिका असमर्थ " + +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "MD5 कामप्युटींग करतांना वाचण्यासाठी असमर्थ" + +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "%s दुवा मोकळा/सुटा करण्यास अडचण" + +#: cmdline/apt-internal-solver.cc:49 +#, fuzzy msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n" +" \n" +"ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n" +"डेबियन पॅकेजेस मधून \n" +"\n" +"पर्याय : \n" +" -h हा साह्याकारी मजकूर \n" +" -t टेंप डिर निर्धारित करा \n" +" -c=? ही संरचना संचिका वाचा \n" +" -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "अनोळखी पॅकेज माहिती संच!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"वापर:apt-sortpkgs [पर्याय] फाईल१[फाईल २...]\n" +"\n" +" apt-sortpkgs हे पॅकेज फाईल्सचं वर्गीकरण करणारी एक साधी आज्ञावली आहे. -s पर्याय हा " +"फाईल\n" +"कुठल्या प्रकारची आहे हे दाखवण्यासाठी वापरतात.\n" +"\n" +"पर्याय\n" +" -h हा मदत मजकूर\n" +" -s उगमस्थान फाईल वापरा\n" +" -c=? ही संरचना फाईल वाचा\n" +" -o=?- अनियंत्रित संरचना पर्याय निश्चित करा,eg -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/nb.po b/po/nb.po index 445f1cca5..69a930a96 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2010-09-01 21:10+0200\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" @@ -161,7 +161,7 @@ msgid " Version table:" msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -360,7 +360,7 @@ msgstr "Klarer ikke å låse nedlastingsmappa" 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke å finne en kildekodepakke for %s" @@ -385,116 +385,116 @@ msgstr "" "bzr get %s\n" "for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hopper over allerede nedlastet fil «%s»\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Klarte ikke bestemme ledig plass i %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Klarte ikke å skaffe alle arkivene." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Nedlasting fullført med innstillinga «bare nedlasting»" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, 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:1290 +#: cmdline/apt-get.cc:1294 #, 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:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -503,37 +503,37 @@ 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:1358 +#: cmdline/apt-get.cc:1362 #, 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:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Klarte ikke å behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Kobler til %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Støttede moduler:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -676,7 +676,7 @@ msgstr "%s er allerede nyeste versjon.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventet på %s, men den ble ikke funnet" @@ -772,16 +772,16 @@ msgstr "" msgid "Disk not found." msgstr "Disk ikke funnet." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Fant ikke fila" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Klarte ikke å få status" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Klarte ikke å sette endringstidspunkt" @@ -835,7 +835,7 @@ msgstr "Kommandoen «%s» i innlogginsskriptet mislykkes, tjeneren sa: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE mislykkes, tjeneren sa: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Tidsavbrudd på forbindelsen" @@ -857,7 +857,7 @@ msgstr "Et svar oversvømte bufferen." msgid "Protocol corruption" msgstr "Protokollødeleggelse" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -918,7 +918,7 @@ msgstr "Tidsavbrudd på tilkoblingen til datasokkelen" msgid "Unable to accept connection" msgstr "Klarte ikke å godta tilkoblingen" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Problem ved oppretting av nøkkel for fil" @@ -927,7 +927,7 @@ msgstr "Problem ved oppretting av nøkkel for fil" msgid "Unable to fetch file, server said '%s'" msgstr "Klarte ikke å hente fila, tjeneren sa «%s»" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Tidsavbrudd på datasokkelen" @@ -977,7 +977,7 @@ msgstr "Klarte ikke å koble til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Kobler til %s" @@ -1117,42 +1117,17 @@ msgstr "Forbindelsen mislykkes" msgid "Internal error" msgstr "Intern feil" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Funnet " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Hent:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ign " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Feil " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Hentet %sB på %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Arbeider]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Bytte av media: sett inn CD-en som er merket\n" -" «%s»\n" -"i «%s» og trykk «Enter»\n" +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:93 msgid "Correcting dependencies..." @@ -1182,165 +1157,349 @@ msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette." msgid "Unmet dependencies. Try using -f." msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Installert]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Autentiseringsadvarsel overstyrt.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [Installert]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Noen pakker ble ikke autentisert" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Installer disse pakkene uten verifikasjon?" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Installert]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Installert]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Klarte ikke å skaffe %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!" - -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "Pakker trenges å fjernes, men funksjonen er slått av." - -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Intern feil, sortering fullførte ikke" +msgid "[upgradable from: %s]" +msgstr "" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" msgstr "" -"Så rart ... Størrelsene stemmer ikke overens, send en e-post til " -"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 -#: apt-private/private-install.cc:155 +#: apt-private/private-output.cc:455 #, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "Må hente %sB/%sB med arkiver.\n" +msgid "but %s is installed" +msgstr "men %s er installert" -#. 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:160 +#: apt-private/private-output.cc:457 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "Må hente %sB med arkiver.\n" +msgid "but %s is to be installed" +msgstr "men %s skal installeres" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n" +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "men lar seg ikke installere" -#. 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:172 -#, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "men er en virtuell pakke" -#: apt-private/private-install.cc:200 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "Dessverre, ikke nok ledig plass i %s" +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "men er ikke installert" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "" -"«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring." +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "men skal ikke installeres" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Ja, gjør som jeg sier!" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " eller" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Du er iferd med å utføre en mulig skadelig handling.\n" -"For å fortsette skriv inn teksten «%s»\n" -" ?] " +#: 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-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Avbryter." +#: 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-install.cc:243 -msgid "Do you want to continue?" -msgstr "Vil du fortsette?" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "Følgende pakker vil bli FJERNET:" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Klarte ikke laste ned alle filene" +#: apt-private/private-output.cc:571 +msgid "The following packages have been kept back:" +msgstr "Følgende pakker er holdt tilbake:" -#: apt-private/private-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller " -"«--fix-missing»." +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "Følgende pakker vil bli oppgradert:" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "«--fix-missing» og bytte av media støttes nå ikke" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" +msgstr "Følgende pakker vil bli NEDGRADERT:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Klarer ikke å rette på manglende pakker." +#: apt-private/private-output.cc:633 +msgid "The following held packages will be changed:" +msgstr "Følgende pakker vil bli endret:" -#: apt-private/private-install.cc:330 -msgid "Aborting install." -msgstr "Avbryter installasjonen." +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (pga. %s) " -#: apt-private/private-install.cc:366 +#: apt-private/private-output.cc:696 msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"Den følgende pakken forsvant fra systemet ditt siden\n" -"alle filene er overskrevet av andre pakker:" -msgstr[1] "" -"De følgende pakkene forsvant fra systemet ditt siden\n" -"alle filene er overskrevet av andre pakker:" +"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-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Merk: Dette er gjort automatisk og med hensikt av dpkg." +#: apt-private/private-output.cc:727 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu oppgraderte, %lu nylig installerte, " -#: apt-private/private-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)" +#: apt-private/private-output.cc:731 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu installert på nytt, " -#: apt-private/private-install.cc:499 -msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "Pakker trenges å fjernes, men funksjonen er slått av." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Intern feil, sortering fullførte ikke" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Så rart ... Størrelsene stemmer ikke overens, send en e-post til " +"apt@packages.debian.org" + +#. 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Må hente %sB/%sB med arkiver.\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:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Må hente %sB med arkiver.\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:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Dessverre, ikke nok ledig plass i %s" + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "" +"«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring." + +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Ja, gjør som jeg sier!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Du er iferd med å utføre en mulig skadelig handling.\n" +"For å fortsette skriv inn teksten «%s»\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Avbryter." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Vil du fortsette?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Klarte ikke laste ned alle filene" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller " +"«--fix-missing»." + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "«--fix-missing» og bytte av media støttes nå ikke" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Klarer ikke å rette på manglende pakker." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Avbryter installasjonen." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"Den følgende pakken forsvant fra systemet ditt siden\n" +"alle filene er overskrevet av andre pakker:" +msgstr[1] "" +"De følgende pakkene forsvant fra systemet ditt siden\n" +"alle filene er overskrevet av andre pakker:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Merk: Dette er gjort automatisk og med hensikt av dpkg." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)" + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" "Hmm, det ser ut som auto-fjerneren (AutoRemover) ødela noe, og det skal\n" @@ -1474,210 +1633,26 @@ 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:129 -msgid "Listing" -msgstr "" - -#: apt-private/private-list.cc:159 -#, 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-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!" -#: 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:40 +msgid "Authentication warning overridden.\n" +msgstr "Autentiseringsadvarsel overstyrt.\n" -#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 -#: apt-private/private-show.cc:89 -msgid "unknown" -msgstr "" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Noen pakker ble ikke autentisert" -#: 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:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Kompileringsfeil i regulært uttrykk - %s" - -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Installer disse pakkene uten verifikasjon?" -#: apt-private/private-show.cc:156 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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 "" +msgid "Failed to fetch %s %s\n" +msgstr "Klarte ikke å skaffe %s %s\n" #: apt-private/private-sources.cc:58 #, fuzzy, c-format @@ -1689,20 +1664,8 @@ msgstr "Klarte ikke å endre navnet på %s til %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Oppdaterings-kommandoen tar ingen argumenter" - -#: apt-private/private-update.cc:90 -#, 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:94 -msgid "All packages are up to date." +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" #: apt-private/private-upgrade.cc:25 @@ -1713,20 +1676,57 @@ msgstr "Beregner oppgradering... " msgid "Done" msgstr "Utført" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Funnet " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Hent:" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ign " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Feil " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Hentet %sB på %s (%sB/s)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Arbeider]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Bytte av media: sett inn CD-en som er merket\n" +" «%s»\n" +"i «%s» og trykk «Enter»\n" + #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format msgid "Unable to read %s" msgstr "Klarer ikke å lese %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1760,7 +1760,7 @@ msgstr "[Speil: %s]" msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikke å opprette IPC-rør til underprosessen" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "Forbindelsen ble uventet stengt" @@ -1801,514 +1801,124 @@ 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:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Bruk: apt-extracttemplates fil1 [fil2 ...]\n" -"\n" -"apt-extracttemplates er et verktøy til å hente ut informasjon om " -"innstillinger\n" -"og maler fra debianpakker.\n" -"\n" -"Innstillinger:\n" -" -h Denne hjelpeteksten\n" -" -t Lag en midlertidig mappe\n" -" -c=? Les denne innstillingsfila.\n" -" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" - -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Klarte ikke å få statusen på %s" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode ble startet på et knutepunkt som ennå er lenket" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "Kan ikke skrive til %s" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Fant ikke nøkkelelementet." -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Klarte ikke å tildele avledning" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Lista over pakkeutvidelser er for lang" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Intern feil i AddDiversion" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "Feil ved lesing av katalogen %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Lista over kildeutvidelser er for lang" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Feil ved skriving av topptekst til innholdsfila" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Prøver å skrive over en avledning, %s -> %s og %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "Det oppsto en feil ved lesing av %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Bruk: apt-ftparchive [innstillinger] kommando\n" -"Kommandoer: packages binærsti [overstyringsfil [sti-prefiks]]\n" -" sources kildesti [overstyringsfil [sti-prefiks]]\n" -" contents sti\n" -" release sti\n" -" generate config [grupper]\n" -" clean config\n" -"\n" -"apt-ftparchive oppretter indeksfiler for debianarkiver. Mange ulike\n" -"metoder er støttet - fra helautomatiske til funksjonelle\n" -"erstatninger for dpkg-scanpackages og dpkg-scansources.\n" -"\n" -"apt-ftparchive oppretter «Packages»-filer fra et tre med debianpakker.\n" -"«Packages»-fila inneholder alle kontrollfeltene fra hver pakke i tillegg " -"til\n" -"MD5-nøkkel og filstørrelse. Du kan bruke en overstyringsfil for å tvinge\n" -"gjennom verdier for prioritet og kategori.\n" -"\n" -"apt-ftparchive kan på samme måte opprette kildefiler fra et tre\n" -"med .dsc-filer. Du kan bruke en overstyringsfil med --source-override.\n" -"\n" -"Kommandoene «packages» og «sources» skal kjøres i rota av katalogtreet.\n" -"«Binærsti» skal peke til toppkatalogen for det rekursive søket, og\n" -"overstyringsfila skal inneholde innstillinger for overstyring.\n" -"Sti-prefikset blir lagt til feltene for filnavn, dersom det er oppgitt. Her " -"er\n" -"et eksempel på bruk i debianarkivet:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Innstillinger:\n" -" -h Vis denne hjelpeteksten.\n" -" --md5 Styrer MD5-opprettelsen\n" -" -s=? Overstyringsfil for kildekode.\n" -" -q Stille.\n" -" -d=? Velger om du vil bruke en mellomlagerdatabase.\n" -" --no-delink Bruk avlusingsmodus med «delinking».\n" -" --contents Styrer opprettelse av innholdsfila.\n" -" -c=? Les denne oppsettsfila.\n" -" -o=? Setter en vilkårlig innstilling" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Ingen utvalg passet" +msgid "Double add of diversion %s -> %s" +msgstr "Dobbel tillegging av avledning %s -> %s" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Enkelte filer mangler i pakkegruppa «%s»" +msgid "Duplicate conf file %s/%s" +msgstr "Dobbel oppsettsfil %s/%s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Databasen er ødelagt. Filnavnet er endret til %s.old" +msgid "The path %s is too long" +msgstr "Stien %s er for lang" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Databasen er gammel, forsøker å oppgradere %s" +msgid "Unpacking %s more than once" +msgstr "Pakker ut %s mer enn en gang" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, " -"fjern og så gjenopprett databasen." +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "Katalogen %s er avledet" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Klarte ikke å åpne Databasefila %s: %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Pakken prøver å skrive til avledningsmålet %s/%s" + +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Avledningsstien er for lang" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Klarte ikke å få statusen på %s" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Klarte ikke å lese lenken %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Arkivet har ingen kontrollpost" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Klarte ikke å finne en peker" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "A: Klarte ikke å lese katalogen %s\n" +msgid "Failed to rename %s to %s" +msgstr "Klarte ikke å endre navnet på %s til %s" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "A: Klarte ikke å få statusen på %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "F:" +msgid "The directory %s is being replaced by a non-directory" +msgstr "Mappa %s blir byttet ut med noe som ikke er en mappe" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "A:" +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Fant ikke knutepunktet i dens hash-spann" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "F: Det er feil ved fila" +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Stien er for lang" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "Klarte ikke å slå opp %s" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Klarte ikke å finne fram i treet" +msgid "Overwrite package match with no version for %s" +msgstr "Skriver over pakketreff uten versjon for %s" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to open %s" -msgstr "Klarte ikke å åpne %s" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s" -#: ftparchive/writer.cc:278 +#: apt-inst/extract.cc:498 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgid "Unable to stat %s" +msgstr "Klarte ikke å få statusen på %s" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Failed to readlink %s" -msgstr "Klarte ikke å lese lenken %s" +msgid "Failed to write file %s" +msgstr "Klarte ikke å skrive fila %s" -#: ftparchive/writer.cc:290 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to unlink %s" -msgstr "Klarte ikke å oppheve lenken %s" +msgid "Failed to close file %s" +msgstr "Klarte ikke å lukke fila %s" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Klarte ikke å lenke %s til %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Dette er ikke et gyldig DEB-arkiv, mangler «%s»-medlemmet" -#: ftparchive/writer.cc:308 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " DeLink-grensa på %s B er nådd.\n" - -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Arkivet har ikke noe pakkefelt" - -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s har ingen overstyringsoppføring\n" - -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " %s-vedlikeholderen er %s, ikke %s\n" - -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s har ingen kildeoverstyringsoppføring\n" - -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s har ingen binæroverstyringsoppføring heller\n" - -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Klarte ikke å tildele minne" - -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Klarte ikke å åpne %s" - -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Ugyldig overstyring %s linje %lu #1" - -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Klarte ikke å lese overstyringsfila %s" - -#: ftparchive/override.cc:166 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Ugyldig overstyring %s linje %lu #1" - -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Ugyldig overstyring %s linje %lu #2" - -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Ugyldig overstyring %s linje %lu #3" - -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Ukjent komprimeringsalgoritme «%s»" - -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Komprimert utdata %s trenger et komprimeringssett" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Klarte ikke å opprette FILE*" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Klarte ikke å forgreine prosess" - -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Komprimer barneprosess" - -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "Intern feil, klarte ikke å opprette %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Klarte ikke å kommunisere med underprosess/fil" - -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Klarte ikke å lese under utregning av MD5" - -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "Problem ved oppheving av lenken til %s" - -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "Klarte ikke å endre navnet på %s til %s" - -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Bruk: apt-extracttemplates fil1 [fil2 ...]\n" -"\n" -"apt-extracttemplates er et verktøy til å hente ut informasjon om " -"innstillinger\n" -"og maler fra debianpakker.\n" -"\n" -"Innstillinger:\n" -" -h Denne hjelpeteksten\n" -" -t Lag en midlertidig mappe\n" -" -c=? Les denne innstillingsfila.\n" -" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Ukjent pakkeoppføring" - -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Bruk: apt-sortpkgs [innstillinger] fil1 [fil2 ...]\n" -"\n" -"apt-sortpkgs er et enkelt redskap til å sortere pakkefiler. Innstillingen\n" -"-s brukes til å angi hvilken filtype det er.\n" -"\n" -"Innstillinger:\n" -" -h Denne hjelpeteksten\n" -" -s Bruk filsortering\n" -" -c=? Les denne innstillingsfila.\n" -" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" - -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" -msgstr "Klarte ikke å skrive fila %s" - -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "Klarte ikke å lukke fila %s" - -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "Stien %s er for lang" - -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" -msgstr "Pakker ut %s mer enn en gang" - -#: apt-inst/extract.cc:142 -#, c-format -msgid "The directory %s is diverted" -msgstr "Katalogen %s er avledet" - -#: apt-inst/extract.cc:152 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Pakken prøver å skrive til avledningsmålet %s/%s" - -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Avledningsstien er for lang" - -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Mappa %s blir byttet ut med noe som ikke er en mappe" - -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Fant ikke knutepunktet i dens hash-spann" - -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Stien er for lang" - -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Skriver over pakketreff uten versjon for %s" - -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s" - -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "Klarte ikke å få statusen på %s" - -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "DropNode ble startet på et knutepunkt som ennå er lenket" - -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Fant ikke nøkkelelementet." - -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Klarte ikke å tildele avledning" - -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Intern feil i AddDiversion" - -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Prøver å skrive over en avledning, %s -> %s og %s/%s" - -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Dobbel tillegging av avledning %s -> %s" +msgid "Internal error, could not locate member %s" +msgstr "Intern feil, fant ikke medlemmet %s" -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Dobbel oppsettsfil %s/%s" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Kontrollfila kan ikke tolkes" #: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" @@ -2356,134 +1966,53 @@ msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt" msgid "Unknown TAR header type %u, member %s" msgstr "Ukjent TAR-hode: type %u, medlem %s" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 -#, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Dette er ikke et gyldig DEB-arkiv, mangler «%s»-medlemmet" - -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "Intern feil, fant ikke medlemmet %s" - -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Kontrollfila kan ikke tolkes" - -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, c-format -msgid "List directory %spartial is missing." -msgstr "Listemappa %spartial mangler." - -#: apt-pkg/acquire.cc:91 -#, c-format -msgid "Archives directory %spartial is missing." -msgstr "Arkivmappa %spartial mangler." - -#: apt-pkg/acquire.cc:99 -#, c-format -msgid "Unable to lock directory %s" -msgstr "Klarte ikke låse mappa %s" - -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "Oversiktsfil av typen «%s» støttes ikke" - -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Henter fil %li av %li (%s gjenværende)" - -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "Henter fil %li av %li" - -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "klarte ikke å endre navnet, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "Hashsummen stemmer ikke" - -#: apt-pkg/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "Feil størrelse" - -#: apt-pkg/acquire-item.cc:173 -#, fuzzy -msgid "Invalid file format" -msgstr "Ugyldig operasjon %s" - -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" +msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/acquire-item.cc:1589 -#, 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:1631 -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/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "Kjører dpkg" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/init.cc:146 #, c-format -msgid "" -"Release file for %s is expired (invalid since %s). Updates for this " -"repository will not be applied." -msgstr "" +msgid "Packaging system '%s' is not supported" +msgstr "Pakkesystemet «%s» støttes ikke" + +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Klarer ikke bestemme en passende pakkesystemtype" -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)" +msgid "Wrote %i records.\n" +msgstr "Skrev %i poster.\n" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "" -"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" -msgstr "" -"En feil oppstod under signaturverifisering. Depotet er ikke oppdatert og den " -"forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Skrev %i poster med %i manglende filer.\n" -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "GPG error: %s: %s" -msgstr "GPG-feil: %s: %s" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Skrev %i poster med %i feile filer.\n" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, 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 "" -"Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken " -"selv (fordi arkitekturen mangler)." +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Can't find a source to download version '%s' of '%s'" -msgstr "" +msgid "Can't find authentication record for: %s" +msgstr "Klarte ikke finne autentiseringsoppføring for: %s" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/indexcopy.cc:521 #, 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." +msgid "Hash mismatch for: %s" +msgstr "Hashsummen stemmer ikke for: %s" #: apt-pkg/acquire-worker.cc:116 #, c-format @@ -2505,25 +2034,6 @@ msgstr "Metoden %s startet ikke korrekt" 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/algorithms.cc:265 -#, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den." - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker " -"som holdes tilbake." - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake." - #: 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." @@ -2537,177 +2047,245 @@ msgstr "" msgid "The list of sources could not be read." msgstr "Kan ikke lese kildlista." -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Utgave «%s» av «%s» ble ikke funnet" - -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Versjon «%s» av «%s» ble ikke funnet" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Tomt pakkelager" -#: apt-pkg/cacheset.cc:603 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "Klarte ikke å finne oppgave «%s»" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Pakkens lagerfil er ødelagt" -#: apt-pkg/cacheset.cc:609 -#, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Klarte ikke finne noen pakken med regex «%s»" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Pakkens lagerfil er av feil versjon (samvirker ikke)" -#: apt-pkg/cacheset.cc:615 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Klarte ikke finne noen pakken med regex «%s»" +#: apt-pkg/pkgcache.cc:169 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "Pakkens lagerfil er ødelagt" -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/pkgcache.cc:174 #, 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" +msgid "This APT does not support the versioning system '%s'" +msgstr "Denne APT støtter ikke versjonssystemet «%s»" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 -#, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" -"Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den " -"har ingen av dem" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Pakkelageret ble bygd for en annen arkitektur" -#: apt-pkg/cacheset.cc:647 -#, 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/pkgcache.cc:321 +msgid "Depends" +msgstr "Avhenger av" -#: apt-pkg/cacheset.cc:655 -#, 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/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Forutsetter" -#: apt-pkg/cacheset.cc:663 -#, 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/pkgcache.cc:321 +msgid "Suggests" +msgstr "Foreslår" -#: 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/pkgcache.cc:322 +msgid "Recommends" +msgstr "Anbefaler" -#: apt-pkg/cdrom.cc:571 -msgid "Unmounting CD-ROM...\n" -msgstr "Avmonterer CD-ROM ...\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Er i konflikt med" -#: apt-pkg/cdrom.cc:586 -#, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "Bruker CD-ROM monteringspunkt %s\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Erstatter" -#: apt-pkg/cdrom.cc:599 -msgid "Waiting for disc...\n" -msgstr "Venter på CD-en...\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Nuller" -#: apt-pkg/cdrom.cc:609 -msgid "Mounting CD-ROM...\n" -msgstr "Monterer CD-ROM...\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Ødelegger" -#: apt-pkg/cdrom.cc:620 -msgid "Identifying... " -msgstr "Indentifiserer..." +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Forbedrer" -#: apt-pkg/cdrom.cc:662 +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "viktig" + +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "påkrevet" + +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "vanlig" + +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "valgfri" + +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "tillegg" + +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Stored label: %s\n" -msgstr "Lagret merkelapp: %s \n" +msgid "Index file type '%s' is not supported" +msgstr "Oversiktsfil av typen «%s» støttes ikke" -#: apt-pkg/cdrom.cc:680 -msgid "Scanning disc for index files...\n" -msgstr "Leter gjennom CD for indeksfiler...\n" +#: 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/cdrom.cc:734 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "" -"Found %zu package indexes, %zu source indexes, %zu translation indexes and " -"%zu signatures\n" -msgstr "" -"Fant %zu pakkeindekser, %zu kildeindekser, %zu oversettelsesindekser og %zu " -"signaturer\n" +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)" -#: apt-pkg/cdrom.cc:744 -msgid "" -"Unable to locate any package files, perhaps this is not a Debian Disc or the " -"wrong architecture?" -msgstr "" -"Klarte ikke finne noen Package-filer. Kanskje dette ikke er en Debian Disc " -"eller du har valgt feil arkitektur?" +#: 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/cdrom.cc:771 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "Found label '%s'\n" -msgstr "Fant merkelapp «%s»\n" +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/cdrom.cc:800 -msgid "That is not a valid name, try again.\n" -msgstr "Det er ikke et gyldig navn, prøv igjen.\n" +#: 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/cdrom.cc:817 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "" -"This disc is called: \n" -"'%s'\n" -msgstr "" -"CD-en er kalt: \n" -"«%s»\n" +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/cdrom.cc:819 -msgid "Copying package lists..." -msgstr "Kopierer pakkelister..." +#: 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/cdrom.cc:863 -msgid "Writing new source list\n" -msgstr "Skriver ny kildeliste\n" +#: 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/cdrom.cc:874 -msgid "Source list entries for this disc are:\n" -msgstr "Kildelisteoppføringer for denne CD-en er:\n" +#: 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:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Oversiktsfil av typen «%s» støttes ikke" #: apt-pkg/clean.cc:64 #, c-format msgid "Unable to stat %s." msgstr "Klarer ikke finne informasjonom %s." -#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 -msgid "Building dependency tree" -msgstr "Skaper oversikt over avhengighetsforhold" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "Lageret har et uoverensstemmende versjonssystem" -#: apt-pkg/depcache.cc:139 -msgid "Candidate versions" -msgstr "Versjons-kandidater" +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Feil oppsto under behandling av %s (FindPkg)" -#: apt-pkg/depcache.cc:168 -msgid "Dependency generation" -msgstr "Oppretter avhengighetsforhold" +#: apt-pkg/pkgcachegen.cc:257 +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/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 -msgid "Reading state information" -msgstr "Leser tilstandsinformasjon" +#: apt-pkg/pkgcachegen.cc:260 +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:263 +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:266 +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:576 #, 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:1211 #, 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:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Leser pakkelister" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Samler inn filtilbud" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Kan ikke skrive til %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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" @@ -2729,78 +2307,145 @@ msgstr "" msgid "Execute external solver" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format -msgid "Wrote %i records.\n" -msgstr "Skrev %i poster.\n" +msgid "rename failed, %s (%s -> %s)." +msgstr "klarte ikke å endre navnet, %s (%s -> %s)." -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 -#, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Skrev %i poster med %i manglende filer.\n" +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "Hashsummen stemmer ikke" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 -#, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Skrev %i poster med %i feile filer.\n" +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "Feil størrelse" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 -#, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n" +#: apt-pkg/acquire-item.cc:173 +#, fuzzy +msgid "Invalid file format" +msgstr "Ugyldig operasjon %s" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/acquire-item.cc:1640 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "Klarte ikke finne autentiseringsoppføring for: %s" +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, c-format -msgid "Hash mismatch for: %s" -msgstr "Hashsummen stemmer ikke for: %s" +#: apt-pkg/acquire-item.cc:1656 +#, fuzzy, c-format +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "Klarer ikke å fortolke Release-fila %s" -#: apt-pkg/indexrecords.cc:78 +#: apt-pkg/acquire-item.cc:1698 +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:1736 #, c-format -msgid "Unable to parse Release file %s" -msgstr "Klarer ikke å fortolke Release-fila %s" +msgid "" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." +msgstr "" -#: apt-pkg/indexrecords.cc:86 +#: apt-pkg/acquire-item.cc:1758 #, c-format -msgid "No sections in Release file %s" -msgstr "Ingen avsnitt i Release-fila %s" +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)" -#: apt-pkg/indexrecords.cc:117 +#: apt-pkg/acquire-item.cc:1788 #, c-format -msgid "No Hash entry in Release file %s" -msgstr "Ingen sjekksumoppføring i Release-fila %s" +msgid "" +"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" +msgstr "" +"En feil oppstod under signaturverifisering. Depotet er ikke oppdatert og den " +"forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n" -#: apt-pkg/indexrecords.cc:130 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format -msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "Ugyldig «Valid-Until»-oppføring i Release-fila %s" +msgid "GPG error: %s: %s" +msgstr "GPG-feil: %s: %s" -#: apt-pkg/indexrecords.cc:149 +#: apt-pkg/acquire-item.cc:1926 #, c-format -msgid "Invalid 'Date' entry in Release file %s" -msgstr "Ugyldig «Date»-oppføring i Release-fila %s" +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 "" +"Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken " +"selv (fordi arkitekturen mangler)." -#: apt-pkg/init.cc:146 +#: apt-pkg/acquire-item.cc:1992 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Pakkesystemet «%s» støttes ikke" +msgid "Can't find a source to download version '%s' of '%s'" +msgstr "" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Klarer ikke bestemme en passende pakkesystemtype" +#: apt-pkg/acquire-item.cc:2050 +#, 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/install-progress.cc:57 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "Progress: [%3i%%]" +msgid "Vendor block %s contains no fingerprint" +msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk" + +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#, c-format +msgid "List directory %spartial is missing." +msgstr "Listemappa %spartial mangler." + +#: apt-pkg/acquire.cc:91 +#, c-format +msgid "Archives directory %spartial is missing." +msgstr "Arkivmappa %spartial mangler." + +#: apt-pkg/acquire.cc:99 +#, 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:902 +#, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Henter fil %li av %li (%s gjenværende)" + +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Henter fil %li av %li" + +#: 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/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "Kjører dpkg" +#: 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 "" + +#: apt-pkg/policy.cc:422 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Ugyldig oppslag i foretrekksfila %s, manglende pakkehode" + +#: apt-pkg/policy.cc:444 +#, c-format +msgid "Did not understand pin type %s" +msgstr "Forsto ikke spikring av typen %s" + +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Ingen prioritet (eller null) spesifisert for pin" #: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format @@ -2827,425 +2472,299 @@ 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/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Tomt pakkelager" - -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Pakkens lagerfil er ødelagt" - -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Pakkens lagerfil er av feil versjon (samvirker ikke)" - -#: apt-pkg/pkgcache.cc:169 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "Pakkens lagerfil er ødelagt" +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/pkgcache.cc:174 +#: apt-pkg/cdrom.cc:571 +msgid "Unmounting CD-ROM...\n" +msgstr "Avmonterer CD-ROM ...\n" + +#: apt-pkg/cdrom.cc:586 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Denne APT støtter ikke versjonssystemet «%s»" +msgid "Using CD-ROM mount point %s\n" +msgstr "Bruker CD-ROM monteringspunkt %s\n" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "Pakkelageret ble bygd for en annen arkitektur" +#: apt-pkg/cdrom.cc:599 +msgid "Waiting for disc...\n" +msgstr "Venter på CD-en...\n" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Avhenger av" +#: apt-pkg/cdrom.cc:609 +msgid "Mounting CD-ROM...\n" +msgstr "Monterer CD-ROM...\n" -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Forutsetter" +#: apt-pkg/cdrom.cc:620 +msgid "Identifying... " +msgstr "Indentifiserer..." -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Foreslår" +#: apt-pkg/cdrom.cc:662 +#, c-format +msgid "Stored label: %s\n" +msgstr "Lagret merkelapp: %s \n" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Anbefaler" +#: apt-pkg/cdrom.cc:680 +msgid "Scanning disc for index files...\n" +msgstr "Leter gjennom CD for indeksfiler...\n" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Er i konflikt med" +#: apt-pkg/cdrom.cc:734 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" +msgstr "" +"Fant %zu pakkeindekser, %zu kildeindekser, %zu oversettelsesindekser og %zu " +"signaturer\n" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Erstatter" +#: apt-pkg/cdrom.cc:744 +msgid "" +"Unable to locate any package files, perhaps this is not a Debian Disc or the " +"wrong architecture?" +msgstr "" +"Klarte ikke finne noen Package-filer. Kanskje dette ikke er en Debian Disc " +"eller du har valgt feil arkitektur?" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Nuller" +#: apt-pkg/cdrom.cc:771 +#, c-format +msgid "Found label '%s'\n" +msgstr "Fant merkelapp «%s»\n" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Ødelegger" +#: apt-pkg/cdrom.cc:800 +msgid "That is not a valid name, try again.\n" +msgstr "Det er ikke et gyldig navn, prøv igjen.\n" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Forbedrer" +#: apt-pkg/cdrom.cc:817 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"CD-en er kalt: \n" +"«%s»\n" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "viktig" +#: apt-pkg/cdrom.cc:819 +msgid "Copying package lists..." +msgstr "Kopierer pakkelister..." -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "påkrevet" +#: apt-pkg/cdrom.cc:863 +msgid "Writing new source list\n" +msgstr "Skriver ny kildeliste\n" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "vanlig" +#: apt-pkg/cdrom.cc:874 +msgid "Source list entries for this disc are:\n" +msgstr "Kildelisteoppføringer for denne CD-en er:\n" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "valgfri" +#: apt-pkg/algorithms.cc:265 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den." -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "tillegg" +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker " +"som holdes tilbake." -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Lageret har et uoverensstemmende versjonssystem" +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake." -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 -#, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Feil oppsto under behandling av %s (FindPkg)" +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 +msgid "Building dependency tree" +msgstr "Skaper oversikt over avhengighetsforhold" -#: apt-pkg/pkgcachegen.cc:257 -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/depcache.cc:139 +msgid "Candidate versions" +msgstr "Versjons-kandidater" -#: apt-pkg/pkgcachegen.cc:260 -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:168 +msgid "Dependency generation" +msgstr "Oppretter avhengighetsforhold" -#: apt-pkg/pkgcachegen.cc:263 -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/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 +msgid "Reading state information" +msgstr "Leser tilstandsinformasjon" -#: apt-pkg/pkgcachegen.cc:266 -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/depcache.cc:250 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Klarte ikke å åpne StateFile %s" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/depcache.cc:256 #, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "Fant ikke pakken %s %s ved behandling av filkrav" +msgid "Failed to write temporary StateFile %s" +msgstr "Klarte ikke å skrive midlertidig StateFile %s" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/tagfile.cc:140 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker" +msgid "Unable to parse package file %s (1)" +msgstr "Klarer ikke å fortolke pakkefila %s (1)" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Leser pakkelister" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Klarer ikke å fortolke pakkefila %s (2)" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Samler inn filtilbud" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Utgave «%s» av «%s» ble ikke funnet" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "IO-feil ved lagring av kildekode-lager" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Versjon «%s» av «%s» ble ikke funnet" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/cacheset.cc:603 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Oversiktsfil av typen «%s» støttes ikke" +msgid "Couldn't find task '%s'" +msgstr "Klarte ikke å finne oppgave «%s»" -#: apt-pkg/policy.cc:83 +#: apt-pkg/cacheset.cc:609 +#, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "Klarte ikke finne noen pakken med regex «%s»" + +#: apt-pkg/cacheset.cc:615 +#, 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:626 +#, 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:633 apt-pkg/cacheset.cc:640 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" +"Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den " +"har ingen av dem" -#: apt-pkg/policy.cc:422 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Ugyldig oppslag i foretrekksfila %s, manglende pakkehode" +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/policy.cc:444 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Did not understand pin type %s" -msgstr "Forsto ikke spikring av typen %s" - -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Ingen prioritet (eller null) spesifisert for pin" +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/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/cacheset.cc:663 +#, 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/sourcelist.cc:170 +#: apt-pkg/indexrecords.cc:78 #, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)" +msgid "Unable to parse Release file %s" +msgstr "Klarer ikke å fortolke Release-fila %s" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/indexrecords.cc:86 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "Feil på linje %lu i kildelista %s ([valg] for kort)" +msgid "No sections in Release file %s" +msgstr "Ingen avsnitt i Release-fila %s" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/indexrecords.cc:117 #, 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)" +msgid "No Hash entry in Release file %s" +msgstr "Ingen sjekksumoppføring i Release-fila %s" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/indexrecords.cc:130 #, 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)" +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "Ugyldig «Valid-Until»-oppføring i Release-fila %s" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/indexrecords.cc:149 #, 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)" +msgid "Invalid 'Date' entry in Release file %s" +msgstr "Ugyldig «Date»-oppføring i Release-fila %s" -#: apt-pkg/sourcelist.cc:206 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Feil på linje %lu i kildelista %s (nettadresse)" +msgid "%lid %lih %limin %lis" +msgstr "%lid %lit %lim %lis" -#: apt-pkg/sourcelist.cc:208 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Feil på linje %lu i kildelista %s (dist)" +msgid "%lih %limin %lis" +msgstr "%lit %lim %lis" -#: apt-pkg/sourcelist.cc:211 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)" +msgid "%limin %lis" +msgstr "%lim %lis" -#: apt-pkg/sourcelist.cc:217 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Feil på %lu i kildelista %s (Absolutt dist)" +msgid "%lis" +msgstr "%lis" -#: apt-pkg/sourcelist.cc:224 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Feil på %lu i kildelista %s (dist fortolking)" +msgid "Selection %s not found" +msgstr "Fant ikke utvalget %s" -#: apt-pkg/sourcelist.cc:335 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "Opening %s" -msgstr "Åpner %s" +msgid "Not using locking for read only lock file %s" +msgstr "Bruker ikke låsing for den skrivebeskyttede låsefila %s" -#: apt-pkg/sourcelist.cc:371 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Feil på %u i kildelista %s (type)" +msgid "Could not open lock file %s" +msgstr "Klarte ikke åpne låsefila %s" -#: apt-pkg/sourcelist.cc:375 +#: apt-pkg/contrib/fileutl.cc:218 #, 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" +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Bruker ikke låsing på den nfs-monterte låsefila %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/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Får ikke låst %s" -#: apt-pkg/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" msgstr "" -"Beklager, du må legge inn noen kilder (nettadresser) i din «sources.list»." -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/fileutl.cc:394 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Klarer ikke å fortolke pakkefila %s (1)" +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/fileutl.cc:412 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Klarer ikke å fortolke pakkefila %s (2)" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" -#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 -#, fuzzy +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format 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/vendorlist.cc:85 -#, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk" - -#: apt-pkg/contrib/cdromutl.cc:65 -#, c-format -msgid "Unable to stat the mount point %s" -msgstr "Klarer ikke å fastsette monteringspunktet %s" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "Klarer ikke å få statusen på CD-spilleren" - -#: apt-pkg/contrib/cmndline.cc:121 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "Kjenner ikke kommandolinjevalget «%c» (fra %s)." - -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "Skjønner ikke kommandolinjevalget %s" - -#: apt-pkg/contrib/cmndline.cc:168 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "Kommandolinjevalget %s er ikke boolsk" - -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "Valget %s krever et argument." - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "Valg %s: Angivelsen av oppsettselementet må ha en =." - -#: apt-pkg/contrib/cmndline.cc:278 -#, 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:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "Valget «%s» er for langt" - -#: apt-pkg/contrib/cmndline.cc:341 -#, 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:391 -#, c-format -msgid "Invalid operation %s" -msgstr "Ugyldig operasjon %s" - -#: apt-pkg/contrib/configuration.cc:519 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Ukjent typeforkortelse: «%c»" - -#: apt-pkg/contrib/configuration.cc:633 -#, c-format -msgid "Opening configuration file %s" -msgstr "Åpner oppsettsfila %s" - -#: apt-pkg/contrib/configuration.cc:801 -#, 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:820 -#, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Syntaksfeil %s:%u: Feil på taggen" - -#: apt-pkg/contrib/configuration.cc:837 -#, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien" - -#: apt-pkg/contrib/configuration.cc:877 -#, 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:884 -#, 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:888 apt-pkg/contrib/configuration.cc:893 -#, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Syntaksfeil %s:%u: Inkludert herfra" - -#: apt-pkg/contrib/configuration.cc:897 -#, 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:900 -#, 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:950 -#, 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/fileutl.cc:190 -#, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Bruker ikke låsing for den skrivebeskyttede låsefila %s" - -#: apt-pkg/contrib/fileutl.cc:195 -#, c-format -msgid "Could not open lock file %s" -msgstr "Klarte ikke åpne låsefila %s" - -#: apt-pkg/contrib/fileutl.cc:218 -#, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Bruker ikke låsing på den nfs-monterte låsefila %s" - -#: apt-pkg/contrib/fileutl.cc:223 -#, c-format -msgid "Could not get lock %s" -msgstr "Får ikke låst %s" - -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 -#, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:394 -#, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:412 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:421 -#, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" #: apt-pkg/contrib/fileutl.cc:824 @@ -3320,11 +2839,25 @@ msgstr "Problem ved oppheving av lenke til fila %s" msgid "Problem syncing the file" msgstr "Problem ved oppdatering av fila" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "No keyring installed in %s." -msgstr "Ingen nøkkelring installert i %s." +msgid "%c%s... Error!" +msgstr "%c%s ... Feil" + +#: apt-pkg/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s ... Ferdig" + +#: apt-pkg/contrib/progress.cc:181 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s ... Ferdig" #: apt-pkg/contrib/mmap.cc:79 msgid "Can't mmap an empty file" @@ -3382,226 +2915,688 @@ msgstr "" "Klarte ikke øke størrelsen på MMap-en siden automatisk voksing er deaktivert " "av brukeren." -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s ... Feil" +msgid "Unable to stat the mount point %s" +msgstr "Klarer ikke å fastsette monteringspunktet %s" -#: apt-pkg/contrib/progress.cc:150 +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Klarer ikke å få statusen på CD-spilleren" + +#: apt-pkg/contrib/configuration.cc:519 #, c-format -msgid "%c%s... Done" -msgstr "%c%s ... Ferdig" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Ukjent typeforkortelse: «%c»" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "" +#: apt-pkg/contrib/configuration.cc:633 +#, c-format +msgid "Opening configuration file %s" +msgstr "Åpner oppsettsfila %s" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s ... Ferdig" +#: apt-pkg/contrib/configuration.cc:801 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Syntaksfeil %s:%u: Blokka starter uten navn." -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: apt-pkg/contrib/configuration.cc:820 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%lid %lit %lim %lis" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Syntaksfeil %s:%u: Feil på taggen" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: apt-pkg/contrib/configuration.cc:837 #, c-format -msgid "%lih %limin %lis" -msgstr "%lit %lim %lis" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "%limin %lis" -msgstr "%lim %lis" +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" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "%lis" -msgstr "%lis" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Syntaksfeil %s:%u: For mange nøstede inkluderte filer" -#: apt-pkg/contrib/strutl.cc:1258 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format -msgid "Selection %s not found" -msgstr "Fant ikke utvalget %s" +msgid "Syntax error %s:%u: Included from here" +msgstr "Syntaksfeil %s:%u: Inkludert herfra" + +#: apt-pkg/contrib/configuration.cc:897 +#, 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:900 +#, 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:950 +#, c-format +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Syntaksfeil %s:%u: Ugyldige angivelser på slutten av fila" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, c-format +msgid "No keyring installed in %s." +msgstr "Ingen nøkkelring installert i %s." + +#: apt-pkg/contrib/cmndline.cc:124 +#, 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 +#, c-format +msgid "Command line option %s is not understood" +msgstr "Skjønner ikke kommandolinjevalget %s" + +#: apt-pkg/contrib/cmndline.cc:171 +#, 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 +#, 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 +#, c-format +msgid "Option %s: Configuration item specification must have an =." +msgstr "Valg %s: Angivelsen av oppsettselementet må ha en =." + +#: apt-pkg/contrib/cmndline.cc:281 +#, 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 +#, c-format +msgid "Option '%s' is too long" +msgstr "Valget «%s» er for langt" + +#: apt-pkg/contrib/cmndline.cc:344 +#, 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 +#, c-format +msgid "Invalid operation %s" +msgstr "Ugyldig operasjon %s" + +#: apt-pkg/deb/dpkgpm.cc:110 +#, c-format +msgid "Installing %s" +msgstr "Installerer %s" + +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 +#, c-format +msgid "Configuring %s" +msgstr "Setter opp %s" + +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 +#, c-format +msgid "Removing %s" +msgstr "Fjerner %s" + +#: apt-pkg/deb/dpkgpm.cc:113 +#, c-format +msgid "Completely removing %s" +msgstr "Fjerner %s fullstendig" + +#: apt-pkg/deb/dpkgpm.cc:114 +#, c-format +msgid "Noting disappearance of %s" +msgstr "Legger merke til at %s forsvinner" + +#: apt-pkg/deb/dpkgpm.cc:115 +#, 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:845 +#, c-format +msgid "Directory '%s' missing" +msgstr "Mappa «%s» mangler" + +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 +#, c-format +msgid "Could not open file '%s'" +msgstr "Klarte ikke åpne fila «%s»" + +#: apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Preparing %s" +msgstr "Forbereder %s" + +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr "Pakker ut %s" + +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing to configure %s" +msgstr "Forbereder oppsett av %s" + +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr "Installerte %s" + +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "Forbereder fjerning av %s" + +#: apt-pkg/deb/dpkgpm.cc:1022 +#, c-format +msgid "Removed %s" +msgstr "Fjernet %s" + +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Forbereder å fullstendig slette %s" + +#: apt-pkg/deb/dpkgpm.cc:1028 +#, c-format +msgid "Completely removed %s" +msgstr "Fjernet %s fullstendig" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Kan ikke skrive til %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1719 +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:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "avhengighetsproblemer - lar den være uoppsatt" + +#: apt-pkg/deb/dpkgpm.cc:1726 +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:1732 +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:1739 +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:1746 apt-pkg/deb/dpkgpm.cc:1752 +#, 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:1774 +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" + +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Bruk: apt-extracttemplates fil1 [fil2 ...]\n" +"\n" +"apt-extracttemplates er et verktøy til å hente ut informasjon om " +"innstillinger\n" +"og maler fra debianpakker.\n" +"\n" +"Innstillinger:\n" +" -h Denne hjelpeteksten\n" +" -t Lag en midlertidig mappe\n" +" -c=? Les denne innstillingsfila.\n" +" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "Klarte ikke å få statusen på %s" + +#: cmdline/apt-extracttemplates.cc:300 +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 +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 +#, c-format +msgid "Error processing directory %s" +msgstr "Feil ved lesing av katalogen %s" + +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Lista over kildeutvidelser er for lang" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Feil ved skriving av topptekst til innholdsfila" + +#: ftparchive/apt-ftparchive.cc:431 +#, c-format +msgid "Error processing contents %s" +msgstr "Det oppsto en feil ved lesing av %s" + +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Bruk: apt-ftparchive [innstillinger] kommando\n" +"Kommandoer: packages binærsti [overstyringsfil [sti-prefiks]]\n" +" sources kildesti [overstyringsfil [sti-prefiks]]\n" +" contents sti\n" +" release sti\n" +" generate config [grupper]\n" +" clean config\n" +"\n" +"apt-ftparchive oppretter indeksfiler for debianarkiver. Mange ulike\n" +"metoder er støttet - fra helautomatiske til funksjonelle\n" +"erstatninger for dpkg-scanpackages og dpkg-scansources.\n" +"\n" +"apt-ftparchive oppretter «Packages»-filer fra et tre med debianpakker.\n" +"«Packages»-fila inneholder alle kontrollfeltene fra hver pakke i tillegg " +"til\n" +"MD5-nøkkel og filstørrelse. Du kan bruke en overstyringsfil for å tvinge\n" +"gjennom verdier for prioritet og kategori.\n" +"\n" +"apt-ftparchive kan på samme måte opprette kildefiler fra et tre\n" +"med .dsc-filer. Du kan bruke en overstyringsfil med --source-override.\n" +"\n" +"Kommandoene «packages» og «sources» skal kjøres i rota av katalogtreet.\n" +"«Binærsti» skal peke til toppkatalogen for det rekursive søket, og\n" +"overstyringsfila skal inneholde innstillinger for overstyring.\n" +"Sti-prefikset blir lagt til feltene for filnavn, dersom det er oppgitt. Her " +"er\n" +"et eksempel på bruk i debianarkivet:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Innstillinger:\n" +" -h Vis denne hjelpeteksten.\n" +" --md5 Styrer MD5-opprettelsen\n" +" -s=? Overstyringsfil for kildekode.\n" +" -q Stille.\n" +" -d=? Velger om du vil bruke en mellomlagerdatabase.\n" +" --no-delink Bruk avlusingsmodus med «delinking».\n" +" --contents Styrer opprettelse av innholdsfila.\n" +" -c=? Les denne oppsettsfila.\n" +" -o=? Setter en vilkårlig innstilling" + +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Ingen utvalg passet" + +#: ftparchive/apt-ftparchive.cc:907 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "Enkelte filer mangler i pakkegruppa «%s»" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Databasen er ødelagt. Filnavnet er endret til %s.old" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "Databasen er gammel, forsøker å oppgradere %s" + +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, " +"fjern og så gjenopprett databasen." + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Klarte ikke å åpne Databasefila %s: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Klarte ikke å lese lenken %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Arkivet har ingen kontrollpost" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Klarte ikke å finne en peker" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.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?" +msgid "W: Unable to read directory %s\n" +msgstr "A: Klarte ikke å lese katalogen %s\n" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:96 #, 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 "W: Unable to stat %s\n" +msgstr "A: Klarte ikke å få statusen på %s\n" -#. 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," +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "F:" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "Ikke låst" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "A:" -#: apt-pkg/deb/dpkgpm.cc:95 -#, c-format -msgid "Installing %s" -msgstr "Installerer %s" +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "F: Det er feil ved fila" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "Configuring %s" -msgstr "Setter opp %s" +msgid "Failed to resolve %s" +msgstr "Klarte ikke å slå opp %s" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 -#, c-format -msgid "Removing %s" -msgstr "Fjerner %s" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Klarte ikke å finne fram i treet" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:219 #, c-format -msgid "Completely removing %s" -msgstr "Fjerner %s fullstendig" +msgid "Failed to open %s" +msgstr "Klarte ikke å åpne %s" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:278 #, c-format -msgid "Noting disappearance of %s" -msgstr "Legger merke til at %s forsvinner" +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:286 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Kjører etter-installasjonsutløser %s" +msgid "Failed to readlink %s" +msgstr "Klarte ikke å lese lenken %s" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:290 #, c-format -msgid "Directory '%s' missing" -msgstr "Mappa «%s» mangler" +msgid "Failed to unlink %s" +msgstr "Klarte ikke å oppheve lenken %s" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:298 #, c-format -msgid "Could not open file '%s'" -msgstr "Klarte ikke åpne fila «%s»" +msgid "*** Failed to link %s to %s" +msgstr "*** Klarte ikke å lenke %s til %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:308 #, c-format -msgid "Preparing %s" -msgstr "Forbereder %s" +msgid " DeLink limit of %sB hit.\n" +msgstr " DeLink-grensa på %s B er nådd.\n" -#: apt-pkg/deb/dpkgpm.cc:993 -#, c-format -msgid "Unpacking %s" -msgstr "Pakker ut %s" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Arkivet har ikke noe pakkefelt" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Preparing to configure %s" -msgstr "Forbereder oppsett av %s" +msgid " %s has no override entry\n" +msgstr " %s har ingen overstyringsoppføring\n" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Installed %s" -msgstr "Installerte %s" +msgid " %s maintainer is %s not %s\n" +msgstr " %s-vedlikeholderen er %s, ikke %s\n" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing for removal of %s" -msgstr "Forbereder fjerning av %s" +msgid " %s has no source override entry\n" +msgstr " %s har ingen kildeoverstyringsoppføring\n" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/writer.cc:710 #, c-format -msgid "Removed %s" -msgstr "Fjernet %s" +msgid " %s has no binary override entry either\n" +msgstr " %s har ingen binæroverstyringsoppføring heller\n" + +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Klarte ikke å tildele minne" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Forbereder å fullstendig slette %s" +msgid "Unable to open %s" +msgstr "Klarte ikke å åpne %s" -#: apt-pkg/deb/dpkgpm.cc:1013 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Ugyldig overstyring %s linje %lu #1" + +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Completely removed %s" -msgstr "Fjernet %s fullstendig" +msgid "Failed to read the override file %s" +msgstr "Klarte ikke å lese overstyringsfila %s" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/override.cc:166 #, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Kan ikke skrive til %s" +msgid "Malformed override %s line %llu #1" +msgstr "Ugyldig overstyring %s linje %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "Ugyldig overstyring %s linje %lu #2" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "Ugyldig overstyring %s linje %lu #3" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" +#: ftparchive/multicompress.cc:73 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Ukjent komprimeringsalgoritme «%s»" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nådd" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Komprimert utdata %s trenger et komprimeringssett" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "avhengighetsproblemer - lar den være uoppsatt" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Klarte ikke å opprette FILE*" -#: apt-pkg/deb/dpkgpm.cc:1694 -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." +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Klarte ikke å forgreine prosess" -#: apt-pkg/deb/dpkgpm.cc:1700 -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" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Komprimer barneprosess" -#: apt-pkg/deb/dpkgpm.cc:1707 -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" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Intern feil, klarte ikke å opprette %s" + +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "Klarte ikke å kommunisere med underprosess/fil" + +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Klarte ikke å lese under utregning av MD5" + +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Problem ved oppheving av lenken til %s" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-internal-solver.cc:49 #, fuzzy msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-" -"feil" +"Bruk: apt-extracttemplates fil1 [fil2 ...]\n" +"\n" +"apt-extracttemplates er et verktøy til å hente ut informasjon om " +"innstillinger\n" +"og maler fra debianpakker.\n" +"\n" +"Innstillinger:\n" +" -h Denne hjelpeteksten\n" +" -t Lag en midlertidig mappe\n" +" -c=? Les denne innstillingsfila.\n" +" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Ukjent pakkeoppføring" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «dpkg I/O»-feil" +"Bruk: apt-sortpkgs [innstillinger] fil1 [fil2 ...]\n" +"\n" +"apt-sortpkgs er et enkelt redskap til å sortere pakkefiler. Innstillingen\n" +"-s brukes til å angi hvilken filtype det er.\n" +"\n" +"Innstillinger:\n" +" -h Denne hjelpeteksten\n" +" -s Bruk filsortering\n" +" -c=? Les denne innstillingsfila.\n" +" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/ne.po b/po/ne.po index 08de0f8ef..caec89af5 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " संस्करण तालिका:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -358,7 +358,7 @@ msgstr "डाउनलोड डाइरेक्ट्री ताल्च msgid "Must specify at least one package to fetch source for" msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो" @@ -378,114 +378,114 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "स्रोत फड्काउनुहोस् %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "केही संग्रह फड्काउन असफल भयो ।" -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n" -#: cmdline/apt-get.cc:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "अनप्याक आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "निर्माण आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "शाखा प्रक्रिया असफल भयो" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, 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:1290 +#: cmdline/apt-get.cc:1294 #, 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:1313 +#: cmdline/apt-get.cc:1317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1356 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -494,37 +494,37 @@ msgstr "" "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण " "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन " -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1362 #, 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:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । " -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) मा जडान गरिदैछ" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "समर्थित मोड्युलहरू:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -663,7 +663,7 @@ msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन" @@ -757,16 +757,16 @@ msgstr "%s मा सिडी रोम अनमाउन्ट गर्न msgid "Disk not found." msgstr "डिस्क फेला परेन ।" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "फाइल फेला परेन " -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "स्थिर गर्न असफल भयो" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "परिमार्जन समय सेट असफल भयो" @@ -820,7 +820,7 @@ msgstr "लगइन स्क्रिफ्ट आदेश '%s' असफल msgid "TYPE failed, server said: %s" msgstr "टाइप असफल भयो: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "जडान समय सकियो" @@ -842,7 +842,7 @@ msgstr "एउटा प्रतिक्रियाले बफर अधि msgid "Protocol corruption" msgstr "प्रोटोकल दूषित" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -903,7 +903,7 @@ msgstr "डेटा सकेटको जडान समय सकियो" msgid "Unable to accept connection" msgstr "जडान स्वीकार गर्न असक्षम भयो" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "समस्या द्रुतान्वेषण फाइल" @@ -912,7 +912,7 @@ msgstr "समस्या द्रुतान्वेषण फाइल" msgid "Unable to fetch file, server said '%s'" msgstr "फाइल तान्न असक्षम भयो, सर्भरले भन्यो '%s'" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "डेटा सकेट समय सकियो" @@ -962,7 +962,7 @@ msgstr " %s:%s (%s) मा जडान गर्न सकिएन ।" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "%s मा जडान गरिदैछ" @@ -1100,42 +1100,17 @@ msgstr "जडान असफल भयो" msgid "Internal error" msgstr "आन्तरिक त्रुटि" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "हान्नुहोस्" - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "प्राप्त गर्नुहोस्:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ign " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Err " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "%s (%sB/s) मा %sB मा तानियो\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [काम गरिरहेको]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"मेडिया परिवर्तन: कृपया डिस्क लेबुल ड्राइभ '%s' मा घुसाउनुहोस्\n" -" '%s'\n" -"र इन्टर थिच्नुहोस्\n" +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:93 msgid "Correcting dependencies..." @@ -1165,35 +1140,210 @@ msgstr "यी सुधार गर्न तपाईँले 'apt-get -f in msgid "Unmet dependencies. Try using -f." msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।" -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "चेतावनी: निम्न प्याकलेजहरू प्रणाणीकरण हुन सक्दैन! " +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [स्थापना भयो]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "प्रमाणिकरण चेतावनी अधिलेखन भयो ।\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [स्थापना भयो]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "केही प्याकेजहरू प्रमाणीकरण हुन सक्दैन" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 +#: apt-private/private-output.cc:272 #, fuzzy -msgid "Install these packages without verification?" -msgstr "यी प्याकेजहरू रूजू बिना स्थापना गर्नुहुन्छ [y/N]? " +msgid "[installed,automatic]" +msgstr " [स्थापना भयो]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [स्थापना भयो]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "%s %s तान्न असफल भयो\n" +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:35 +#, 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:97 +#, 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:101 +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:82 msgid "Internal error, InstallPackages was called with broken packages!" @@ -1244,7 +1394,11 @@ msgstr "%sB अनप्याक गरिसके पछि डिस्क msgid "You don't have enough free space in %s." msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 msgid "Trivial Only specified but this is not a trivial operation." msgstr "त्रिभियल मात्र निर्दिष्ट गरिएको छ तर यो त्रिभियल सञ्चालन होइन ।" @@ -1447,928 +1601,681 @@ msgstr "प्याकेज %s स्थापना भएन, त्यस msgid "Package '%s' is not installed, so not removed\n" msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n" -#: apt-private/private-list.cc:129 -msgid "Listing" -msgstr "" - -#: apt-private/private-list.cc:159 -#, 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-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:36 +msgid "WARNING: The following packages cannot be authenticated!" +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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "प्रमाणिकरण चेतावनी अधिलेखन भयो ।\n" -#: apt-private/private-output.cc:265 -#, fuzzy, c-format -msgid "[installed,upgradable to: %s]" -msgstr " [स्थापना भयो]" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "केही प्याकेजहरू प्रमाणीकरण हुन सक्दैन" -#: apt-private/private-output.cc:268 +#: apt-private/private-download.cc:50 #, fuzzy -msgid "[installed,local]" -msgstr " [स्थापना भयो]" - -#: apt-private/private-output.cc:270 -msgid "[installed,auto-removable]" -msgstr "" +msgid "Install these packages without verification?" +msgstr "यी प्याकेजहरू रूजू बिना स्थापना गर्नुहुन्छ [y/N]? " -#: apt-private/private-output.cc:272 -#, fuzzy -msgid "[installed,automatic]" -msgstr " [स्थापना भयो]" +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "%s %s तान्न असफल भयो\n" -#: apt-private/private-output.cc:274 -#, fuzzy -msgid "[installed]" -msgstr " [स्थापना भयो]" +#: apt-private/private-sources.cc:58 +#, fuzzy, c-format +msgid "Failed to parse %s. Edit again? " +msgstr " %s मा %s पुन:नामकरण असफल भयो" -#: apt-private/private-output.cc:277 +#: apt-private/private-sources.cc:70 #, c-format -msgid "[upgradable from: %s]" +msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-output.cc:281 -msgid "[residual-config]" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" 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-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "स्तर वृद्धि गणना गरिदैछ..." -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "काम भयो" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "निम्न प्याकेजहरू हटाइनेछन्:" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "हान्नुहोस्" -#: apt-private/private-output.cc:571 -msgid "The following packages have been kept back:" -msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:" +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "प्राप्त गर्नुहोस्:" -#: apt-private/private-output.cc:592 -msgid "The following packages will be upgraded:" -msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:" +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ign " -#: apt-private/private-output.cc:613 -msgid "The following packages will be DOWNGRADED:" -msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:" +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Err " -#: apt-private/private-output.cc:633 -msgid "The following held packages will be changed:" -msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:" +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "%s (%sB/s) मा %sB मा तानियो\n" -#: apt-private/private-output.cc:688 +#: apt-private/acqprogress.cc:236 #, c-format -msgid "%s (due to %s) " -msgstr "%s (%s कारणले) " +msgid " [Working]" +msgstr " [काम गरिरहेको]" -#: apt-private/private-output.cc:696 +#: apt-private/acqprogress.cc:297 +#, c-format msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" msgstr "" -"चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n" -"तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!" +"मेडिया परिवर्तन: कृपया डिस्क लेबुल ड्राइभ '%s' मा घुसाउनुहोस्\n" +" '%s'\n" +"र इन्टर थिच्नुहोस्\n" -#: apt-private/private-output.cc:727 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, " +msgid "Unable to read %s" +msgstr "%s पढ्न असफल भयो" -#: apt-private/private-output.cc:731 +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 #, c-format -msgid "%lu reinstalled, " -msgstr "%lu पुन: स्थापना गरियो, " +msgid "Unable to change to %s" +msgstr "%s मा परिवर्तन गर्न असक्षम" -#: apt-private/private-output.cc:733 +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 #, c-format -msgid "%lu downgraded, " -msgstr "%lu स्तर कम गरियो, " +msgid "No mirror file '%s' found " +msgstr "" -#: apt-private/private-output.cc:735 -#, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 +#, fuzzy, c-format +msgid "Can not read mirror file '%s'" +msgstr "फाइल %s खोल्न सकिएन" -#: apt-private/private-output.cc:739 -#, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n" +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "फाइल %s खोल्न सकिएन" -#. 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]" +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" 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 "" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "सहायक प्रक्रियामा IPC पाइप सिर्जना गर्न असफल" -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:778 -msgid "Y" -msgstr "" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "जडान असमायिक बन्द भयो" -#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:784 -msgid "N" -msgstr "" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "खराब पूर्वनिर्धारण सेटिङ्ग!" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "निरन्तरता दिन इन्टर थिच्नुहोस् ।" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" 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] "" +#: dselect/install:102 +#, fuzzy +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "अनप्याक गर्दा केही त्रुटिहरू देखा पर्यो । म कनफिगर गर्न गइरहेको छु" -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" -msgstr "" +#: dselect/install:103 +#, fuzzy +msgid "will be configured. This may result in duplicate errors" +msgstr "स्थापना भएको प्याकेजहरू । यसले नक्कली त्रुटिहरुमा नतिजा गर्न सक्छ" -#: apt-private/private-sources.cc:58 -#, fuzzy, c-format -msgid "Failed to parse %s. Edit again? " -msgstr " %s मा %s पुन:नामकरण असफल भयो" +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "वा त्रुटि हरटाइरहेको निर्भरताहरुले गरेको हो । यो ठीक छ, मात्र त्रुटिहरू" -#: apt-private/private-sources.cc:70 -#, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." +#: dselect/install:105 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" +"दिएको संदेशहरू महत्वपूर्ण छ । कृपया तिनीहरू निश्चित गर्नुहोस् र चलाउनुहोस् [I]फेरी स्थापना " +"गर्नुहोस्" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन" +#: dselect/update:30 +msgid "Merging available information" +msgstr "उपलब्ध सूचना गाँभिदैछ" -#: apt-private/private-update.cc:90 -#, 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-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "अहिलेसम्म लिङ्क गरिएको नोडमा बोलाइएको ड्रपनोड" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." -msgstr "" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "ह्यास तत्व तोक्न असफल भयो" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "स्तर वृद्धि गणना गरिदैछ..." +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "मोड बाँड्न असफल भयो" -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "काम भयो" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "थपमोडमा आन्तरिक त्रुटि" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Unable to read %s" -msgstr "%s पढ्न असफल भयो" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "मोड अधिलेखन गर्ने प्यास गरिदै, %s -> %s र %s/%s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Unable to change to %s" -msgstr "%s मा परिवर्तन गर्न असक्षम" +msgid "Double add of diversion %s -> %s" +msgstr "मोडको डबल थप %s -> %s" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 +#: apt-inst/filelist.cc:549 #, c-format -msgid "No mirror file '%s' found " -msgstr "" - -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:287 -#, fuzzy, c-format -msgid "Can not read mirror file '%s'" -msgstr "फाइल %s खोल्न सकिएन" - -#: methods/mirror.cc:315 -#, fuzzy, c-format -msgid "No entry found in mirror file '%s'" -msgstr "फाइल %s खोल्न सकिएन" +msgid "Duplicate conf file %s/%s" +msgstr "नक्कली कनफिगगरेसन फाइल %s/%s" -#: methods/mirror.cc:445 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "[Mirror: %s]" -msgstr "" +msgid "The path %s is too long" +msgstr "बाटो %s अति लामो छ " -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "सहायक प्रक्रियामा IPC पाइप सिर्जना गर्न असफल" +#: apt-inst/extract.cc:132 +#, c-format +msgid "Unpacking %s more than once" +msgstr "एक भन्दा बढी %s अनप्याक गरिदैछ" -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" -msgstr "जडान असमायिक बन्द भयो" +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "डाइरेक्ट्री %s फेरियो " -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "खराब पूर्वनिर्धारण सेटिङ्ग!" +#: apt-inst/extract.cc:152 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "प्याकेज लक्षित मोडमा लेख्ने प्यास गर्दैछ %s/%s" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "निरन्तरता दिन इन्टर थिच्नुहोस् ।" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "घुम्ती बाटो अति लामो छ" -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "" +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 +#, c-format +msgid "Failed to stat %s" +msgstr " %s स्थिर गर्न असफल" -#: dselect/install:102 -#, fuzzy -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "अनप्याक गर्दा केही त्रुटिहरू देखा पर्यो । म कनफिगर गर्न गइरहेको छु" +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#, c-format +msgid "Failed to rename %s to %s" +msgstr " %s मा %s पुन:नामकरण असफल भयो" -#: dselect/install:103 -#, fuzzy -msgid "will be configured. This may result in duplicate errors" -msgstr "स्थापना भएको प्याकेजहरू । यसले नक्कली त्रुटिहरुमा नतिजा गर्न सक्छ" +#: apt-inst/extract.cc:249 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "डाइरेक्ट्री %s डाइरेक्ट्री विहिन द्वारा बदलिदैछ" -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "वा त्रुटि हरटाइरहेको निर्भरताहरुले गरेको हो । यो ठीक छ, मात्र त्रुटिहरू" +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "यसको ह्यास बाल्टीमा नोड स्थित गर्न असफल भयो" -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" -msgstr "" -"दिएको संदेशहरू महत्वपूर्ण छ । कृपया तिनीहरू निश्चित गर्नुहोस् र चलाउनुहोस् [I]फेरी स्थापना " -"गर्नुहोस्" +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "बाटो अति लामो छ" -#: dselect/update:30 -msgid "Merging available information" -msgstr "उपलब्ध सूचना गाँभिदैछ" +#: apt-inst/extract.cc:421 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr " %s को लागि संस्करन बिना अधिलेखन प्याकेज मेल खायो" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"उपयोग: apt-extracttemplates file1 [file2 ...]\n" -"\n" -" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n" -"\n" -"\n" -"विकल्पहरू:\n" -" -h यो मद्दत पाठ\n" -" -t टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n" -" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" -" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" +#: apt-inst/extract.cc:438 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा अधिलेखन गर्दछ" -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" +#: apt-inst/extract.cc:498 +#, c-format +msgid "Unable to stat %s" msgstr "%s स्थिर गर्न असक्षम भयो" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Unable to write to %s" -msgstr " %s मा लेख्न असक्षम" +msgid "Failed to write file %s" +msgstr "फाइल %s लेख्न असफल भयो" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? " +#: apt-inst/dirstream.cc:105 +#, c-format +msgid "Failed to close file %s" +msgstr "%s फाइल बन्द गर्न असफल भयो" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "प्याकेज विस्तार सूचि अति लामो छ" +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "यो वैध DEB संग्रह होइन, '%s' सदस्य हराइरहेछ" -#: 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 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "Error processing directory %s" -msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि" +msgid "Internal error, could not locate member %s" +msgstr "आन्तरीक त्रुटि, सदस्य तोक्न सक्दैन %s" -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "स्रोत विस्तार सूचि अति लामो छ" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "पद वर्णन गर्न नसकिने नियन्त्रण फाइल" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "सामाग्री फाइलहरुमा हेडर लेख्दा त्रुटि" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "अवैध संग्रह हस्ताक्षर" -#: ftparchive/apt-ftparchive.cc:431 -#, c-format -msgid "Error processing contents %s" -msgstr "सामग्री %sप्रक्रिया गर्दा त्रुटि" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "संग्रह सदस्य हेडर पढ्दा त्रुटि " -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"उपयोग: apt-ftparchive [विकल्पहरू] आदेश\n" -"आदेशहरू: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive ले डेवियन संग्रहहरुको लागि अनुक्रमणिका फाइलहरू सिर्जना गर्दछ । यसले " -"समर्थन गर्दछ\n" -"dpkg-scanpackages र dpkg-scansources को लागि कार्यात्मक प्रतिस्थापनमा पुरै " -"स्वचालितबाट सिर्जनाको धेरै शैलीहरू\n" -" \n" -"\n" -"apt-ftparchive ले debs को ट्रीबाट प्याकेज फाइलहरू सिर्जना गर्दछ । प्याकेज\n" -"फाइलहरुले प्रत्येक प्याकेजबाट सबै नियन्त्रण फाँटहरुको सामग्रीहरू साथ साथै MD5 hash र " -"filesize समावेश गर्दछ ।\n" -"एउटा अधिलेखन फाइल\n" -"प्राथमिकता र सेक्सनको मान जोड गर्न समर्थित हुन्छ ।\n" -"\n" -"त्यस्तै गरी apt-ftparchive ले .dscs को ट्रीबाट स्रोत फाइलहरू सिर्जना गर्दछ ।\n" -"स्रोत--अधिलेखन--विकल्प src अधीलेखन फाइल निर्दिष्ट गर्न प्रयोग गर्न सकिन्छ\n" -"\n" -"'packages' and 'sources' आदेश ट्रीको मूलमा चलाउन सकिन्छ ।\n" -" विनारी मार्ग फेरी हुने खोजीको विन्दुमा आधारित हुन्छ र \n" -"अधिलेखन फाइलले अधिलेखन झण्डाहरू समाविष्ट गर्दछ । यदि उपस्थित छ भने बाटो उपसर्ग\n" -"फाइलनाम फाँटहरुमा थपिन्छ । उदाहरणको लागि \n" -"डेवियन संग्रहबाट उपयोग:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"विकल्पहरू:\n" -" -h यो मद्दत पाठ\n" -" --md5 नियन्त्रण MD5 सिर्जना\n" -" -s=? स्रोत अधिलेखन फाइल\n" -" -q बन्द गर्नुहोस्\n" -" -d=? वैकल्पिक क्यासिङ डेटाबेस चयन गर्नुहोस्\n" -" --no-delink delinking डिबग मोड सक्षम गर्नुहोस्\n" -" --सामग्रीहरू सामग्री फाइल सिर्जना नियन्त्रण गर्नुहोस्\n" -" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" -" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "कुनै चयनहरू मेल खाएन" - -#: ftparchive/apt-ftparchive.cc:907 -#, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "केही फाइलहरू प्याकेज फाइल समूह `%s' मा हराइरहेको छ" - -#: ftparchive/cachedb.cc:65 -#, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB दूषित थियो, फाइल %s.पुरानो मा पुन:नामकरण गर्नुहोस्" +#: apt-inst/contrib/arfile.cc:96 +#, fuzzy, c-format +msgid "Invalid archive member header %s" +msgstr "अवैध संग्रह सदस्य हेडर" -#: ftparchive/cachedb.cc:83 -#, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "DB पुरानो छ, %s स्तरवृद्धि गर्न प्रयास गरिदैछ" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "अवैध संग्रह सदस्य हेडर" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "संग्रह अति छोटो छ" -#: ftparchive/cachedb.cc:99 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "DB फाइल %s असक्षम भयो: %s" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "संग्रह हेडरहरू पढ्न असफल" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 -#, c-format -msgid "Failed to stat %s" -msgstr " %s स्थिर गर्न असफल" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "पाइपहरू सिर्जना गर्न असफल" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "लिङ्क पढ्न असफल %s" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "gzip कार्यन्वयन गर्न असफल" -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "संग्रह संग नियन्त्रण रेकर्ड छैन" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "संग्रह दूषित भयो" -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "कर्सर प्राप्त गर्न असक्षम भयो" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "टार चेकसम असफल भयो, संग्रह दूषित भयो" -#: ftparchive/writer.cc:91 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: डाइरेक्ट्री %s पढ्न असक्षम\n" +msgid "Unknown TAR header type %u, member %s" +msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s" -#: ftparchive/writer.cc:96 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "W: %s स्थिर गर्न असक्षम\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " - -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "W: " +msgid "Progress: [%3i%%]" +msgstr "" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस्" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-pkg/init.cc:146 #, c-format -msgid "Failed to resolve %s" -msgstr "%s हल गर्न असफल भयो" +msgid "Packaging system '%s' is not supported" +msgstr "प्याकिङ्ग प्रणाली '%s' समर्थित छैन" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "ट्री हिडाईँ असफल भयो" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "उपयुक्त प्याकिङ्ग प्रणाली प्रकार निर्धारन गर्न असक्षम भयो" -#: ftparchive/writer.cc:219 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Failed to open %s" -msgstr "%s खोल्न असफल" +msgid "Wrote %i records.\n" +msgstr "%i रेकर्डहरू लेखियो ।\n" -#: ftparchive/writer.cc:278 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" -#: ftparchive/writer.cc:286 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "Failed to readlink %s" -msgstr "लिङ्क पढ्न असफल %s" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" -#: ftparchive/writer.cc:290 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "Failed to unlink %s" -msgstr "अनलिङ्क गर्न असफल %s" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" -#: ftparchive/writer.cc:298 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** %s मा %s लिङ्क असफल भयो" +msgid "Can't find authentication record for: %s" +msgstr "" -#: ftparchive/writer.cc:308 +#: apt-pkg/indexcopy.cc:521 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "MD5Sum मेल भएन" + +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr "यस %sB हिटको डि लिङ्क सिमा।\n" +msgid "The method driver %s could not be found." +msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "संग्रह संग कुनै प्याकेज फाँट छैन" +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid " %s has no override entry\n" -msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" +msgid "Method %s did not start correctly" +msgstr "विधि %s सही रुपले सुरू हुन सकेन" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " %s संभारकर्ता %s हो %s होइन\n" +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । " -#: ftparchive/writer.cc:706 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "प्याकेज सूचीहरू वा वस्तुस्थिति फाइल पद वर्णन गर्न वा खोल्न सकिएन ।" -#: ftparchive/writer.cc:710 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "यो समस्याहरू सुधार्न तपाईँ apt-get अद्यावधिक चलाउन चाहनुहुन्छ" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - स्मृति बाँडफाँड गर्न असफल भयो" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "%s खोल्न असफल" - -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #१" - -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "अधिलेखन फाइल पढ्न असफल %s" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "खाली प्याकेज क्यास" -#: ftparchive/override.cc:166 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #१" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "प्याकेज क्यास फाइल दूषित भयो " -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #२" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "प्याकेज क्यास फाइल एउटा अमिल्दो संस्करण हो" -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #३" +#: apt-pkg/pkgcache.cc:169 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "प्याकेज क्यास फाइल दूषित भयो " -#: ftparchive/multicompress.cc:73 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "अज्ञात सङ्कुचन अल्गोरिद्म '%s'" +msgid "This APT does not support the versioning system '%s'" +msgstr "यो APT ले संस्करण प्रणालीलाई समर्थन गर्दैन '%s'" -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "सङ्कुचन गरिएको निर्गात %s लाई सङ्कुचन सेटको आवश्यक्ता पर्दछ" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "प्याकेज क्यास विभिन्न वास्तुकलाको लागि निर्माण भएको हो" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "FILE* सिर्जना गर्न असफल" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "आधारित" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "काँटा गर्न असफल" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "पुन:आधारित" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "सङ्कुचन शाखा" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "सुझाव दिन्छ" -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "आन्तरीक त्रुटि, %s सिर्जना गर्न असफल" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "सिफारिस गर्दछ" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "सहायक प्रक्रिया/फाइलमा IO असफल भयो" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "द्वन्दहरू" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "MD5 गणना गर्दा पढ्न असफल भयो" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "बदल्छ" -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "समस्या अनलिङ्क भइरहेछ %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "वेकायमहरू" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 -#, c-format -msgid "Failed to rename %s to %s" -msgstr " %s मा %s पुन:नामकरण असफल भयो" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "" -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" msgstr "" -"उपयोग: apt-extracttemplates file1 [file2 ...]\n" -"\n" -" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n" -"\n" -"\n" -"विकल्पहरू:\n" -" -h यो मद्दत पाठ\n" -" -t टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n" -" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" -" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "अज्ञात प्याकेज रेकर्ड!" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "महत्वपूर्ण" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"उपयोग: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs प्याकेज फाइलहरू क्रमबद्ध गर्ने साधारण उपकरण हो । -s विकल्प कस्तो खालको " -"फाइल हो भनी इंकित गर्न प्रयोग गरिन्छ ।\n" -"\n" -"विकल्पहरू:\n" -" -h यो मद्दत पाठ\n" -" -s क्रमबद्ध स्रोत फाइल प्रयोग गर्नुहोस्\n" -" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" -" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "आवश्यक" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" -msgstr "फाइल %s लेख्न असफल भयो" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "मानक" -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "%s फाइल बन्द गर्न असफल भयो" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "वैकल्पिक" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "बाटो %s अति लामो छ " +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "अतिरिक्त" -#: apt-inst/extract.cc:132 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Unpacking %s more than once" -msgstr "एक भन्दा बढी %s अनप्याक गरिदैछ" +msgid "Index file type '%s' is not supported" +msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन" -#: apt-inst/extract.cc:142 -#, c-format -msgid "The directory %s is diverted" -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-inst/extract.cc:152 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "प्याकेज लक्षित मोडमा लेख्ने प्यास गर्दैछ %s/%s" +#: apt-pkg/sourcelist.cc:170 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -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-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "डाइरेक्ट्री %s डाइरेक्ट्री विहिन द्वारा बदलिदैछ" +#: 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-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "यसको ह्यास बाल्टीमा नोड स्थित गर्न असफल भयो" +#: 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-inst/extract.cc:293 -msgid "The path is too long" -msgstr "बाटो अति लामो छ" +#: 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-inst/extract.cc:421 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Overwrite package match with no version for %s" -msgstr " %s को लागि संस्करन बिना अधिलेखन प्याकेज मेल खायो" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)" -#: apt-inst/extract.cc:438 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा अधिलेखन गर्दछ" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)" -#: apt-inst/extract.cc:498 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Unable to stat %s" -msgstr "%s स्थिर गर्न असक्षम भयो" - -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "अहिलेसम्म लिङ्क गरिएको नोडमा बोलाइएको ड्रपनोड" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "ह्यास तत्व तोक्न असफल भयो" - -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "मोड बाँड्न असफल भयो" +#: apt-pkg/sourcelist.cc:217 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "थपमोडमा आन्तरिक त्रुटि" +#: apt-pkg/sourcelist.cc:224 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-inst/filelist.cc:477 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "मोड अधिलेखन गर्ने प्यास गरिदै, %s -> %s र %s/%s" +msgid "Opening %s" +msgstr "%s खोलिदैछ" -#: apt-inst/filelist.cc:506 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "मोडको डबल थप %s -> %s" +msgid "Line %u too long in source list %s." +msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।" -#: apt-inst/filelist.cc:549 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "नक्कली कनफिगगरेसन फाइल %s/%s" +msgid "Malformed line %u in source list %s (type)" +msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "अवैध संग्रह हस्ताक्षर" +#: 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-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "संग्रह सदस्य हेडर पढ्दा त्रुटि " +#: 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-inst/contrib/arfile.cc:96 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 #, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "अवैध संग्रह सदस्य हेडर" +msgid "Clean of %s is not supported" +msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "अवैध संग्रह सदस्य हेडर" +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." +msgstr "%s स्थिर गर्न असक्षम भयो ।" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "संग्रह अति छोटो छ" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "क्यास संग एउटा नमिल्दो संस्करण प्रणाली छ" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "पाइपहरू सिर्जना गर्न असफल" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "gzip कार्यन्वयन गर्न असफल" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "संग्रह दूषित भयो" +#: apt-pkg/pkgcachegen.cc:263 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "टार चेकसम असफल भयो, संग्रह दूषित भयो" +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " -#: apt-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s" +msgid "Package %s %s was not found while processing file dependencies" +msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "यो वैध DEB संग्रह होइन, '%s' सदस्य हराइरहेछ" +msgid "Couldn't stat source package list %s" +msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन " -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "आन्तरीक त्रुटि, सदस्य तोक्न सक्दैन %s" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "प्याकेज सूचिहरू पढिदैछ" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "पद वर्णन गर्न नसकिने नियन्त्रण फाइल" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, fuzzy, c-format -msgid "List directory %spartial is missing." -msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।" +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr " %s मा लेख्न असक्षम" -#: apt-pkg/acquire.cc:91 -#, fuzzy, c-format -msgid "Archives directory %spartial is missing." -msgstr "आंशिक संग्रह डाइरेक्ट्री %s हराइरहेछ ।" +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि" -#: apt-pkg/acquire.cc:99 -#, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल" +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ (%s बाँकी छ)" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2389,35 +2296,35 @@ msgstr "साइज मेल खाएन" msgid "Invalid file format" msgstr "अवैध सञ्चालन %s" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, 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:1589 +#: apt-pkg/acquire-item.cc:1656 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/acquire-item.cc:1631 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2425,12 +2332,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2439,123 +2346,105 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) " -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।" -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।" +msgid "Vendor block %s contains no fingerprint" +msgstr "बिक्रता ब्ल्क %s ले कुनै औठाछाप समाविष्ट गर्दैन" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n" +msgid "List directory %spartial is missing." +msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।" -#: apt-pkg/acquire-worker.cc:169 -#, c-format -msgid "Method %s did not start correctly" -msgstr "विधि %s सही रुपले सुरू हुन सकेन" +#: apt-pkg/acquire.cc:91 +#, fuzzy, c-format +msgid "Archives directory %spartial is missing." +msgstr "आंशिक संग्रह डाइरेक्ट्री %s हराइरहेछ ।" -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 +#, fuzzy, c-format +msgid "Unable to lock directory %s" +msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल" + +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । " +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ (%s बाँकी छ)" -#: apt-pkg/algorithms.cc:265 +#: apt-pkg/acquire.cc:904 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "प्याकेज %s पुन:स्थापना हुन चाहन्छ, तर यसको लागि मैले एउटा संग्रह फेला पार्न सकिन ।" +msgid "Retrieving file %li of %li" +msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ" -#: apt-pkg/algorithms.cc:1086 +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्" + +#: apt-pkg/policy.cc:83 +#, c-format msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -"त्रुटि, pkgProblemResolver:: समाधानले विच्छेदन सिर्जना गर्दछ, यो भइरहेको प्याकेजहरुको " -"कारणले गर्दा हो ।" -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।" +#: apt-pkg/policy.cc:422 +#, fuzzy, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "प्राथमिकता फाइलमा अवैध रेकर्ड, कुनै प्याकेज हेडर छैन" -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." -msgstr "प्याकेज सूचीहरू वा वस्तुस्थिति फाइल पद वर्णन गर्न वा खोल्न सकिएन ।" +#: apt-pkg/policy.cc:444 +#, c-format +msgid "Did not understand pin type %s" +msgstr "पिन टाइप %s बुझ्न सकिएन " -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "यो समस्याहरू सुधार्न तपाईँ apt-get अद्यावधिक चलाउन चाहनुहुन्छ" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन" -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।" - -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन" - -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन" - -#: apt-pkg/cacheset.cc:603 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "प्याकेज फेला पार्न सकिएन %s" - -#: apt-pkg/cacheset.cc:609 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "प्याकेज फेला पार्न सकिएन %s" - -#: apt-pkg/cacheset.cc:615 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "प्याकेज फेला पार्न सकिएन %s" - -#: apt-pkg/cacheset.cc:626 -#, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "" - -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" +"द्वन्द/पुन-आधारित लूपको कारणले गर्दा स्थापना चलाउनको लागि अस्थायी रुपमा प्याकेज %s " +"हटाउनु पर्नेछ । यो प्राय नराम्रो हो, तर यदि तपाईँ यो साँच्चै गर्न चाहनुहुन्छ भने, APT::" +"Force-LoopBreak विकल्प सक्रिय गर्नुहोस् ।" -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +#: 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:497 apt-pkg/sourcelist.cc:347 -#, c-format -msgid "Line %u too long in source list %s." -msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।" +"केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो " +"एउटा प्रयोग गरियो ।" #: apt-pkg/cdrom.cc:571 #, fuzzy @@ -2631,10 +2520,23 @@ msgstr "नयाँ स्रोत सूचि लेखिदैछ\n" msgid "Source list entries for this disc are:\n" msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "%s स्थिर गर्न असक्षम भयो ।" +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "प्याकेज %s पुन:स्थापना हुन चाहन्छ, तर यसको लागि मैले एउटा संग्रह फेला पार्न सकिन ।" + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"त्रुटि, pkgProblemResolver:: समाधानले विच्छेदन सिर्जना गर्दछ, यो भइरहेको प्याकेजहरुको " +"कारणले गर्दा हो ।" + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।" #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2663,55 +2565,67 @@ msgstr "%s खोल्न असफल" msgid "Failed to write temporary StateFile %s" msgstr "फाइल %s लेख्न असफल भयो" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "प्याकेज फेला पार्न सकिएन %s" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 -#, c-format -msgid "Wrote %i records.\n" -msgstr "%i रेकर्डहरू लेखियो ।\n" +#: apt-pkg/cacheset.cc:609 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "प्याकेज फेला पार्न सकिएन %s" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "प्याकेज फेला पार्न सकिएन %s" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "MD5Sum मेल भएन" +#: apt-pkg/cacheset.cc:663 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" #: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format @@ -2738,316 +2652,220 @@ msgstr "घुमाउरो फाइलमा अवैध लाइन:%s" msgid "Invalid 'Date' entry in Release file %s" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "प्याकिङ्ग प्रणाली '%s' समर्थित छैन" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "उपयुक्त प्याकिङ्ग प्रणाली प्रकार निर्धारन गर्न असक्षम भयो" +msgid "%lid %lih %limin %lis" +msgstr "" -#: apt-pkg/install-progress.cc:57 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Progress: [%3i%%]" +msgid "%lih %limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 +#, c-format +msgid "%limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "%lis" msgstr "" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "फाइल %s खोल्न सकिएन" +#: apt-pkg/contrib/strutl.cc:1258 +#, c-format +msgid "Selection %s not found" +msgstr "चयन %s फेला पार्न सकिएन" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" -"द्वन्द/पुन-आधारित लूपको कारणले गर्दा स्थापना चलाउनको लागि अस्थायी रुपमा प्याकेज %s " -"हटाउनु पर्नेछ । यो प्राय नराम्रो हो, तर यदि तपाईँ यो साँच्चै गर्न चाहनुहुन्छ भने, APT::" -"Force-LoopBreak विकल्प सक्रिय गर्नुहोस् ।" +msgid "Not using locking for read only lock file %s" +msgstr "ताल्चा मारिएको फाइल मात्र पढ्नको लागि ताल्चा मार्न प्रयोग गरिएको छैन %s" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "खाली प्याकेज क्यास" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "ताल्चा मारिएको फाइल खोल्न सकिएन %s" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "प्याकेज क्यास फाइल दूषित भयो " +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "nfs माउन्ट गरिएको लक फाइलको लागि लक प्रयोग गरिएको छैन %s" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "प्याकेज क्यास फाइल एउटा अमिल्दो संस्करण हो" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "ताल्चा प्राप्त गर्न सकिएन %s" -#: apt-pkg/pkgcache.cc:169 -#, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "प्याकेज क्यास फाइल दूषित भयो " +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:394 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "यो APT ले संस्करण प्रणालीलाई समर्थन गर्दैन '%s'" +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "प्याकेज क्यास विभिन्न वास्तुकलाको लागि निर्माण भएको हो" - -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "आधारित" - -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "पुन:आधारित" - -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "सुझाव दिन्छ" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "सिफारिस गर्दछ" - -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "द्वन्दहरू" - -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "बदल्छ" - -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "वेकायमहरू" - -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "महत्वपूर्ण" - -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "आवश्यक" - -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "मानक" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "वैकल्पिक" +#: apt-pkg/contrib/fileutl.cc:826 +#, fuzzy, c-format +msgid "Sub-process %s received signal %u." +msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "अतिरिक्त" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "क्यास संग एउटा नमिल्दो संस्करण प्रणाली छ" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "सहायक प्रक्रिया %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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/fileutl.cc:913 #, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )" +msgid "Problem closing the gzip file %s" +msgstr "फाइल बन्द गर्दा समस्या" -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, fuzzy, c-format +msgid "Could not open file descriptor %d" +msgstr "%s को लागि पाइप खोल्न सकिएन" -#: apt-pkg/pkgcachegen.cc:263 -#, fuzzy -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "सहायक प्रक्रिया IPC सिर्जना गर्न असफल" -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । " +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "सङ्कुचनकर्ता कार्यान्वयन गर्न असफल भयो" -#: apt-pkg/pkgcachegen.cc:576 -#, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन" +#: apt-pkg/contrib/fileutl.cc:1514 +#, fuzzy, c-format +msgid "read, still have %llu to read but none left" +msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन" -#: apt-pkg/pkgcachegen.cc:1211 -#, c-format -msgid "Couldn't stat source package list %s" -msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन " +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, fuzzy, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन " -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "प्याकेज सूचिहरू पढिदैछ" +#: apt-pkg/contrib/fileutl.cc:1915 +#, fuzzy, c-format +msgid "Problem closing the file %s" +msgstr "फाइल बन्द गर्दा समस्या" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ" +#: apt-pkg/contrib/fileutl.cc:1927 +#, fuzzy, c-format +msgid "Problem renaming the file %s to %s" +msgstr "फाइल गुप्तिकरण गर्दा समस्या" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि" +#: apt-pkg/contrib/fileutl.cc:1938 +#, fuzzy, c-format +msgid "Problem unlinking the file %s" +msgstr "फाइल अनलिङ्क गर्दा समस्या" -#: apt-pkg/pkgrecords.cc:38 -#, c-format -msgid "Index file type '%s' is not supported" -msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "फाइल गुप्तिकरण गर्दा समस्या" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" -msgstr "" - -#: apt-pkg/policy.cc:422 -#, fuzzy, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "प्राथमिकता फाइलमा अवैध रेकर्ड, कुनै प्याकेज हेडर छैन" +msgid "%c%s... Error!" +msgstr "%c%s... त्रुटि!" -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "Did not understand pin type %s" -msgstr "पिन टाइप %s बुझ्न सकिएन " +msgid "%c%s... Done" +msgstr "%c%s... गरियो" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन" +#: apt-pkg/contrib/progress.cc:181 +msgid "..." +msgstr "" -#: apt-pkg/sourcelist.cc:127 +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)" +msgid "%c%s... %u%%" +msgstr "%c%s... गरियो" -#: apt-pkg/sourcelist.cc:170 -#, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "एउटा खाली फाइल mmap बनाउन सकिएन" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/mmap.cc:111 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)" +msgid "Couldn't duplicate file descriptor %i" +msgstr "%s को लागि पाइप खोल्न सकिएन" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/mmap.cc:119 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" +msgid "Couldn't make mmap of %llu bytes" +msgstr "%lu बाइटहरुको mmap बनाउन सकिएन" -#: 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/contrib/mmap.cc:146 +#, fuzzy +msgid "Unable to close mmap" +msgstr "%s खोल्न असफल" -#: 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/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "आह्वान गर्न असक्षम भयो" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)" +msgid "Couldn't make mmap of %lu bytes" +msgstr "%lu बाइटहरुको mmap बनाउन सकिएन" -#: apt-pkg/sourcelist.cc:208 -#, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)" +#: apt-pkg/contrib/mmap.cc:322 +#, fuzzy +msgid "Failed to truncate file" +msgstr "फाइल %s लेख्न असफल भयो" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/mmap.cc:341 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)" +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" -#: apt-pkg/sourcelist.cc:217 +#: apt-pkg/contrib/mmap.cc:446 #, 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 (प्रकार)" - -#: 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/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्" - -#: apt-pkg/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" - -#: apt-pkg/tagfile.cc:237 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %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." +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." msgstr "" -"केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो " -"एउटा प्रयोग गरियो ।" -#: apt-pkg/vendorlist.cc:85 -#, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "बिक्रता ब्ल्क %s ले कुनै औठाछाप समाविष्ट गर्दैन" +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" #: apt-pkg/contrib/cdromutl.cc:65 #, c-format @@ -3058,52 +2876,6 @@ msgstr "माउन्ट बिन्दु %s स्थिर गर्न msgid "Failed to stat the cdrom" msgstr "सिडी रोम स्थिर गर्न असफल भयो" -#: apt-pkg/contrib/cmndline.cc:121 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "आदेश लाइन विकल्प '%c' [%s बाट] ज्ञात छैन ।" - -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "आदेश लाइन विकल्प %s बुझिएन" - -#: apt-pkg/contrib/cmndline.cc:168 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "आदेश लाइन विकल्प %s बूलियन छैन" - -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "विकल्प %s लाई एउटा तर्कको आवश्यकता पर्दछ ।" - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "विकल्प %s: कनफिगरेसन वस्तु विशिष्टिकरण संग एउटा = हुनुपर्छ ।" - -#: apt-pkg/contrib/cmndline.cc:278 -#, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "विकल्प %s लाई एउटा इन्टिजर तर्कको आवश्यक पर्दछ, '%s' होइन" - -#: apt-pkg/contrib/cmndline.cc:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "विकल्प '%s' अति लामो छ" - -#: apt-pkg/contrib/cmndline.cc:341 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "अर्थ %s बुझिएन, सत्य वा झूठो प्रयास गर्नुहोस् ।" - -#: apt-pkg/contrib/cmndline.cc:391 -#, c-format -msgid "Invalid operation %s" -msgstr "अवैध सञ्चालन %s" - #: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" @@ -3159,387 +2931,610 @@ msgstr "वाक्य संरचना त्रुटि %s:%u: निर msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "वाक्य संरचना त्रुटि %s:%u:फाइलको अन्त्यमा अतिरिक्त जंक" -#: apt-pkg/contrib/fileutl.cc:190 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "स्थापना परित्याग गरिदैछ ।" + +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "ताल्चा मारिएको फाइल मात्र पढ्नको लागि ताल्चा मार्न प्रयोग गरिएको छैन %s" +msgid "Command line option '%c' [from %s] is not known." +msgstr "आदेश लाइन विकल्प '%c' [%s बाट] ज्ञात छैन ।" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Could not open lock file %s" -msgstr "ताल्चा मारिएको फाइल खोल्न सकिएन %s" +msgid "Command line option %s is not understood" +msgstr "आदेश लाइन विकल्प %s बुझिएन" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "nfs माउन्ट गरिएको लक फाइलको लागि लक प्रयोग गरिएको छैन %s" +msgid "Command line option %s is not boolean" +msgstr "आदेश लाइन विकल्प %s बूलियन छैन" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "Could not get lock %s" -msgstr "ताल्चा प्राप्त गर्न सकिएन %s" +msgid "Option %s requires an argument." +msgstr "विकल्प %s लाई एउटा तर्कको आवश्यकता पर्दछ ।" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "" +msgid "Option %s: Configuration item specification must have an =." +msgstr "विकल्प %s: कनफिगरेसन वस्तु विशिष्टिकरण संग एउटा = हुनुपर्छ ।" -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "विकल्प %s लाई एउटा इन्टिजर तर्कको आवश्यक पर्दछ, '%s' होइन" -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" +msgid "Option '%s' is too long" +msgstr "विकल्प '%s' अति लामो छ" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" +msgid "Sense %s is not understood, try true or false." +msgstr "अर्थ %s बुझिएन, सत्य वा झूठो प्रयास गर्नुहोस् ।" -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।" +msgid "Invalid operation %s" +msgstr "अवैध सञ्चालन %s" -#: apt-pkg/contrib/fileutl.cc:826 +#: apt-pkg/deb/dpkgpm.cc:110 #, fuzzy, c-format -msgid "Sub-process %s received signal %u." -msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।" +msgid "Installing %s" +msgstr " %s स्थापना भयो" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)" +msgid "Configuring %s" +msgstr " %s कनफिगर गरिदैछ" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो" +msgid "Removing %s" +msgstr " %s हटाइदैछ" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/dpkgpm.cc:113 #, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "फाइल बन्द गर्दा समस्या" +msgid "Completely removing %s" +msgstr " %s पूर्ण रुपले हट्यो" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Could not open file %s" -msgstr "फाइल %s खोल्न सकिएन" - -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 -#, fuzzy, c-format -msgid "Could not open file descriptor %d" -msgstr "%s को लागि पाइप खोल्न सकिएन" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "सहायक प्रक्रिया IPC सिर्जना गर्न असफल" +msgid "Noting disappearance of %s" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "सङ्कुचनकर्ता कार्यान्वयन गर्न असफल भयो" +#: apt-pkg/deb/dpkgpm.cc:115 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1514 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format -msgid "read, still have %llu to read but none left" -msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन" +msgid "Directory '%s' missing" +msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, fuzzy, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन " +msgid "Could not open file '%s'" +msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/contrib/fileutl.cc:1915 -#, fuzzy, c-format -msgid "Problem closing the file %s" -msgstr "फाइल बन्द गर्दा समस्या" +#: apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Preparing %s" +msgstr " %s तयार गरिदैछ" -#: apt-pkg/contrib/fileutl.cc:1927 -#, fuzzy, c-format -msgid "Problem renaming the file %s to %s" -msgstr "फाइल गुप्तिकरण गर्दा समस्या" +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr " %s अनप्याक गरिदैछ" -#: apt-pkg/contrib/fileutl.cc:1938 -#, fuzzy, c-format -msgid "Problem unlinking the file %s" -msgstr "फाइल अनलिङ्क गर्दा समस्या" +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing to configure %s" +msgstr " %s कनफिगर गर्न तयार गरिदैछ" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "फाइल गुप्तिकरण गर्दा समस्या" +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr " %s स्थापना भयो" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "स्थापना परित्याग गरिदैछ ।" +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr " %s हटाउन तयार गरिदैछ" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "एउटा खाली फाइल mmap बनाउन सकिएन" +#: apt-pkg/deb/dpkgpm.cc:1022 +#, c-format +msgid "Removed %s" +msgstr " %s हट्यो" -#: apt-pkg/contrib/mmap.cc:111 -#, fuzzy, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "%s को लागि पाइप खोल्न सकिएन" +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ" -#: apt-pkg/contrib/mmap.cc:119 +#: apt-pkg/deb/dpkgpm.cc:1028 +#, c-format +msgid "Completely removed %s" +msgstr " %s पूर्ण रुपले हट्यो" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "%lu बाइटहरुको mmap बनाउन सकिएन" +msgid "Can not write log (%s)" +msgstr " %s मा लेख्न असक्षम" -#: apt-pkg/contrib/mmap.cc:146 -#, fuzzy -msgid "Unable to close mmap" -msgstr "%s खोल्न असफल" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -#, fuzzy -msgid "Unable to synchronize mmap" -msgstr "आह्वान गर्न असक्षम भयो" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "%lu बाइटहरुको mmap बनाउन सकिएन" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "" -#: apt-pkg/contrib/mmap.cc:322 -#, fuzzy -msgid "Failed to truncate file" -msgstr "फाइल %s लेख्न असफल भयो" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "" -#: apt-pkg/contrib/mmap.cc:341 +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"Unable to lock the administration directory (%s), is another process using " +"it?" msgstr "" -#: apt-pkg/contrib/mmap.cc:446 +#: 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 "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +"dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/contrib/mmap.cc:449 +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "" + +#: cmdline/apt-extracttemplates.cc:224 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"उपयोग: apt-extracttemplates file1 [file2 ...]\n" +"\n" +" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n" +"\n" +"\n" +"विकल्पहरू:\n" +" -h यो मद्दत पाठ\n" +" -t टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n" +" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" +" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" -#: apt-pkg/contrib/progress.cc:148 +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "%s स्थिर गर्न असक्षम भयो" + +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? " + +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +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 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... त्रुटि!" +msgid "Error processing directory %s" +msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "स्रोत विस्तार सूचि अति लामो छ" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "सामाग्री फाइलहरुमा हेडर लेख्दा त्रुटि" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... गरियो" +msgid "Error processing contents %s" +msgstr "सामग्री %sप्रक्रिया गर्दा त्रुटि" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" +"उपयोग: apt-ftparchive [विकल्पहरू] आदेश\n" +"आदेशहरू: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive ले डेवियन संग्रहहरुको लागि अनुक्रमणिका फाइलहरू सिर्जना गर्दछ । यसले " +"समर्थन गर्दछ\n" +"dpkg-scanpackages र dpkg-scansources को लागि कार्यात्मक प्रतिस्थापनमा पुरै " +"स्वचालितबाट सिर्जनाको धेरै शैलीहरू\n" +" \n" +"\n" +"apt-ftparchive ले debs को ट्रीबाट प्याकेज फाइलहरू सिर्जना गर्दछ । प्याकेज\n" +"फाइलहरुले प्रत्येक प्याकेजबाट सबै नियन्त्रण फाँटहरुको सामग्रीहरू साथ साथै MD5 hash र " +"filesize समावेश गर्दछ ।\n" +"एउटा अधिलेखन फाइल\n" +"प्राथमिकता र सेक्सनको मान जोड गर्न समर्थित हुन्छ ।\n" +"\n" +"त्यस्तै गरी apt-ftparchive ले .dscs को ट्रीबाट स्रोत फाइलहरू सिर्जना गर्दछ ।\n" +"स्रोत--अधिलेखन--विकल्प src अधीलेखन फाइल निर्दिष्ट गर्न प्रयोग गर्न सकिन्छ\n" +"\n" +"'packages' and 'sources' आदेश ट्रीको मूलमा चलाउन सकिन्छ ।\n" +" विनारी मार्ग फेरी हुने खोजीको विन्दुमा आधारित हुन्छ र \n" +"अधिलेखन फाइलले अधिलेखन झण्डाहरू समाविष्ट गर्दछ । यदि उपस्थित छ भने बाटो उपसर्ग\n" +"फाइलनाम फाँटहरुमा थपिन्छ । उदाहरणको लागि \n" +"डेवियन संग्रहबाट उपयोग:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"विकल्पहरू:\n" +" -h यो मद्दत पाठ\n" +" --md5 नियन्त्रण MD5 सिर्जना\n" +" -s=? स्रोत अधिलेखन फाइल\n" +" -q बन्द गर्नुहोस्\n" +" -d=? वैकल्पिक क्यासिङ डेटाबेस चयन गर्नुहोस्\n" +" --no-delink delinking डिबग मोड सक्षम गर्नुहोस्\n" +" --सामग्रीहरू सामग्री फाइल सिर्जना नियन्त्रण गर्नुहोस्\n" +" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" +" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... गरियो" +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "कुनै चयनहरू मेल खाएन" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "%lid %lih %limin %lis" +msgid "Some files are missing in the package file group `%s'" +msgstr "केही फाइलहरू प्याकेज फाइल समूह `%s' मा हराइरहेको छ" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB दूषित थियो, फाइल %s.पुरानो मा पुन:नामकरण गर्नुहोस्" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "DB पुरानो छ, %s स्तरवृद्धि गर्न प्रयास गरिदैछ" + +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" -msgstr "" +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "DB फाइल %s असक्षम भयो: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "लिङ्क पढ्न असफल %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "संग्रह संग नियन्त्रण रेकर्ड छैन" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "कर्सर प्राप्त गर्न असक्षम भयो" + +#: ftparchive/writer.cc:91 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "W: डाइरेक्ट्री %s पढ्न असक्षम\n" + +#: ftparchive/writer.cc:96 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "W: %s स्थिर गर्न असक्षम\n" + +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "W: " + +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस्" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%limin %lis" -msgstr "" +msgid "Failed to resolve %s" +msgstr "%s हल गर्न असफल भयो" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 -#, c-format -msgid "%lis" -msgstr "" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "ट्री हिडाईँ असफल भयो" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:219 #, c-format -msgid "Selection %s not found" -msgstr "चयन %s फेला पार्न सकिएन" +msgid "Failed to open %s" +msgstr "%s खोल्न असफल" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:278 #, 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 "सूचि डाइरेक्ट्री ताल्चा मार्न असफल" +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:286 #, 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 "" +msgid "Failed to readlink %s" +msgstr "लिङ्क पढ्न असफल %s" -#: apt-pkg/deb/dpkgpm.cc:95 -#, fuzzy, c-format -msgid "Installing %s" -msgstr " %s स्थापना भयो" +#: ftparchive/writer.cc:290 +#, c-format +msgid "Failed to unlink %s" +msgstr "अनलिङ्क गर्न असफल %s" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:298 #, c-format -msgid "Configuring %s" -msgstr " %s कनफिगर गरिदैछ" +msgid "*** Failed to link %s to %s" +msgstr "*** %s मा %s लिङ्क असफल भयो" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:308 #, c-format -msgid "Removing %s" -msgstr " %s हटाइदैछ" +msgid " DeLink limit of %sB hit.\n" +msgstr "यस %sB हिटको डि लिङ्क सिमा।\n" -#: apt-pkg/deb/dpkgpm.cc:98 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr " %s पूर्ण रुपले हट्यो" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "संग्रह संग कुनै प्याकेज फाँट छैन" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Noting disappearance of %s" -msgstr "" +msgid " %s has no override entry\n" +msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Running post-installation trigger %s" -msgstr "" +msgid " %s maintainer is %s not %s\n" +msgstr " %s संभारकर्ता %s हो %s होइन\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:706 #, fuzzy, c-format -msgid "Directory '%s' missing" -msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।" +msgid " %s has no source override entry\n" +msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:710 #, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "फाइल %s खोल्न सकिएन" +msgid " %s has no binary override entry either\n" +msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: apt-pkg/deb/dpkgpm.cc:992 -#, c-format -msgid "Preparing %s" -msgstr " %s तयार गरिदैछ" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - स्मृति बाँडफाँड गर्न असफल भयो" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Unpacking %s" -msgstr " %s अनप्याक गरिदैछ" +msgid "Unable to open %s" +msgstr "%s खोल्न असफल" -#: apt-pkg/deb/dpkgpm.cc:998 -#, c-format -msgid "Preparing to configure %s" -msgstr " %s कनफिगर गर्न तयार गरिदैछ" +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #१" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Installed %s" -msgstr " %s स्थापना भयो" +msgid "Failed to read the override file %s" +msgstr "अधिलेखन फाइल पढ्न असफल %s" -#: apt-pkg/deb/dpkgpm.cc:1005 -#, c-format -msgid "Preparing for removal of %s" -msgstr " %s हटाउन तयार गरिदैछ" +#: ftparchive/override.cc:166 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #1" +msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #१" -#: apt-pkg/deb/dpkgpm.cc:1007 -#, c-format -msgid "Removed %s" -msgstr " %s हट्यो" +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #२" -#: apt-pkg/deb/dpkgpm.cc:1012 -#, c-format -msgid "Preparing to completely remove %s" -msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "वैरुप्य गरिएको अधिलेखन %s रेखा %lu #३" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Completely removed %s" -msgstr " %s पूर्ण रुपले हट्यो" +msgid "Unknown compression algorithm '%s'" +msgstr "अज्ञात सङ्कुचन अल्गोरिद्म '%s'" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr " %s मा लेख्न असक्षम" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "सङ्कुचन गरिएको निर्गात %s लाई सङ्कुचन सेटको आवश्यक्ता पर्दछ" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "FILE* सिर्जना गर्न असफल" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "काँटा गर्न असफल" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "सङ्कुचन शाखा" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "आन्तरीक त्रुटि, %s सिर्जना गर्न असफल" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "सहायक प्रक्रिया/फाइलमा IO असफल भयो" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "MD5 गणना गर्दा पढ्न असफल भयो" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "समस्या अनलिङ्क भइरहेछ %s" -#: apt-pkg/deb/dpkgpm.cc:1707 +#: cmdline/apt-internal-solver.cc:49 +#, fuzzy msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"उपयोग: apt-extracttemplates file1 [file2 ...]\n" +"\n" +" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n" +"\n" +"\n" +"विकल्पहरू:\n" +" -h यो मद्दत पाठ\n" +" -t टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n" +" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" +" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" -msgstr "" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "अज्ञात प्याकेज रेकर्ड!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"उपयोग: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs प्याकेज फाइलहरू क्रमबद्ध गर्ने साधारण उपकरण हो । -s विकल्प कस्तो खालको " +"फाइल हो भनी इंकित गर्न प्रयोग गरिन्छ ।\n" +"\n" +"विकल्पहरू:\n" +" -h यो मद्दत पाठ\n" +" -s क्रमबद्ध स्रोत फाइल प्रयोग गर्नुहोस्\n" +" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" +" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/nl.po b/po/nl.po index f37beaa49..9e2b3cba2 100644 --- a/po/nl.po +++ b/po/nl.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.15.9\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2014-11-09 23:47+0100\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -163,7 +163,7 @@ msgid " Version table:" msgstr " Versietabel:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -371,7 +371,7 @@ msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet " "worden" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" @@ -398,80 +398,80 @@ msgstr "" "om de nieuwste (mogelijk nog niet uitgebrachte) bijwerkingen van het pakket " "op te halen.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Gelieve na te gaan of het pakket 'dpkg-dev' geïnstalleerd is.\n" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "" "U dient tenminste één pakket op te geven om er de bouwvereisten van te " "controleren" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -480,17 +480,17 @@ msgstr "" "Er is geen architectuurinformatie beschikbaar voor %s. Raadpleeg apt.conf(5) " "APT::Architectures om dit te configureren" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -499,7 +499,7 @@ msgstr "" "De vereiste %s van %s kan niet voldaan worden omdat %s niet toegestaan is " "voor de pakketten van '%s'" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -507,14 +507,14 @@ msgid "" msgstr "" "De vereiste %s van %s kan niet voldaan worden omdat pakket %s onvindbaar is" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Voldoen van vereiste %s van %s is mislukt: geïnstalleerd pakket %s is te " "nieuw" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -523,7 +523,7 @@ msgstr "" "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:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -532,30 +532,30 @@ msgstr "" "De vereiste %s van %s kan niet voldaan worden omdat er geen geschikte versie " "is van pakket %s" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Voldoen van de vereiste %s van %s is mislukt: %s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Logbestand met veranderingen aan %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -709,7 +709,7 @@ msgstr "%s was reeds ingesteld op niet tegenhouden.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Er is gewacht op %s, maar die kwam niet" @@ -847,16 +847,16 @@ msgstr "" msgid "Disk not found." msgstr "Schijf niet gevonden." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Bestand niet gevonden" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Kon status niet bepalen" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" @@ -911,7 +911,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "TYPE mislukt; bericht van de server: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "De verbinding is verlopen" @@ -933,7 +933,7 @@ msgstr "Een reactie deed de buffer overlopen." msgid "Protocol corruption" msgstr "Protocolcorruptie" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -994,7 +994,7 @@ msgstr "Verbinding met de datasocket is verlopen" msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Probleem bij het frommelen van het bestand" @@ -1003,7 +1003,7 @@ msgstr "Probleem bij het frommelen van het bestand" msgid "Unable to fetch file, server said '%s'" msgstr "Kan het bestand niet ophalen; bericht van de server: %s" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Datasocket verliep" @@ -1053,7 +1053,7 @@ msgstr "Kon niet verbinden met %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Er wordt verbinding gemaakt met %s" @@ -1199,42 +1199,18 @@ msgstr "Verbinding mislukt" msgid "Internal error" msgstr "Interne fout" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Geraakt " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Ophalen:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Genegeerd " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Fout " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "%sB opgehaald in %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Bezig]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "Bezig met oplijsten" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Medium wisselen: gelieve de schijf met label\n" -" '%s'\n" -"in het station '%s' te plaatsen en op 'enter' te drukken\n" +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:93 msgid "Correcting dependencies..." @@ -1264,173 +1240,359 @@ msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen." msgid "Unmet dependencies. Try using -f." msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" -msgstr "Bezig met sorteren" - -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "" -"WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden!" - -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Authenticiteitswaarschuwing werd genegeerd.\n" - -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Sommige pakketten konden niet geauthenticeerd worden" - -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Wilt u deze pakketten installeren zonder verificatie?" - -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" +#: 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-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:265 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Ophalen van %s is mislukt %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Interne fout. InstallPackages is aangeroepen met defecte pakketten!" +msgid "[installed,upgradable to: %s]" +msgstr "[geïnstalleerd,opwaardeerbaar naar: %s]" -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." +#: apt-private/private-output.cc:268 +msgid "[installed,local]" +msgstr "[geïnstalleerd,lokaal]" -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Interne fout. Rangschikken is niet voltooid" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "[geïnstalleerd,automatisch verwijderbaar]" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" -msgstr "" -"Merkwaardig... De groottes kwamen niet overeen. Gelieve apt@packages.debian." -"org te mailen" +#: apt-private/private-output.cc:272 +msgid "[installed,automatic]" +msgstr "[geïnstalleerd,automatisch]" -#. 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 -#: apt-private/private-install.cc:155 -#, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n" +#: apt-private/private-output.cc:274 +msgid "[installed]" +msgstr "[geïnstalleerd]" -#. 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:160 +#: apt-private/private-output.cc:277 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "Er moeten %sB aan archieven opgehaald worden.\n" +msgid "[upgradable from: %s]" +msgstr "[opwaardeerbaar van: %s]" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Na deze bewerking zal er %sB extra schijfruimte gebruikt worden.\n" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" +msgstr "[overgebleven configuratie]" -#. 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:172 +#: apt-private/private-output.cc:455 #, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Na deze bewerking zal er %sB schijfruimte vrijkomen.\n" +msgid "but %s is installed" +msgstr "maar %s is geïnstalleerd" -#: apt-private/private-install.cc:200 +#: apt-private/private-output.cc:457 #, c-format -msgid "You don't have enough free space in %s." -msgstr "U heeft onvoldoende vrije schijfruimte op %s." +msgid "but %s is to be installed" +msgstr "maar %s zal geïnstalleerd worden" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "'Trivial Only' is opgegeven. Dit is echter geen triviale bewerking." +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "maar het is niet installeerbaar" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Ja, doe wat ik zeg!" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "maar het is een virtueel pakket" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"U staat op het punt om iets te doen wat mogelijk schadelijk is.\n" -"Als u wilt doorgaan, dient u de zin '%s' in te typen.\n" -" ?] " +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "maar het is niet geïnstalleerd" -#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Afbreken." +#: 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-install.cc:243 -msgid "Do you want to continue?" -msgstr "Wilt u doorgaan?" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " of" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Ophalen van sommige bestanden is mislukt" +#: 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-install.cc:320 -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' " -"uitvoeren of het met '--fix-missing' proberen?" +#: 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-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "De volgende pakketten zullen VERWIJDERD worden:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Geen oplossing gevonden voor de ontbrekende pakketten." +#: apt-private/private-output.cc:571 +msgid "The following packages have been kept back:" +msgstr "De volgende pakketten zijn achtergehouden:" -#: apt-private/private-install.cc:330 -msgid "Aborting install." -msgstr "Installatie wordt afgebroken." +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "De volgende pakketten zullen opgewaardeerd worden:" -#: apt-private/private-install.cc:366 -msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"Het volgende pakket is van uw systeem verdwenen omdat\n" -"alle bestanden zijn overschreven door andere pakketten:" -msgstr[1] "" -"De volgende pakketten zijn van uw systeem verdwenen omdat\n" -"alle bestanden zijn overschreven door andere pakketten:" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" +msgstr "De volgende pakketten zullen GEDEGRADEERD worden:" -#: apt-private/private-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Let op: dit wordt automatisch en bewust gedaan door dpkg." +#: 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-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten" +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (vanwege %s) " -#: apt-private/private-install.cc:499 +#: apt-private/private-output.cc:696 msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" msgstr "" -"Hmm, het lijkt erop dat de AutoRemover iets vernietigd heeft. Dit zou\n" -"niet mogen kunnen. Gelieve een bug-rapport voor apt in te sturen." +"WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n" +"Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!" -#. -#. if (Packages == 1) -#. { +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Interne fout. InstallPackages is aangeroepen met defecte pakketten!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Interne fout. Rangschikken is niet voltooid" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Merkwaardig... De groottes kwamen niet overeen. Gelieve apt@packages.debian." +"org te mailen" + +#. 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Er moeten %sB/%sB aan archieven opgehaald 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:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Er moeten %sB aan archieven opgehaald 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:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Na deze bewerking zal er %sB schijfruimte vrijkomen.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "U heeft onvoldoende vrije schijfruimte op %s." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Ja, doe wat ik zeg!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"U staat op het punt om iets te doen wat mogelijk schadelijk is.\n" +"Als u wilt doorgaan, dient u de zin '%s' in te typen.\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Afbreken." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Wilt u doorgaan?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Ophalen van sommige bestanden is mislukt" + +#: apt-private/private-install.cc:320 +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' " +"uitvoeren of het met '--fix-missing' proberen?" + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Geen oplossing gevonden voor de ontbrekende pakketten." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Installatie wordt afgebroken." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"Het volgende pakket is van uw systeem verdwenen omdat\n" +"alle bestanden zijn overschreven door andere pakketten:" +msgstr[1] "" +"De volgende pakketten zijn van uw systeem verdwenen omdat\n" +"alle bestanden zijn overschreven door andere pakketten:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Let op: dit wordt automatisch en bewust gedaan door dpkg." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten" + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"Hmm, het lijkt erop dat de AutoRemover iets vernietigd heeft. Dit zou\n" +"niet mogen kunnen. Gelieve een bug-rapport voor apt in te sturen." + +#. +#. if (Packages == 1) +#. { #. c1out << std::endl; #. c1out << #. _("Since you only requested a single operation it is extremely likely that\n" @@ -1563,941 +1725,703 @@ msgstr "" 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:129 -msgid "Listing" -msgstr "Bezig met oplijsten" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "" +"WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden!" -#: apt-private/private-list.cc:159 -#, 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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Authenticiteitswaarschuwing werd genegeerd.\n" -#: 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-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Sommige pakketten konden niet geauthenticeerd worden" -#: 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-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Wilt u deze pakketten installeren zonder verificatie?" -#: apt-private/private-output.cc:265 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format -msgid "[installed,upgradable to: %s]" -msgstr "[geïnstalleerd,opwaardeerbaar naar: %s]" +msgid "Failed to fetch %s %s\n" +msgstr "Ophalen van %s is mislukt %s\n" -#: apt-private/private-output.cc:268 -msgid "[installed,local]" -msgstr "[geïnstalleerd,lokaal]" +#: apt-private/private-sources.cc:58 +#, c-format +msgid "Failed to parse %s. Edit again? " +msgstr "Verwerken van %s is mislukt. Opnieuw bewerken? " -#: apt-private/private-output.cc:270 -msgid "[installed,auto-removable]" -msgstr "[geïnstalleerd,automatisch verwijderbaar]" +#: apt-private/private-sources.cc:70 +#, c-format +msgid "Your '%s' file changed, please run 'apt-get update'." +msgstr "Uw bestand '%s' is gewijzigd. Voer 'apt-get update' uit." -#: apt-private/private-output.cc:272 -msgid "[installed,automatic]" -msgstr "[geïnstalleerd,automatisch]" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" +msgstr "Volledige tekst doorzoeken" -#: apt-private/private-output.cc:274 -msgid "[installed]" -msgstr "[geïnstalleerd]" +#: apt-private/private-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "Opwaardering wordt doorgerekend... " -#: apt-private/private-output.cc:277 +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "Klaar" + +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Geraakt " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Ophalen:" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Genegeerd " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Fout " + +#: apt-private/acqprogress.cc:146 #, c-format -msgid "[upgradable from: %s]" -msgstr "[opwaardeerbaar van: %s]" +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "%sB opgehaald in %s (%sB/s)\n" -#: apt-private/private-output.cc:281 -msgid "[residual-config]" -msgstr "[overgebleven configuratie]" +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Bezig]" -#: apt-private/private-output.cc:455 +#: apt-private/acqprogress.cc:297 #, c-format -msgid "but %s is installed" -msgstr "maar %s is geïnstalleerd" +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Medium wisselen: gelieve de schijf met label\n" +" '%s'\n" +"in het station '%s' te plaatsen en op 'enter' te drukken\n" -#: apt-private/private-output.cc:457 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "but %s is to be installed" -msgstr "maar %s zal geïnstalleerd worden" +msgid "Unable to read %s" +msgstr "Kan %s niet lezen" -#: apt-private/private-output.cc:464 -msgid "but it is not installable" -msgstr "maar het is niet installeerbaar" +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 +#, c-format +msgid "Unable to change to %s" +msgstr "Kan %s niet veranderen" -#: apt-private/private-output.cc:466 -msgid "but it is a virtual package" -msgstr "maar het is een virtueel pakket" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 +#, c-format +msgid "No mirror file '%s' found " +msgstr "Geen spiegelbestand '%s' gevonden " -#: apt-private/private-output.cc:469 -msgid "but it is not installed" -msgstr "maar het is niet geïnstalleerd" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 +#, c-format +msgid "Can not read mirror file '%s'" +msgstr "Kan spiegelbestand '%s' niet lezen" -#: apt-private/private-output.cc:469 -msgid "but it is not going to be installed" -msgstr "maar het zal niet geïnstalleerd worden" +#: methods/mirror.cc:315 +#, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Geen vermelding gevonden in spiegelbestand '%s'" -#: apt-private/private-output.cc:474 -msgid " or" -msgstr " of" +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" +msgstr "[Spiegelserver: %s]" -#: 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:" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Aanmaken van IPC-pijp naar subproces is mislukt" -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "Verbinding werd voortijdig afgebroken" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "De volgende pakketten zullen VERWIJDERD worden:" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "Foute standaardinstelling!" -#: apt-private/private-output.cc:571 -msgid "The following packages have been kept back:" -msgstr "De volgende pakketten zijn achtergehouden:" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "Druk 'enter' om door te gaan." -#: apt-private/private-output.cc:592 -msgid "The following packages will be upgraded:" -msgstr "De volgende pakketten zullen opgewaardeerd worden:" +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Wilt u alle eerder opgehaalde '.deb'-bestanden verwijderen?" -#: apt-private/private-output.cc:613 -msgid "The following packages will be DOWNGRADED:" -msgstr "De volgende pakketten zullen GEDEGRADEERD worden:" +# Note to translators: The following four messages belong together. It doesn't +# matter where sentences start, but it has to fit in just these four lines, and +# at only 80 characters per line, if possible. +#: dselect/install:102 +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "" +"Er zijn fouten opgetreden tijdens het uitpakken. Geïnstalleerde pakketten" -#: apt-private/private-output.cc:633 -msgid "The following held packages will be changed:" -msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:" +#: dselect/install:103 +msgid "will be configured. This may result in duplicate errors" +msgstr "worden geconfigureerd. Hierbij kunnen fouten meerdere malen optreden" -#: apt-private/private-output.cc:688 -#, c-format -msgid "%s (due to %s) " -msgstr "%s (vanwege %s) " +#: 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 O.K., enkel de " +"fouten" -#: apt-private/private-output.cc:696 +#: dselect/install:105 msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" -"WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n" -"Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!" +"boven dit bericht zijn belangrijk. U dient ze op te lossen en de opdracht " +"[I]nstall opnieuw uit te voeren" -#: apt-private/private-output.cc:727 -#, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu opgewaardeerd, %lu nieuw geïnstalleerd, " +#: dselect/update:30 +msgid "Merging available information" +msgstr "De beschikbare informatie wordt samengevoegd" -#: apt-private/private-output.cc:731 -#, c-format -msgid "%lu reinstalled, " -msgstr "%lu opnieuw geïnstalleerd, " +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode werd aangeroepen voor een nog steeds aangekoppeld punt" -#: apt-private/private-output.cc:733 +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Situeren van het hash-element is mislukt!" + +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Toewijzen van de omleiding is mislukt" + +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Interne fout in AddDiversion" + +#: apt-inst/filelist.cc:477 #, c-format -msgid "%lu downgraded, " -msgstr "%lu gedegradeerd, " +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Er wordt gepoogd om de omleiding %s -> %s en %s/%s te overschrijven" -#: apt-private/private-output.cc:735 +#: apt-inst/filelist.cc:506 #, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n" +msgid "Double add of diversion %s -> %s" +msgstr "Dubbele toevoeging van de omleiding %s -> %s" -#: apt-private/private-output.cc:739 +#: apt-inst/filelist.cc:549 #, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu niet volledig geïnstalleerd of verwijderd.\n" +msgid "Duplicate conf file %s/%s" +msgstr "Dubbel configuratiebestand %s/%s" -#. 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-inst/extract.cc:101 apt-inst/extract.cc:172 +#, c-format +msgid "The path %s is too long" +msgstr "Het pad %s is te lang" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 +#: apt-inst/extract.cc:132 #, c-format -msgid "Regex compilation error - %s" -msgstr "Regex-compilatiefout - %s" +msgid "Unpacking %s more than once" +msgstr "%s wordt meer dan eens uitgepakt" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "Volledige tekst doorzoeken" +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "De map %s is al omgeleid" -#: apt-private/private-show.cc:156 +#: apt-inst/extract.cc:152 #, 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." +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Het pakket probeert om weg te schrijven naar het omleidingsdoel %s/%s" -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" -msgstr "geen echt pakket (virtueel)" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Het omleidingspad is te lang" -#: apt-private/private-sources.cc:58 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "Verwerken van %s is mislukt. Opnieuw bewerken? " +msgid "Failed to stat %s" +msgstr "Opvragen van de status van %s is mislukt" -#: apt-private/private-sources.cc:70 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "Uw bestand '%s' is gewijzigd. Voer 'apt-get update' uit." - -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "De opdracht 'update' aanvaardt geen argumenten" +msgid "Failed to rename %s to %s" +msgstr "Hernoemen van %s naar %s is mislukt" -#: apt-private/private-update.cc:90 +#: apt-inst/extract.cc:249 #, 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" +msgid "The directory %s is being replaced by a non-directory" +msgstr "De map %s wordt vervangen door een niet-map" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." -msgstr "Alle pakketten zijn up-to-date." +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Vinden van de knoop in de hash-emmer is mislukt" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "Opwaardering wordt doorgerekend... " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Het pad is te lang" -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "Klaar" +#: apt-inst/extract.cc:421 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "Pakket-overeenkomst wordt overschreven zonder een versie voor %s" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: apt-inst/extract.cc:438 #, c-format -msgid "Unable to read %s" -msgstr "Kan %s niet lezen" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/extract.cc:498 #, c-format -msgid "Unable to change to %s" -msgstr "Kan %s niet veranderen" +msgid "Unable to stat %s" +msgstr "Kan de status van %s niet opvragen" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "No mirror file '%s' found " -msgstr "Geen spiegelbestand '%s' gevonden " +msgid "Failed to write file %s" +msgstr "Wegschrijven van bestand %s is mislukt" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:287 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Can not read mirror file '%s'" -msgstr "Kan spiegelbestand '%s' niet lezen" +msgid "Failed to close file %s" +msgstr "Sluiten van bestand %s is mislukt" -#: methods/mirror.cc:315 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "No entry found in mirror file '%s'" -msgstr "Geen vermelding gevonden in spiegelbestand '%s'" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Dit is geen geldig DEB-archief, het onderdeel '%s' mankeert" -#: methods/mirror.cc:445 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "[Mirror: %s]" -msgstr "[Spiegelserver: %s]" +msgid "Internal error, could not locate member %s" +msgstr "Interne fout, kon onderdeel %s niet vinden" -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "Aanmaken van IPC-pijp naar subproces is mislukt" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Niet-ontleedbaar 'control'-bestand" -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" -msgstr "Verbinding werd voortijdig afgebroken" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Ongeldige archiefondertekening" -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "Foute standaardinstelling!" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Fout bij het lezen van de koptekst van het archiefonderdeel" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "Druk 'enter' om door te gaan." +#: apt-inst/contrib/arfile.cc:96 +#, c-format +msgid "Invalid archive member header %s" +msgstr "Ongeldige koptekst voor archiefonderdeel %s" -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "Wilt u alle eerder opgehaalde '.deb'-bestanden verwijderen?" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Ongeldige koptekst in archiefonderdeel" -# Note to translators: The following four messages belong together. It doesn't -# matter where sentences start, but it has to fit in just these four lines, and -# at only 80 characters per line, if possible. -#: dselect/install:102 -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "" -"Er zijn fouten opgetreden tijdens het uitpakken. Geïnstalleerde pakketten" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Archief is te kort" -#: dselect/install:103 -msgid "will be configured. This may result in duplicate errors" -msgstr "worden geconfigureerd. Hierbij kunnen fouten meerdere malen optreden" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Lezen van de archiefkopteksten is mislukt" -#: 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 O.K., enkel de " -"fouten" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Aanmaken van pijpen is mislukt" -#: 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 opdracht [I]" -"nstall opnieuw uit te voeren" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Uitvoeren van gzip is mislukt " -#: dselect/update:30 -msgid "Merging available information" -msgstr "De beschikbare informatie wordt samengevoegd" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Beschadigd archief" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Gebruik: apt-extracttemplates bestand1 [bestand2 ...]\n" -"\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" -" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Tar controlesom klopt niet, het pakket is beschadigd" -#: cmdline/apt-extracttemplates.cc:254 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Unable to mkstemp %s" -msgstr "Kan tijdelijk bestand %s niet aanmaken" +msgid "Unknown TAR header type %u, member %s" +msgstr "Onbekend TAR-kopteksttype %u, onderdeel %s" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Unable to write to %s" -msgstr "Kan niet naar %s schrijven" +msgid "Progress: [%3i%%]" +msgstr "Voortgang: [%3i%%]" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Kan versie van debconf niet bepalen. Is debconf geïnstalleerd?" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "dpkg wordt uitgevoerd" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -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 +#: apt-pkg/init.cc:146 #, c-format -msgid "Error processing directory %s" -msgstr "Fout bij het verwerken van map %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Bron-extensielijst is te lang" +msgid "Packaging system '%s' is not supported" +msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Fout bij het wegschrijven van de koptekst naar het inhoudsbestand" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Kan geen geschikt pakketbeheersysteemtype bepalen" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Error processing contents %s" -msgstr "Fout bij het verwerken van de inhoud van %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Gebruik: apt-ftparchive [opties] opdracht\n" -"Opdrachten: packages [voorrangsbestand [padprefix]]\n" -" sources [voorrangsbestand [padprefix]]\n" -" contents \n" -" release \n" -" generate config [groepen]\n" -" clean config\n" -"\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 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" -"Op overeenkomstige wijze genereert apt-ftparchive de 'Sources'-bestanden\n" -"van een boom met .dscs. De '--source-override'-optie kan gebruikt worden\n" -"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\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 het aanmaken van de MD5\n" -" -s=? Bronvoorrangsbestand\n" -" -q Stille uitvoer\n" -" -d=? Selecteert de optionele caching database\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 -msgid "No selections matched" -msgstr "Geen van de selecties kwam overeen" +msgid "Wrote %i records.\n" +msgstr "%i records weggeschreven.\n" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'" +msgid "Wrote %i records with %i missing files.\n" +msgstr "%i records weggeschreven met %i ontbrekende bestanden.\n" -#: ftparchive/cachedb.cc:65 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB is beschadigd, bestand hernoemd naar %s.old" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "%i records weggeschreven met %i niet-overeenstemmende bestanden\n" -#: ftparchive/cachedb.cc:83 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd" - -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"DB-formaat is ongeldig. Als u opgewaardeerd heeft van een oudere versie van " -"apt, dient u de database te verwijderen en opnieuw aan te maken." +"%i records weggeschreven met %i ontbrekende bestanden en %i niet-" +"overeenstemmende bestanden\n" -#: ftparchive/cachedb.cc:99 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Kan het DB-bestand %s niet openen: %s" +msgid "Can't find authentication record for: %s" +msgstr "Kan geen authenticiteitsrecord vinden voor: %s" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "Failed to stat %s" -msgstr "Opvragen van de status van %s is mislukt" - -#: ftparchive/cachedb.cc:332 -msgid "Failed to read .dsc" -msgstr "Lezen van .dsc is mislukt" +msgid "Hash mismatch for: %s" +msgstr "Hash-som komt niet overeen voor: %s" -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Archief heeft geen 'control'-record" +#: apt-pkg/acquire-worker.cc:116 +#, c-format +msgid "The method driver %s could not be found." +msgstr "Het methodestuurprogramma %s kon niet gevonden worden." -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Kan geen cursor verkrijgen" +#: apt-pkg/acquire-worker.cc:118 +#, c-format +msgid "Is the package %s installed?" +msgstr "Is het pakket %s geïnstalleerd?" -#: ftparchive/writer.cc:91 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: Kon map %s niet lezen\n" +msgid "Method %s did not start correctly" +msgstr "Methode %s startte niet op de juiste manier" -#: ftparchive/writer.cc:96 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "W: Kon de status van %s niet opvragen\n" +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." -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "F: " +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "" +"De pakketlijsten of het statusbestand konden of niet ontleed, of niet " +"geopend worden." -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "W: " +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"U kunt misschien 'apt-get update' uitvoeren om deze problemen te verhelpen" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "F: Er zijn fouten van toepassing op het bestand " +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "De lijst van bronnen kon niet gelezen worden." -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 -#, c-format -msgid "Failed to resolve %s" -msgstr "Oplossen van %s is mislukt" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Lege pakketcache" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Doorlopen boomstructuur is mislukt" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Het pakketcachebestand is beschadigd" -#: ftparchive/writer.cc:219 -#, c-format -msgid "Failed to open %s" -msgstr "Openen van %s is mislukt" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Het pakketcachebestand heeft een niet-compatibele versie" -#: ftparchive/writer.cc:278 -#, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" +msgstr "Het pakketcachebestand is beschadigd. Het is te klein" -#: ftparchive/writer.cc:286 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Failed to readlink %s" -msgstr "Opdracht readlink %s is mislukt" +msgid "This APT does not support the versioning system '%s'" +msgstr "Deze APT ondersteunt het versienummeringssysteem '%s' niet" -#: ftparchive/writer.cc:290 -#, c-format -msgid "Failed to unlink %s" -msgstr "Ontkoppelen van %s is mislukt" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "De pakketcache was aangemaakt voor een andere architectuur" -#: ftparchive/writer.cc:298 -#, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Koppelen van %s aan %s is mislukt" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Vereisten" -#: ftparchive/writer.cc:308 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " DeLink-limiet van %sB bereikt.\n" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Voor-Vereisten" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Archief heeft geen 'package'-veld" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Suggesties" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s heeft geen voorrangsingang\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Aanbevelingen" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " %s beheerder is %s, niet %s\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Conflicteert met" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s heeft geen voorrangsingang voor bronpakketten\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Vervangt" -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Doet in onbruik geraken" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Geheugentoewijzing is mislukt" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Breekt" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Kan %s niet openen" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Vult aan" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Niet juist gevormde voorrangsingang %s op regel %llu (%s)" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "belangrijk" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Lezen van het voorrangsbestand %s is mislukt" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "noodzakelijk" -#: ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Niet juist gevormde voorrangsingang %s op regel %llu #1" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "standaard" -#: ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Niet juist gevormde voorrangsingang %s op regel %llu #2" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "optioneel" -#: ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Niet juist gevormde voorrangsingang %s op regel %llu #3" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "extra" -#: ftparchive/multicompress.cc:73 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Onbekend compressie-algoritme '%s'" +msgid "Index file type '%s' is not supported" +msgstr "Indexbestand van type '%s' wordt niet ondersteund" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/sourcelist.cc:127 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Gecomprimeerde uitvoer %s vereist dat een compressie ingesteld is" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Aanmaken van FILE* is mislukt" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Vorken van proces is mislukt" - -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Comprimeer kind" +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Niet juist gevormd element %lu in bronlijst %s (URI-verwerking)" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Interne fout, aanmaken van %s is mislukt" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "IO naar subproces/bestand is mislukt" - -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Lezen tijdens het berekenen van de MD5 is mislukt" +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "Niet juist gevormde regel %lu in bronlijst %s ([optie] onbegrijpelijk)" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "Problem unlinking %s" -msgstr "Probleem bij het ontkoppelen van %s" +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "Niet juist gevormde regel %lu in bronlijst %s ([optie] te kort)" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Hernoemen van %s naar %s is mislukt" - -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" -"Gebruik: apt-internal-solver\n" -"\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 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 -msgid "Unknown package record!" -msgstr "Onbekend pakketrecord!" +"Niet juist gevormde regel %lu in bronlijst %s ([%s] is geen toekenning)" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/sourcelist.cc:190 +#, c-format +msgid "Malformed line %lu in source list %s ([%s] has no key)" msgstr "" -"Gebruik: apt-sortpkgs [opties] bestand1 [bestand2 ...]\n" -"\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 hulptekst\n" -" -s Sorteer bronbestanden\n" -" -c=? Lees dit configuratiebestand\n" -" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" +"Niet juist gevormde regel %lu in bronlijst %s ([%s] heeft geen sleutel)" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "Failed to write file %s" -msgstr "Wegschrijven van bestand %s is mislukt" +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-inst/dirstream.cc:105 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Failed to close file %s" -msgstr "Sluiten van bestand %s is mislukt" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Niet juist gevormde regel %lu in bronlijst %s (URI)" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "The path %s is too long" -msgstr "Het pad %s is te lang" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Niet juist gevormde regel %lu in bronlijst %s (dist)" -#: apt-inst/extract.cc:132 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Unpacking %s more than once" -msgstr "%s wordt meer dan eens uitgepakt" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Niet juist gevormde regel %lu in bronlijst %s (URI-verwerking)" -#: apt-inst/extract.cc:142 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "The directory %s is diverted" -msgstr "De map %s is al omgeleid" +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "Niet juist gevormde regel %lu in bronlijst %s (absolute dist)" -#: apt-inst/extract.cc:152 +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -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" -msgstr "Het omleidingspad is te lang" +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "Niet juist gevormde regel %lu in bronlijst %s (ontleding van dist)" -#: apt-inst/extract.cc:249 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "De map %s wordt vervangen door een niet-map" - -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Vinden van de knoop in de hash-emmer is mislukt" +msgid "Opening %s" +msgstr "%s wordt geopend" -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Het pad is te lang" +#: 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-inst/extract.cc:421 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Pakket-overeenkomst wordt overschreven zonder een versie voor %s" +msgid "Malformed line %u in source list %s (type)" +msgstr "Niet juist gevormde regel %u in bronlijst %s (type)" -#: apt-inst/extract.cc:438 +#: apt-pkg/sourcelist.cc:375 #, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s" - -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "Kan de status van %s niet opvragen" - -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "DropNode werd aangeroepen voor een nog steeds aangekoppeld punt" - -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Situeren van het hash-element is mislukt!" - -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Toewijzen van de omleiding is mislukt" - -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Interne fout in AddDiversion" +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-inst/filelist.cc:477 +#: apt-pkg/sourcelist.cc:416 #, 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" +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-inst/filelist.cc:506 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Dubbele toevoeging van de omleiding %s -> %s" +msgid "Clean of %s is not supported" +msgstr "Opschonen van %s wordt niet ondersteund" -#: apt-inst/filelist.cc:549 +#: apt-pkg/clean.cc:64 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Dubbel configuratiebestand %s/%s" - -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Ongeldige archiefondertekening" +msgid "Unable to stat %s." +msgstr "Kan de status van %s niet opvragen." -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Fout bij het lezen van de koptekst van het archiefonderdeel" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "Cache heeft een niet-compatibel versienummeringssysteem" -#: apt-inst/contrib/arfile.cc:96 +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format -msgid "Invalid archive member header %s" -msgstr "Ongeldige koptekst voor archiefonderdeel %s" - -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Ongeldige koptekst in archiefonderdeel" - -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Archief is te kort" - -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Lezen van de archiefkopteksten is mislukt" +msgid "Error occurred while processing %s (%s%d)" +msgstr "Fout tijdens verwerken van %s (%s%d)" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Aanmaken van pijpen is mislukt" +#: apt-pkg/pkgcachegen.cc:257 +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-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Uitvoeren van gzip is mislukt " +#: apt-pkg/pkgcachegen.cc:260 +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-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Beschadigd archief" +#: apt-pkg/pkgcachegen.cc:263 +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-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Tar controlesom klopt niet, het pakket is beschadigd" +#: apt-pkg/pkgcachegen.cc:266 +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-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Onbekend TAR-kopteksttype %u, onderdeel %s" +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-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Dit is geen geldig DEB-archief, het onderdeel '%s' mankeert" +msgid "Couldn't stat source package list %s" +msgstr "Kon de status van de bronpakketlijst %s niet opvragen" -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "Interne fout, kon onderdeel %s niet vinden" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Pakketlijsten worden ingelezen" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Niet-ontleedbaar 'control'-bestand" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Voorziene bestanden worden verzameld" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "List directory %spartial is missing." -msgstr "Lijstmap %spartial is afwezig." +msgid "Unable to write to %s" +msgstr "Kan niet naar %s schrijven" -#: apt-pkg/acquire.cc:91 -#, c-format -msgid "Archives directory %spartial is missing." -msgstr "Archiefmap %spartial is afwezig." +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bron-cache" -#: apt-pkg/acquire.cc:99 -#, c-format -msgid "Unable to lock directory %s" -msgstr "Kan de map %s niet vergrendelen" +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "Scenario naar de oplosser sturen" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, c-format -msgid "Clean of %s is not supported" -msgstr "Opschonen van %s wordt niet ondersteund" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "Verzoek naar de oplosser sturen" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "Instellen op het ontvangen van een oplossing" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "Bestand %li van %li wordt opgehaald" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "Externe oplosser faalde zonder passende foutmelding" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "Externe oplosser uitvoeren" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2516,7 +2440,7 @@ msgstr "Grootte komt niet overeen" msgid "Invalid file format" msgstr "Ongeldig bestandsformaat" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2525,17 +2449,17 @@ 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:1589 +#: apt-pkg/acquire-item.cc:1656 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kon de hash-som voor '%s' niet vinden in het Release-bestand" -#: apt-pkg/acquire-item.cc:1631 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-ID's:\n" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2544,12 +2468,12 @@ msgstr "" "Het Release-bestand voor %s is vervallen (ongeldig sinds %s). Bijwerkingen " "voor deze pakketbron zullen niet uitgevoerd worden." -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/acquire-item.cc:1758 #, 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:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2560,12 +2484,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fout: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2574,12 +2498,12 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens ontbrekende architectuur)" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Kan geen bron vinden om versie '%s' van '%s' op te halen" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2587,128 +2511,101 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Het methodestuurprogramma %s kon niet gevonden worden." +msgid "Vendor block %s contains no fingerprint" +msgstr "Leveranciersblok %s bevat geen vingerafdruk" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Is the package %s installed?" -msgstr "Is het pakket %s geïnstalleerd?" +msgid "List directory %spartial is missing." +msgstr "Lijstmap %spartial is afwezig." -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Method %s did not start correctly" -msgstr "Methode %s startte niet op de juiste manier" +msgid "Archives directory %spartial is missing." +msgstr "Archiefmap %spartial is afwezig." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 #, 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." +msgid "Unable to lock directory %s" +msgstr "Kan de map %s niet vergrendelen" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)" + +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Bestand %li van %li wordt opgehaald" + +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" msgstr "" -"Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor " -"gevonden worden." +"Uw bronnenlijst (/etc/apt/sources.list) dient tenminste één bron-URI te " +"bevatten" -#: apt-pkg/algorithms.cc:1086 +#: apt-pkg/policy.cc:83 +#, c-format msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -"Fout, pkgProblemResolver::Resolve leverde defecten op. Dit kan veroorzaakt " -"worden door vastgehouden pakketten." - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast." +"Een waarde '%s' voor APT::Default-Release is ongeldig, aangezien een " +"dergelijke uitgave niet voorkomt in de bronnen" -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." +#: apt-pkg/policy.cc:422 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -"De pakketlijsten of het statusbestand konden of niet ontleed, of niet " -"geopend worden." +"Ongeldig record in het voorkeurenbestand %s, 'Package'-koptekst ontbreekt" -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "" -"U kunt misschien 'apt-get update' uitvoeren om deze problemen te verhelpen" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "De lijst van bronnen kon niet gelezen worden." - -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Release '%s' voor '%s' is niet gevonden" - -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Versie '%s' voor '%s' is niet gevonden" - -#: apt-pkg/cacheset.cc:603 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "Kon taak '%s' niet vinden" - -#: apt-pkg/cacheset.cc:609 -#, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Kon geen enkel pakket vinden via regex '%s'" - -#: apt-pkg/cacheset.cc:615 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Kon geen enkel pakket vinden via glob '%s'" +msgid "Did not understand pin type %s" +msgstr "Pintype %s wordt niet begrepen" -#: apt-pkg/cacheset.cc:626 -#, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "" -"Kan geen versies selecteren voor pakket '%s' omdat het puur virtueel is" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -"Kan noch de geïnstalleerde, noch de kandidaat-versie van het pakket '%s' " -"selecteren omdat geen van beide er zijn" +"Kon onmiddellijke configuratie van '%s' niet uitvoeren. Voor details zie " +"'man 5 apt.conf', onder APT::Immediate-Configure. (%d)" -#: apt-pkg/cacheset.cc:647 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, 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 het puur " -"virtueel is" +msgid "Could not configure '%s'. " +msgstr "Kon '%s' niet configureren. " -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +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 "" -"Kan de kandidaat-versie van het pakket %s niet selecteren omdat het geen " -"kandidaat heeft" +"Deze installatie-aanroep vereist het tijdelijk verwijderen van het " +"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/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +#: 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 "" -"Kan de geïnstalleerde versie van het pakket %s niet selecteren omdat het " -"niet geïnstalleerd is" - -#: 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." +"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" @@ -2787,10 +2684,25 @@ msgstr "Nieuwe bronlijst wordt weggeschreven\n" msgid "Source list entries for this disc are:\n" msgstr "Bronlijst-elementen voor deze schijf zijn:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Kan de status van %s niet opvragen." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor " +"gevonden worden." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Fout, pkgProblemResolver::Resolve leverde defecten op. Dit kan veroorzaakt " +"worden door vastgehouden pakketten." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast." #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2818,57 +2730,76 @@ msgstr "Openen van StateFile %s is mislukt" msgid "Failed to write temporary StateFile %s" msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "Scenario naar de oplosser sturen" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Kon pakketbestand %s niet ontleden (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "Verzoek naar de oplosser sturen" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Kon pakketbestand %s niet ontleden (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "Instellen op het ontvangen van een oplossing" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Release '%s' voor '%s' is niet gevonden" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "Externe oplosser faalde zonder passende foutmelding" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Versie '%s' voor '%s' is niet gevonden" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "Externe oplosser uitvoeren" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Kon taak '%s' niet vinden" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "%i records weggeschreven.\n" +msgid "Couldn't find any package by regex '%s'" +msgstr "Kon geen enkel pakket vinden via regex '%s'" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "%i records weggeschreven met %i ontbrekende bestanden.\n" +msgid "Couldn't find any package by glob '%s'" +msgstr "Kon geen enkel pakket vinden via glob '%s'" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "%i records weggeschreven met %i niet-overeenstemmende bestanden\n" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "" +"Kan geen versies selecteren voor pakket '%s' omdat het puur virtueel is" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" -"%i records weggeschreven met %i ontbrekende bestanden en %i niet-" -"overeenstemmende bestanden\n" +"Kan noch de geïnstalleerde, noch de kandidaat-versie van het pakket '%s' " +"selecteren omdat geen van beide er zijn" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "Kan geen authenticiteitsrecord vinden voor: %s" +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 het puur " +"virtueel is" -#: apt-pkg/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Hash-som komt niet overeen voor: %s" +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 het geen " +"kandidaat heeft" + +#: apt-pkg/cacheset.cc:663 +#, 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 het " +"niet geïnstalleerd is" #: apt-pkg/indexrecords.cc:78 #, c-format @@ -2895,334 +2826,229 @@ msgstr "Ongeldige 'Valid-Until'-vermelding in Release-bestand %s" msgid "Invalid 'Date' entry in Release file %s" msgstr "Ongeldige 'Date'-vermelding in Release-bestand %s" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund" +msgid "%lid %lih %limin %lis" +msgstr "%lid %liu %limin %lis" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Kan geen geschikt pakketbeheersysteemtype bepalen" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" +msgstr "%liu %limin %lis" -#: apt-pkg/install-progress.cc:57 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Progress: [%3i%%]" -msgstr "Voortgang: [%3i%%]" +msgid "%limin %lis" +msgstr "%limin %lis" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "dpkg wordt uitgevoerd" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" +msgstr "%lis" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "Selection %s not found" +msgstr "Selectie %s niet gevonden" + +#: apt-pkg/contrib/fileutl.cc:190 +#, c-format +msgid "Not using locking for read only lock file %s" msgstr "" -"Kon onmiddellijke configuratie van '%s' niet uitvoeren. Voor details zie " -"'man 5 apt.conf', onder APT::Immediate-Configure. (%d)" +"Er wordt geen vergrendeling gebruikt voor het alleen-lezen-" +"vergrendelingsbestand %s" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format -msgid "Could not configure '%s'. " -msgstr "Kon '%s' niet configureren. " +msgid "Could not open lock file %s" +msgstr "Kon het vergrendelingsbestand %s niet openen" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:218 #, 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." +msgid "Not using locking for nfs mounted lock file %s" msgstr "" -"Deze installatie-aanroep vereist het tijdelijk verwijderen van het " -"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/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Lege pakketcache" +"Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Het pakketcachebestand is beschadigd" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Kon vergrendeling %s niet verkrijgen" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Het pakketcachebestand heeft een niet-compatibele versie" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "Bestandenlijst kan niet aangemaakt worden, omdat '%s' geen map is" -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" -msgstr "Het pakketcachebestand is beschadigd. Het is te klein" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "Negeren van '%s' in map '%s' omdat het geen gewoon bestand is" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:412 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Deze APT ondersteunt het versienummeringssysteem '%s' niet" +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/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "De pakketcache was aangemaakt voor een andere architectuur" +#: apt-pkg/contrib/fileutl.cc:421 +#, 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/pkgcache.cc:321 -msgid "Depends" -msgstr "Vereisten" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Subproces %s ontving een segmentatiefout." -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Voor-Vereisten" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "Subproces %s ontving signaal %u." -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Suggesties" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Subproces %s gaf een foutcode terug (%u)" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Aanbevelingen" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Subproces %s sloot onverwacht af" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Conflicteert met" +#: apt-pkg/contrib/fileutl.cc:913 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Probleem bij het sluiten van het gzip-bestand %s" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Vervangt" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Kon het bestand %s niet openen" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Doet in onbruik geraken" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "Kon de bestandsindicator %d niet openen" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Breekt" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Aanmaken IPC-subproces is mislukt" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Vult aan" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Uitvoeren van de compressor is mislukt " -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "belangrijk" +#: apt-pkg/contrib/fileutl.cc:1514 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "lezen; moet er nog %lu lezen, maar er schieten er geen meer over" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "noodzakelijk" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "schrijven; de laatste %lu konden niet weggeschreven worden" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "standaard" +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" +msgstr "Probleem bij het sluiten van het bestand %s" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "optioneel" +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Probleem bij het hernoemen van het bestand %s naar %s" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "extra" +#: apt-pkg/contrib/fileutl.cc:1938 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "Probleem bij het ontkoppelen van het bestand %s" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Cache heeft een niet-compatibel versienummeringssysteem" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Probleem bij het synchroniseren van het bestand" -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Fout tijdens verwerken van %s (%s%d)" +msgid "%c%s... Error!" +msgstr "%c%s... Fout!" -#: apt-pkg/pkgcachegen.cc:257 -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/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Klaar" -#: apt-pkg/pkgcachegen.cc:260 -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/contrib/progress.cc:181 +msgid "..." +msgstr "..." -#: apt-pkg/pkgcachegen.cc:263 -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." +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... %u%%" -#: apt-pkg/pkgcachegen.cc:266 -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/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Kan systeem-aanroep mmap niet op een leeg bestand toepassen" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/mmap.cc:111 #, 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" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Kon de bestandsindicator %i niet dupliceren" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/mmap.cc:119 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Kon de status van de bronpakketlijst %s niet opvragen" - -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Pakketlijsten worden ingelezen" +msgid "Couldn't make mmap of %llu bytes" +msgstr "Kon het omslaan naar het geheugen van %llu bytes niet uitvoeren" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Voorziene bestanden worden verzameld" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Kan de 'mmap' niet sluiten" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bron-cache" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Kan de 'mmap' niet synchronizeren" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Indexbestand van type '%s' wordt niet ondersteund" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Kon het omslaan naar het geheugen van %lu bytes niet uitvoeren" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Afkorten van bestand is mislukt" + +#: apt-pkg/contrib/mmap.cc:341 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"Een waarde '%s' voor APT::Default-Release is ongeldig, aangezien een " -"dergelijke uitgave niet voorkomt in de bronnen" +"Onvoldoende ruimte voor Dynamische MMap. Gelieve de grootte van APT::Cache-" +"Start te verhogen. Huidige waarde: %lu. (man 5 apt.conf)" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." msgstr "" -"Ongeldig record in het voorkeurenbestand %s, 'Package'-koptekst ontbreekt" +"Kan het formaat van de MMap niet vergroten omdat de grens van %lu bytes al " +"is bereikt." -#: apt-pkg/policy.cc:444 -#, c-format -msgid "Did not understand pin type %s" -msgstr "Pintype %s wordt niet begrepen" - -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin" - -#: 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/sourcelist.cc:170 -#, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "Niet juist gevormde 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 "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 "" -"Niet juist gevormde 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 "" -"Niet juist gevormde 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 "" -"Niet juist gevormde 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 "Niet juist gevormde regel %lu in bronlijst %s (URI)" - -#: 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/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/sourcelist.cc:217 -#, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Niet juist gevormde regel %lu in bronlijst %s (absolute dist)" - -#: apt-pkg/sourcelist.cc:224 -#, c-format -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: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/srcrecords.cc:52 -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/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Kon pakketbestand %s niet ontleden (1)" - -#: apt-pkg/tagfile.cc:237 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Kon pakketbestand %s niet ontleden (2)" - -#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 +#: apt-pkg/contrib/mmap.cc:449 msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." +"Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" -"Ophalen van sommige indexbestanden is mislukt. Deze zijn of genegeerd, of er " -"zijn oudere versies van gebruikt." - -#: apt-pkg/vendorlist.cc:85 -#, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Leveranciersblok %s bevat geen vingerafdruk" +"Kan het formaat van de MMap niet vergroten omdat het automatisch vergroten " +"door de gebruiker is uitgeschakeld." #: apt-pkg/contrib/cdromutl.cc:65 #, c-format @@ -3233,54 +3059,6 @@ msgstr "Kan de status van het aanhechtpunt %s niet opvragen" msgid "Failed to stat the cdrom" msgstr "Opvragen van de status van de cd-rom is mislukt" -#: apt-pkg/contrib/cmndline.cc:121 -#, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "Commandoregel-optie %s wordt niet begrepen" - -#: apt-pkg/contrib/cmndline.cc:168 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "Commandoregel-optie %s is niet booleaans" - -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "Optie %s vereist een argument." - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "" -"Optie %s: de specificatie van het configuratie-item dient een = te " -"bevatten." - -#: apt-pkg/contrib/cmndline.cc:278 -#, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "Optie %s vereist een geheel getal als argument, niet '%s'" - -#: apt-pkg/contrib/cmndline.cc:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "Optie '%s' is te lang" - -#: apt-pkg/contrib/cmndline.cc:341 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "Betekenis van %s wordt niet begrepen, probeer 'true' of 'false'." - -#: apt-pkg/contrib/cmndline.cc:391 -#, c-format -msgid "Invalid operation %s" -msgstr "Ongeldige bewerking %s" - #: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" @@ -3340,411 +3118,631 @@ msgstr "" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntactische fout %s:%u: extra rommel aan het einde van het bestand" -#: apt-pkg/contrib/fileutl.cc:190 -#, c-format -msgid "Not using locking for read only lock file %s" -msgstr "" -"Er wordt geen vergrendeling gebruikt voor het alleen-lezen-" -"vergrendelingsbestand %s" - -#: apt-pkg/contrib/fileutl.cc:195 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Could not open lock file %s" -msgstr "Kon het vergrendelingsbestand %s niet openen" +msgid "No keyring installed in %s." +msgstr "Geen sleutelring geïnstalleerd in %s." -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "" -"Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld" +msgid "Command line option '%c' [from %s] is not known." +msgstr "Commandoregel-optie '%c' [van %s] is onbekend." -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Could not get lock %s" -msgstr "Kon vergrendeling %s niet verkrijgen" +msgid "Command line option %s is not understood" +msgstr "Commandoregel-optie %s wordt niet begrepen" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "Bestandenlijst kan niet aangemaakt worden, omdat '%s' geen map is" +msgid "Command line option %s is not boolean" +msgstr "Commandoregel-optie %s is niet booleaans" -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "Negeren van '%s' in map '%s' omdat het geen gewoon bestand is" +msgid "Option %s requires an argument." +msgstr "Optie %s vereist een argument." -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgid "Option %s: Configuration item specification must have an =." msgstr "" -"Negeren van bestand '%s' in map '%s' omdat het geen bestandsextensie heeft" +"Optie %s: de specificatie van het configuratie-item dient een = te " +"bevatten." -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/cmndline.cc:281 #, 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" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Optie %s vereist een geheel getal als argument, niet '%s'" -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Subproces %s ontving een segmentatiefout." +msgid "Option '%s' is too long" +msgstr "Optie '%s' is te lang" -#: apt-pkg/contrib/fileutl.cc:826 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "Sub-process %s received signal %u." -msgstr "Subproces %s ontving signaal %u." +msgid "Sense %s is not understood, try true or false." +msgstr "Betekenis van %s wordt niet begrepen, probeer 'true' of 'false'." -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Subproces %s gaf een foutcode terug (%u)" +msgid "Invalid operation %s" +msgstr "Ongeldige bewerking %s" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Subproces %s sloot onverwacht af" +msgid "Installing %s" +msgstr "%s wordt geïnstalleerd" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Problem closing the gzip file %s" -msgstr "Probleem bij het sluiten van het gzip-bestand %s" +msgid "Configuring %s" +msgstr "%s wordt geconfigureerd" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Could not open file %s" -msgstr "Kon het bestand %s niet openen" +msgid "Removing %s" +msgstr "%s wordt verwijderd" -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Could not open file descriptor %d" -msgstr "Kon de bestandsindicator %d niet openen" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Aanmaken IPC-subproces is mislukt" - -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Uitvoeren van de compressor is mislukt " +msgid "Completely removing %s" +msgstr "%s wordt volledig verwijderd" -#: apt-pkg/contrib/fileutl.cc:1514 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "read, still have %llu to read but none left" -msgstr "lezen; moet er nog %lu lezen, maar er schieten er geen meer over" +msgid "Noting disappearance of %s" +msgstr "De verdwijning van %s wordt opgemerkt" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#: apt-pkg/deb/dpkgpm.cc:115 #, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "schrijven; de laatste %lu konden niet weggeschreven worden" +msgid "Running post-installation trigger %s" +msgstr "Post-installatie-trigger %s wordt uitgevoerd" -#: apt-pkg/contrib/fileutl.cc:1915 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "Problem closing the file %s" -msgstr "Probleem bij het sluiten van het bestand %s" +msgid "Directory '%s' missing" +msgstr "Map '%s' ontbreekt" -#: apt-pkg/contrib/fileutl.cc:1927 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Probleem bij het hernoemen van het bestand %s naar %s" +msgid "Could not open file '%s'" +msgstr "Kon het bestand '%s' niet openen" -#: apt-pkg/contrib/fileutl.cc:1938 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Problem unlinking the file %s" -msgstr "Probleem bij het ontkoppelen van het bestand %s" +msgid "Preparing %s" +msgstr "%s wordt voorbereid" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Probleem bij het synchroniseren van het bestand" +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr "%s wordt uitgepakt" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "No keyring installed in %s." -msgstr "Geen sleutelring geïnstalleerd in %s." +msgid "Preparing to configure %s" +msgstr "Configuratie van %s wordt voorbereid" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Kan systeem-aanroep mmap niet op een leeg bestand toepassen" +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr "%s is geïnstalleerd" -#: apt-pkg/contrib/mmap.cc:111 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Kon de bestandsindicator %i niet dupliceren" +msgid "Preparing for removal of %s" +msgstr "Verwijderen van %s wordt voorbereid" -#: apt-pkg/contrib/mmap.cc:119 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Kon het omslaan naar het geheugen van %llu bytes niet uitvoeren" +msgid "Removed %s" +msgstr "%s is verwijderd" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Kan de 'mmap' niet sluiten" +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Volledig verwijderen van %s wordt voorbereid" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Kan de 'mmap' niet synchronizeren" +#: apt-pkg/deb/dpkgpm.cc:1028 +#, c-format +msgid "Completely removed %s" +msgstr "%s is volledig verwijderd" -#: apt-pkg/contrib/mmap.cc:290 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Kon het omslaan naar het geheugen van %lu bytes niet uitvoeren" +msgid "Can not write log (%s)" +msgstr "Kan log (%s) niet opschrijven" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Afkorten van bestand is mislukt" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "Is /dev/pts aangekoppeld?" -#: apt-pkg/contrib/mmap.cc:341 +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "Bewerking werd afgebroken vooraleer ze beëindigd was" + +#: apt-pkg/deb/dpkgpm.cc:1719 +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:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "problemen met vereisten - wordt niet geconfigureerd" + +#: apt-pkg/deb/dpkgpm.cc:1726 +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:1732 +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:1739 +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:1746 apt-pkg/deb/dpkgpm.cc:1752 +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:1774 +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 "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"Unable to lock the administration directory (%s), is another process using " +"it?" msgstr "" -"Onvoldoende ruimte voor Dynamische MMap. Gelieve de grootte van APT::Cache-" -"Start te verhogen. Huidige waarde: %lu. (man 5 apt.conf)" +"Kan de beheersmap (%s) niet vergrendelen. Is deze in gebruik door een ander " +"proces?" -#: apt-pkg/contrib/mmap.cc:446 +#: 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 "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +"dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -"Kan het formaat van de MMap niet vergroten omdat de grens van %lu bytes al " -"is bereikt." +"dpkg werd onderbroken; voer handmatig '%s' uit om het probleem te verhelpen. " -#: apt-pkg/contrib/mmap.cc:449 +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "Niet vergrendeld" + +#: cmdline/apt-extracttemplates.cc:224 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Kan het formaat van de MMap niet vergroten omdat het automatisch vergroten " -"door de gebruiker is uitgeschakeld." +"Gebruik: apt-extracttemplates bestand1 [bestand2 ...]\n" +"\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" +" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: apt-pkg/contrib/progress.cc:148 +#: cmdline/apt-extracttemplates.cc:254 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Fout!" +msgid "Unable to mkstemp %s" +msgstr "Kan tijdelijk bestand %s niet aanmaken" -#: apt-pkg/contrib/progress.cc:150 +#: cmdline/apt-extracttemplates.cc:300 +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 +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 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Klaar" +msgid "Error processing directory %s" +msgstr "Fout bij het verwerken van map %s" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "..." +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Bron-extensielijst is te lang" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Fout bij het wegschrijven van de koptekst naar het inhoudsbestand" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... %u%%" +msgid "Error processing contents %s" +msgstr "Fout bij het verwerken van de inhoud van %s" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Gebruik: apt-ftparchive [opties] opdracht\n" +"Opdrachten: packages [voorrangsbestand [padprefix]]\n" +" sources [voorrangsbestand [padprefix]]\n" +" contents \n" +" release \n" +" generate config [groepen]\n" +" clean config\n" +"\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 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" +"Op overeenkomstige wijze genereert apt-ftparchive de 'Sources'-bestanden\n" +"van een boom met .dscs. De '--source-override'-optie kan gebruikt worden\n" +"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\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 het aanmaken van de MD5\n" +" -s=? Bronvoorrangsbestand\n" +" -q Stille uitvoer\n" +" -d=? Selecteert de optionele caching database\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 +msgid "No selections matched" +msgstr "Geen van de selecties kwam overeen" + +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%lid %liu %limin %lis" +msgid "Some files are missing in the package file group `%s'" +msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB is beschadigd, bestand hernoemd naar %s.old" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd" + +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"DB-formaat is ongeldig. Als u opgewaardeerd heeft van een oudere versie van " +"apt, dient u de database te verwijderen en opnieuw aan te maken." + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Kan het DB-bestand %s niet openen: %s" + +#: ftparchive/cachedb.cc:332 +msgid "Failed to read .dsc" +msgstr "Lezen van .dsc is mislukt" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Archief heeft geen 'control'-record" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Kan geen cursor verkrijgen" + +#: ftparchive/writer.cc:91 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "W: Kon map %s niet lezen\n" + +#: ftparchive/writer.cc:96 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "W: Kon de status van %s niet opvragen\n" + +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "F: " + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "W: " -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" -msgstr "%liu %limin %lis" +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "F: Er zijn fouten van toepassing op het bestand " -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%limin %lis" -msgstr "%limin %lis" +msgid "Failed to resolve %s" +msgstr "Oplossen van %s is mislukt" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 -#, c-format -msgid "%lis" -msgstr "%lis" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Doorlopen boomstructuur is mislukt" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:219 #, c-format -msgid "Selection %s not found" -msgstr "Selectie %s niet gevonden" +msgid "Failed to open %s" +msgstr "Openen van %s is mislukt" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:278 #, 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 " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:286 #, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Kan de beheersmap (%s) niet vergrendelen. Heeft u beheerdersrechten?" +msgid "Failed to readlink %s" +msgstr "Opdracht readlink %s is mislukt" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:290 #, 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 "Failed to unlink %s" +msgstr "Ontkoppelen van %s is mislukt" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:298 #, c-format -msgid "Installing %s" -msgstr "%s wordt geïnstalleerd" +msgid "*** Failed to link %s to %s" +msgstr "*** Koppelen van %s aan %s is mislukt" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:308 #, c-format -msgid "Configuring %s" -msgstr "%s wordt geconfigureerd" +msgid " DeLink limit of %sB hit.\n" +msgstr " DeLink-limiet van %sB bereikt.\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 -#, c-format -msgid "Removing %s" -msgstr "%s wordt verwijderd" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Archief heeft geen 'package'-veld" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Completely removing %s" -msgstr "%s wordt volledig verwijderd" +msgid " %s has no override entry\n" +msgstr " %s heeft geen voorrangsingang\n" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Noting disappearance of %s" -msgstr "De verdwijning van %s wordt opgemerkt" +msgid " %s maintainer is %s not %s\n" +msgstr " %s beheerder is %s, niet %s\n" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:706 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Post-installatie-trigger %s wordt uitgevoerd" +msgid " %s has no source override entry\n" +msgstr " %s heeft geen voorrangsingang voor bronpakketten\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:710 #, c-format -msgid "Directory '%s' missing" -msgstr "Map '%s' ontbreekt" +msgid " %s has no binary override entry either\n" +msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, c-format -msgid "Could not open file '%s'" -msgstr "Kon het bestand '%s' niet openen" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Geheugentoewijzing is mislukt" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing %s" -msgstr "%s wordt voorbereid" +msgid "Unable to open %s" +msgstr "Kan %s niet openen" -#: apt-pkg/deb/dpkgpm.cc:993 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 #, c-format -msgid "Unpacking %s" -msgstr "%s wordt uitgepakt" +msgid "Malformed override %s line %llu (%s)" +msgstr "Niet juist gevormde voorrangsingang %s op regel %llu (%s)" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing to configure %s" -msgstr "Configuratie van %s wordt voorbereid" +msgid "Failed to read the override file %s" +msgstr "Lezen van het voorrangsbestand %s is mislukt" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/override.cc:166 #, c-format -msgid "Installed %s" -msgstr "%s is geïnstalleerd" +msgid "Malformed override %s line %llu #1" +msgstr "Niet juist gevormde voorrangsingang %s op regel %llu #1" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:178 #, c-format -msgid "Preparing for removal of %s" -msgstr "Verwijderen van %s wordt voorbereid" +msgid "Malformed override %s line %llu #2" +msgstr "Niet juist gevormde voorrangsingang %s op regel %llu #2" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:191 #, c-format -msgid "Removed %s" -msgstr "%s is verwijderd" +msgid "Malformed override %s line %llu #3" +msgstr "Niet juist gevormde voorrangsingang %s op regel %llu #3" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Volledig verwijderen van %s wordt voorbereid" +msgid "Unknown compression algorithm '%s'" +msgstr "Onbekend compressie-algoritme '%s'" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:103 #, c-format -msgid "Completely removed %s" -msgstr "%s is volledig verwijderd" +msgid "Compressed output %s needs a compression set" +msgstr "Gecomprimeerde uitvoer %s vereist dat een compressie ingesteld is" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, c-format -msgid "Can not write log (%s)" -msgstr "Kan log (%s) niet opschrijven" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Aanmaken van FILE* is mislukt" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "Is /dev/pts aangekoppeld?" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Vorken van proces is mislukt" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "Is stdout een terminal?" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Comprimeer kind" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "Bewerking werd afgebroken vooraleer ze beëindigd was" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Interne fout, aanmaken van %s is mislukt" -#: apt-pkg/deb/dpkgpm.cc:1687 -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" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "IO naar subproces/bestand is mislukt" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "problemen met vereisten - wordt niet geconfigureerd" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Lezen tijdens het berekenen van de MD5 is mislukt" -#: apt-pkg/deb/dpkgpm.cc:1694 -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." +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Probleem bij het ontkoppelen van %s" -#: apt-pkg/deb/dpkgpm.cc:1700 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates a disk full " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Er is geen apport-verslag weggeschreven omdat de foutmelding als oorzaak een " -"volle schijf opgeeft." +"Gebruik: apt-internal-solver\n" +"\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 Logbare uitvoer - geen voortgangsaanduiding\n" +" -c=? Lees dit configuratiebestand\n" +" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1707 -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." +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Onbekend pakketrecord!" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Er is geen apport-verslag weggeschreven omdat de foutmelding een probleem op " -"het lokale systeem signaleert." +"Gebruik: apt-sortpkgs [opties] bestand1 [bestand2 ...]\n" +"\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 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/deb/dpkgpm.cc:1742 -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." +#~ msgid "Is stdout a terminal?" +#~ msgstr "Is stdout een terminal?" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/nn.po b/po/nn.po index 7c5f77759..c85d6628c 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " Versjonstabell:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -364,7 +364,7 @@ msgstr "Klarte ikkje l 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" @@ -384,115 +384,115 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, 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:1290 +#: cmdline/apt-get.cc:1294 #, 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:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -501,37 +501,37 @@ 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:1358 +#: cmdline/apt-get.cc:1362 #, 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:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Koplar til %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Sttta modular:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -671,7 +671,7 @@ msgstr "Den nyaste versjonen av %s er installert fr #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Venta p %s, men den fanst ikkje" @@ -767,16 +767,16 @@ msgstr "" msgid "Disk not found." msgstr "Fann ikkje fila" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Fann ikkje fila" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Klarte ikkje f status" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" @@ -830,7 +830,7 @@ msgstr "Kommandoen msgid "TYPE failed, server said: %s" msgstr "TYPE mislukkast, tenaren sa: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Tidsavbrot p samband" @@ -852,7 +852,7 @@ msgstr "Eit svar flaumde over bufferen." msgid "Protocol corruption" msgstr "Protokollydeleggjing" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -913,7 +913,7 @@ msgstr "Tidsavbrot p msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -922,7 +922,7 @@ msgstr "Problem ved oppretting av n msgid "Unable to fetch file, server said '%s'" msgstr "Klarte ikkje henta fila, tenaren sa %s" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Tidsavbrot p datasokkelen" @@ -972,7 +972,7 @@ msgstr "Klarte ikkje kopla til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Koplar til %s" @@ -1110,42 +1110,17 @@ msgstr "Sambandet mislukkast" msgid "Internal error" msgstr "Intern feil" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Treff " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Hent:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ign " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Feil " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Henta %sB p %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Arbeider]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Skifte av medum: Set inn plata merkt\n" -" %s\n" -"i stasjonen %s og trykk Enter.\n" +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:93 msgid "Correcting dependencies..." @@ -1176,34 +1151,211 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "Nokre krav er ikkje oppfylte. Prv med -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "TVARING: Klarer ikkje autentisere desse pakkane." +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Installert]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" +#: 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-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Nokre pakkar kunne ikkje bli autentisert" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Installert]" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Installer desse pakkane utan verifikasjon?" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Installert]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Det oppstod problem, og -y vart brukt utan --force-yes" +#: apt-private/private-output.cc:277 +#, c-format +msgid "[upgradable from: %s]" +msgstr "" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:281 +msgid "[residual-config]" +msgstr "" + +#: apt-private/private-output.cc:455 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Klarte ikkje henta %s %s\n" +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:35 +#, 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:97 +#, 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:101 +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:82 msgid "Internal error, InstallPackages was called with broken packages!" @@ -1255,7 +1407,11 @@ msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" msgid "You don't have enough free space in %s." msgstr "Du har ikkje nok ledig plass i %s." -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Det oppstod problem, og -y vart brukt utan --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Trivial Only var spesifisert, men dette er ikkje noka triviell handling." @@ -1462,924 +1618,682 @@ 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:129 -msgid "Listing" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "TVARING: Klarer ikkje autentisere desse pakkane." + +#: apt-private/private-download.cc:40 +msgid "Authentication warning overridden.\n" msgstr "" -#: apt-private/private-list.cc:159 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Nokre pakkar kunne ikkje bli autentisert" + +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Installer desse pakkane utan verifikasjon?" + +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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] "" +msgid "Failed to fetch %s %s\n" +msgstr "Klarte ikkje henta %s %s\n" -#: 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!" +#: apt-private/private-sources.cc:58 +#, fuzzy, c-format +msgid "Failed to parse %s. Edit again? " +msgstr "Klarte ikkje endra namnet p %s til %s" + +#: apt-private/private-sources.cc:70 +#, c-format +msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 -#: apt-private/private-show.cc:89 -msgid "unknown" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" -#: apt-private/private-output.cc:265 -#, fuzzy, c-format -msgid "[installed,upgradable to: %s]" -msgstr " [Installert]" +#: apt-private/private-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "Reknar ut oppgradering ... " -#: apt-private/private-output.cc:268 -#, fuzzy -msgid "[installed,local]" -msgstr " [Installert]" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "Ferdig" -#: apt-private/private-output.cc:270 -msgid "[installed,auto-removable]" -msgstr "" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Treff " -#: apt-private/private-output.cc:272 -#, fuzzy -msgid "[installed,automatic]" -msgstr " [Installert]" +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Hent:" -#: apt-private/private-output.cc:274 -#, fuzzy -msgid "[installed]" -msgstr " [Installert]" +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ign " -#: apt-private/private-output.cc:277 +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Feil " + +#: apt-private/acqprogress.cc:146 #, c-format -msgid "[upgradable from: %s]" -msgstr "" +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Henta %sB p %s (%sB/s)\n" -#: apt-private/private-output.cc:281 -msgid "[residual-config]" -msgstr "" +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Arbeider]" -#: apt-private/private-output.cc:455 +#: apt-private/acqprogress.cc:297 #, c-format -msgid "but %s is installed" -msgstr "men %s er installert" +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Skifte av medum: Set inn plata merkt\n" +" %s\n" +"i stasjonen %s og trykk Enter.\n" -#: apt-private/private-output.cc:457 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "but %s is to be installed" -msgstr "men %s skal installerast" +msgid "Unable to read %s" +msgstr "Klarte ikkje lesa %s" -#: apt-private/private-output.cc:464 -msgid "but it is not installable" -msgstr "men lt seg ikkje installera" +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 +#, c-format +msgid "Unable to change to %s" +msgstr "Klarte ikkje byta til %s" -#: apt-private/private-output.cc:466 -msgid "but it is a virtual package" -msgstr "men er ein virtuell pakke" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" -#: apt-private/private-output.cc:469 -msgid "but it is not installed" -msgstr "men er ikkje installert" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 +#, fuzzy, c-format +msgid "Can not read mirror file '%s'" +msgstr "Klarte ikkje opna fila %s" -#: apt-private/private-output.cc:469 -msgid "but it is not going to be installed" -msgstr "men skal ikkje installerast" +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Klarte ikkje opna fila %s" -#: apt-private/private-output.cc:474 -msgid " or" -msgstr " eller" +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" +msgstr "" -#: 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:" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Klarte ikkje oppretta IPC-ryr til underprosessen" -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "Dei flgjande NYE pakkane vil verta installerte:" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "Sambandet vart uventa stengd" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "Dei flgjande pakkane vil verta FJERNA:" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "Drleg standardinnstilling" -#: apt-private/private-output.cc:571 -msgid "The following packages have been kept back:" -msgstr "Dei flgjande pakkane er haldne tilbake:" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "Trykk Enter for halda fram." -#: apt-private/private-output.cc:592 -msgid "The following packages will be upgraded:" -msgstr "Dei flgjande pakkane vil verta oppgraderte:" +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" -#: apt-private/private-output.cc:613 -msgid "The following packages will be DOWNGRADED:" -msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:" +#: dselect/install:102 +#, fuzzy +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "Nokre feil oppstod ved utpakking. Dei installerte pakkane vert no" -#: 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:" +#: dselect/install:103 +#, fuzzy +msgid "will be configured. This may result in duplicate errors" +msgstr "sette opp. Dette kan fra til flgjefeil eller feil p grunn av" -#: apt-private/private-output.cc:688 -#, c-format -msgid "%s (due to %s) " -msgstr "%s (fordi %s) " +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "krav som ikkje er oppfylte. Det gjer ikkje noko, berre feila ovanfor" -#: apt-private/private-output.cc:696 -#, fuzzy +#: dselect/install:105 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!" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "er viktige. Rett opp dei feila og [i]nstaller p nytt." -#: apt-private/private-output.cc:727 -#, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu oppgraderte, %lu nyleg installerte, " +#: dselect/update:30 +msgid "Merging available information" +msgstr "Flettar informasjon om tilgjengelege pakkar" -#: apt-private/private-output.cc:731 -#, c-format -msgid "%lu reinstalled, " -msgstr "%lu installerte p nytt, " +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode vart kalla p ein node som framleis er lenkja" -#: apt-private/private-output.cc:733 -#, c-format -msgid "%lu downgraded, " -msgstr "%lu nedgraderte, " +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Fann ikkje nkkelelementet." -#: 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-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Klarte ikkje tildela avleiing" -#: apt-private/private-output.cc:739 +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Intern feil i AddDiversion" + +#: apt-inst/filelist.cc:477 #, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Prver skriva over ei avleiing, %s -> %s og %s/%s" -#. 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" +#: apt-inst/filelist.cc:506 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "Dobbel tilleggjing av avleiing %s -> %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-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "Dobbel oppsettsfil %s/%s" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "Regex compilation error - %s" -msgstr "Regex-kompileringsfeil - %s" +msgid "The path %s is too long" +msgstr "Stigen %s er for lang" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-inst/extract.cc:132 +#, c-format +msgid "Unpacking %s more than once" +msgstr "Pakkar ut %s meir enn in gong" -#: apt-private/private-show.cc:156 +#: apt-inst/extract.cc:142 #, 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] "" +msgid "The directory %s is diverted" +msgstr "Katalogen %s er avleidd" -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" -msgstr "" +#: apt-inst/extract.cc:152 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Pakken prver skriva til avleiingsmlet %s/%s" -#: apt-private/private-sources.cc:58 -#, fuzzy, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "Klarte ikkje endra namnet p %s til %s" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Avleiingsstigen er for lang" -#: apt-private/private-sources.cc:70 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "" - -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Oppdateringskommandoen tek ingen argument" +msgid "Failed to stat %s" +msgstr "Klarte ikkje f status til %s" -#: apt-private/private-update.cc:90 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, 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] "" +msgid "Failed to rename %s to %s" +msgstr "Klarte ikkje endra namnet p %s til %s" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." -msgstr "" +#: apt-inst/extract.cc:249 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "Katalogen %s vert bytt ut med ein ikkje-katalog" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "Reknar ut oppgradering ... " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Fann ikkje noden i nkkelbtta" -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "Ferdig" +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Stigen er for lang" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: apt-inst/extract.cc:421 #, c-format -msgid "Unable to read %s" -msgstr "Klarte ikkje lesa %s" +msgid "Overwrite package match with no version for %s" +msgstr "Skriv over pakketreff utan versjon for %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/extract.cc:438 #, c-format -msgid "Unable to change to %s" -msgstr "Klarte ikkje byta til %s" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 +#: apt-inst/extract.cc:498 #, c-format -msgid "No mirror file '%s' found " -msgstr "" +msgid "Unable to stat %s" +msgstr "Klarte ikkje f status til %s" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:287 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, fuzzy, c-format -msgid "Can not read mirror file '%s'" -msgstr "Klarte ikkje opna fila %s" +msgid "Failed to write file %s" +msgstr "Klarte ikkje skriva fila %s" -#: methods/mirror.cc:315 -#, fuzzy, c-format -msgid "No entry found in mirror file '%s'" -msgstr "Klarte ikkje opna fila %s" +#: apt-inst/dirstream.cc:105 +#, c-format +msgid "Failed to close file %s" +msgstr "Klarte ikkje lukka fila %s" -#: methods/mirror.cc:445 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "[Mirror: %s]" -msgstr "" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Dette er ikkje eit gyldig DEB-arkiv, manglar %s-medlemmen" -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "Klarte ikkje oppretta IPC-ryr til underprosessen" +#: apt-inst/deb/debfile.cc:132 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "Intern feil, fann ikkje medlemmen %s" -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" -msgstr "Sambandet vart uventa stengd" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Kontrollfila kan ikkje tolkast" -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "Drleg standardinnstilling" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Ugyldig arkivsignatur" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "Trykk Enter for halda fram." +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Feil ved lesing av arkivmedlemshovud" -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "" +#: apt-inst/contrib/arfile.cc:96 +#, fuzzy, c-format +msgid "Invalid archive member header %s" +msgstr "Ugyldig arkivmedlemshovud" -#: dselect/install:102 -#, fuzzy -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "Nokre feil oppstod ved utpakking. Dei installerte pakkane vert no" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Ugyldig arkivmedlemshovud" -#: dselect/install:103 -#, fuzzy -msgid "will be configured. This may result in duplicate errors" -msgstr "sette opp. Dette kan fra til flgjefeil eller feil p grunn av" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Arkivet er for kort" -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "krav som ikkje er oppfylte. Det gjer ikkje noko, berre feila ovanfor" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Klarte ikkje lesa arkivhovuda" -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" -msgstr "er viktige. Rett opp dei feila og [i]nstaller p nytt." +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Klarte ikkje oppretta ryr" -#: dselect/update:30 -msgid "Merging available information" -msgstr "Flettar informasjon om tilgjengelege pakkar" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Klarte ikkje kyra gzip " -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Bruk: apt-extracttemplates fil1 [fil2 ...]\n" -"\n" -"apt-extracttemplates er eit verkty for henta ut informasjon om\n" -"oppsett og malar fr Debian-pakkar.\n" -"\n" -"Val:\n" -" -h Vis denne hjelpeteksten\n" -" -t Vel mellombels katalog\n" -" -c=? Les denne innstillingsfila.\n" -" -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "ydelagt arkiv" -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Klarte ikkje f status til %s" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Tar-sjekksummen mislukkast, arkivet er ydelagt" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Unable to write to %s" -msgstr "Klarte ikkje skriva til %s" +msgid "Unknown TAR header type %u, member %s" +msgstr "Ukjend TAR-hovud type %u, medlem %s" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Finn ikkje debconf-versjonen. Er debconf installert?" +#: apt-pkg/install-progress.cc:57 +#, c-format +msgid "Progress: [%3i%%]" +msgstr "" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Lista over pakkeutvidingar er for lang" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +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 +#: apt-pkg/init.cc:146 #, c-format -msgid "Error processing directory %s" -msgstr "Feil ved lesing av katalogen %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Lista over kjeldeutvidingar er for lang" +msgid "Packaging system '%s' is not supported" +msgstr "Pakkesystemet %s er ikkje sttta" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Feil ved skriving av topptekst til innhaldsfila" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Error processing contents %s" -msgstr "Feil ved lesing av %s" - -#: ftparchive/apt-ftparchive.cc:626 -#, fuzzy -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Bruk: apt-ftparchive [val] kommando\n" -"Kommandoar: packages binrstig [overstyringsfil [stigprefiks]]\n" -" sources kjeldesti [overstyringsfil [stiprefiks]]\n" -" contents sti\n" -" generate config [grupper]\n" -" clean config\n" -"\n" -"apt-ftparchive opprettar indeksfiler for Debian-arkiv. Mange ulike\n" -"mtar kan brukast, fr heilautomatiske til funksjonelle erstattingar\n" -"for dpkg-scanpackages og dpkg-scansources.\n" -"\n" -"apt-ftparchive opprettar Package-filer fr eit tre med .debs-filer.\n" -"Package-fila inneheld alle kontrollfelta fr kvar pakke i tillegg til\n" -"MD5-nkkel og filstorleik. Du kan bruka ei overstyringsfil for tvinga\n" -"gjennom verdiar for prioritet og kategori.\n" -"\n" -"apt-ftparchive kan p same mten oppretta Sources-filer fr eit tre\n" -"med .dscs-filer. Du kan bruka ei overstyringsfil med --source-override.\n" -"\n" -"Kommandoane packages og sources skal kyrast i rota av katalogtreet.\n" -"Binrstien skal peika til toppkatalogen i det rekursive sket, og\n" -"overstyringsfila skal innehalda innstillingar for overstyring.\n" -"Stiprefikset vert lagt til filnamnfelta dersom det er oppgjeve. Her er\n" -"eit dme p bruk i Debian-arkivet:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Val:\n" -" -h Vis denne hjelpeteksten.\n" -" --md5 Styrer MD5-genereringa.\n" -" -s=? Overstyringsfil for kjeldekode.\n" -" -q Stille.\n" -" -d=? Vel ein anna mellomlagerdatabase.\n" -" --no-delink Bruk avlusingsmodus med delinking.\n" -" --contents Styrer opprettinga av innhaldsfila.\n" -" -c=? Les denne oppsettsfila.\n" -" -o=? Set ei vilkrleg innstilling." - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Ingen utval passa" +msgid "Wrote %i records.\n" +msgstr "Skreiv %i postar.\n" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Enkelte filer manglar i pakkefilgruppa %s" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Skreiv %i postar med %i manglande filer.\n" -#: ftparchive/cachedb.cc:65 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Databasen er ydelagd. Filnamnet er endra til %s.old" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Skreiv %i postar med %i filer som ikkje passa\n" -#: ftparchive/cachedb.cc:83 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "DB er for gammal, forskjer oppgradere %s" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +#: apt-pkg/indexcopy.cc:515 +#, c-format +msgid "Can't find authentication record for: %s" msgstr "" -#: ftparchive/cachedb.cc:99 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Klarte ikkje opna DB-fila %s: %s" +#: apt-pkg/indexcopy.cc:521 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Feil MD5-sum" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "Failed to stat %s" -msgstr "Klarte ikkje f status til %s" - -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Klarte ikkje lesa lenkja %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Arkivet har ingen kontrollpost" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Klarte ikkje f peikar" +msgid "The method driver %s could not be found." +msgstr "Finn ikkje metodedrivaren %s." -#: ftparchive/writer.cc:91 +#: apt-pkg/acquire-worker.cc:118 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr ": Klarte ikkje lesa katalogen %s\n" +msgid "Is the package %s installed?" +msgstr "" -#: ftparchive/writer.cc:96 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "W: Unable to stat %s\n" -msgstr ": Klarte ikkje f status til %s\n" +msgid "Method %s did not start correctly" +msgstr "Metoden %s starta ikkje rett" -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "F: " +#: apt-pkg/acquire-worker.cc:455 +#, 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" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr ": " +#: 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." -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "F: Det er feil ved fila " +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"Du vil kanskje prva retta p desse problema ved kyra apt-get update." -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 -#, c-format -msgid "Failed to resolve %s" -msgstr "Klarte ikkje sl opp %s" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Kjeldelista kan ikkje lesast." -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Treklatring mislukkast" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Tomt pakkelager" -#: ftparchive/writer.cc:219 -#, c-format -msgid "Failed to open %s" -msgstr "Klarte ikkje opna %s" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Pakkelagerfila er ydelagd" -#: ftparchive/writer.cc:278 -#, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Versjonen til pakkelagerfila er ikkje kompatibel" -#: ftparchive/writer.cc:286 -#, c-format -msgid "Failed to readlink %s" -msgstr "Klarte ikkje lesa lenkja %s" +#: apt-pkg/pkgcache.cc:169 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "Pakkelagerfila er ydelagd" -#: ftparchive/writer.cc:290 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Failed to unlink %s" -msgstr "Klarte ikkje oppheva lenkja %s" +msgid "This APT does not support the versioning system '%s'" +msgstr "APT stttar ikkje versjonssystemet %s" -#: ftparchive/writer.cc:298 -#, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Klarte ikkje lenkja %s til %s" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Pakkelageret er bygd for ein annan arkitektur" -#: ftparchive/writer.cc:308 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " DeLink-grensa p %sB er ndd.\n" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Krav" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Arkivet har ikkje noko pakkefelt" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Forkrav" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s har inga overstyringsoppfring\n" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Forslag" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " %s-vedlikehaldaren er %s, ikkje %s\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Tilrdingar" -#: ftparchive/writer.cc:706 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s har inga overstyringsoppfring\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Konflikt" -#: ftparchive/writer.cc:710 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s har inga overstyringsoppfring\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Byter ut" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Klarte ikkje tildela minne" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Foreldar" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Klarte ikkje opna %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Misforma overstyring %s linje %lu #1" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Klarte ikkje lesa overstyringsfila %s" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "viktig" -#: ftparchive/override.cc:166 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Misforma overstyring %s linje %lu #1" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "pkravd" -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Misforma overstyring %s linje %lu #2" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "vanleg" -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Misforma overstyring %s linje %lu #3" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "valfri" -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Ukjend komprimeringsalgoritme %s" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "tillegg" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Komprimert utdata %s treng eit komprimeringssett" +msgid "Index file type '%s' is not supported" +msgstr "Indeksfiltypen %s er ikkje sttta" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Klarte ikkje oppretta FILE*" +#: 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)" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Klarte ikkje gafla" +#: 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)" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Komprimer barn" +#: 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)" -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "Intern feil, klarte ikkje oppretta %s" +#: 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)" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Klarte ikkje kommunisera med underprosess/fil" +#: 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)" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Klarte ikkje lesa under utrekning av MD5" +#: 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)" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Problem unlinking %s" -msgstr "Problem ved oppheving av lenkje til %s" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Misforma linje %lu i kjeldelista %s (URI)" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Klarte ikkje endra namnet p %s til %s" - -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Bruk: apt-extracttemplates fil1 [fil2 ...]\n" -"\n" -"apt-extracttemplates er eit verkty for henta ut informasjon om\n" -"oppsett og malar fr Debian-pakkar.\n" -"\n" -"Val:\n" -" -h Vis denne hjelpeteksten\n" -" -t Vel mellombels katalog\n" -" -c=? Les denne innstillingsfila.\n" -" -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Ukjend pakkeoppslag" - -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Bruk: apt-sortpkgs [val] fil1 [fil2 ...]\n" -"\n" -"apt-sortpkgs er eit enkelt verkty for sortera pakkefiler. Innstillinga\n" -"-s vert brukt til velja kva for ein type fil det er snakk om.\n" -"\n" -"Val:\n" -" -h Vis denne hjelpeteksten.\n" -" -s Bruk kjeldefilsortering.\n" -" -c=? Les denne oppsettsfila.\n" -" -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" - -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, fuzzy, c-format -msgid "Failed to write file %s" -msgstr "Klarte ikkje skriva fila %s" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Misforma linje %lu i kjeldelista %s (dist)" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Failed to close file %s" -msgstr "Klarte ikkje lukka fila %s" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "The path %s is too long" -msgstr "Stigen %s er for lang" +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)" -#: apt-inst/extract.cc:132 +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "Unpacking %s more than once" -msgstr "Pakkar ut %s meir enn in gong" +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-inst/extract.cc:142 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "The directory %s is diverted" -msgstr "Katalogen %s er avleidd" +msgid "Opening %s" +msgstr "Opnar %s" -#: apt-inst/extract.cc:152 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Pakken prver skriva til avleiingsmlet %s/%s" - -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Avleiingsstigen er for lang" +msgid "Line %u too long in source list %s." +msgstr "Linja %u i kjeldelista %s er for lang." -#: apt-inst/extract.cc:249 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Katalogen %s vert bytt ut med ein ikkje-katalog" +msgid "Malformed line %u in source list %s (type)" +msgstr "Misforma linje %u i kjeldelista %s (type)" -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Fann ikkje noden i nkkelbtta" +#: 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-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Stigen er for lang" +#: 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" -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Skriv over pakketreff utan versjon for %s" +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Indeksfiltypen %s er ikkje sttta" -#: apt-inst/extract.cc:438 +#: apt-pkg/clean.cc:64 #, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s" +msgid "Unable to stat %s." +msgstr "Klarte ikkje f status p %s." -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "Klarte ikkje f status til %s" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "DropNode vart kalla p ein node som framleis er lenkja" +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Feil ved behandling av %s (FindPkg)" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Fann ikkje nkkelelementet." +#: apt-pkg/pkgcachegen.cc:257 +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-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Klarte ikkje tildela avleiing" +#: apt-pkg/pkgcachegen.cc:260 +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-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Intern feil i AddDiversion" +#: apt-pkg/pkgcachegen.cc:263 +#, 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-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Prver skriva over ei avleiing, %s -> %s og %s/%s" +#: apt-pkg/pkgcachegen.cc:266 +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-inst/filelist.cc:506 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Dobbel tilleggjing av avleiing %s -> %s" +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Fann ikkje pakken %s %s ved behandling av filkrav" -#: apt-inst/filelist.cc:549 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Dobbel oppsettsfil %s/%s" - -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Ugyldig arkivsignatur" - -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Feil ved lesing av arkivmedlemshovud" - -#: apt-inst/contrib/arfile.cc:96 -#, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "Ugyldig arkivmedlemshovud" - -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Ugyldig arkivmedlemshovud" - -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Arkivet er for kort" - -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Klarte ikkje lesa arkivhovuda" - -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Klarte ikkje oppretta ryr" - -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Klarte ikkje kyra gzip " - -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "ydelagt arkiv" - -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Tar-sjekksummen mislukkast, arkivet er ydelagt" +msgid "Couldn't stat source package list %s" +msgstr "Klarte ikkje f status p kjeldepakkelista %s" -#: apt-inst/contrib/extracttar.cc:308 -#, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Ukjend TAR-hovud type %u, medlem %s" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Les pakkelister" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 -#, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Dette er ikkje eit gyldig DEB-arkiv, manglar %s-medlemmen" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Samlar inn filtilbod" -#: apt-inst/deb/debfile.cc:132 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "Intern feil, fann ikkje medlemmen %s" - -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Kontrollfila kan ikkje tolkast" +msgid "Unable to write to %s" +msgstr "Klarte ikkje skriva til %s" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, fuzzy, c-format -msgid "List directory %spartial is missing." -msgstr "Listekatalogen %spartial manglar." +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "IU-feil ved lagring av kjeldelager" -#: apt-pkg/acquire.cc:91 -#, fuzzy, c-format -msgid "Archives directory %spartial is missing." -msgstr "Arkivkatalogen %spartial manglar." +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "" -#: apt-pkg/acquire.cc:99 -#, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "Klarte ikkje lsa listekatalogen" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "Indeksfiltypen %s er ikkje sttta" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/acquire.cc:904 -#, fuzzy, c-format -msgid "Retrieving file %li of %li" -msgstr "Les filliste" +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2400,35 +2314,35 @@ msgstr "Feil storleik" msgid "Invalid file format" msgstr "Ugyldig operasjon %s" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, 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:1589 +#: apt-pkg/acquire-item.cc:1656 #, 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:1631 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2436,12 +2350,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2450,129 +2364,107 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Finn ikkje metodedrivaren %s." +msgid "Vendor block %s contains no fingerprint" +msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk" -#: apt-pkg/acquire-worker.cc:118 -#, c-format -msgid "Is the package %s installed?" -msgstr "" +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#, fuzzy, c-format +msgid "List directory %spartial is missing." +msgstr "Listekatalogen %spartial manglar." -#: apt-pkg/acquire-worker.cc:169 -#, c-format -msgid "Method %s did not start correctly" -msgstr "Metoden %s starta ikkje rett" +#: apt-pkg/acquire.cc:91 +#, fuzzy, c-format +msgid "Archives directory %spartial is missing." +msgstr "Arkivkatalogen %spartial manglar." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 #, 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" +msgid "Unable to lock directory %s" +msgstr "Klarte ikkje lsa listekatalogen" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "Pakken %s m installerast p nytt, men arkivet finst ikkje." - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -"Feil, pkgProblemResolver::Resolve har laga brot. Dette kan skuldast pakkar " -"som er haldne tilbake." -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "" -"Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake." +#: apt-pkg/acquire.cc:904 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Les filliste" -#: 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." +#: 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/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" +#: 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 "" -"Du vil kanskje prva retta p desse problema ved kyra apt-get update." -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Kjeldelista kan ikkje lesast." - -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Fann ikkje utgva %s av %s" - -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Fann ikkje versjonen %s av %s" - -#: apt-pkg/cacheset.cc:603 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "Fann ikkje pakken %s" - -#: apt-pkg/cacheset.cc:609 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Fann ikkje pakken %s" - -#: apt-pkg/cacheset.cc:615 +#: apt-pkg/policy.cc:422 #, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Fann ikkje pakken %s" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud" -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "" +msgid "Did not understand pin type %s" +msgstr "Skjnar ikkje spikringstypen %s" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Ingen prioritet (eller null) oppgitt for spiker" + +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +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 "" +"Denne installasjonen vil verta nydd til mellombels fjerna den ndvendige " +"pakken %s p grunn av ei konflikt/forkrav-lkkje. Dette er ofte uheldig, men " +"om du verkeleg vil gjera det, kan du bruka innstillinga APT::Force-" +"LoopBreak." -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +#: 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: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." +"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" @@ -2647,10 +2539,24 @@ msgstr "Skriv ny kjeldeliste\n" msgid "Source list entries for this disc are:\n" msgstr "Kjeldelisteoppfringar for denne disken er:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Klarte ikkje f status p %s." +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:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Feil, pkgProblemResolver::Resolve har laga brot. Dette kan skuldast pakkar " +"som er haldne tilbake." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "" +"Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake." #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2679,55 +2585,67 @@ msgstr "Klarte ikkje opna %s" msgid "Failed to write temporary StateFile %s" msgstr "Klarte ikkje skriva fila %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Klarte ikkje tolka pakkefila %s (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Fann ikkje utgva %s av %s" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Fann ikkje versjonen %s av %s" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "Fann ikkje pakken %s" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 -#, c-format -msgid "Wrote %i records.\n" -msgstr "Skreiv %i postar.\n" +#: apt-pkg/cacheset.cc:609 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "Fann ikkje pakken %s" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Fann ikkje pakken %s" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Skreiv %i postar med %i manglande filer.\n" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Skreiv %i postar med %i filer som ikkje passa\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "Feil MD5-sum" +#: apt-pkg/cacheset.cc:663 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" #: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format @@ -2754,317 +2672,220 @@ msgstr "Ugyldig linje i avleiingsfila: %s" msgid "Invalid 'Date' entry in Release file %s" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/init.cc:146 -#, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Pakkesystemet %s er ikkje sttta" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype" - -#: apt-pkg/install-progress.cc:57 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Progress: [%3i%%]" +msgid "%lid %lih %limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "%limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "Klarte ikkje opna fila %s" - -#: apt-pkg/packagemanager.cc:630 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, 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." +msgid "%lis" msgstr "" -"Denne installasjonen vil verta nydd til mellombels fjerna den ndvendige " -"pakken %s p grunn av ei konflikt/forkrav-lkkje. Dette er ofte uheldig, men " -"om du verkeleg vil gjera det, kan du bruka innstillinga APT::Force-" -"LoopBreak." -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Tomt pakkelager" +#: apt-pkg/contrib/strutl.cc:1258 +#, c-format +msgid "Selection %s not found" +msgstr "Fann ikkje utvalet %s" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Pakkelagerfila er ydelagd" +#: apt-pkg/contrib/fileutl.cc:190 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "Brukar ikkje lsing for den skrivebeskytta lsefila %s" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Versjonen til pakkelagerfila er ikkje kompatibel" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "Klarte ikkje opna lsefila %s" -#: apt-pkg/pkgcache.cc:169 -#, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "Pakkelagerfila er ydelagd" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Brukar ikkje lsing for den nfs-monterte lsefila %s" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:223 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "APT stttar ikkje versjonssystemet %s" +msgid "Could not get lock %s" +msgstr "Klarte ikkje lsa %s" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "Pakkelageret er bygd for ein annan arkitektur" - -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Krav" - -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Forkrav" - -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Forslag" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Tilrdingar" - -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Konflikt" - -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Byter ut" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Foreldar" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "viktig" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Underprosessen %s mottok ein segmenteringsfeil." -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "pkravd" +#: apt-pkg/contrib/fileutl.cc:826 +#, fuzzy, c-format +msgid "Sub-process %s received signal %u." +msgstr "Underprosessen %s mottok ein segmenteringsfeil." -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "vanleg" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Underprosessen %s returnerte ein feilkode (%u)" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "valfri" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Underprosessen %s avslutta uventa" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "tillegg" +#: apt-pkg/contrib/fileutl.cc:913 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problem ved lsing av fila" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Klarte ikkje opna fila %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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 #, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Feil ved behandling av %s (FindPkg)" - -#: apt-pkg/pkgcachegen.cc:257 -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." +msgid "Could not open file descriptor %d" +msgstr "Klarte ikkje opna ryr for %s" -#: apt-pkg/pkgcachegen.cc:260 -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/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Klarte ikkje oppretta underprosessen IPC" -#: apt-pkg/pkgcachegen.cc:263 -#, 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/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Klarte ikkje kyra komprimeringa " -#: apt-pkg/pkgcachegen.cc:266 -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/contrib/fileutl.cc:1514 +#, fuzzy, c-format +msgid "read, still have %llu to read but none left" +msgstr "lese, har framleis %lu att lesa, men ingen att" -#: apt-pkg/pkgcachegen.cc:576 -#, 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/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, fuzzy, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "skrive, har framleis %lu att skrive, men klarte ikkje" -#: apt-pkg/pkgcachegen.cc:1211 -#, c-format -msgid "Couldn't stat source package list %s" -msgstr "Klarte ikkje f status p kjeldepakkelista %s" +#: apt-pkg/contrib/fileutl.cc:1915 +#, fuzzy, c-format +msgid "Problem closing the file %s" +msgstr "Problem ved lsing av fila" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Les pakkelister" +#: apt-pkg/contrib/fileutl.cc:1927 +#, fuzzy, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Problem ved synkronisering av fila" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Samlar inn filtilbod" +#: apt-pkg/contrib/fileutl.cc:1938 +#, fuzzy, c-format +msgid "Problem unlinking the file %s" +msgstr "Problem ved oppheving av lenkje til fila" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "IU-feil ved lagring av kjeldelager" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Problem ved synkronisering av fila" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Indeksfiltypen %s er ikkje sttta" +msgid "%c%s... Error!" +msgstr "%c%s ... Feil" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +msgid "%c%s... Done" +msgstr "%c%s ... Ferdig" + +#: apt-pkg/contrib/progress.cc:181 +msgid "..." msgstr "" -#: apt-pkg/policy.cc:422 +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud" - -#: apt-pkg/policy.cc:444 -#, c-format -msgid "Did not understand pin type %s" -msgstr "Skjnar ikkje spikringstypen %s" +msgid "%c%s... %u%%" +msgstr "%c%s ... Ferdig" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Ingen prioritet (eller null) oppgitt for spiker" +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Kan ikkje utfra mmap p ei tom fil" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/mmap.cc:111 #, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Klarte ikkje opna ryr for %s" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/mmap.cc:119 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" +msgid "Couldn't make mmap of %llu bytes" +msgstr "Klarte ikkje laga mmap av %lu byte" -#: 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/contrib/mmap.cc:146 +#, fuzzy +msgid "Unable to close mmap" +msgstr "Klarte ikkje opna %s" -#: 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/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "Klarte ikkje starta " -#: 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/contrib/mmap.cc:290 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "Klarte ikkje laga mmap av %lu byte" -#: 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/contrib/mmap.cc:322 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Klarte ikkje skriva fila %s" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/contrib/mmap.cc:341 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Misforma linje %lu i kjeldelista %s (URI)" +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/mmap.cc:446 #, 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" - -#: 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/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" - -#: apt-pkg/srcrecords.cc:52 -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/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Klarte ikkje tolka pakkefila %s (1)" - -#: apt-pkg/tagfile.cc:237 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Klarte ikkje tolka pakkefila %s (2)" - -#: 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." +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." msgstr "" -"Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle " -"filer er brukte i staden." -#: apt-pkg/vendorlist.cc:85 -#, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk" +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" #: apt-pkg/contrib/cdromutl.cc:65 #, c-format @@ -3075,52 +2896,6 @@ msgstr "Klarte ikkje f msgid "Failed to stat the cdrom" msgstr "Klarte ikkje f status til CD-ROM" -#: apt-pkg/contrib/cmndline.cc:121 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "Kjenner ikkje kommandolinjevalet %c (fr %s)." - -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "Skjnar ikkje kommandolinjevalet %s" - -#: apt-pkg/contrib/cmndline.cc:168 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "Kommandolinjevalet %s er ikkje boolsk" - -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "Valet %s krev eit argument." - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "Val %s: Spesifikasjonen av oppsettselementet m ha ein =." - -#: apt-pkg/contrib/cmndline.cc:278 -#, 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:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "Valet %s er for langt" - -#: apt-pkg/contrib/cmndline.cc:341 -#, 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:391 -#, c-format -msgid "Invalid operation %s" -msgstr "Ugyldig operasjon %s" - #: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" @@ -3176,387 +2951,607 @@ msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila" -#: apt-pkg/contrib/fileutl.cc:190 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Avbryt installasjon." + +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Brukar ikkje lsing for den skrivebeskytta lsefila %s" +msgid "Command line option '%c' [from %s] is not known." +msgstr "Kjenner ikkje kommandolinjevalet %c (fr %s)." -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Could not open lock file %s" -msgstr "Klarte ikkje opna lsefila %s" +msgid "Command line option %s is not understood" +msgstr "Skjnar ikkje kommandolinjevalet %s" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Brukar ikkje lsing for den nfs-monterte lsefila %s" +msgid "Command line option %s is not boolean" +msgstr "Kommandolinjevalet %s er ikkje boolsk" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "Could not get lock %s" -msgstr "Klarte ikkje lsa %s" +msgid "Option %s requires an argument." +msgstr "Valet %s krev eit argument." -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "" +msgid "Option %s: Configuration item specification must have an =." +msgstr "Val %s: Spesifikasjonen av oppsettselementet m ha ein =." -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Valet %s m ha eit heiltalsargument, ikkje %s" -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" +msgid "Option '%s' is too long" +msgstr "Valet %s er for langt" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" +msgid "Sense %s is not understood, try true or false." +msgstr "Skjnar ikkje %s. Prv true eller false." -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Underprosessen %s mottok ein segmenteringsfeil." +msgid "Invalid operation %s" +msgstr "Ugyldig operasjon %s" -#: apt-pkg/contrib/fileutl.cc:826 +#: apt-pkg/deb/dpkgpm.cc:110 #, fuzzy, c-format -msgid "Sub-process %s received signal %u." -msgstr "Underprosessen %s mottok ein segmenteringsfeil." +msgid "Installing %s" +msgstr " Installert: " -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Underprosessen %s returnerte ein feilkode (%u)" +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 +#, fuzzy, c-format +msgid "Configuring %s" +msgstr "Koplar til %s" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 -#, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Underprosessen %s avslutta uventa" +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 +#, fuzzy, c-format +msgid "Removing %s" +msgstr "Opnar %s" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/dpkgpm.cc:113 #, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problem ved lsing av fila" +msgid "Completely removing %s" +msgstr "Klarte ikkje fjerna %s" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Could not open file %s" -msgstr "Klarte ikkje opna fila %s" - -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 -#, fuzzy, c-format -msgid "Could not open file descriptor %d" -msgstr "Klarte ikkje opna ryr for %s" +msgid "Noting disappearance of %s" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Klarte ikkje oppretta underprosessen IPC" +#: apt-pkg/deb/dpkgpm.cc:115 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Klarte ikkje kyra komprimeringa " +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 +#, fuzzy, c-format +msgid "Directory '%s' missing" +msgstr "Listekatalogen %spartial manglar." -#: apt-pkg/contrib/fileutl.cc:1514 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, fuzzy, c-format -msgid "read, still have %llu to read but none left" -msgstr "lese, har framleis %lu att lesa, men ingen att" +msgid "Could not open file '%s'" +msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#: apt-pkg/deb/dpkgpm.cc:1007 #, fuzzy, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "skrive, har framleis %lu att skrive, men klarte ikkje" +msgid "Preparing %s" +msgstr "Opnar %s" -#: apt-pkg/contrib/fileutl.cc:1915 +#: apt-pkg/deb/dpkgpm.cc:1008 #, fuzzy, c-format -msgid "Problem closing the file %s" -msgstr "Problem ved lsing av fila" +msgid "Unpacking %s" +msgstr "Opnar %s" -#: apt-pkg/contrib/fileutl.cc:1927 +#: apt-pkg/deb/dpkgpm.cc:1013 #, fuzzy, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Problem ved synkronisering av fila" +msgid "Preparing to configure %s" +msgstr "Opnar oppsettsfila %s" -#: apt-pkg/contrib/fileutl.cc:1938 +#: apt-pkg/deb/dpkgpm.cc:1015 #, fuzzy, c-format -msgid "Problem unlinking the file %s" -msgstr "Problem ved oppheving av lenkje til fila" +msgid "Installed %s" +msgstr " Installert: " -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Problem ved synkronisering av fila" +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: apt-pkg/deb/dpkgpm.cc:1022 #, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Avbryt installasjon." - -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Kan ikkje utfra mmap p ei tom fil" +msgid "Removed %s" +msgstr "Tilrdingar" -#: apt-pkg/contrib/mmap.cc:111 +#: apt-pkg/deb/dpkgpm.cc:1027 #, fuzzy, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Klarte ikkje opna ryr for %s" +msgid "Preparing to completely remove %s" +msgstr "Opnar oppsettsfila %s" -#: apt-pkg/contrib/mmap.cc:119 +#: apt-pkg/deb/dpkgpm.cc:1028 #, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Klarte ikkje laga mmap av %lu byte" +msgid "Completely removed %s" +msgstr "Klarte ikkje fjerna %s" -#: apt-pkg/contrib/mmap.cc:146 -#, fuzzy -msgid "Unable to close mmap" -msgstr "Klarte ikkje opna %s" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Klarte ikkje skriva til %s" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -#, fuzzy -msgid "Unable to synchronize mmap" -msgstr "Klarte ikkje starta " +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Klarte ikkje laga mmap av %lu byte" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "" -#: apt-pkg/contrib/mmap.cc:322 -#, fuzzy -msgid "Failed to truncate file" -msgstr "Klarte ikkje skriva fila %s" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "" -#: apt-pkg/contrib/mmap.cc:341 +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"Unable to lock the administration directory (%s), is another process using " +"it?" msgstr "" -#: apt-pkg/contrib/mmap.cc:446 +#: 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 "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +"dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/contrib/mmap.cc:449 +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "" + +#: cmdline/apt-extracttemplates.cc:224 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Bruk: apt-extracttemplates fil1 [fil2 ...]\n" +"\n" +"apt-extracttemplates er eit verkty for henta ut informasjon om\n" +"oppsett og malar fr Debian-pakkar.\n" +"\n" +"Val:\n" +" -h Vis denne hjelpeteksten\n" +" -t Vel mellombels katalog\n" +" -c=? Les denne innstillingsfila.\n" +" -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" -#: apt-pkg/contrib/progress.cc:148 +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "Klarte ikkje f status til %s" + +#: cmdline/apt-extracttemplates.cc:300 +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 +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 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s ... Feil" +msgid "Error processing directory %s" +msgstr "Feil ved lesing av katalogen %s" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Lista over kjeldeutvidingar er for lang" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Feil ved skriving av topptekst til innhaldsfila" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "%c%s... Done" -msgstr "%c%s ... Ferdig" +msgid "Error processing contents %s" +msgstr "Feil ved lesing av %s" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +#: ftparchive/apt-ftparchive.cc:626 +#, fuzzy +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Bruk: apt-ftparchive [val] kommando\n" +"Kommandoar: packages binrstig [overstyringsfil [stigprefiks]]\n" +" sources kjeldesti [overstyringsfil [stiprefiks]]\n" +" contents sti\n" +" generate config [grupper]\n" +" clean config\n" +"\n" +"apt-ftparchive opprettar indeksfiler for Debian-arkiv. Mange ulike\n" +"mtar kan brukast, fr heilautomatiske til funksjonelle erstattingar\n" +"for dpkg-scanpackages og dpkg-scansources.\n" +"\n" +"apt-ftparchive opprettar Package-filer fr eit tre med .debs-filer.\n" +"Package-fila inneheld alle kontrollfelta fr kvar pakke i tillegg til\n" +"MD5-nkkel og filstorleik. Du kan bruka ei overstyringsfil for tvinga\n" +"gjennom verdiar for prioritet og kategori.\n" +"\n" +"apt-ftparchive kan p same mten oppretta Sources-filer fr eit tre\n" +"med .dscs-filer. Du kan bruka ei overstyringsfil med --source-override.\n" +"\n" +"Kommandoane packages og sources skal kyrast i rota av katalogtreet.\n" +"Binrstien skal peika til toppkatalogen i det rekursive sket, og\n" +"overstyringsfila skal innehalda innstillingar for overstyring.\n" +"Stiprefikset vert lagt til filnamnfelta dersom det er oppgjeve. Her er\n" +"eit dme p bruk i Debian-arkivet:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Val:\n" +" -h Vis denne hjelpeteksten.\n" +" --md5 Styrer MD5-genereringa.\n" +" -s=? Overstyringsfil for kjeldekode.\n" +" -q Stille.\n" +" -d=? Vel ein anna mellomlagerdatabase.\n" +" --no-delink Bruk avlusingsmodus med delinking.\n" +" --contents Styrer opprettinga av innhaldsfila.\n" +" -c=? Les denne oppsettsfila.\n" +" -o=? Set ei vilkrleg innstilling." + +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Ingen utval passa" + +#: ftparchive/apt-ftparchive.cc:907 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "Enkelte filer manglar i pakkefilgruppa %s" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Databasen er ydelagd. Filnamnet er endra til %s.old" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "DB er for gammal, forskjer oppgradere %s" + +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s ... Ferdig" +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Klarte ikkje opna DB-fila %s: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Klarte ikkje lesa lenkja %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Arkivet har ingen kontrollpost" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Klarte ikkje f peikar" + +#: ftparchive/writer.cc:91 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr ": Klarte ikkje lesa katalogen %s\n" + +#: ftparchive/writer.cc:96 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr ": Klarte ikkje f status til %s\n" + +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "F: " + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr ": " + +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "F: Det er feil ved fila " -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "" +msgid "Failed to resolve %s" +msgstr "Klarte ikkje sl opp %s" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" -msgstr "" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Treklatring mislukkast" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/writer.cc:219 #, c-format -msgid "%limin %lis" -msgstr "" +msgid "Failed to open %s" +msgstr "Klarte ikkje opna %s" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:278 #, c-format -msgid "%lis" -msgstr "" +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:286 #, c-format -msgid "Selection %s not found" -msgstr "Fann ikkje utvalet %s" +msgid "Failed to readlink %s" +msgstr "Klarte ikkje lesa lenkja %s" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:290 #, 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" +msgid "Failed to unlink %s" +msgstr "Klarte ikkje oppheva lenkja %s" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:298 #, 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-pkg/deb/dpkgpm.cc:95 -#, fuzzy, c-format -msgid "Installing %s" -msgstr " Installert: " - -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 -#, fuzzy, c-format -msgid "Configuring %s" -msgstr "Koplar til %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Klarte ikkje lenkja %s til %s" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 -#, fuzzy, c-format -msgid "Removing %s" -msgstr "Opnar %s" +#: ftparchive/writer.cc:308 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr " DeLink-grensa p %sB er ndd.\n" -#: apt-pkg/deb/dpkgpm.cc:98 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "Klarte ikkje fjerna %s" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Arkivet har ikkje noko pakkefelt" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Noting disappearance of %s" -msgstr "" +msgid " %s has no override entry\n" +msgstr " %s har inga overstyringsoppfring\n" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Running post-installation trigger %s" -msgstr "" - -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 -#, fuzzy, c-format -msgid "Directory '%s' missing" -msgstr "Listekatalogen %spartial manglar." +msgid " %s maintainer is %s not %s\n" +msgstr " %s-vedlikehaldaren er %s, ikkje %s\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:706 #, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "Klarte ikkje opna fila %s" +msgid " %s has no source override entry\n" +msgstr " %s har inga overstyringsoppfring\n" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:710 #, fuzzy, c-format -msgid "Preparing %s" -msgstr "Opnar %s" +msgid " %s has no binary override entry either\n" +msgstr " %s har inga overstyringsoppfring\n" -#: apt-pkg/deb/dpkgpm.cc:993 -#, fuzzy, c-format -msgid "Unpacking %s" -msgstr "Opnar %s" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Klarte ikkje tildela minne" -#: apt-pkg/deb/dpkgpm.cc:998 -#, fuzzy, c-format -msgid "Preparing to configure %s" -msgstr "Opnar oppsettsfila %s" +#: ftparchive/override.cc:38 ftparchive/override.cc:142 +#, c-format +msgid "Unable to open %s" +msgstr "Klarte ikkje opna %s" -#: apt-pkg/deb/dpkgpm.cc:1000 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 #, fuzzy, c-format -msgid "Installed %s" -msgstr " Installert: " +msgid "Malformed override %s line %llu (%s)" +msgstr "Misforma overstyring %s linje %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing for removal of %s" -msgstr "" +msgid "Failed to read the override file %s" +msgstr "Klarte ikkje lesa overstyringsfila %s" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:166 #, fuzzy, c-format -msgid "Removed %s" -msgstr "Tilrdingar" +msgid "Malformed override %s line %llu #1" +msgstr "Misforma overstyring %s linje %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:178 #, fuzzy, c-format -msgid "Preparing to completely remove %s" -msgstr "Opnar oppsettsfila %s" +msgid "Malformed override %s line %llu #2" +msgstr "Misforma overstyring %s linje %lu #2" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/override.cc:191 #, fuzzy, c-format -msgid "Completely removed %s" -msgstr "Klarte ikkje fjerna %s" +msgid "Malformed override %s line %llu #3" +msgstr "Misforma overstyring %s linje %lu #3" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Klarte ikkje skriva til %s" +#: ftparchive/multicompress.cc:73 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Ukjend komprimeringsalgoritme %s" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Komprimert utdata %s treng eit komprimeringssett" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Klarte ikkje oppretta FILE*" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Klarte ikkje gafla" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Komprimer barn" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Intern feil, klarte ikkje oppretta %s" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "Klarte ikkje kommunisera med underprosess/fil" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Klarte ikkje lesa under utrekning av MD5" -#: apt-pkg/deb/dpkgpm.cc:1707 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Problem ved oppheving av lenkje til %s" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-internal-solver.cc:49 +#, fuzzy msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Bruk: apt-extracttemplates fil1 [fil2 ...]\n" +"\n" +"apt-extracttemplates er eit verkty for henta ut informasjon om\n" +"oppsett og malar fr Debian-pakkar.\n" +"\n" +"Val:\n" +" -h Vis denne hjelpeteksten\n" +" -t Vel mellombels katalog\n" +" -c=? Les denne innstillingsfila.\n" +" -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Ukjend pakkeoppslag" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Bruk: apt-sortpkgs [val] fil1 [fil2 ...]\n" +"\n" +"apt-sortpkgs er eit enkelt verkty for sortera pakkefiler. Innstillinga\n" +"-s vert brukt til velja kva for ein type fil det er snakk om.\n" +"\n" +"Val:\n" +" -h Vis denne hjelpeteksten.\n" +" -s Bruk kjeldefilsortering.\n" +" -c=? Les denne oppsettsfila.\n" +" -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/pl.po b/po/pl.po index 95785904a..ff360c9ff 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2012-07-28 21:53+0200\n" "Last-Translator: Michał Kułach \n" "Language-Team: Polish \n" @@ -163,7 +163,7 @@ msgid " Version table:" msgstr " Tabela wersji:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -365,7 +365,7 @@ msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane " "źródła" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Nie udało się odnaleźć źródła dla pakietu %s" @@ -392,80 +392,80 @@ msgstr "" "by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego " "pakietu.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pomijanie już pobranego pliku \"%s\"\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie udało się ustalić ilości wolnego miejsca w %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczającej ilości wolnego miejsca" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiwów źródeł.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Pobieranie źródeł %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Nie udało się pobrać niektórych archiwów." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Ukończono pobieranie w trybie samego pobierania" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Proces potomny zawiódł" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -474,17 +474,17 @@ msgstr "" "Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt." "conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zależności dla budowania.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -493,7 +493,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:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -502,14 +502,14 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -518,7 +518,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:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -527,30 +527,30 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ pakiet %s nie ma " "wersji kandydującej" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, 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:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Nie udało się przetworzyć zależności dla budowania" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Dziennik zmian %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Obsługiwane moduły:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -694,7 +694,7 @@ msgstr "%s został już odznaczony jako zatrzymany.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Oczekiwano na proces %s, ale nie było go" @@ -812,16 +812,16 @@ msgstr "Nie udało się odmontować CD-ROM-u w %s, być może wciąż jest używ msgid "Disk not found." msgstr "Nie odnaleziono dysku." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Nie odnaleziono pliku" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Nie udało się wykonać operacji stat" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Nie udało się ustawić czasu modyfikacji" @@ -877,7 +877,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "Polecenie TYPE nie powiodło się, odpowiedź serwera: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Przekroczenie czasu połączenia" @@ -899,7 +899,7 @@ msgstr "Odpowiedź przepełniła bufor." msgid "Protocol corruption" msgstr "Naruszenie zasad protokołu" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -960,7 +960,7 @@ msgstr "Przekroczony czas połączenia gniazda danych" msgid "Unable to accept connection" msgstr "Nie udało się przyjąć połączenia" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Nie udało się obliczyć skrótu pliku" @@ -969,7 +969,7 @@ msgstr "Nie udało się obliczyć skrótu pliku" msgid "Unable to fetch file, server said '%s'" msgstr "Nie można pobrać pliku, odpowiedź serwera: %s" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Przekroczony czas oczekiwania na dane" @@ -1019,7 +1019,7 @@ msgstr "Nie udało się połączyć z %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Łączenie z %s" @@ -1161,45 +1161,18 @@ msgstr "Połączenie nie powiodło się" msgid "Internal error" msgstr "Błąd wewnętrzny" -# Ujednolicono z aptitude -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Stary " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Pobieranie:" - -# Wyrównane do Hit i Err. -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ign. " - -# Wyrównane do Hit i Ign. -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Błąd " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Pobrano %sB w %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Pracuje]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Zmiana nośnika: Proszę włożyć dysk oznaczony\n" -" \"%s\"\n" -"do napędu \"%s\" i nacisnąć enter\n" +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:93 msgid "Correcting dependencies..." @@ -1229,164 +1202,350 @@ msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić." msgid "Unmet dependencies. Try using -f." msgstr "Niespełnione zależności. Proszę spróbować użyć -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Zainstalowany]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Zignorowano ostrzeżenie uwierzytelniania.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [Zainstalowany]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Niektóre pakiety nie mogły zostać zweryfikowane" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Zainstalować te pakiety bez weryfikacji?" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Zainstalowany]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Wystąpiły problemy, a użyto -y bez --force-yes" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Zainstalowany]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Nie udało się pobrać %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Błąd wewnętrzny, użyto InstallPackages z uszkodzonymi pakietami!" - -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone." - -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Błąd wewnętrzny, sortowanie niezakończone" +msgid "[upgradable from: %s]" +msgstr "" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" msgstr "" -"Wystąpił dziwny błąd - rozmiary się nie zgadzają. Proszę to zgłosić pod " -"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 -#: apt-private/private-install.cc:155 +#: apt-private/private-output.cc:455 #, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "Konieczne pobranie %sB/%sB archiwów.\n" +msgid "but %s is installed" +msgstr "ale %s jest zainstalowany" -#. 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:160 +#: apt-private/private-output.cc:457 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "Konieczne pobranie %sB archiwów.\n" +msgid "but %s is to be installed" +msgstr "ale %s ma zostać zainstalowany" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n" +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "ale nie da się go zainstalować" -#. 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:172 -#, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "ale jest pakietem wirtualnym" -#: apt-private/private-install.cc:200 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca." +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "ale nie jest zainstalowany" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Nakazano wykonywać tylko trywialne operacje, a ta do nich nie należy." +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "ale nie zostanie zainstalowany" -# Bezpieczniej jest nie używać tu polskich znaków. -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Tak, jestem pewien!" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " lub" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Zaraz stanie się coś potencjalnie szkodliwego.\n" -"Aby kontynuować proszę napisać zdanie \"%s\"\n" -" ?] " +#: 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-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Przerwane." +#: 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-install.cc:243 -msgid "Do you want to continue?" -msgstr "Kontynuować?" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "Następujące pakiety zostaną USUNIĘTE:" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Nie udało się pobrać niektórych plików" +#: 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-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Nie udało się pobrać niektórych archiwów, proszę spróbować uruchomić apt-get " -"update lub użyć opcji --fix-missing." +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "Następujące pakiety zostaną zaktualizowane:" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing i zamiana nośników nie są obecnie obsługiwane" +#: 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-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Nie udało się poprawić brakują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-install.cc:330 -msgid "Aborting install." -msgstr "Przerywanie instalacji" +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (z powodu %s) " -#: apt-private/private-install.cc:366 +#: apt-private/private-output.cc:696 msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"Następujący pakiet zniknął z tego systemu, ponieważ wszystkie jego pliki " -"zostały nadpisane przez inne pakiety:" -msgstr[1] "" -"Następujące pakiety zniknęły z tego systemu, ponieważ wszystkie ich pliki " -"zostały nadpisane przez inne pakiety:" -msgstr[2] "" -"Następujące pakiety zniknęły z tego systemu, ponieważ wszystkie ich pliki " -"zostały nadpisane przez inne pakiety:" +"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-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Uwaga: dpkg wykonał to automatycznie i celowo." +#: apt-private/private-output.cc:727 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu aktualizowanych, %lu nowo instalowanych, " -#: apt-private/private-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony" +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Błąd wewnętrzny, użyto InstallPackages z uszkodzonymi pakietami!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Błąd wewnętrzny, sortowanie niezakończone" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Wystąpił dziwny błąd - rozmiary się nie zgadzają. Proszę to zgłosić pod " +"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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Konieczne pobranie %sB/%sB archiwów.\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:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Konieczne pobranie %sB archiwów.\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:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n" + +#. 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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Wystąpiły problemy, a użyto -y bez --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "Nakazano wykonywać tylko trywialne operacje, a ta do nich nie należy." + +# Bezpieczniej jest nie używać tu polskich znaków. +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Tak, jestem pewien!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Zaraz stanie się coś potencjalnie szkodliwego.\n" +"Aby kontynuować proszę napisać zdanie \"%s\"\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Przerwane." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Kontynuować?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Nie udało się pobrać niektórych plików" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Nie udało się pobrać niektórych archiwów, proszę spróbować uruchomić apt-get " +"update lub użyć opcji --fix-missing." + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing i zamiana nośników nie są obecnie obsługiwane" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Nie udało się poprawić brakujących pakietów." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Przerywanie instalacji" + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"Następujący pakiet zniknął z tego systemu, ponieważ wszystkie jego pliki " +"zostały nadpisane przez inne pakiety:" +msgstr[1] "" +"Następujące pakiety zniknęły z tego systemu, ponieważ wszystkie ich pliki " +"zostały nadpisane przez inne pakiety:" +msgstr[2] "" +"Następujące pakiety zniknęły z tego systemu, ponieważ wszystkie ich pliki " +"zostały nadpisane przez inne pakiety:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Uwaga: dpkg wykonał to automatycznie i celowo." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony" #: apt-private/private-install.cc:499 msgid "" @@ -1539,212 +1698,26 @@ 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:129 -msgid "Listing" -msgstr "" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!" -#: apt-private/private-list.cc:159 +#: apt-private/private-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Zignorowano ostrzeżenie uwierzytelniania.\n" + +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Niektóre pakiety nie mogły zostać zweryfikowane" + +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Zainstalować te pakiety bez weryfikacji?" + +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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-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-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:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Błąd kompilacji wyrażenia regularnego - %s" - -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -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 "" +msgid "Failed to fetch %s %s\n" +msgstr "Nie udało się pobrać %s %s\n" #: apt-private/private-sources.cc:58 #, fuzzy, c-format @@ -1756,21 +1729,8 @@ msgstr "Nie udało się zmienić nazwy %s na %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: 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:90 -#, 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:94 -msgid "All packages are up to date." +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" #: apt-private/private-upgrade.cc:25 @@ -1781,20 +1741,60 @@ msgstr "Obliczanie aktualizacji..." msgid "Done" msgstr "Gotowe" +# Ujednolicono z aptitude +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Stary " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Pobieranie:" + +# Wyrównane do Hit i Err. +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ign. " + +# Wyrównane do Hit i Ign. +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Błąd " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Pobrano %sB w %s (%sB/s)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Pracuje]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Zmiana nośnika: Proszę włożyć dysk oznaczony\n" +" \"%s\"\n" +"do napędu \"%s\" i nacisnąć enter\n" + #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, 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:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1828,7 +1828,7 @@ msgstr "[Serwer lustrzany: %s]" msgid "Failed to create IPC pipe to subprocess" msgstr "Nie udało się utworzyć potoku IPC do podprocesu" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "Połączenie zostało przedwcześnie zamknięte" @@ -1871,644 +1871,552 @@ msgstr "" msgid "Merging available information" msgstr "Łączenie informacji o dostępnych pakietach" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Użycie: apt-extracttemplates plik1 [plik2 ...]\n" -"\n" -"apt-extracttemplates to narzędzie służące do pobierania informacji\n" -"i konfiguracji i szablonach z pakietów Debiana.\n" -"\n" -"Opcje:\n" -" -h Ten tekst pomocy.\n" -" -t Ustawia katalog tymczasowy\n" -" -c=? Czyta wskazany plik konfiguracyjny.\n" -" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" - -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Nie można wykonać operacji stat na %s" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode wywołane na wciąż podłączonym węźle" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "Nie udało się pisać do %s" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Nie udało się odnaleźć elementu tablicy haszującej!" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Nie udało się pobrać wersji debconf. Czy debconf jest zainstalowany?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Nie udało się utworzyć ominięcia" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Lista rozszerzeń pakietów jest zbyt długa" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Błąd wewnętrzny w AddDiversion" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "Błąd przetwarzania katalogu %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Lista rozszerzeń źródeł jest zbyt długa" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Błąd przy zapisywaniu nagłówka do pliku zawartości" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Próba nadpisania ominięcia, %s -> %s i %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "Błąd podczas przetwarzania zawartości %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Użycie: apt-ftparchive [opcje] polecenie\n" -"Polecenia: packages ścieżka_do_binariów [plik_override [przedrostek]]\n" -" sources ścieżka_do_źródeł [plik_override [przedrostek]]\n" -" contents ścieżka\n" -" release ścieżka\n" -" generate konfiguracja [grupy]\n" -" clean konfiguracja\n" -"\n" -"apt-ftparchive generuje pliki indeksów dla archiwów Debiana. Obsługuje\n" -"różne rodzaje generowania, od w pełni zautomatyzowanych po funkcjonalne\n" -"zamienniki programów dpkg-scanpackages i dpkg-scansources.\n" -"\n" -"apt-ftparchive generuje pliki Package na postawie drzewa plików .deb.\n" -"Wygenerowany plik zawiera pola kontrolne wszystkich pakietów oraz ich\n" -"skróty MD5 i rozmiary. Obsługiwany jest plik override, pozwalający wymusić\n" -"priorytet i dział pakietu.\n" -"\n" -"apt-ftparchive podobnie generuje pliki Sources na podstawie drzewa plików\n" -".dsc. Przy pomocy opcji --source-override można podać plik override dla\n" -"źródeł.\n" -"\n" -"Polecenia \"packages\" i \"sources\" powinny być wykonywane w katalogu " -"głównym\n" -"drzewa. \"ścieżka_do_binariów\" powinna wskazywać na katalog, od którego " -"zacznie\n" -"się wyszukiwanie, a plik override powinien zawierać odpowiednie flagi.\n" -"Przedrostek (o ile został podany) jest dodawany przed ścieżką do każdego\n" -"pliku. Przykładowe użycie, z archiwum Debiana:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Opcje:\n" -" -h Ten tekst pomocy\n" -" --md5 Generuje sumy kontrolne MD5\n" -" -s=? Plik override dla źródeł\n" -" -q \"Ciche\" działanie\n" -" -d=? Opcjonalna podręczna baza danych\n" -" --no-delink Włącza tryb diagnostyczny odłączania\n" -" --contents Generuje plik zawartości (Contents)\n" -" -c=? Czyta wskazany plik konfiguracyjny\n" -" -o=? Ustawia dowolną opcję konfiguracji" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Nie dopasowano żadnej nazwy" +msgid "Double add of diversion %s -> %s" +msgstr "Podwójne dodanie ominięcia %s -> %s" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, 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\"" +msgid "Duplicate conf file %s/%s" +msgstr "Zduplikowany plik konfiguracyjny %s/%s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Baza była uszkodzona, plik został przeniesiony do %s.old" +msgid "The path %s is too long" +msgstr "Ścieżka %s jest zbyt długa" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Baza jest przestarzała, próbuję zaktualizować %s" +msgid "Unpacking %s more than once" +msgstr "Wypakowanie %s więcej niż raz" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"Niepoprawny format bazy. Jeśli zaktualizowano ze starszej wersji apt, proszę " -"usunąć i utworzyć ponownie bazę danych." +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "Ominięcie katalogu %s" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Nie udało się otworzyć pliku bazy %s: %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Pakiet próbuje pisać do celu ominięcia %s/%s" + +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Zbyt długa ścieżka ominięcia" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Nie udało się wykonać operacji stat na %s" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Nie udało się odczytać dowiązania %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Archiwum nie posiada rekordu kontrolnego" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Nie udało się pobrać kursora" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: Nie udało się odczytać katalogu %s\n" +msgid "Failed to rename %s to %s" +msgstr "Nie udało się zmienić nazwy %s na %s" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "W: Nie można wykonać operacji stat na %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "Katalog %s został zastąpiony obiektem nie będącym katalogiem" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "W: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Nie udało się znaleźć węzła w jego kubełku haszującym" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: Błędy odnoszą się do pliku " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Ścieżka jest zbyt długa" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "Nie udało się przetłumaczyć nazwy %s" +msgid "Overwrite package match with no version for %s" +msgstr "Nadpisujący pakiet nie pasuje z wersją %s" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Przejście po drzewie nie powiodło się" +#: apt-inst/extract.cc:438 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Plik %s/%s nadpisuje plik w pakiecie %s" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:498 #, c-format -msgid "Failed to open %s" -msgstr "Nie udało się otworzyć %s" +msgid "Unable to stat %s" +msgstr "Nie można wykonać operacji stat na %s" -#: ftparchive/writer.cc:278 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " Odłączenie %s [%s]\n" +msgid "Failed to write file %s" +msgstr "Nie udało się zapisać pliku %s" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to readlink %s" -msgstr "Nie udało się odczytać dowiązania %s" +msgid "Failed to close file %s" +msgstr "Nie udało się zamknąć pliku %s" -#: ftparchive/writer.cc:290 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "Failed to unlink %s" -msgstr "Nie udało się usunąć %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "To nie jest poprawne archiwum DEB, brakuje składnika \"%s\"" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Nie udało się dowiązać %s do %s" +msgid "Internal error, could not locate member %s" +msgstr "Błąd wewnętrzny, nie udało się odnaleźć składnika %s" -#: ftparchive/writer.cc:308 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Osiągnięto ograniczenie odłączania %sB.\n" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Plik kontrolny nie może zostać poprawnie zinterpretowany" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Archiwum nie posiadało pola pakietu" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Nieprawidłowy podpis archiwum" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s nie posiada wpisu w pliku override\n" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Błąd przy czytaniu nagłówka składnika archiwum" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " opiekunem %s jest %s, a nie %s\n" +msgid "Invalid archive member header %s" +msgstr "Nieprawidłowy nagłówek składnika archiwum: %s" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s nie posiada wpisu w pliku override źródeł\n" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Nieprawidłowy nagłówek składnika archiwum" -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s nie posiada również wpisu w pliku override binariów\n" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Archiwum jest za krótkie" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Nie udało się zaalokować pamięci" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Nie udało się odczytać nagłówków archiwum" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Nie można otworzyć %s" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Nie udało się utworzyć potoków" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Nieprawidłowa linia %llu #1 pliku override %s" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Nie udało się uruchomić programu gzip " -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Nie udało się czytać pliku override %s" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Uszkodzone archiwum" -#: ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Nieprawidłowa linia %2$llu #1 pliku override %1$s" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone" -#: ftparchive/override.cc:178 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Nieprawidłowa linia %2$llu #2 pliku override %1$s" +msgid "Unknown TAR header type %u, member %s" +msgstr "Nieznany typ nagłówka TAR %u, składnik %s" -#: ftparchive/override.cc:191 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Nieprawidłowa linia %2$llu #3 pliku override %1$s" +msgid "Progress: [%3i%%]" +msgstr "" -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Nieznany algorytm kompresji \"%s\"" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "Uruchamianie dpkg" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/init.cc:146 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Skompresowany plik wynikowy %s wymaga podania kompresji" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Nie udało się utworzyć obiektu FILE*" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Nie udało się utworzyć procesu potomnego" +msgid "Packaging system '%s' is not supported" +msgstr "System pakietów \"%s\" nie jest obsługiwany" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Potomny proces kompresujący" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Nie udało się określić odpowiedniego typu systemu pakietów" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Błąd wewnętrzny, nie udało się utworzyć %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Zawiodła operacja IO na pliku/podprocesie" - -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5" +msgid "Wrote %i records.\n" +msgstr "Zapisano %i rekordów.\n" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Problem unlinking %s" -msgstr "Problem przy usuwaniu %s" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Zapisano %i rekordów z %i brakującymi plikami.\n" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Nie udało się zmienić nazwy %s na %s" - -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Użycie: apt-internal-solver\n" -"\n" -"apt-internal-solver jest interfejsem do używania bieżącego, wewnętrznego\n" -"mechanizmu rozwiązywania zależności - w sposób podobny jak zewnętrznego\n" -"mechanizmu rodziny APT - do celów debugowania itp.\n" -"\n" -"Opcje:\n" -" -h Ten tekst pomocy.\n" -" -q Zapisywalne wyjście - brak wskaźnika postępu\n" -" -c=? Czyta wskazany plik konfiguracyjny\n" -" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Nieznane informacje o pakiecie!" - -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Użycie: apt-sortpkgs [opcje] plik1 [plik2 ...]\n" -"\n" -"apt-sortpkgs to proste narzędzie służące do sortowania plików pakietów.\n" -"Opcji -s używa się do wskazania typu pliku.\n" -"\n" -"Opcje:\n" -" -h Ten tekst pomocy.\n" -" -s Sortowanie pliku źródeł.\n" -" -c=? Czyta wskazany plik konfiguracyjny.\n" -" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "Failed to write file %s" -msgstr "Nie udało się zapisać pliku %s" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Failed to close file %s" -msgstr "Nie udało się zamknąć pliku %s" +msgid "Can't find authentication record for: %s" +msgstr "Nie udało się znaleźć wpisu uwierzytelnienia dla: %s" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "The path %s is too long" -msgstr "Ścieżka %s jest zbyt długa" +msgid "Hash mismatch for: %s" +msgstr "Błędna suma kontrolna dla: %s" -#: apt-inst/extract.cc:132 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "Unpacking %s more than once" -msgstr "Wypakowanie %s więcej niż raz" +msgid "The method driver %s could not be found." +msgstr "Nie udało się odnaleźć sterownika metody %s." -#: apt-inst/extract.cc:142 -#, c-format -msgid "The directory %s is diverted" -msgstr "Ominięcie katalogu %s" +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n" -#: apt-inst/extract.cc:152 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Pakiet próbuje pisać do celu ominięcia %s/%s" - -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Zbyt długa ścieżka ominięcia" +msgid "Method %s did not start correctly" +msgstr "Metoda %s nie uruchomiła się poprawnie" -#: apt-inst/extract.cc:249 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Katalog %s został zastąpiony obiektem nie będącym katalogiem" +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-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Nie udało się znaleźć węzła w jego kubełku haszującym" +#: 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." -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Ścieżka jest zbyt długa" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Należy uruchomić apt-get update aby naprawić te problemy." -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Nadpisujący pakiet nie pasuje z wersją %s" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Nie udało się odczytać list źródeł." -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Plik %s/%s nadpisuje plik w pakiecie %s" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Pusty magazyn podręczny pakietów" -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "Nie można wykonać operacji stat na %s" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Magazyn podręczny pakietów jest uszkodzony" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "DropNode wywołane na wciąż podłączonym węźle" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Magazyn podręczny pakietów jest w niezgodnej wersji" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Nie udało się odnaleźć elementu tablicy haszującej!" +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" +msgstr "Magazyn podręczny pakietów jest uszkodzony - jest zbyt mały" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Nie udało się utworzyć ominięcia" +#: apt-pkg/pkgcache.cc:174 +#, c-format +msgid "This APT does not support the versioning system '%s'" +msgstr "Ta wersja APT nie obsługuje systemu wersji \"%s\"" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Błąd wewnętrzny w AddDiversion" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Ten magazyn podręczny pakietów został zbudowany dla innej architektury" -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Próba nadpisania ominięcia, %s -> %s i %s/%s" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Wymaga" -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Podwójne dodanie ominięcia %s -> %s" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Wymaga wstępnie" -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Zduplikowany plik konfiguracyjny %s/%s" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Sugeruje" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Nieprawidłowy podpis archiwum" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Poleca" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Błąd przy czytaniu nagłówka składnika archiwum" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "W konflikcie z" -#: apt-inst/contrib/arfile.cc:96 -#, c-format -msgid "Invalid archive member header %s" -msgstr "Nieprawidłowy nagłówek składnika archiwum: %s" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Zastępuje" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Nieprawidłowy nagłówek składnika archiwum" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Dezaktualizuje" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Archiwum jest za krótkie" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Narusza zależności" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Nie udało się odczytać nagłówków archiwum" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Rozszerza" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Nie udało się utworzyć potoków" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "ważny" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Nie udało się uruchomić programu gzip " +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "wymagany" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Uszkodzone archiwum" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "standardowy" -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "opcjonalny" -#: apt-inst/contrib/extracttar.cc:308 -#, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Nieznany typ nagłówka TAR %u, składnik %s" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "dodatkowy" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "To nie jest poprawne archiwum DEB, brakuje składnika \"%s\"" +msgid "Index file type '%s' is not supported" +msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany" -#: apt-inst/deb/debfile.cc:132 +#: 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 "Internal error, could not locate member %s" -msgstr "Błąd wewnętrzny, nie udało się odnaleźć składnika %s" +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-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Plik kontrolny nie może zostać poprawnie zinterpretowany" +#: 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/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "List directory %spartial is missing." -msgstr "Brakuje katalogu list %spartial." +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/acquire.cc:91 +#: apt-pkg/sourcelist.cc:190 #, c-format -msgid "Archives directory %spartial is missing." -msgstr "Brakuje katalogu archiwów %spartial." +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/acquire.cc:99 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "Unable to lock directory %s" -msgstr "Nie udało się zablokować katalogu %s" +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/acquire.cc:490 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/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)" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Pobieranie pliku %li z %li (pozostało %s)" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)" -#: apt-pkg/acquire.cc:904 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Retrieving file %li of %li" -msgstr "Pobieranie pliku %li z %li" +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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "nie udało się zmienić nazwy, %s (%s -> %s)" +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/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "Błędna suma kontrolna" +#: 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/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "Błędny rozmiar" +#: apt-pkg/sourcelist.cc:335 +#, c-format +msgid "Opening %s" +msgstr "Otwieranie %s" -#: apt-pkg/acquire-item.cc:173 -#, fuzzy -msgid "Invalid file format" -msgstr "Nieprawidłowa operacja %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/acquire-item.cc:1573 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" -msgstr "" -"Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release " -"(nieprawidłowy wpis sources.list lub nieprawidłowy plik)" +msgid "Malformed line %u in source list %s (type)" +msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)" -#: apt-pkg/acquire-item.cc:1589 +#: apt-pkg/sourcelist.cc:375 #, 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" +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/acquire-item.cc:1631 +#: 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:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany" + +#: 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/pkgcachegen.cc:93 +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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Wystąpił błąd podczas przetwarzania %s (%s%d)" + +#: apt-pkg/pkgcachegen.cc:257 +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:260 +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:263 +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:266 +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:576 +#, 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:1211 +#, 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:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Czytanie list pakietów" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Zbieranie zapewnień plików" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Nie udało się pisać do %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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:241 +msgid "Send request to solver" +msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności" + +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "Przygotowywanie na otrzymanie rozwiązania" + +#: apt-pkg/edsp.cc:327 +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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności" + +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "nie udało się zmienić nazwy, %s (%s -> %s)" + +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "Błędna suma kontrolna" + +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "Błędny rozmiar" + +#: apt-pkg/acquire-item.cc:173 +#, fuzzy +msgid "Invalid file format" +msgstr "Nieprawidłowa operacja %s" + +#: apt-pkg/acquire-item.cc:1640 +#, c-format +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +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:1656 +#, 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:1698 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:1669 +#: apt-pkg/acquire-item.cc:1736 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2517,12 +2425,12 @@ msgstr "" "Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego " "repozytorium nie będą wykonywane." -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/acquire-item.cc:1758 #, 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:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2532,12 +2440,12 @@ 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:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "Błąd GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2546,138 +2454,111 @@ 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:1925 +#: apt-pkg/acquire-item.cc:1992 #, 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:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, 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:118 -#, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n" +msgid "Vendor block %s contains no fingerprint" +msgstr "Blok producenta %s nie zawiera odcisku" -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Method %s did not start correctly" -msgstr "Metoda %s nie uruchomiła się poprawnie" +msgid "List directory %spartial is missing." +msgstr "Brakuje katalogu list %spartial." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:91 #, 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 "Archives directory %spartial is missing." +msgstr "Brakuje katalogu archiwów %spartial." -#: apt-pkg/algorithms.cc:265 +#: apt-pkg/acquire.cc:99 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"Pakiet %s ma zostać ponownie zainstalowany, ale nie można znaleźć jego " -"archiwum." - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Błąd, pkgProblemResolver::Resolve zwrócił błąd, może to być spowodowane " -"zatrzymanymi pakietami." - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety." - -#: 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." - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Należy uruchomić apt-get update aby naprawić te problemy." - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Nie udało się odczytać list źródeł." +msgid "Unable to lock directory %s" +msgstr "Nie udało się zablokować katalogu %s" -#: apt-pkg/cacheset.cc:489 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Pobieranie pliku %li z %li (pozostało %s)" -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/acquire.cc:904 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona" +msgid "Retrieving file %li of %li" +msgstr "Pobieranie pliku %li z %li" -#: apt-pkg/cacheset.cc:603 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "Nie udało się odnaleźć zadania \"%s\"" +#: 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/cacheset.cc:609 +#: apt-pkg/policy.cc:83 #, c-format -msgid "Couldn't find any package by regex '%s'" +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\"" +"Wartość %s jest nieprawidłowa dla APT::Default-Release, ponieważ takie " +"wydanie nie jest dostępne w źródłach" -#: apt-pkg/cacheset.cc:615 -#, 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/policy.cc:422 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Nieprawidłowe informacje w pliku ustawień %s, brak nagłówka Package" -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/policy.cc:444 #, 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" +msgid "Did not understand pin type %s" +msgstr "Nierozpoznany typ przypinania %s" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Brak (lub zerowy) priorytet przypięcia" + +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -"Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", " -"ponieważ nie ma żadnej z nich" +"Nie udało się wykonać natychmiastowej konfiguracji %s. Proszę wykonać \"man " +"5 apt.conf\" i zapoznać się z wpisem APT::Immediate-Configure aby dowiedzieć " +"się więcej. (%d)" -#: apt-pkg/cacheset.cc:647 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, 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" +msgid "Could not configure '%s'. " +msgstr "Nie udało się skonfigurować \"%s\". " -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +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 "" -"Nie udało się wybrać wersji kandydującej pakietu %s, ponieważ nie ma " -"kandydata" +"To uruchomienie programu będzie wymagało tymczasowego usunięcia istotnego " +"pakietu %s z powodu pętli konfliktów/wymagań wstępnych. Często jest to złe " +"rozwiązanie, ale jeśli jest się pewnym swoich działań, należy włączyć opcję " +"APT::Force-LoopBreak." -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +#: 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ę wybrać zainstalowanej wersji z pakietu %s, ponieważ nie jest " -"zainstalowany" - -#: 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." +"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" @@ -2756,10 +2637,25 @@ msgstr "Zapisywanie nowej listy źródeł\n" msgid "Source list entries for this disc are:\n" msgstr "Źródła dla tej płyty to:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Nie udało się wykonać operacji stat na pliku %s." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Pakiet %s ma zostać ponownie zainstalowany, ale nie można znaleźć jego " +"archiwum." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Błąd, pkgProblemResolver::Resolve zwrócił błąd, może to być spowodowane " +"zatrzymanymi pakietami." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety." #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2787,57 +2683,79 @@ msgstr "Nie udało się otworzyć pliku stanu %s" msgid "Failed to write temporary StateFile %s" msgstr "Nie udało się zapisać tymczasowego pliku stanu %s" -#: 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/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Nie udało się zanalizować pliku pakietu %s (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Nie udało się zanalizować pliku pakietu %s (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "Przygotowywanie na otrzymanie rozwiązania" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione" -#: apt-pkg/edsp.cc:327 -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/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Nie udało się odnaleźć zadania \"%s\"" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "Zapisano %i rekordów.\n" +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/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, 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:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Zapisano %i rekordów z %i brakującymi plikami.\n" +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/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", " +"ponieważ nie ma żadnej z nich" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n" +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/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "Nie udało się znaleźć wpisu uwierzytelnienia dla: %s" +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/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:663 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Błędna suma kontrolna dla: %s" +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/indexrecords.cc:78 #, c-format @@ -2864,841 +2782,918 @@ msgstr "Nieprawidłowy wpis Valid-Until w pliku Release %s" msgid "Invalid 'Date' entry in Release file %s" msgstr "Nieprawidłowy wpis Date w pliku Release %s" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "System pakietów \"%s\" nie jest obsługiwany" +msgid "%lid %lih %limin %lis" +msgstr "%lidni %lig %limin %lis" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Nie udało się określić odpowiedniego typu systemu pakietów" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" +msgstr "%lig %limin %lis" -#: apt-pkg/install-progress.cc:57 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Progress: [%3i%%]" -msgstr "" +msgid "%limin %lis" +msgstr "%limin %lis" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "Uruchamianie dpkg" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" +msgstr "%lis" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" -"Nie udało się wykonać natychmiastowej konfiguracji %s. Proszę wykonać \"man " -"5 apt.conf\" i zapoznać się z wpisem APT::Immediate-Configure aby dowiedzieć " -"się więcej. (%d)" +msgid "Selection %s not found" +msgstr "Nie odnaleziono wyboru %s" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "Could not configure '%s'. " -msgstr "Nie udało się skonfigurować \"%s\". " +msgid "Not using locking for read only lock file %s" +msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie użyta blokada" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" -"To uruchomienie programu będzie wymagało tymczasowego usunięcia istotnego " -"pakietu %s z powodu pętli konfliktów/wymagań wstępnych. Często jest to złe " -"rozwiązanie, ale jeśli jest się pewnym swoich działań, należy włączyć opcję " -"APT::Force-LoopBreak." +msgid "Could not open lock file %s" +msgstr "Nie udało się otworzyć pliku blokady %s" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Pusty magazyn podręczny pakietów" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie użyta blokada" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Magazyn podręczny pakietów jest uszkodzony" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Nie udało się uzyskać blokady %s" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Magazyn podręczny pakietów jest w niezgodnej wersji" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" +"Lista plików nie może zostać stworzona, ponieważ \"%s\" nie jest katalogiem" -#: apt-pkg/pkgcache.cc:169 -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/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "Ignorowanie \"%s\" w katalogu \"%s\", ponieważ nie jest to zwykły plik" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:412 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Ta wersja APT nie obsługuje systemu wersji \"%s\"" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" +"Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ nie ma on rozszerzenia " +"pliku" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "Ten magazyn podręczny pakietów został zbudowany dla innej architektury" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" +"Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ ma on nieprawidłowe " +"rozszerzenie pliku" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Wymaga" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Podproces %s spowodował naruszenie ochrony pamięci." -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Wymaga wstępnie" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "Podproces %s otrzymał sygnał %u." -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Sugeruje" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Podproces %s zwrócił kod błędu (%u)" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Poleca" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Podproces %s zakończył się niespodziewanie" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "W konflikcie z" +#: apt-pkg/contrib/fileutl.cc:913 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problem przy zamykaniu pliku gzip %s" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Zastępuje" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Nie udało się otworzyć pliku %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Dezaktualizuje" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "Nie udało się otworzyć deskryptora pliku %d" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Narusza zależności" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Nie udało się utworzyć IPC z podprocesem" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Rozszerza" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Nie udało się uruchomić kompresora " -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "ważny" +#: apt-pkg/contrib/fileutl.cc:1514 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "należało przeczytać jeszcze %llu, ale nic nie zostało" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "wymagany" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "należało zapisać jeszcze %llu, ale nie udało się to" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "standardowy" +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" +msgstr "Problem przy zamykaniu pliku %s" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "opcjonalny" +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Problem przy zapisywaniu pliku %s w %s" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "dodatkowy" +#: apt-pkg/contrib/fileutl.cc:1938 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "Problem przy odlinkowywaniu pliku %s" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Magazyn podręczny ma niezgodny system wersji" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Problem przy zapisywaniu pliku na dysk" -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Wystąpił błąd podczas przetwarzania %s (%s%d)" +msgid "%c%s... Error!" +msgstr "%c%s... Błąd!" -#: apt-pkg/pkgcachegen.cc:257 -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/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Gotowe" -#: apt-pkg/pkgcachegen.cc:260 -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/contrib/progress.cc:181 +msgid "..." +msgstr "" -#: apt-pkg/pkgcachegen.cc:263 -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ć." +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Gotowe" -#: apt-pkg/pkgcachegen.cc:266 -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/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Nie można wykonać mmap na pustym pliku" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/mmap.cc:111 #, 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" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Nie udało się zduplikować deskryptora pliku %i" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/mmap.cc:119 #, 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:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Czytanie list pakietów" +msgid "Couldn't make mmap of %llu bytes" +msgstr "Nie udało się wykonać mmap %llu bajtów" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Zbieranie zapewnień plików" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Nie udało się zamknąć mmap" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Nie udało się zsynchronizować mmap" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Nie udało się wykonać mmap %lu bajtów" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Nie udało się uciąć zawartości pliku %s" + +#: apt-pkg/contrib/mmap.cc:341 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"Wartość %s jest nieprawidłowa dla APT::Default-Release, ponieważ takie " -"wydanie nie jest dostępne w źródłach" +"Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-" +"Start. Bieżąca wartość: %lu. (man 5 apt.conf)" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Nieprawidłowe informacje w pliku ustawień %s, brak nagłówka Package" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" +"Nie udało się zwiększyć rozmiaru MMap, ponieważ limit %lu bajtów został już " +"osiągnięty." -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Nie udało się zwiększyć rozmiaru MMap, ponieważ automatycznie powiększanie " +"zostało wyłączone przez użytkownika." + +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "Did not understand pin type %s" -msgstr "Nierozpoznany typ przypinania %s" +msgid "Unable to stat the mount point %s" +msgstr "Nie udało się wykonać operacji stat na punkcie montowania %s" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Brak (lub zerowy) priorytet przypięcia" +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Nie udało się wykonać operacji stat na CDROM-ie" -#: 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/contrib/configuration.cc:519 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Nierozpoznany skrót typu: \"%c\"" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/configuration.cc:633 #, 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ć)" +msgid "Opening configuration file %s" +msgstr "Otwieranie pliku konfiguracyjnego %s" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/configuration.cc:801 #, 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)" +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Błąd składniowy %s:%u: Blok nie zaczyna się nazwą." -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/configuration.cc:820 #, 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)" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Błąd składniowy %s:%u: Błędny znacznik" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/configuration.cc:837 #, 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)" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Błąd składniowy %s:%u: Po wartości występują śmieci" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -"Nieprawidłowa linia %lu w liście źródeł %s ([%s] klucz %s nie ma wartości)" +"Błąd składniowy %s:%u: Dyrektywy mogą występować tylko na najwyższym poziomie" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/contrib/configuration.cc:884 #, 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:371 -#, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)" +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/sourcelist.cc:375 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, 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/srcrecords.cc:52 -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" +msgid "Syntax error %s:%u: Included from here" +msgstr "Błąd składniowy %s:%u: Włączony tutaj" -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/configuration.cc:897 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Nie udało się zanalizować pliku pakietu %s (1)" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Błąd składniowy %s:%u: Nieobsługiwana dyrektywa \"%s\"" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/configuration.cc:900 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Nie udało się zanalizować pliku pakietu %s (2)" - -#: 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." +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -"Nie udało się pobrać niektórych plików indeksu, zostały one zignorowane lub " -"użyto ich starszej wersji." +"Błąd składniowy %s:%u: czysta dyrektywa wymaga drzewa opcji jako argumentu" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/configuration.cc:950 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Blok producenta %s nie zawiera odcisku" +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/cdromutl.cc:65 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "Nie udało się wykonać operacji stat na punkcie montowania %s" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "Nie udało się wykonać operacji stat na CDROM-ie" +msgid "No keyring installed in %s." +msgstr "Brak zainstalowanej bazy kluczy w %s." -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format msgid "Command line option %s is not understood" msgstr "Niezrozumiała opcja linii poleceń %s" -#: apt-pkg/contrib/cmndline.cc:168 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format msgid "Command line option %s is not boolean" msgstr "Opcja linii poleceń %s nie jest typu logicznego" -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format msgid "Option %s requires an argument." msgstr "Opcja %s wymaga argumentu." -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Opcja %s: Specyfikacja elementu konfiguracji musi zawierać =." -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, 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:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "Opcja \"%s\" jest zbyt długa" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, 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:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "Nieprawidłowa operacja %s" -#: apt-pkg/contrib/configuration.cc:519 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Nierozpoznany skrót typu: \"%c\"" +msgid "Installing %s" +msgstr "Instalowanie %s" -#: apt-pkg/contrib/configuration.cc:633 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Opening configuration file %s" -msgstr "Otwieranie pliku konfiguracyjnego %s" +msgid "Configuring %s" +msgstr "Konfigurowanie %s" -#: apt-pkg/contrib/configuration.cc:801 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Błąd składniowy %s:%u: Blok nie zaczyna się nazwą." +msgid "Removing %s" +msgstr "Usuwanie %s" -#: apt-pkg/contrib/configuration.cc:820 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Błąd składniowy %s:%u: Błędny znacznik" +msgid "Completely removing %s" +msgstr "Całkowite usuwanie %s" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Błąd składniowy %s:%u: Po wartości występują śmieci" +msgid "Noting disappearance of %s" +msgstr "Proszę odnotować zniknięcie %s" -#: apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/deb/dpkgpm.cc:115 #, 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" +msgid "Running post-installation trigger %s" +msgstr "Uruchamianie wyzwalacza post-installation %s" -#: apt-pkg/contrib/configuration.cc:884 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, 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" +msgid "Directory '%s' missing" +msgstr "Brakuje katalogu \"%s\"" -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Błąd składniowy %s:%u: Włączony tutaj" +msgid "Could not open file '%s'" +msgstr "Nie udało się otworzyć pliku \"%s\"" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Błąd składniowy %s:%u: Nieobsługiwana dyrektywa \"%s\"" +msgid "Preparing %s" +msgstr "Przygotowywanie %s" -#: apt-pkg/contrib/configuration.cc:900 +#: apt-pkg/deb/dpkgpm.cc:1008 #, 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" +msgid "Unpacking %s" +msgstr "Rozpakowywanie %s" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:1013 #, 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" +msgid "Preparing to configure %s" +msgstr "Przygotowywanie do konfiguracji %s" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie użyta blokada" +msgid "Installed %s" +msgstr "Pakiet %s został zainstalowany" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "Could not open lock file %s" -msgstr "Nie udało się otworzyć pliku blokady %s" +msgid "Preparing for removal of %s" +msgstr "Przygotowywanie do usunięcia %s" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie użyta blokada" +msgid "Removed %s" +msgstr "Pakiet %s został usunięty" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Could not get lock %s" -msgstr "Nie udało się uzyskać blokady %s" +msgid "Preparing to completely remove %s" +msgstr "Przygotowywanie do całkowitego usunięcia %s" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "List of files can't be created as '%s' is not a directory" +msgid "Completely removed %s" +msgstr "Pakiet %s został całkowicie usunięty" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Nie udało się pisać do %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" msgstr "" -"Lista plików nie może zostać stworzona, ponieważ \"%s\" nie jest katalogiem" -#: apt-pkg/contrib/fileutl.cc:394 -#, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "Ignorowanie \"%s\" w katalogu \"%s\", ponieważ nie jest to zwykły plik" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "Operacja została przerwana, zanim mogła zostać zakończona" -#: apt-pkg/contrib/fileutl.cc:412 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +#: apt-pkg/deb/dpkgpm.cc:1719 +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:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego" + +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -"Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ nie ma on rozszerzenia " -"pliku" +"Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że " +"przyczyna niepowodzenia leży w poprzednim błędzie." -#: apt-pkg/contrib/fileutl.cc:421 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1732 msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +"No apport report written because the error message indicates a disk full " +"error" msgstr "" -"Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ ma on nieprawidłowe " -"rozszerzenie pliku" +"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na " +"przepełnienie dysku" -#: apt-pkg/contrib/fileutl.cc:824 -#, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Podproces %s spowodował naruszenie ochrony pamięci." +#: apt-pkg/deb/dpkgpm.cc:1739 +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/contrib/fileutl.cc:826 -#, c-format -msgid "Sub-process %s received signal %u." -msgstr "Podproces %s otrzymał sygnał %u." +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +#, 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/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Podproces %s zwrócił kod błędu (%u)" +#: apt-pkg/deb/dpkgpm.cc:1774 +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/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Podproces %s zakończył się niespodziewanie" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Nie udało się zablokować katalogu administracyjnego (%s), czy inny proces go " +"używa?" -#: apt-pkg/contrib/fileutl.cc:913 +# Musi pasować do su i sudo. +#: apt-pkg/deb/debsystem.cc:94 #, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problem przy zamykaniu pliku gzip %s" +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?" -#: apt-pkg/contrib/fileutl.cc:1101 -#, c-format -msgid "Could not open file %s" -msgstr "Nie udało się otworzyć pliku %s" - -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 -#, c-format -msgid "Could not open file descriptor %d" -msgstr "Nie udało się otworzyć deskryptora pliku %d" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Nie udało się utworzyć IPC z podprocesem" - -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Nie udało się uruchomić kompresora " - -#: apt-pkg/contrib/fileutl.cc:1514 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 #, c-format -msgid "read, still have %llu to read but none left" -msgstr "należało przeczytać jeszcze %llu, ale nic nie zostało" +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/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "należało zapisać jeszcze %llu, ale nie udało się to" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "Niezablokowany" -#: apt-pkg/contrib/fileutl.cc:1915 -#, c-format -msgid "Problem closing the file %s" -msgstr "Problem przy zamykaniu pliku %s" +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Użycie: apt-extracttemplates plik1 [plik2 ...]\n" +"\n" +"apt-extracttemplates to narzędzie służące do pobierania informacji\n" +"i konfiguracji i szablonach z pakietów Debiana.\n" +"\n" +"Opcje:\n" +" -h Ten tekst pomocy.\n" +" -t Ustawia katalog tymczasowy\n" +" -c=? Czyta wskazany plik konfiguracyjny.\n" +" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" -#: apt-pkg/contrib/fileutl.cc:1927 -#, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Problem przy zapisywaniu pliku %s w %s" +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "Nie można wykonać operacji stat na %s" -#: apt-pkg/contrib/fileutl.cc:1938 -#, c-format -msgid "Problem unlinking the file %s" -msgstr "Problem przy odlinkowywaniu pliku %s" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Nie udało się pobrać wersji debconf. Czy debconf jest zainstalowany?" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Problem przy zapisywaniu pliku na dysk" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "Lista rozszerzeń pakietów jest zbyt długa" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: 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 #, c-format -msgid "No keyring installed in %s." -msgstr "Brak zainstalowanej bazy kluczy w %s." +msgid "Error processing directory %s" +msgstr "Błąd przetwarzania katalogu %s" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Nie można wykonać mmap na pustym pliku" +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Lista rozszerzeń źródeł jest zbyt długa" -#: apt-pkg/contrib/mmap.cc:111 -#, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Nie udało się zduplikować deskryptora pliku %i" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Błąd przy zapisywaniu nagłówka do pliku zawartości" -#: apt-pkg/contrib/mmap.cc:119 +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Nie udało się wykonać mmap %llu bajtów" +msgid "Error processing contents %s" +msgstr "Błąd podczas przetwarzania zawartości %s" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Nie udało się zamknąć mmap" +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Użycie: apt-ftparchive [opcje] polecenie\n" +"Polecenia: packages ścieżka_do_binariów [plik_override [przedrostek]]\n" +" sources ścieżka_do_źródeł [plik_override [przedrostek]]\n" +" contents ścieżka\n" +" release ścieżka\n" +" generate konfiguracja [grupy]\n" +" clean konfiguracja\n" +"\n" +"apt-ftparchive generuje pliki indeksów dla archiwów Debiana. Obsługuje\n" +"różne rodzaje generowania, od w pełni zautomatyzowanych po funkcjonalne\n" +"zamienniki programów dpkg-scanpackages i dpkg-scansources.\n" +"\n" +"apt-ftparchive generuje pliki Package na postawie drzewa plików .deb.\n" +"Wygenerowany plik zawiera pola kontrolne wszystkich pakietów oraz ich\n" +"skróty MD5 i rozmiary. Obsługiwany jest plik override, pozwalający wymusić\n" +"priorytet i dział pakietu.\n" +"\n" +"apt-ftparchive podobnie generuje pliki Sources na podstawie drzewa plików\n" +".dsc. Przy pomocy opcji --source-override można podać plik override dla\n" +"źródeł.\n" +"\n" +"Polecenia \"packages\" i \"sources\" powinny być wykonywane w katalogu " +"głównym\n" +"drzewa. \"ścieżka_do_binariów\" powinna wskazywać na katalog, od którego " +"zacznie\n" +"się wyszukiwanie, a plik override powinien zawierać odpowiednie flagi.\n" +"Przedrostek (o ile został podany) jest dodawany przed ścieżką do każdego\n" +"pliku. Przykładowe użycie, z archiwum Debiana:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Opcje:\n" +" -h Ten tekst pomocy\n" +" --md5 Generuje sumy kontrolne MD5\n" +" -s=? Plik override dla źródeł\n" +" -q \"Ciche\" działanie\n" +" -d=? Opcjonalna podręczna baza danych\n" +" --no-delink Włącza tryb diagnostyczny odłączania\n" +" --contents Generuje plik zawartości (Contents)\n" +" -c=? Czyta wskazany plik konfiguracyjny\n" +" -o=? Ustawia dowolną opcję konfiguracji" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Nie udało się zsynchronizować mmap" +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Nie dopasowano żadnej nazwy" -#: apt-pkg/contrib/mmap.cc:290 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Nie udało się wykonać mmap %lu bajtów" - -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Nie udało się uciąć zawartości pliku %s" +msgid "Some files are missing in the package file group `%s'" +msgstr "Brakuje pewnych plików w grupie plików pakietów \"%s\"" -#: apt-pkg/contrib/mmap.cc:341 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "" -"Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-" -"Start. Bieżąca wartość: %lu. (man 5 apt.conf)" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Baza była uszkodzona, plik został przeniesiony do %s.old" -#: apt-pkg/contrib/mmap.cc:446 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "" -"Nie udało się zwiększyć rozmiaru MMap, ponieważ limit %lu bajtów został już " -"osiągnięty." +msgid "DB is old, attempting to upgrade %s" +msgstr "Baza jest przestarzała, próbuję zaktualizować %s" -#: apt-pkg/contrib/mmap.cc:449 +#: ftparchive/cachedb.cc:94 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" -"Nie udało się zwiększyć rozmiaru MMap, ponieważ automatycznie powiększanie " -"zostało wyłączone przez użytkownika." +"Niepoprawny format bazy. Jeśli zaktualizowano ze starszej wersji apt, proszę " +"usunąć i utworzyć ponownie bazę danych." -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Błąd!" +msgid "Unable to open DB file %s: %s" +msgstr "Nie udało się otworzyć pliku bazy %s: %s" -#: apt-pkg/contrib/progress.cc:150 -#, c-format -msgid "%c%s... Done" -msgstr "%c%s... Gotowe" +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Nie udało się odczytać dowiązania %s" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "" +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Archiwum nie posiada rekordu kontrolnego" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Gotowe" +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Nie udało się pobrać kursora" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/writer.cc:91 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%lidni %lig %limin %lis" +msgid "W: Unable to read directory %s\n" +msgstr "W: Nie udało się odczytać katalogu %s\n" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/writer.cc:96 #, c-format -msgid "%lih %limin %lis" -msgstr "%lig %limin %lis" +msgid "W: Unable to stat %s\n" +msgstr "W: Nie można wykonać operacji stat na %s\n" + +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "W: " -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 -#, c-format -msgid "%limin %lis" -msgstr "%limin %lis" +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: Błędy odnoszą się do pliku " -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%lis" -msgstr "%lis" +msgid "Failed to resolve %s" +msgstr "Nie udało się przetłumaczyć nazwy %s" -#: apt-pkg/contrib/strutl.cc:1258 -#, c-format -msgid "Selection %s not found" -msgstr "Nie odnaleziono wyboru %s" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Przejście po drzewie nie powiodło się" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:219 #, 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 "Failed to open %s" +msgstr "Nie udało się otworzyć %s" -# Musi pasować do su i sudo. -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:278 #, 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 " DeLink %s [%s]\n" +msgstr " Odłączenie %s [%s]\n" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:286 #, 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 "Failed to readlink %s" +msgstr "Nie udało się odczytać dowiązania %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:290 #, c-format -msgid "Installing %s" -msgstr "Instalowanie %s" +msgid "Failed to unlink %s" +msgstr "Nie udało się usunąć %s" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:298 #, c-format -msgid "Configuring %s" -msgstr "Konfigurowanie %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Nie udało się dowiązać %s do %s" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:308 #, c-format -msgid "Removing %s" -msgstr "Usuwanie %s" +msgid " DeLink limit of %sB hit.\n" +msgstr " Osiągnięto ograniczenie odłączania %sB.\n" -#: apt-pkg/deb/dpkgpm.cc:98 -#, c-format -msgid "Completely removing %s" -msgstr "Całkowite usuwanie %s" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Archiwum nie posiadało pola pakietu" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Noting disappearance of %s" -msgstr "Proszę odnotować zniknięcie %s" +msgid " %s has no override entry\n" +msgstr " %s nie posiada wpisu w pliku override\n" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Uruchamianie wyzwalacza post-installation %s" +msgid " %s maintainer is %s not %s\n" +msgstr " opiekunem %s jest %s, a nie %s\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:706 #, c-format -msgid "Directory '%s' missing" -msgstr "Brakuje katalogu \"%s\"" +msgid " %s has no source override entry\n" +msgstr " %s nie posiada wpisu w pliku override źródeł\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:710 #, c-format -msgid "Could not open file '%s'" -msgstr "Nie udało się otworzyć pliku \"%s\"" +msgid " %s has no binary override entry either\n" +msgstr " %s nie posiada również wpisu w pliku override binariów\n" -#: apt-pkg/deb/dpkgpm.cc:992 -#, c-format -msgid "Preparing %s" -msgstr "Przygotowywanie %s" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Nie udało się zaalokować pamięci" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Unpacking %s" -msgstr "Rozpakowywanie %s" +msgid "Unable to open %s" +msgstr "Nie można otworzyć %s" -#: apt-pkg/deb/dpkgpm.cc:998 -#, c-format -msgid "Preparing to configure %s" -msgstr "Przygotowywanie do konfiguracji %s" +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Nieprawidłowa linia %llu #1 pliku override %s" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Installed %s" -msgstr "Pakiet %s został zainstalowany" +msgid "Failed to read the override file %s" +msgstr "Nie udało się czytać pliku override %s" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:166 #, c-format -msgid "Preparing for removal of %s" -msgstr "Przygotowywanie do usunięcia %s" +msgid "Malformed override %s line %llu #1" +msgstr "Nieprawidłowa linia %2$llu #1 pliku override %1$s" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:178 #, c-format -msgid "Removed %s" -msgstr "Pakiet %s został usunięty" +msgid "Malformed override %s line %llu #2" +msgstr "Nieprawidłowa linia %2$llu #2 pliku override %1$s" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:191 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Przygotowywanie do całkowitego usunięcia %s" +msgid "Malformed override %s line %llu #3" +msgstr "Nieprawidłowa linia %2$llu #3 pliku override %1$s" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Completely removed %s" -msgstr "Pakiet %s został całkowicie usunięty" +msgid "Unknown compression algorithm '%s'" +msgstr "Nieznany algorytm kompresji \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Nie udało się pisać do %s" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Skompresowany plik wynikowy %s wymaga podania kompresji" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Nie udało się utworzyć obiektu FILE*" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Nie udało się utworzyć procesu potomnego" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "Operacja została przerwana, zanim mogła zostać zakończona" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Potomny proces kompresujący" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "Brak raportu programu apport, ponieważ osiągnięto limit MaxReports" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Błąd wewnętrzny, nie udało się utworzyć %s" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "Zawiodła operacja IO na pliku/podprocesie" -#: apt-pkg/deb/dpkgpm.cc:1694 -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." +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5" -#: apt-pkg/deb/dpkgpm.cc:1700 -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" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Problem przy usuwaniu %s" -#: apt-pkg/deb/dpkgpm.cc:1707 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd " -"braku wolnej pamięci" +"Użycie: apt-internal-solver\n" +"\n" +"apt-internal-solver jest interfejsem do używania bieżącego, wewnętrznego\n" +"mechanizmu rozwiązywania zależności - w sposób podobny jak zewnętrznego\n" +"mechanizmu rodziny APT - do celów debugowania itp.\n" +"\n" +"Opcje:\n" +" -h Ten tekst pomocy.\n" +" -q Zapisywalne wyjście - brak wskaźnika postępu\n" +" -c=? Czyta wskazany plik konfiguracyjny\n" +" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -#, 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" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Nieznane informacje o pakiecie!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd " -"wejścia/wyjścia dpkg" +"Użycie: apt-sortpkgs [opcje] plik1 [plik2 ...]\n" +"\n" +"apt-sortpkgs to proste narzędzie służące do sortowania plików pakietów.\n" +"Opcji -s używa się do wskazania typu pliku.\n" +"\n" +"Opcje:\n" +" -h Ten tekst pomocy.\n" +" -s Sortowanie pliku źródeł.\n" +" -c=? Czyta wskazany plik konfiguracyjny.\n" +" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/pt.po b/po/pt.po index 5dcd74bb5..f024d8be4 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2012-06-29 15:45+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -159,7 +159,7 @@ msgid " Version table:" msgstr " Tabela de Versão:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -358,7 +358,7 @@ msgstr "Impossível criar acesso exclusivo ao directório de downloads" 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, 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" @@ -384,81 +384,81 @@ msgstr "" "bzr branch %s\n" "para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, 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:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Obter código fonte %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Falhou obter alguns arquivos." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de fazer apenas o download" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -467,18 +467,18 @@ msgstr "" "Nenhuma informação de arquitectura disponível para %s. Para configuração " "veja apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -487,7 +487,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:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -496,14 +496,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:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -512,7 +512,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:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -521,30 +521,30 @@ 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:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, 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:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Falhou processar as dependências de compilação" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Changlog para %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -688,7 +688,7 @@ msgstr "%s já estava para não manter.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperou por %s mas não estava lá" @@ -803,16 +803,16 @@ msgstr "Impossível desmontar o CD-ROM em %s, pode ainda estar a ser utilizado." msgid "Disk not found." msgstr "Disco não encontrado." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Ficheiro não encontrado" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Falhou o stat" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Falhou definir hora de modificação" @@ -866,7 +866,7 @@ msgstr "O comando de script de login '%s' falhou, o servidor respondeu: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE falhou, o servidor respondeu: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Foi atingido o tempo limite de ligação" @@ -888,7 +888,7 @@ msgstr "Uma resposta sobrecarregou o buffer." msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -949,7 +949,7 @@ msgstr "Ligação de socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" @@ -958,7 +958,7 @@ msgstr "Problema ao calcular o hash do ficheiro" msgid "Unable to fetch file, server said '%s'" msgstr "Não foi possível obter o ficheiro, o servidor respondeu '%s'" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Expirou o tempo do socket de dados" @@ -1008,7 +1008,7 @@ msgstr "Não foi possível ligar em %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "A ligar a %s" @@ -1151,42 +1151,17 @@ msgstr "A ligação falhou" msgid "Internal error" msgstr "Erro interno" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Hit " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Obter:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ign " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Err " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Obtidos %sB em %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [A trabalhar]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Troca de mídia: Por favor insira o disco chamado\n" -" '%s'\n" -"no leitor '%s' e pressione enter\n" +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:93 msgid "Correcting dependencies..." @@ -1216,175 +1191,359 @@ msgstr "Você pode querer executar 'apt-get -f install' para corrigir isso." msgid "Unmet dependencies. Try using -f." msgstr "Dependências não satisfeitas. Tente utilizar -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instalado]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Aviso de autenticação ultrapassado.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [Instalado]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Alguns pacotes não puderam ser autenticados" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Instalar estes pacotes sem verificação?" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Instalado]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Há problemas e foi utilizado -y sem --force-yes" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Instalado]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Falhou obter %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!" - -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." - -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Erro Interno, Ordering não terminou" - -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgid "[upgradable from: %s]" msgstr "" -"Estranho... Os tamanhos não coincidiram, escreva para 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 -#: apt-private/private-install.cc:155 -#, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "É necessário obter %sB/%sB de arquivos.\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:160 -#, c-format -msgid "Need to get %sB of archives.\n" -msgstr "É necessário obter %sB de arquivos.\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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" msgstr "" -"Após esta operação, serão utilizados %sB adicionais de espaço em disco.\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:172 +#: apt-private/private-output.cc:455 #, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Após esta operação, será libertado %sB de espaço em disco.\n" +msgid "but %s is installed" +msgstr "mas %s está instalado" -#: apt-private/private-install.cc:200 +#: apt-private/private-output.cc:457 #, c-format -msgid "You don't have enough free space in %s." -msgstr "Você não possui espaço livre suficiente em %s." +msgid "but %s is to be installed" +msgstr "mas %s está para ser instalado" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Trivial Only especificado mas isto não é uma operação trivial." +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "mas não é instalável" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Sim, faça como eu digo!" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "mas é um pacote virtual" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Você está prestes a fazer algo potencialmente nocivo.\n" -"Para continuar escreva a frase '%s'\n" -" ?] " +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "mas não está instalado" -#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Abortado." +#: 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-install.cc:243 -msgid "Do you want to continue?" -msgstr "Deseja continuar?" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " ou" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Falhou o download de alguns ficheiros" +#: 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-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Não foi possível obter alguns arquivos, tente talvez correr apt-get update " -"ou tente com --fix-missing?" +#: 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-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing e troca de mídia não são suportados actualmente" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "Serão REMOVIDOS os seguintes pacotes:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Não foi possível corrigir os pacotes em falta." +#: 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-install.cc:330 -msgid "Aborting install." -msgstr "A abortar a instalação." +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "Serão actualizados os seguintes pacotes:" -#: apt-private/private-install.cc:366 -msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"O seguinte pacote desapareceu do seu sistema pois\n" -"todos os ficheiros foram sobrescritos por outros pacotes:" -msgstr[1] "" -"Os seguintes pacotes desapareceram do seu sistema pois\n" -"todos os ficheiros foram por outros 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-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Nota: Isto foi feito automaticamente e intencionalmente pelo dpkg." +#: 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-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover" +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (devido a %s) " -#: apt-private/private-install.cc:499 +#: apt-private/private-output.cc:696 msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" msgstr "" -"Hmm, parece que o AutoRemover destruiu algo que realmente não deveria ter\n" -"acontecido. Por favor arquive um relatório de bug contra o apt." +"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!" -#. -#. if (Packages == 1) -#. { -#. c1out << std::endl; -#. c1out << -#. _("Since you only requested a single operation it is extremely likely that\n" +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Erro Interno, Ordering não terminou" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Estranho... Os tamanhos não coincidiram, escreva para apt@packages.debian.org" + +#. 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "É necessário obter %sB/%sB de arquivos.\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:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "É necessário obter %sB de arquivos.\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:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "" +"Após esta operação, serão utilizados %sB adicionais de espaço em disco.\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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Após esta operação, será libertado %sB de espaço em disco.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Você não possui espaço livre suficiente em %s." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Há problemas e foi utilizado -y sem --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "Trivial Only especificado mas isto não é uma operação 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Sim, faça como eu digo!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Você está prestes a fazer algo potencialmente nocivo.\n" +"Para continuar escreva a frase '%s'\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Abortado." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Deseja continuar?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Falhou o download de alguns ficheiros" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Não foi possível obter alguns arquivos, tente talvez correr apt-get update " +"ou tente com --fix-missing?" + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing e troca de mídia não são suportados actualmente" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Não foi possível corrigir os pacotes em falta." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "A abortar a instalação." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"O seguinte pacote desapareceu do seu sistema pois\n" +"todos os ficheiros foram sobrescritos por outros pacotes:" +msgstr[1] "" +"Os seguintes pacotes desapareceram do seu sistema pois\n" +"todos os ficheiros foram por outros pacotes:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Nota: Isto foi feito automaticamente e intencionalmente pelo dpkg." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover" + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"Hmm, parece que o AutoRemover destruiu algo que realmente não deveria ter\n" +"acontecido. Por favor arquive um relatório de bug contra o apt." + +#. +#. if (Packages == 1) +#. { +#. c1out << std::endl; +#. c1out << +#. _("Since you only requested a single operation it is extremely likely that\n" #. "the package is simply not installable and a bug report against\n" #. "that package should be filed.") << std::endl; #. } @@ -1509,210 +1668,26 @@ 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:129 -msgid "Listing" -msgstr "" - -#: apt-private/private-list.cc:159 -#, 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-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!" -#: 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-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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Aviso de autenticação ultrapassado.\n" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Erro de compilação de regex - %s" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Alguns pacotes não puderam ser autenticados" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Instalar estes pacotes sem verificação?" -#: apt-private/private-show.cc:156 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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 "" +msgid "Failed to fetch %s %s\n" +msgstr "Falhou obter %s %s\n" #: apt-private/private-sources.cc:58 #, fuzzy, c-format @@ -1724,20 +1699,8 @@ msgstr "Falha ao baixar %s %s\n" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: 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:90 -#, 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:94 -msgid "All packages are up to date." +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" #: apt-private/private-upgrade.cc:25 @@ -1748,20 +1711,57 @@ msgstr "A calcular a actualização... " msgid "Done" msgstr "Pronto" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Hit " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Obter:" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ign " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Err " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Obtidos %sB em %s (%sB/s)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [A trabalhar]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Troca de mídia: Por favor insira o disco chamado\n" +" '%s'\n" +"no leitor '%s' e pressione enter\n" + #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, 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:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 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 "[Mirror: %s]" msgid "Failed to create IPC pipe to subprocess" msgstr "Falha ao criar pipe IPC para subprocesso" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "Ligação encerrada prematuramente" @@ -1839,645 +1839,564 @@ msgstr "" msgid "Merging available information" msgstr "A juntar a informação disponível" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Utilização: apt-extracttemplates ficheiro1 [ficheiro2 ...]\n" -"\n" -"O apt-extracttemplates é uma ferramenta para extrair configuração\n" -"e informação de template de pacotes debian.\n" -"\n" -"Opções:\n" -" -h Este texto de ajuda\n" -" -t Definir o directório temporário\n" -" -c=? Ler este ficheiro de configuração\n" -" -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" -"tmp\n" - -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Não foi possível fazer stat %s" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode chamado em nó ainda linkado" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "Não conseguiu escrever para %s" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Falha ao localizar o elemento de hash!" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Não pode obter a versão do debconf. O debconf está instalado?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Falha ao alocar desvio (diversion)" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "A lista de extensão de pacotes é demasiado longa" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Erro Interno em AddDiversion" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "Erro ao processar o directório %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Lista de extensão de códigos-fonte é demasiado longa" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Erro ao escrever o cabeçalho no ficheiro de conteúdo" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "A tentar sobrescrever um desvio, %s -> %s e %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "Erro ao processar o conteúdo %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Utilização: apt-ftparchive [opções] comando\n" -"Comandos: packages caminho_binário [ficheiro_override [prefixo_caminho]]\n" -" sources caminho_fonte [ficheiro_override [prefixo_caminho]]\n" -" contents caminho\n" -" release caminho\n" -" generate config [grupos]\n" -" clean config\n" -"\n" -"O apt-ftparchive gera ficheiros de índice para repositórios Debian. Ele \n" -"suporta muitos estilos de criação, desde totalmente automatizados até \n" -"substitutos funcionais para o dpkg-scanpackages e dpkg-scansources\n" -"\n" -"O apt-ftparchive gera ficheiros Packages a partir de uma árvore de .debs.\n" -" O ficheiro Package contém o conteúdo de todos os campos de controle de \n" -"cada pacote bem como o hash MD5 e tamanho do ficheiro. É suportado um \n" -"ficheiro override para forçar o valor de Priority e Section.\n" -"\n" -"Similarmente, o apt-ftparchive gera ficheiros Sources a partir de uma \n" -"árvore de .dscs. A opção --source-override pode ser utilizada para \n" -"especificar um ficheiro override de fontes\n" -"\n" -"Os comandos 'packages' e 'sources' devem ser executados na raiz da \n" -"árvore. CaminhoBinário deve apontar para a base de procura recursiva \n" -"e o ficheiro override deve conter as flags override. CaminhoPrefixo é \n" -"incluído aos campos filename caso esteja presente. Exemplo de uso do \n" -"repositório Debian :\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Opções:\n" -" -h Este texto de ajuda\n" -" --md5 Controlar a criação do MD5\n" -" -s=? Ficheiro override de código-fonte \n" -" -q Silencioso\n" -" -d=? Seleccionar a base de dados de caching opcional\n" -" --no-delink Habilitar o modo de debug delinking\n" -" --contents Controlar a criação do ficheiro de conteúdo\n" -" -c=? Ler este ficheiro de configuração\n" -" -o=? Definir uma opção de configuração arbitrária" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Nenhuma selecção coincidiu" +msgid "Double add of diversion %s -> %s" +msgstr "Adição dupla de desvio %s -> %s" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Faltam alguns ficheiros no grupo `%s' do ficheiro do pacote" +msgid "Duplicate conf file %s/%s" +msgstr "Arquivo de configuração duplicado %s/%s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "A base de dados estava corrompida, ficheiro renomeado para %s.old" +msgid "The path %s is too long" +msgstr "O caminho %s é demasiado longo" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "A base de dados é antiga, a tentar actualizar %s" +msgid "Unpacking %s more than once" +msgstr "A descompactar %s mais de uma vez" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"O formato da BD é inválido. Se actualizou a partir de uma versão antiga do " -"apt, por favor remova-a e crie novamente a base de dados." +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "O directório %s é desviado" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Não foi possível abrir o ficheiro %s da base de dados: %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "O pacote está a tentar escrever no alvo de desvio %s/%s" + +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "O caminho de desvio é muito longo" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Falha stat %s" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Falhou o readlink %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "O arquivo não tem registo de controlo" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Não foi possível obter um cursor" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: Não foi possível ler o directório %s\n" +msgid "Failed to rename %s to %s" +msgstr "Falhou renomear %s para %s" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "W: Não foi possível fazer stat %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "O directório %s está a ser substituído por um não-directório" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "W: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Falhou localizar o nó no seu hash bucket" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: Os erros aplicam-se ao ficheiro " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "O caminho é demasiado longo" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "Falhou resolver %s" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Falhou ao percorrer a árvore" +msgid "Overwrite package match with no version for %s" +msgstr "Substituir o pacote correspondente sem versão para %s" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to open %s" -msgstr "Falhou abrir %s" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "O ficheiro %s/%s substitui o que está no pacote %s" -#: ftparchive/writer.cc:278 +#: apt-inst/extract.cc:498 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgid "Unable to stat %s" +msgstr "Não foi possível fazer stat %s" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Failed to readlink %s" -msgstr "Falhou o readlink %s" +msgid "Failed to write file %s" +msgstr "Falhou escrever o ficheiro %s" -#: ftparchive/writer.cc:290 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to unlink %s" -msgstr "Falhou o unlink %s" +msgid "Failed to close file %s" +msgstr "Falhou fechar o ficheiro %s" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Falhou ligar %s a %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Este não é um arquivo DEB válido, falta o membro '%s'" -#: ftparchive/writer.cc:308 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Limite DeLink de %sB atingido.\n" - -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Arquivo não possuía campo package" +msgid "Internal error, could not locate member %s" +msgstr "Erro Interno, não foi possível localizar o membro %s" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s não possui entrada override\n" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Ficheiro de controle não interpretável" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " o maintainer de %s é %s, não %s\n" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Assinatura de arquivo inválida" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s não possui fonte de entrada de 'override'\n" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Erro na leitura de cabeçalho membro de arquivo" -#: ftparchive/writer.cc:710 +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s também não possui entrada binária de 'override'\n" +msgid "Invalid archive member header %s" +msgstr "Cabeçalho membro de arquivo inválido %s" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Falhou alocar memória" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Cabeçalho membro de arquivo inválido" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Não foi possível abrir %s" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Arquivo é demasiado pequeno" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Override %s malformado linha %llu #1" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Falha ao ler os cabeçalhos do arquivo" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Falhou ler o ficheiro override %s" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Falhou a criação de pipes" -#: ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Override %s malformado linha %llu #1" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Falhou executar gzip " -#: ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Override %s malformado linha %llu #2" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Arquivo corrompido" -#: ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Override %s malformado linha %llu #3" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "A soma de controlo do tar falhou, arquivo corrompido" -#: ftparchive/multicompress.cc:73 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Algoritmo de compressão desconhecido '%s'" +msgid "Unknown TAR header type %u, member %s" +msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Saída compactada %s precisa de um conjunto de compressão" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Falhou criar FILE*" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Falhou o fork" +msgid "Progress: [%3i%%]" +msgstr "" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Compactar filho" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "A correr o dpkg" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/init.cc:146 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Erro Interno, falhou criar %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Falhou o IO para subprocesso/arquivo" +msgid "Packaging system '%s' is not supported" +msgstr "Sistema de empacotamento '%s' não é suportado" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Falhou ler durante o cálculo de MD5" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "" +"Não foi possível determinar um tipo de sistema de empacotamento adequado" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Problem unlinking %s" -msgstr "Problema ao executar unlinking %s" +msgid "Wrote %i records.\n" +msgstr "Escreveu %i registos.\n" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Falhou renomear %s para %s" - -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Utilização: apt-internal-solver\n" -"\n" -"O apt-internal-solver é um interface para utilizar o actual interno como um\n" -" resolvedor externo para a família APT para depuração ou semelhante.\n" -"\n" -"Opções:\n" -" -h Este texto de ajuda.\n" -" -q Saída para registo - sem indicador de progresso\n" -" -c=? Ler este ficheiro de configuração\n" -" -o=? Definir uma opção de configuração arbitrária, p.e. dir::cache=/tmp\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Escreveu %i registos com %i ficheiros em falta.\n" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Registo de pacote desconhecido!" +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"Utilização: apt-sortpkgs [opções] ficheiro1 [ficheiro2 ...]\n" -"\n" -"O apt-sortpkgs é uma ferramenta simples para ordenar ficheiros de pacotes.\n" -"A opção -s é utilizada para indicar que tipo de ficheiro é.\n" -"\n" -"Opções:\n" -" -h Este texto de ajuda\n" -" -s Utilizar a ordenação de ficheiros de código-fonte\n" -" -c=? Ler este ficheiro de configuração\n" -" -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" -"tmp\n" +"Escreveu %i registos com %i ficheiros em falta e %i ficheiros não " +"coincidentes\n" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Failed to write file %s" -msgstr "Falhou escrever o ficheiro %s" +msgid "Can't find authentication record for: %s" +msgstr "Não foi possível encontrar registo de autenticação para: %s" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "Failed to close file %s" -msgstr "Falhou fechar o ficheiro %s" +msgid "Hash mismatch for: %s" +msgstr "Hash não coincide para: %s" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "The path %s is too long" -msgstr "O caminho %s é demasiado longo" +msgid "The method driver %s could not be found." +msgstr "O driver do método %s não pôde ser encontrado." -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" -msgstr "A descompactar %s mais de uma vez" +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n" -#: apt-inst/extract.cc:142 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "The directory %s is diverted" -msgstr "O directório %s é desviado" +msgid "Method %s did not start correctly" +msgstr "Método %s não iniciou correctamente" -#: apt-inst/extract.cc:152 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "O pacote está a tentar escrever no alvo de desvio %s/%s" +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-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "O caminho de desvio é muito longo" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "" +"As listas de pacotes ou o ficheiro de status não pôde ser analisado ou " +"aberto." -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "O directório %s está a ser substituído por um não-directório" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Você terá que executar apt-get update para corrigir estes problemas" -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Falhou localizar o nó no seu hash bucket" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "A lista de fontes não pôde ser lida." -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "O caminho é demasiado longo" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Cache de pacotes vazia" -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Substituir o pacote correspondente sem versão para %s" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "O ficheiro de cache de pacotes está corrompido" -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "O ficheiro %s/%s substitui o que está no pacote %s" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "O ficheiro de cache de pacotes é de uma versão incompatível" -#: apt-inst/extract.cc:498 +#: apt-pkg/pkgcache.cc:169 +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:174 #, c-format -msgid "Unable to stat %s" -msgstr "Não foi possível fazer stat %s" +msgid "This APT does not support the versioning system '%s'" +msgstr "Este APT não suporta o sistema de versões '%s'" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "DropNode chamado em nó ainda linkado" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "A cache de pacotes foi gerada para uma arquitectura diferente" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Falha ao localizar o elemento de hash!" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Depende" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Falha ao alocar desvio (diversion)" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Pré-Depende" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Erro Interno em AddDiversion" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Sugere" -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "A tentar sobrescrever um desvio, %s -> %s e %s/%s" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Recomenda" -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Adição dupla de desvio %s -> %s" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Em Conflito" -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Arquivo de configuração duplicado %s/%s" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Substitui" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Assinatura de arquivo inválida" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Obsoleta" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Erro na leitura de cabeçalho membro de arquivo" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Estraga" -#: apt-inst/contrib/arfile.cc:96 -#, c-format -msgid "Invalid archive member header %s" -msgstr "Cabeçalho membro de arquivo inválido %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Aumenta" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Cabeçalho membro de arquivo inválido" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "importante" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Arquivo é demasiado pequeno" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "necessário" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Falha ao ler os cabeçalhos do arquivo" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "padrão" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Falhou a criação de pipes" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "opcional" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Falhou executar gzip " +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "extra" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Arquivo corrompido" +#: apt-pkg/pkgrecords.cc:38 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "Tipo do ficheiro de índice '%s' não é suportado" -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "A soma de controlo do tar falhou, arquivo corrompido" +#: 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-inst/contrib/extracttar.cc:308 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s" +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-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Este não é um arquivo DEB válido, falta o membro '%s'" +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-inst/deb/debfile.cc:132 +#: apt-pkg/sourcelist.cc:184 #, c-format -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 -msgid "Unparsable control file" -msgstr "Ficheiro de controle não interpretável" +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/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/sourcelist.cc:190 #, c-format -msgid "List directory %spartial is missing." -msgstr "Falta directório de listas %spartial." +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/acquire.cc:91 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "Archives directory %spartial is missing." -msgstr "Falta o directório de arquivos %spartial." +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/acquire.cc:99 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Unable to lock directory %s" -msgstr "Impossível criar acesso exclusivo ao directório %s" - -#: apt-pkg/acquire.cc:490 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" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Linha mal formada %lu na lista de fontes %s (URI)" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "A obter o ficheiro %li de %li (%s restantes)" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Linha mal formada %lu na lista de fontes %s (distribuição)" -#: apt-pkg/acquire.cc:904 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Retrieving file %li of %li" -msgstr "A obter o ficheiro %li de %li" +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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "falhou renomear, %s (%s -> %s)." +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/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "Código de verificação hash não coincide" +#: 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/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "Tamanho incorrecto" +#: apt-pkg/sourcelist.cc:335 +#, c-format +msgid "Opening %s" +msgstr "A abrir %s" -#: apt-pkg/acquire-item.cc:173 -#, fuzzy -msgid "Invalid file format" -msgstr "Operação %s inválida" +#: 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/acquire-item.cc:1573 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" -msgstr "" -"Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada " -"errada em sources.list ou ficheiro malformado)" +msgid "Malformed line %u in source list %s (type)" +msgstr "Linha mal formada %u na lista de fontes %s (tipo)" -#: apt-pkg/acquire-item.cc:1589 +#: 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:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Tipo do ficheiro de índice '%s' não é suportado" + +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." +msgstr "Não foi possível fazer stat %s." + +#: apt-pkg/pkgcachegen.cc:93 +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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Ocorreu um erro ao processar %s (%s%d)" + +#: apt-pkg/pkgcachegen.cc:257 +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:260 +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:263 +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:266 +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:576 +#, 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:1211 +#, 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:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "A ler as listas de pacotes" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "A obter File Provides" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Não conseguiu escrever para %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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:241 +msgid "Send request to solver" +msgstr "Enviar pedido para resolvedor" + +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "Preparar para receber solução" + +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "Executar resolvedor externo" + +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "falhou renomear, %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "Código de verificação hash não coincide" + +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "Tamanho incorrecto" + +#: apt-pkg/acquire-item.cc:173 +#, fuzzy +msgid "Invalid file format" +msgstr "Operação %s inválida" + +#: apt-pkg/acquire-item.cc:1640 +#, c-format +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +msgstr "" +"Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada " +"errada em sources.list ou ficheiro malformado)" + +#: apt-pkg/acquire-item.cc:1656 #, 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:1631 +#: apt-pkg/acquire-item.cc:1698 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:1669 +#: apt-pkg/acquire-item.cc:1736 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2486,12 +2405,12 @@ 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, 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:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2502,12 +2421,12 @@ msgstr "" "GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "Erro GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2517,12 +2436,12 @@ msgstr "" "significar que você precisa corrigir manualmente este pacote. (devido a " "arquitectura em falta)" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/acquire-item.cc:1992 #, 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:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2530,128 +2449,98 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, 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 "Vendor block %s contains no fingerprint" +msgstr "O bloco de fabricante %s não contém a impressão digital" -#: apt-pkg/acquire-worker.cc:118 -#, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n" +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#, c-format +msgid "List directory %spartial is missing." +msgstr "Falta directório de listas %spartial." -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Method %s did not start correctly" -msgstr "Método %s não iniciou correctamente" +msgid "Archives directory %spartial is missing." +msgstr "Falta o directório de arquivos %spartial." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 #, 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." +msgid "Unable to lock directory %s" +msgstr "Impossível criar acesso exclusivo ao directório %s" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"O pacote %s necessita ser reinstalado, mas não foi possível encontrar um " -"repositório para o mesmo." +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "A obter o ficheiro %li de %li (%s restantes)" -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " -"pacotes mantidos (hold)." +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "A obter o ficheiro %li de %li" -#: apt-pkg/algorithms.cc:1088 -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/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/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." +#: 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 "" -"As listas de pacotes ou o ficheiro de status não pôde ser analisado ou " -"aberto." - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Você terá que executar apt-get update para corrigir estes problemas" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "A lista de fontes não pôde ser lida." +"O valor '%s' é inválido para APT::Default-Release porque tal lançamento não " +"está disponível nas fontes" -#: apt-pkg/cacheset.cc:489 +#: apt-pkg/policy.cc:422 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Não foi encontrado o Release '%s' para '%s'" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Registo inválido no ficheiro de preferências %s, sem cabeçalho Package" -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Não foi encontrada a versão '%s' para '%s'" +msgid "Did not understand pin type %s" +msgstr "Não foi possível entender o tipo de marca (pin) %s" -#: apt-pkg/cacheset.cc:603 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "Não foi possível encontrar a tarefa '%s'" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Nenhuma prioridade (ou zero) especificada para marcação (pin)" -#: apt-pkg/cacheset.cc:609 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, 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:615 -#, 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'" +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +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/cacheset.cc:626 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, 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" +msgid "Could not configure '%s'. " +msgstr "Não pode configurar '%s'. " -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:630 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"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 "" -"Não pode seleccionar a versão instalada nem a versão candidata do pacote " -"'%s' pois não tem nenhuma destas" - -#: apt-pkg/cacheset.cc:647 -#, 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:655 -#, 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" +"Esta execução da instalação irá necessitar de remover temporariamente o " +"pacote essencial %s devido a um loop de Conflitos/Pré-Dependências. Isto " +"normalmente é mau, mas se você quer realmente fazer isso, active a opção " +"APT::Force-LoopBreak." -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +#: 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ão é possível seleccionar a versão instalada do pacote %s pois não está " -"instalado" - -#: 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." +"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" @@ -2730,10 +2619,27 @@ msgstr "A escrever lista de novas source\n" msgid "Source list entries for this disc are:\n" msgstr "As entradas de listas de Source para este Disco são:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Não foi possível fazer stat %s." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"O pacote %s necessita ser reinstalado, mas não foi possível encontrar um " +"repositório para o mesmo." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " +"pacotes mantidos (hold)." + +#: apt-pkg/algorithms.cc:1088 +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/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2761,57 +2667,76 @@ msgstr "Falhou abrir o StateFile %s" msgid "Failed to write temporary StateFile %s" msgstr "Falha escrever ficheiro temporário StateFile %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "Enviar cenário a resolver" +#: apt-pkg/tagfile.cc:140 +#, 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/edsp.cc:241 -msgid "Send request to solver" -msgstr "Enviar pedido para resolvedor" +#: apt-pkg/tagfile.cc:237 +#, 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/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "Preparar para receber solução" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Não foi encontrado o Release '%s' para '%s'" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Não foi encontrada a versão '%s' para '%s'" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "Executar resolvedor externo" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Não foi possível encontrar a tarefa '%s'" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "Escreveu %i registos.\n" +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/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, 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:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Escreveu %i registos com %i ficheiros em falta.\n" +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/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +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/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -"Escreveu %i registos com %i ficheiros em falta e %i ficheiros não " -"coincidentes\n" +"Não foi possível seleccionar a versão mais recente a partir do pacote '%s' " +"já que é puramente virtual" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "Não foi possível encontrar registo de autenticação para: %s" +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/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:663 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Hash não coincide para: %s" +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/indexrecords.cc:78 #, c-format @@ -2838,851 +2763,921 @@ msgstr "Entrada inválida, 'Valid-until', no ficheiro de Release: %s" msgid "Invalid 'Date' entry in Release file %s" msgstr "Entrada, 'Date', inválida no ficheiro Release %s" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Sistema de empacotamento '%s' não é suportado" +msgid "%lid %lih %limin %lis" +msgstr "%lid %lih %limin %lis" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "" -"Não foi possível determinar um tipo de sistema de empacotamento adequado" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" +msgstr "%lih %limin %lis" -#: apt-pkg/install-progress.cc:57 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Progress: [%3i%%]" -msgstr "" +msgid "%limin %lis" +msgstr "%limin %lis" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "A correr o dpkg" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" +msgstr "%lis" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "Selection %s not found" +msgstr "A selecção %s não foi encontrada" + +#: apt-pkg/contrib/fileutl.cc:190 +#, c-format +msgid "Not using locking for read only lock file %s" 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)" +"Não está a ser utilizado acesso exclusivo para apenas leitura ao ficheiro %s" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format -msgid "Could not configure '%s'. " -msgstr "Não pode configurar '%s'. " +msgid "Could not open lock file %s" +msgstr "Não foi possível abrir ficheiro de lock %s" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:218 #, 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." +msgid "Not using locking for nfs mounted lock file %s" msgstr "" -"Esta execução da instalação irá necessitar de remover temporariamente o " -"pacote essencial %s devido a um loop de Conflitos/Pré-Dependências. Isto " -"normalmente é mau, mas se você quer realmente fazer isso, active a opção " -"APT::Force-LoopBreak." +"Não está a ser utilizado o acesso exclusivo para o ficheiro %s, montado via " +"nfs" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Cache de pacotes vazia" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Não foi possível obter acesso exclusivo a %s" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "O ficheiro de cache de pacotes está corrompido" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" +"Lista de ficheiros que não podem ser criados porque '%s' não é um directório" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "O ficheiro de cache de pacotes é de uma versão incompatível" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "A ignorar '%s' no directório '%s' porque não é um ficheiro normal" -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" -msgstr "O ficheiro de cache de pacotes está corrompido, é demasiado pequeno" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" +"A ignorar o ficheiro '%s' no directório '%s' porque não tem extensão no nome " +"do ficheiro" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:421 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Este APT não suporta o sistema de versões '%s'" +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" +"A ignorar o ficheiro '%s' no directório '%s' porque tem uma extensão " +"inválida no nome do ficheiro" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "A cache de pacotes foi gerada para uma arquitectura diferente" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "O sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Depende" - -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Pré-Depende" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "O sub-processo %s recebeu o sinal %u." -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Sugere" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "O sub-processo %s retornou um código de erro (%u)" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Recomenda" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "O sub-processo %s terminou inesperadamente" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Em Conflito" +#: apt-pkg/contrib/fileutl.cc:913 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problema ao fechar o ficheiro gzip %s" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Substitui" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Não foi possível abrir ficheiro o %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Obsoleta" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "Não foi possível abrir o descritor de ficheiro %d" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Estraga" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Falhou criar subprocesso IPC" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Aumenta" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Falhou executar compactador " -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "importante" +#: apt-pkg/contrib/fileutl.cc:1514 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "lidos, ainda restam %llu para serem lidos mas não resta nenhum" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "necessário" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "escritos, ainda restam %llu para escrever mas não foi possível" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "padrão" +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" +msgstr "Problema ao fechar o ficheiro %s" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "opcional" +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Problema ao renomear o ficheiro %s para %s" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "extra" +#: apt-pkg/contrib/fileutl.cc:1938 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "Problema ao remover o link do ficheiro %s" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "A cache possui um sistema de versões incompatível" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Problema sincronizando o ficheiro" -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Ocorreu um erro ao processar %s (%s%d)" +msgid "%c%s... Error!" +msgstr "%c%s... Erro !" -#: apt-pkg/pkgcachegen.cc:257 -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/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Pronto" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." +#: apt-pkg/contrib/progress.cc:181 +msgid "..." msgstr "" -"Uau, você excedeu o número de versões que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:263 -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." +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Pronto" -#: apt-pkg/pkgcachegen.cc:266 -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/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Não é possível fazer mmap a um ficheiro vazio" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/mmap.cc:111 #, 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" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Não foi possível duplicar o descritor de ficheiro %i" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/mmap.cc:119 #, 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:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "A ler as listas de pacotes" +msgid "Couldn't make mmap of %llu bytes" +msgstr "Não foi possível fazer mmap de %llu bytes" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "A obter File Provides" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Não foi possível fechar mmap" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Erro de I/O ao gravar a cache de código fonte" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Não foi sincronizar mmap " -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Tipo do ficheiro de índice '%s' não é suportado" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Não foi possível fazer mmap de %lu bytes" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Falhou truncar o ficheiro" + +#: apt-pkg/contrib/mmap.cc:341 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"O valor '%s' é inválido para APT::Default-Release porque tal lançamento não " -"está disponível nas fontes" +"O Dynamic MMap ficou sem espaço. Por favor aumente o tamanho de APT::Cache-" +"Start. Valor actual: %lu. (man 5 apt.conf)" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Registo inválido no ficheiro de preferências %s, sem cabeçalho Package" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" +"Não foi possível aumentar o tamanho do MMap pois o limite de %lu bytes já " +"foi alcançado." -#: apt-pkg/policy.cc:444 -#, c-format -msgid "Did not understand pin type %s" -msgstr "Não foi possível entender o tipo de marca (pin) %s" +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Não foi possível aumentar o tamanho do MMap pois o crescimento automático " +"está desabilitado pelo utilizador." -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Nenhuma prioridade (ou zero) especificada para marcação (pin)" +#: apt-pkg/contrib/cdromutl.cc:65 +#, c-format +msgid "Unable to stat the mount point %s" +msgstr "Impossível executar stat ao ponto de montagem %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/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Impossível executar stat ao cdrom" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/configuration.cc:519 #, 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)" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Abreviatura de tipo desconhecida: '%c'" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/configuration.cc:633 #, 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)" +msgid "Opening configuration file %s" +msgstr "A abrir o ficheiro de configuração %s" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/configuration.cc:801 #, 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)" +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Erro de sintaxe %s:%u: O bloco começa sem nome." -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/configuration.cc:820 #, 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)" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Erro de sintaxe %s:%u: Tag mal formada" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/configuration.cc:837 #, 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)" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor" -#: apt-pkg/sourcelist.cc:335 +#: apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "Opening %s" -msgstr "A abrir %s" +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/sourcelist.cc:371 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Linha mal formada %u na lista de fontes %s (tipo)" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Erro de sintaxe %s:%u: Demasiados includes encadeados" -#: apt-pkg/sourcelist.cc:375 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, 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/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "Você deve colocar alguns URIs 'source' no seu sources.list" +msgid "Syntax error %s:%u: Included from here" +msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto" -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/configuration.cc:897 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/configuration.cc:900 #, 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/update.cc:103 apt-pkg/update.cc:105 -msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -"Falhou o download de alguns ficheiros de índice. Foram ignorados ou os " -"antigos foram usados em seu lugar." +"Erro de sintaxe %s:%u: directiva clara necessita de uma árvore de opções " +"como argumento" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/configuration.cc:950 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "O bloco de fabricante %s não contém a impressão digital" +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/cdromutl.cc:65 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "Impossível executar stat ao ponto de montagem %s" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "Impossível executar stat ao cdrom" +msgid "No keyring installed in %s." +msgstr "Nenhum keyring instalado em %s." -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, 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:168 +#: apt-pkg/contrib/cmndline.cc:171 #, 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:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format msgid "Option %s requires an argument." msgstr "A opção %s necessita de um argumento." -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Opção %s: Especificação de item de configuração tem de ter um =." -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, 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:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "Opção '%s' é demasiado longa" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, 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:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "Operação %s inválida" -#: apt-pkg/contrib/configuration.cc:519 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Abreviatura de tipo desconhecida: '%c'" +msgid "Installing %s" +msgstr "A instalar %s" -#: apt-pkg/contrib/configuration.cc:633 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Opening configuration file %s" -msgstr "A abrir o ficheiro de configuração %s" +msgid "Configuring %s" +msgstr "A configurar %s" -#: apt-pkg/contrib/configuration.cc:801 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Erro de sintaxe %s:%u: O bloco começa sem nome." +msgid "Removing %s" +msgstr "A remover %s" -#: apt-pkg/contrib/configuration.cc:820 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Erro de sintaxe %s:%u: Tag mal formada" +msgid "Completely removing %s" +msgstr "A remover completamente %s" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor" +msgid "Noting disappearance of %s" +msgstr "A notar o desaparecimento de %s" -#: apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/deb/dpkgpm.cc:115 #, 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" +msgid "Running post-installation trigger %s" +msgstr "A correr o 'trigger' de pós-instalação %s" -#: apt-pkg/contrib/configuration.cc:884 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Erro de sintaxe %s:%u: Demasiados includes encadeados" +msgid "Directory '%s' missing" +msgstr "Falta o directório '%s'" -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto" +msgid "Could not open file '%s'" +msgstr "Não foi possível abrir ficheiro o '%s'" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada" +msgid "Preparing %s" +msgstr "A preparar %s" -#: apt-pkg/contrib/configuration.cc:900 +#: apt-pkg/deb/dpkgpm.cc:1008 #, 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" +msgid "Unpacking %s" +msgstr "A desempacotar %s" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:1013 #, 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" +msgid "Preparing to configure %s" +msgstr "A preparar para configurar %s" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "" -"Não está a ser utilizado acesso exclusivo para apenas leitura ao ficheiro %s" +msgid "Installed %s" +msgstr "%s instalado" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "Could not open lock file %s" -msgstr "Não foi possível abrir ficheiro de lock %s" +msgid "Preparing for removal of %s" +msgstr "A preparar a remoção de %s" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "" -"Não está a ser utilizado o acesso exclusivo para o ficheiro %s, montado via " -"nfs" +msgid "Removed %s" +msgstr "%s removido" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Could not get lock %s" -msgstr "Não foi possível obter acesso exclusivo a %s" +msgid "Preparing to completely remove %s" +msgstr "A preparar para remover completamente %s" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "List of files can't be created as '%s' is not a directory" +msgid "Completely removed %s" +msgstr "Remoção completa de %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Não conseguiu escrever para %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" msgstr "" -"Lista de ficheiros que não podem ser criados porque '%s' não é um directório" -#: apt-pkg/contrib/fileutl.cc:394 -#, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "A ignorar '%s' no directório '%s' porque não é um ficheiro normal" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "A operação foi interrompida antes de poder terminar" -#: apt-pkg/contrib/fileutl.cc:412 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +#: apt-pkg/deb/dpkgpm.cc:1719 +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:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "problemas de dependências - deixando por configurar" + +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -"A ignorar o ficheiro '%s' no directório '%s' porque não tem extensão no nome " -"do ficheiro" +"Nenhum relatório apport escrito pois a mensagem de erro indica que é um erro " +"de seguimento de um erro anterior." -#: apt-pkg/contrib/fileutl.cc:421 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1732 msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +"No apport report written because the error message indicates a disk full " +"error" msgstr "" -"A ignorar o ficheiro '%s' no directório '%s' porque tem uma extensão " -"inválida no nome do ficheiro" +"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco " +"cheio" -#: apt-pkg/contrib/fileutl.cc:824 -#, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "O sub-processo %s recebeu uma falha de segmentação." +#: apt-pkg/deb/dpkgpm.cc:1739 +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/contrib/fileutl.cc:826 -#, c-format -msgid "Sub-process %s received signal %u." -msgstr "O sub-processo %s recebeu o sinal %u." +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +#, 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/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "O sub-processo %s retornou um código de erro (%u)" +#: apt-pkg/deb/dpkgpm.cc:1774 +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/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "O sub-processo %s terminou inesperadamente" - -#: apt-pkg/contrib/fileutl.cc:913 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problema ao fechar o ficheiro gzip %s" - -#: apt-pkg/contrib/fileutl.cc:1101 -#, c-format -msgid "Could not open file %s" -msgstr "Não foi possível abrir ficheiro o %s" +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/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/deb/debsystem.cc:94 #, c-format -msgid "Could not open file descriptor %d" -msgstr "Não foi possível abrir o descritor de ficheiro %d" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Falhou criar subprocesso IPC" - -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Falhou executar compactador " +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?" -#: apt-pkg/contrib/fileutl.cc:1514 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 #, c-format -msgid "read, still have %llu to read but none left" -msgstr "lidos, ainda restam %llu para serem lidos mas não resta nenhum" +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/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "escritos, ainda restam %llu para escrever mas não foi possível" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "Sem acesso exclusivo" -#: apt-pkg/contrib/fileutl.cc:1915 -#, c-format -msgid "Problem closing the file %s" -msgstr "Problema ao fechar o ficheiro %s" +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Utilização: apt-extracttemplates ficheiro1 [ficheiro2 ...]\n" +"\n" +"O apt-extracttemplates é uma ferramenta para extrair configuração\n" +"e informação de template de pacotes debian.\n" +"\n" +"Opções:\n" +" -h Este texto de ajuda\n" +" -t Definir o directório temporário\n" +" -c=? Ler este ficheiro de configuração\n" +" -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" +"tmp\n" -#: apt-pkg/contrib/fileutl.cc:1927 -#, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Problema ao renomear o ficheiro %s para %s" +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "Não foi possível fazer stat %s" -#: apt-pkg/contrib/fileutl.cc:1938 -#, c-format -msgid "Problem unlinking the file %s" -msgstr "Problema ao remover o link do ficheiro %s" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Não pode obter a versão do debconf. O debconf está instalado?" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Problema sincronizando o ficheiro" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "A lista de extensão de pacotes é demasiado longa" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: 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 #, c-format -msgid "No keyring installed in %s." -msgstr "Nenhum keyring instalado em %s." +msgid "Error processing directory %s" +msgstr "Erro ao processar o directório %s" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Não é possível fazer mmap a um ficheiro vazio" +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Lista de extensão de códigos-fonte é demasiado longa" -#: apt-pkg/contrib/mmap.cc:111 -#, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Não foi possível duplicar o descritor de ficheiro %i" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Erro ao escrever o cabeçalho no ficheiro de conteúdo" -#: apt-pkg/contrib/mmap.cc:119 +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Não foi possível fazer mmap de %llu bytes" +msgid "Error processing contents %s" +msgstr "Erro ao processar o conteúdo %s" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Não foi possível fechar mmap" +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Utilização: apt-ftparchive [opções] comando\n" +"Comandos: packages caminho_binário [ficheiro_override [prefixo_caminho]]\n" +" sources caminho_fonte [ficheiro_override [prefixo_caminho]]\n" +" contents caminho\n" +" release caminho\n" +" generate config [grupos]\n" +" clean config\n" +"\n" +"O apt-ftparchive gera ficheiros de índice para repositórios Debian. Ele \n" +"suporta muitos estilos de criação, desde totalmente automatizados até \n" +"substitutos funcionais para o dpkg-scanpackages e dpkg-scansources\n" +"\n" +"O apt-ftparchive gera ficheiros Packages a partir de uma árvore de .debs.\n" +" O ficheiro Package contém o conteúdo de todos os campos de controle de \n" +"cada pacote bem como o hash MD5 e tamanho do ficheiro. É suportado um \n" +"ficheiro override para forçar o valor de Priority e Section.\n" +"\n" +"Similarmente, o apt-ftparchive gera ficheiros Sources a partir de uma \n" +"árvore de .dscs. A opção --source-override pode ser utilizada para \n" +"especificar um ficheiro override de fontes\n" +"\n" +"Os comandos 'packages' e 'sources' devem ser executados na raiz da \n" +"árvore. CaminhoBinário deve apontar para a base de procura recursiva \n" +"e o ficheiro override deve conter as flags override. CaminhoPrefixo é \n" +"incluído aos campos filename caso esteja presente. Exemplo de uso do \n" +"repositório Debian :\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Opções:\n" +" -h Este texto de ajuda\n" +" --md5 Controlar a criação do MD5\n" +" -s=? Ficheiro override de código-fonte \n" +" -q Silencioso\n" +" -d=? Seleccionar a base de dados de caching opcional\n" +" --no-delink Habilitar o modo de debug delinking\n" +" --contents Controlar a criação do ficheiro de conteúdo\n" +" -c=? Ler este ficheiro de configuração\n" +" -o=? Definir uma opção de configuração arbitrária" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Não foi sincronizar mmap " +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Nenhuma selecção coincidiu" -#: apt-pkg/contrib/mmap.cc:290 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Não foi possível fazer mmap de %lu bytes" - -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Falhou truncar o ficheiro" +msgid "Some files are missing in the package file group `%s'" +msgstr "Faltam alguns ficheiros no grupo `%s' do ficheiro do pacote" -#: apt-pkg/contrib/mmap.cc:341 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "" -"O Dynamic MMap ficou sem espaço. Por favor aumente o tamanho de APT::Cache-" -"Start. Valor actual: %lu. (man 5 apt.conf)" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "A base de dados estava corrompida, ficheiro renomeado para %s.old" -#: apt-pkg/contrib/mmap.cc:446 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "" -"Não foi possível aumentar o tamanho do MMap pois o limite de %lu bytes já " -"foi alcançado." +msgid "DB is old, attempting to upgrade %s" +msgstr "A base de dados é antiga, a tentar actualizar %s" -#: apt-pkg/contrib/mmap.cc:449 +#: ftparchive/cachedb.cc:94 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" -"Não foi possível aumentar o tamanho do MMap pois o crescimento automático " -"está desabilitado pelo utilizador." +"O formato da BD é inválido. Se actualizou a partir de uma versão antiga do " +"apt, por favor remova-a e crie novamente a base de dados." -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Erro !" +msgid "Unable to open DB file %s: %s" +msgstr "Não foi possível abrir o ficheiro %s da base de dados: %s" -#: apt-pkg/contrib/progress.cc:150 -#, c-format -msgid "%c%s... Done" -msgstr "%c%s... Pronto" +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Falhou o readlink %s" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "" +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "O arquivo não tem registo de controlo" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Pronto" +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Não foi possível obter um cursor" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/writer.cc:91 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%lid %lih %limin %lis" +msgid "W: Unable to read directory %s\n" +msgstr "W: Não foi possível ler o directório %s\n" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/writer.cc:96 #, c-format -msgid "%lih %limin %lis" -msgstr "%lih %limin %lis" +msgid "W: Unable to stat %s\n" +msgstr "W: Não foi possível fazer stat %s\n" + +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "W: " -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 -#, c-format -msgid "%limin %lis" -msgstr "%limin %lis" +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: Os erros aplicam-se ao ficheiro " -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%lis" -msgstr "%lis" +msgid "Failed to resolve %s" +msgstr "Falhou resolver %s" -#: apt-pkg/contrib/strutl.cc:1258 -#, c-format -msgid "Selection %s not found" -msgstr "A selecção %s não foi encontrada" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Falhou ao percorrer a árvore" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:219 #, 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 "Failed to open %s" +msgstr "Falhou abrir %s" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:278 #, 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 " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:286 #, 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 "Failed to readlink %s" +msgstr "Falhou o readlink %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:290 #, c-format -msgid "Installing %s" -msgstr "A instalar %s" +msgid "Failed to unlink %s" +msgstr "Falhou o unlink %s" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:298 #, c-format -msgid "Configuring %s" -msgstr "A configurar %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Falhou ligar %s a %s" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:308 #, c-format -msgid "Removing %s" -msgstr "A remover %s" +msgid " DeLink limit of %sB hit.\n" +msgstr " Limite DeLink de %sB atingido.\n" -#: apt-pkg/deb/dpkgpm.cc:98 -#, c-format -msgid "Completely removing %s" -msgstr "A remover completamente %s" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Arquivo não possuía campo package" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Noting disappearance of %s" -msgstr "A notar o desaparecimento de %s" +msgid " %s has no override entry\n" +msgstr " %s não possui entrada override\n" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Running post-installation trigger %s" -msgstr "A correr o 'trigger' de pós-instalação %s" +msgid " %s maintainer is %s not %s\n" +msgstr " o maintainer de %s é %s, não %s\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:706 #, c-format -msgid "Directory '%s' missing" -msgstr "Falta o directório '%s'" +msgid " %s has no source override entry\n" +msgstr " %s não possui fonte de entrada de 'override'\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:710 #, c-format -msgid "Could not open file '%s'" -msgstr "Não foi possível abrir ficheiro o '%s'" +msgid " %s has no binary override entry either\n" +msgstr " %s também não possui entrada binária de 'override'\n" -#: apt-pkg/deb/dpkgpm.cc:992 -#, c-format -msgid "Preparing %s" -msgstr "A preparar %s" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Falhou alocar memória" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Unpacking %s" -msgstr "A desempacotar %s" +msgid "Unable to open %s" +msgstr "Não foi possível abrir %s" -#: apt-pkg/deb/dpkgpm.cc:998 -#, c-format -msgid "Preparing to configure %s" -msgstr "A preparar para configurar %s" +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Override %s malformado linha %llu #1" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Installed %s" -msgstr "%s instalado" +msgid "Failed to read the override file %s" +msgstr "Falhou ler o ficheiro override %s" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:166 #, c-format -msgid "Preparing for removal of %s" -msgstr "A preparar a remoção de %s" +msgid "Malformed override %s line %llu #1" +msgstr "Override %s malformado linha %llu #1" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:178 #, c-format -msgid "Removed %s" -msgstr "%s removido" +msgid "Malformed override %s line %llu #2" +msgstr "Override %s malformado linha %llu #2" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:191 #, c-format -msgid "Preparing to completely remove %s" -msgstr "A preparar para remover completamente %s" +msgid "Malformed override %s line %llu #3" +msgstr "Override %s malformado linha %llu #3" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Completely removed %s" -msgstr "Remoção completa de %s" +msgid "Unknown compression algorithm '%s'" +msgstr "Algoritmo de compressão desconhecido '%s'" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Não conseguiu escrever para %s" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Saída compactada %s precisa de um conjunto de compressão" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Falhou criar FILE*" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Falhou o fork" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "A operação foi interrompida antes de poder terminar" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Compactar filho" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "Nenhum relatório apport escrito pois MaxReports já foi atingido" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Erro Interno, falhou criar %s" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "problemas de dependências - deixando por configurar" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "Falhou o IO para subprocesso/arquivo" -#: apt-pkg/deb/dpkgpm.cc:1694 -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." +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Falhou ler durante o cálculo de MD5" -#: apt-pkg/deb/dpkgpm.cc:1700 -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" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Problema ao executar unlinking %s" -#: apt-pkg/deb/dpkgpm.cc:1707 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Nenhum relatório apport escrito pois a mensagem de erro indica um erro de " -"memória esgotada" +"Utilização: apt-internal-solver\n" +"\n" +"O apt-internal-solver é um interface para utilizar o actual interno como um\n" +" resolvedor externo para a família APT para depuração ou semelhante.\n" +"\n" +"Opções:\n" +" -h Este texto de ajuda.\n" +" -q Saída para registo - sem indicador de progresso\n" +" -c=? Ler este ficheiro de configuração\n" +" -o=? Definir uma opção de configuração arbitrária, p.e. dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -#, 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" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Registo de pacote desconhecido!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Nenhum relatório apport escrito pois a mensagem de erro indica um erro de I/" -"O do dpkg" +"Utilização: apt-sortpkgs [opções] ficheiro1 [ficheiro2 ...]\n" +"\n" +"O apt-sortpkgs é uma ferramenta simples para ordenar ficheiros de pacotes.\n" +"A opção -s é utilizada para indicar que tipo de ficheiro é.\n" +"\n" +"Opções:\n" +" -h Este texto de ajuda\n" +" -s Utilizar a ordenação de ficheiros de código-fonte\n" +" -c=? Ler este ficheiro de configuração\n" +" -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" +"tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/pt_BR.po b/po/pt_BR.po index c23a42275..9ee5b71d8 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: Brazilian Portuguese %s and %s/%s" +msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "Erro processando conteúdo %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Uso: apt-ftparchive [opções] comando\n" -"Comandos: packages caminho_binário [arquivo_override [prefixo_caminho]]\n" -" sources caminho_fonte [arquivo_override [prefixo_caminho]]\n" -" contents caminho\n" -" release caminho\n" -" generate config [grupos]\n" -" clean config\n" -"\n" -"O apt-ftparchive gera arquivos de índice para repositórios Debian. Ele\n" -"dá suporte a muitos estilos de geração, desde totalmente automatizadas até\n" -"substitutos funcionais para o dpkg-scanpackages e o dpkg-scansources\n" -"\n" -"O apt-ftparchive gera arquivos Package a partir de uma árvore de .debs.\n" -"O arquivo Package contém o conteúdo de todos os campos controle de\n" -"cada pacote bem como o hash MD5 e o tamanho do arquivo. Há suporte para\n" -"um arquivo override para forçar o valor da prioridade (\"Priority\") e a\n" -"a seção (\"Section\").\n" -"\n" -"Similarmente, o apt-ftparchive gera arquivos Sources a partir de uma\n" -"árvore de .dscs. A opção --source-override pode ser usada para\n" -"especificar um arquivo override de fontes.\n" -"\n" -"Os comandos 'packages' e 'sources' deverão ser executados na raiz da\n" -"árvore. Caminho_Binário deverá apontar para a base de procura recursiva\n" -"e o arquivo override deverá conter as \"flags override\". Caminho_Prefixo é\n" -"anexado aos campos do nome do arquivo se estiverem presentes. Exemplo de\n" -"uso do repositório Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Opções:\n" -" -h Este texto de ajuda\n" -" --md5 Controla a geração de MD5\n" -" -s=? Arquivo fonte (\"source\") override\n" -" -q Quieto\n" -" -d=? Seleciona o banco de dados de caching opcional\n" -" --no-delink Habilita o modo de depuração \"delinking\"\n" -" --contents Controla a geração do arquivo de conteúdo\n" -" -c=? Lê o arquivo de configuração especificado.\n" -" -o=? Define uma opção de configuração arbitrária" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Nenhuma seleção combinou" +msgid "Double add of diversion %s -> %s" +msgstr "Adição dupla de desvio %s -> %s" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, 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'" +msgid "Duplicate conf file %s/%s" +msgstr "Arquivo de configuração duplicado %s/%s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "BD estava corrompido, arquivo renomeado para %s.old" +msgid "The path %s is too long" +msgstr "O caminho %s é muito longo" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "BD é antigo, tentando atualizar %s" +msgid "Unpacking %s more than once" +msgstr "Desempacotando %s mais de uma vez" -#: ftparchive/cachedb.cc:94 -#, fuzzy -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"Formato do BD é inválido. Se você atualizou a partir de uma versão antiga do " -"apt, por favor, remova e recrie o banco de dados." +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "O diretório %s é desviado (\"diverted\")" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Impossível abrir o arquivo BD %s: %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "O pacote está tentando escrever no alvo do desvio %s/%s" + +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "O caminho de desvio é muito longo" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Falhou ao executar \"stat\" %s" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Falhou ao executar \"readlink\" %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Repositório não possui registro de controle" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Impossível obter um cursor" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: Impossível ler o diretório %s\n" +msgid "Failed to rename %s to %s" +msgstr "Falhou ao renomear %s para %s" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "W: Impossível executar \"stat\" em %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "O diretório %s está sendo substituído por um não-diretório" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "W: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Falha ao localizar nó em seu \"hash bucket\"" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: Erros que se aplicam ao arquivo " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "O caminho é muito longo" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "Falhou ao resolver %s" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Falhou ao percorrer a árvore" +msgid "Overwrite package match with no version for %s" +msgstr "Sobrescrita de pacote não combina com nenhuma versão para %s" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to open %s" -msgstr "Falhou ao abrir %s" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s" -#: ftparchive/writer.cc:278 +#: apt-inst/extract.cc:498 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgid "Unable to stat %s" +msgstr "Impossível executar \"stat\" em %s" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Failed to readlink %s" -msgstr "Falhou ao executar \"readlink\" %s" +msgid "Failed to write file %s" +msgstr "Falhou ao escrever arquivo %s" -#: ftparchive/writer.cc:290 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to unlink %s" -msgstr "Falhou ao executar \"unlink\" %s" +msgid "Failed to close file %s" +msgstr "Falhou ao fechar arquivo %s" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Falhou ao ligar %s a %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Este não é um arquivo DEB válido, membro '%s' faltando" -#: ftparchive/writer.cc:308 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Limite DeLink de %sB atingido.\n" +msgid "Internal error, could not locate member %s" +msgstr "Erro interno, não foi possível localizar membro %s" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Repositório não possuía campo pacote" - -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s não possui entrada override\n" - -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " mantenedor de %s é %s, não %s\n" - -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s não possui entrada override fonte\n" - -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s também não possui entrada override binária\n" - -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Falha ao alocar memória" - -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Impossível abrir %s" - -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Override malformado %s linha %lu #1" - -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Falha ao ler o arquivo override %s" - -#: ftparchive/override.cc:166 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Override malformado %s linha %lu #1" - -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Override malformado %s linha %lu #2" - -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Override malformado %s linha %lu #3" - -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Algoritmo de compactação desconhecido '%s'" - -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Saída compactada %s precisa de um conjunto de compactação" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Falhou ao criar FILE*" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Falhou ao executar \"fork\"" - -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Compactar filho" - -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "Erro interno, falhou ao criar %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "E/S para sub-processo/arquivo falhou" - -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Falhou ao ler durante o cálculo MD5" - -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "Problema removendo %s" - -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "Falhou ao renomear %s para %s" - -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n" -"\n" -"O apt-extracttemplates é uma ferramenta para extrair informações de modelo\n" -"(\"template\") e configuração de pacotes debian.\n" -"\n" -"Opções:\n" -" -h Este texto de ajuda\n" -" -t Define o diretório temporário\n" -" -c=? Lê o arquivo de configuração especificado.\n" -" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" -"tmp\n" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Registro de pacote desconhecido!" - -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Uso: apt-sortpkgs [opções] arquivo1 [arquivo2 ...]\n" -"\n" -"O apt-sortpkgs é uma ferramenta simples para ordenar arquivos de pacote.\n" -"A opção -s é usada para indicar que tipo de arquivo é.\n" -"\n" -"Opções:\n" -" -h Este texto de ajuda\n" -" -s Usar ordenação de arquivo fonte\n" -" -c=? Lê o arquivo de configuração especificado.\n" -" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" -"tmp\n" - -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" -msgstr "Falhou ao escrever arquivo %s" - -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "Falhou ao fechar arquivo %s" - -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "O caminho %s é muito longo" - -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" -msgstr "Desempacotando %s mais de uma vez" - -#: apt-inst/extract.cc:142 -#, c-format -msgid "The directory %s is diverted" -msgstr "O diretório %s é desviado (\"diverted\")" - -#: apt-inst/extract.cc:152 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "O pacote está tentando escrever no alvo do desvio %s/%s" - -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "O caminho de desvio é muito longo" - -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "O diretório %s está sendo substituído por um não-diretório" - -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Falha ao localizar nó em seu \"hash bucket\"" - -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "O caminho é muito longo" - -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Sobrescrita de pacote não combina com nenhuma versão para %s" - -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s" - -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "Impossível executar \"stat\" em %s" - -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "\"DropNode\" chamado em nó ainda ligado (\"linked\")" - -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Falhou ao localizar o elemento hash!" - -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Falhou ao alocar desvio (\"diversion\")" - -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Erro interno em \"AddDiversion\"" - -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s" - -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Adição dupla de desvio %s -> %s" - -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Arquivo de configuração duplicado %s/%s" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Arquivo de controle não interpretável" #: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" @@ -2367,134 +1975,55 @@ msgstr "Checksum do arquivo tar falhou, arquivo corrompido" msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Este não é um arquivo DEB válido, membro '%s' faltando" - -#: apt-inst/deb/debfile.cc:132 -#, c-format -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 -msgid "Unparsable control file" -msgstr "Arquivo de controle não interpretável" - -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, fuzzy, c-format -msgid "List directory %spartial is missing." -msgstr "Diretório de listas %spartial está faltando." - -#: apt-pkg/acquire.cc:91 -#, fuzzy, c-format -msgid "Archives directory %spartial is missing." -msgstr "Diretório de arquivos %spartial está faltando." - -#: apt-pkg/acquire.cc:99 -#, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "Impossível criar trava no diretório de listas" - -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "Tipo de arquivo de índice '%s' não é suportado" - -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Obtendo o arquivo %li de %li (%s restantes)" - -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "Obtendo arquivo %li de %li" - -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "renomeação falhou, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "Hash Sum incorreto" - -#: apt-pkg/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "Tamanho incorreto" - -#: apt-pkg/acquire-item.cc:173 -#, fuzzy -msgid "Invalid file format" -msgstr "Operação %s inválida" - -#: apt-pkg/acquire-item.cc:1573 -#, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" +msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/acquire-item.cc:1589 -#, 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:1631 -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:1669 -#, c-format -msgid "" -"Release file for %s is expired (invalid since %s). Updates for this " -"repository will not be applied." +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" msgstr "" -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/init.cc:146 #, c-format -msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "" +msgid "Packaging system '%s' is not supported" +msgstr "Sistema de empacotamento '%s' não é suportado" + +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Impossível determinar um tipo de sistema de empacotamento aplicável." -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "" -"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" -msgstr "" +msgid "Wrote %i records.\n" +msgstr "Gravados %i registros.\n" -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "GPG error: %s: %s" -msgstr "" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Gravados %i registros com %i arquivos faltando.\n" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "" -"I wasn't able to locate a file for the %s package. This might mean you need " -"to manually fix this package. (due to missing arch)" -msgstr "" -"Não foi possível localizar um arquivo para o pacote %s. Isto pode significar " -"que você precisa consertar manualmente este pacote. (devido a arquitetura " -"não especificada)." +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Gravados %i registros com %i arquivos que não combinam\n" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "Can't find a source to download version '%s' of '%s'" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" +"Gravados %i registros com %i arquivos faltando e %i arquivos que não " +"combinam\n" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "" -"The package index files are corrupted. No Filename: field for package %s." +msgid "Can't find authentication record for: %s" msgstr "" -"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:" -"\" para o pacote %s." + +#: apt-pkg/indexcopy.cc:521 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Hash Sum incorreto" #: apt-pkg/acquire-worker.cc:116 #, c-format @@ -2517,26 +2046,6 @@ 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/algorithms.cc:265 -#, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"O pacote %s precisa ser reinstalado, mas não foi possível encontrar um " -"arquivo para o mesmo." - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " -"pacotes mantidos (hold)." - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados." - #: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "" @@ -2551,168 +2060,256 @@ 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/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Release '%s' para '%s' não foi encontrada" - -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Versão '%s' para '%s' não foi encontrada" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Cache de pacotes vazio" -#: apt-pkg/cacheset.cc:603 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "Impossível achar tarefa %s" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "O arquivo de cache de pacotes está corrompido" -#: apt-pkg/cacheset.cc:609 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Impossível achar pacote %s" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "O arquivo de cache de pacotes é uma versão incompatível" -#: apt-pkg/cacheset.cc:615 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Impossível achar pacote %s" +#: apt-pkg/pkgcache.cc:169 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "O arquivo de cache de pacotes está corrompido" -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "" +msgid "This APT does not support the versioning system '%s'" +msgstr "Este APT não suporta o sistema de versões '%s'" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 -#, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "O cache de pacotes foi gerado para uma arquitetura diferente" -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Depende" -#: apt-pkg/cacheset.cc:655 -#, c-format -msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Pré-Depende" -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" -msgstr "" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Sugere" -#: 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/pkgcache.cc:322 +msgid "Recommends" +msgstr "Recomenda" -#: apt-pkg/cdrom.cc:571 -msgid "Unmounting CD-ROM...\n" -msgstr "Desmontando CD-ROM...\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Conflita" -#: apt-pkg/cdrom.cc:586 -#, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "Usando ponto de montagem de CD-ROM %s\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Substitui" -#: apt-pkg/cdrom.cc:599 -msgid "Waiting for disc...\n" -msgstr "Aguardando por disco...\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Obsoleta" -#: apt-pkg/cdrom.cc:609 -msgid "Mounting CD-ROM...\n" -msgstr "Montando CD-ROM...\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Quebra" -#: apt-pkg/cdrom.cc:620 -msgid "Identifying... " -msgstr "Identificando... " +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "" -#: apt-pkg/cdrom.cc:662 -#, c-format -msgid "Stored label: %s\n" -msgstr "Rótulo armazenado: %s \n" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "importante" -#: apt-pkg/cdrom.cc:680 -msgid "Scanning disc for index files...\n" -msgstr "Procurando por arquivos de índice no disco...\n" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "requerido" -#: apt-pkg/cdrom.cc:734 +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "padrão" + +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "opcional" + +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "extra" + +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "" -"Found %zu package indexes, %zu source indexes, %zu translation indexes and " -"%zu signatures\n" +msgid "Index file type '%s' is not supported" +msgstr "Tipo de arquivo de índice '%s' não é suportado" + +#: 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 "" -"Encontrado(s) %zu índice(s) de pacote(s), %zu índice(s) de fonte(s), %zu " -"índice(s) de traduções e %zu assinatura(s)\n" +"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/cdrom.cc:744 -msgid "" -"Unable to locate any package files, perhaps this is not a Debian Disc or the " -"wrong architecture?" +#: 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/cdrom.cc:771 +#: 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 "Found label '%s'\n" -msgstr "Rótulo encontrado: '%s'\n" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)" -#: apt-pkg/cdrom.cc:800 -msgid "That is not a valid name, try again.\n" -msgstr "Este não é um nome válido, tente novamente.\n" +#: 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/cdrom.cc:817 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "" -"This disc is called: \n" -"'%s'\n" +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 "" -"Esse disco é chamado: \n" -"'%s'\n" +"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/cdrom.cc:819 -msgid "Copying package lists..." -msgstr "Copiando lista de pacotes..." +#: apt-pkg/sourcelist.cc:335 +#, c-format +msgid "Opening %s" +msgstr "Abrindo %s" -#: apt-pkg/cdrom.cc:863 -msgid "Writing new source list\n" -msgstr "Gravando nova lista de fontes\n" +#: 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/cdrom.cc:874 -msgid "Source list entries for this disc are:\n" -msgstr "Entradas na lista de fontes para este disco são:\n" +#: 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:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Tipo de arquivo de índice '%s' não é suportado" #: apt-pkg/clean.cc:64 #, c-format msgid "Unable to stat %s." msgstr "Impossível executar \"stat\" %s." -#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 -msgid "Building dependency tree" -msgstr "Construindo árvore de dependências" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "O cache possui um sistema de versões incompatível" -#: apt-pkg/depcache.cc:139 -msgid "Candidate versions" -msgstr "Versões candidatas" +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Um erro ocorreu processando %s (EncontrarPacote)" -#: apt-pkg/depcache.cc:168 -msgid "Dependency generation" -msgstr "Geração de dependência" +#: apt-pkg/pkgcachegen.cc:257 +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/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:260 +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/depcache.cc:250 +#: apt-pkg/pkgcachegen.cc:263 +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:266 +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:576 #, 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:1211 #, 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:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Lendo listas de pacotes" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Coletando Arquivo \"Provides\"" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Impossível escrever para %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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" @@ -2734,80 +2331,144 @@ msgstr "" msgid "Execute external solver" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format -msgid "Wrote %i records.\n" -msgstr "Gravados %i registros.\n" +msgid "rename failed, %s (%s -> %s)." +msgstr "renomeação falhou, %s (%s -> %s)." -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 -#, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Gravados %i registros com %i arquivos faltando.\n" +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "Hash Sum incorreto" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 -#, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Gravados %i registros com %i arquivos que não combinam\n" +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "Tamanho incorreto" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 -#, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "" -"Gravados %i registros com %i arquivos faltando e %i arquivos que não " -"combinam\n" +#: apt-pkg/acquire-item.cc:173 +#, fuzzy +msgid "Invalid file format" +msgstr "Operação %s inválida" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/acquire-item.cc:1640 #, c-format -msgid "Can't find authentication record for: %s" +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "Hash Sum incorreto" - -#: apt-pkg/indexrecords.cc:78 +#: apt-pkg/acquire-item.cc:1656 #, fuzzy, c-format -msgid "Unable to parse Release file %s" +msgid "Unable to find hash sum for '%s' in Release file" msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/indexrecords.cc:86 -#, fuzzy, c-format -msgid "No sections in Release file %s" -msgstr "Nota, selecionando %s ao invés de %s\n" +#: apt-pkg/acquire-item.cc:1698 +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/indexrecords.cc:117 +#: apt-pkg/acquire-item.cc:1736 #, c-format -msgid "No Hash entry in Release file %s" +msgid "" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." msgstr "" -#: apt-pkg/indexrecords.cc:130 +#: apt-pkg/acquire-item.cc:1758 +#, c-format +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "" + +#: apt-pkg/acquire-item.cc:1788 +#, c-format +msgid "" +"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" +msgstr "" + +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 +#, c-format +msgid "GPG error: %s: %s" +msgstr "" + +#: apt-pkg/acquire-item.cc:1926 +#, c-format +msgid "" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package. (due to missing arch)" +msgstr "" +"Não foi possível localizar um arquivo para o pacote %s. Isto pode significar " +"que você precisa consertar manualmente este pacote. (devido a arquitetura " +"não especificada)." + +#: apt-pkg/acquire-item.cc:1992 +#, c-format +msgid "Can't find a source to download version '%s' of '%s'" +msgstr "" + +#: apt-pkg/acquire-item.cc:2050 +#, c-format +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "" +"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:" +"\" para o pacote %s." + +#: apt-pkg/vendorlist.cc:85 +#, 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:87 apt-pkg/cdrom.cc:829 #, fuzzy, c-format -msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "Linha inválida no arquivo de desvios: %s" +msgid "List directory %spartial is missing." +msgstr "Diretório de listas %spartial está faltando." -#: apt-pkg/indexrecords.cc:149 +#: apt-pkg/acquire.cc:91 #, fuzzy, c-format -msgid "Invalid 'Date' entry in Release file %s" -msgstr "Impossível analisar arquivo de pacote %s (1)" +msgid "Archives directory %spartial is missing." +msgstr "Diretório de arquivos %spartial está faltando." -#: apt-pkg/init.cc:146 +#: apt-pkg/acquire.cc:99 +#, fuzzy, c-format +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:902 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Sistema de empacotamento '%s' não é suportado" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Obtendo o arquivo %li de %li (%s restantes)" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Impossível determinar um tipo de sistema de empacotamento aplicável." +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Obtendo arquivo %li de %li" -#: apt-pkg/install-progress.cc:57 +#: 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/policy.cc:83 #, c-format -msgid "Progress: [%3i%%]" +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "" +#: apt-pkg/policy.cc:422 +#, fuzzy, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Registro inválido no arquivo de preferências, sem cabeçalho Package" + +#: apt-pkg/policy.cc:444 +#, c-format +msgid "Did not understand pin type %s" +msgstr "Não foi possível entender o tipo de \"pin\" %s" + +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Nenhuma prioridade (ou zero) especificada para \"pin\"" #: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format @@ -2833,441 +2494,294 @@ msgstr "" "é ruim, mas se você realmente quer fazer isso, ative a opção APT::Force-" "LoopBreak." -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Cache de pacotes vazio" - -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "O arquivo de cache de pacotes está corrompido" - -#: apt-pkg/pkgcache.cc:166 -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:169 +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 #, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "O arquivo de cache de pacotes está corrompido" +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/pkgcache.cc:174 +#: apt-pkg/cdrom.cc:571 +msgid "Unmounting CD-ROM...\n" +msgstr "Desmontando CD-ROM...\n" + +#: apt-pkg/cdrom.cc:586 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Este APT não suporta o sistema de versões '%s'" +msgid "Using CD-ROM mount point %s\n" +msgstr "Usando ponto de montagem de CD-ROM %s\n" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "O cache de pacotes foi gerado para uma arquitetura diferente" +#: apt-pkg/cdrom.cc:599 +msgid "Waiting for disc...\n" +msgstr "Aguardando por disco...\n" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Depende" +#: apt-pkg/cdrom.cc:609 +msgid "Mounting CD-ROM...\n" +msgstr "Montando CD-ROM...\n" -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Pré-Depende" +#: apt-pkg/cdrom.cc:620 +msgid "Identifying... " +msgstr "Identificando... " -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Sugere" +#: apt-pkg/cdrom.cc:662 +#, c-format +msgid "Stored label: %s\n" +msgstr "Rótulo armazenado: %s \n" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Recomenda" +#: apt-pkg/cdrom.cc:680 +msgid "Scanning disc for index files...\n" +msgstr "Procurando por arquivos de índice no disco...\n" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Conflita" +#: apt-pkg/cdrom.cc:734 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" +msgstr "" +"Encontrado(s) %zu índice(s) de pacote(s), %zu índice(s) de fonte(s), %zu " +"índice(s) de traduções e %zu assinatura(s)\n" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Substitui" +#: apt-pkg/cdrom.cc:744 +msgid "" +"Unable to locate any package files, perhaps this is not a Debian Disc or the " +"wrong architecture?" +msgstr "" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Obsoleta" +#: apt-pkg/cdrom.cc:771 +#, c-format +msgid "Found label '%s'\n" +msgstr "Rótulo encontrado: '%s'\n" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Quebra" +#: apt-pkg/cdrom.cc:800 +msgid "That is not a valid name, try again.\n" +msgstr "Este não é um nome válido, tente novamente.\n" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" +#: apt-pkg/cdrom.cc:817 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" msgstr "" +"Esse disco é chamado: \n" +"'%s'\n" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "importante" +#: apt-pkg/cdrom.cc:819 +msgid "Copying package lists..." +msgstr "Copiando lista de pacotes..." -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "requerido" +#: apt-pkg/cdrom.cc:863 +msgid "Writing new source list\n" +msgstr "Gravando nova lista de fontes\n" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "padrão" +#: apt-pkg/cdrom.cc:874 +msgid "Source list entries for this disc are:\n" +msgstr "Entradas na lista de fontes para este disco são:\n" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "opcional" +#: apt-pkg/algorithms.cc:265 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"O pacote %s precisa ser reinstalado, mas não foi possível encontrar um " +"arquivo para o mesmo." -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "extra" +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " +"pacotes mantidos (hold)." -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "O cache possui um sistema de versões incompatível" +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados." -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 -#, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Um erro ocorreu processando %s (EncontrarPacote)" +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 +msgid "Building dependency tree" +msgstr "Construindo árvore de dependências" -#: apt-pkg/pkgcachegen.cc:257 -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/depcache.cc:139 +msgid "Candidate versions" +msgstr "Versões candidatas" -#: apt-pkg/pkgcachegen.cc:260 -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/depcache.cc:168 +msgid "Dependency generation" +msgstr "Geração de dependência" -#: apt-pkg/pkgcachegen.cc:263 -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/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:266 -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 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/depcache.cc:256 #, 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" +msgid "Failed to write temporary StateFile %s" +msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/tagfile.cc:140 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s" +msgid "Unable to parse package file %s (1)" +msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Lendo listas de pacotes" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Impossível analisar arquivo de pacote %s (2)" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Coletando Arquivo \"Provides\"" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Release '%s' para '%s' não foi encontrada" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Erro de E/S ao gravar cache fonte" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Versão '%s' para '%s' não foi encontrada" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/cacheset.cc:603 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "Impossível achar tarefa %s" + +#: apt-pkg/cacheset.cc:609 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "Impossível achar pacote %s" + +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Impossível achar pacote %s" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Tipo de arquivo de índice '%s' não é suportado" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/policy.cc:83 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" -#: apt-pkg/policy.cc:422 -#, fuzzy, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Registro inválido no arquivo de preferências, sem cabeçalho Package" +#: apt-pkg/cacheset.cc:647 +#, c-format +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/policy.cc:444 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Did not understand pin type %s" -msgstr "Não foi possível entender o tipo de \"pin\" %s" +msgid "Can't select candidate version from package %s as it has no candidate" +msgstr "" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Nenhuma prioridade (ou zero) especificada para \"pin\"" +#: apt-pkg/cacheset.cc:663 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/indexrecords.cc:78 #, 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)" +msgid "Unable to parse Release file %s" +msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/indexrecords.cc:86 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgid "No sections in Release file %s" +msgstr "Nota, selecionando %s ao invés de %s\n" + +#: apt-pkg/indexrecords.cc:117 +#, c-format +msgid "No Hash entry in Release file %s" msgstr "" -"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/indexrecords.cc:130 #, 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)" +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "Linha inválida no arquivo de desvios: %s" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/indexrecords.cc:149 #, 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)" +msgid "Invalid 'Date' entry in Release file %s" +msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/sourcelist.cc:190 -#, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 +#, c-format +msgid "%lid %lih %limin %lis" 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)" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" msgstr "" -"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:206 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)" +msgid "%limin %lis" +msgstr "" -#: apt-pkg/sourcelist.cc:208 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)" +msgid "%lis" +msgstr "" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/strutl.cc:1258 #, 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)" +msgid "Selection %s not found" +msgstr "Seleção %s não encontrada" -#: apt-pkg/sourcelist.cc:217 +#: apt-pkg/contrib/fileutl.cc:190 #, 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)" +msgid "Not using locking for read only lock file %s" +msgstr "Não usando travamento para arquivo de trava somente leitura %s" -#: apt-pkg/sourcelist.cc:224 +#: apt-pkg/contrib/fileutl.cc:195 #, 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)" +msgid "Could not open lock file %s" +msgstr "Não foi possível abrir arquivo de trava %s" -#: apt-pkg/sourcelist.cc:335 +#: apt-pkg/contrib/fileutl.cc:218 #, c-format -msgid "Opening %s" -msgstr "Abrindo %s" +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Não usando travamento para arquivo de trava montado via nfs %s" -#: apt-pkg/sourcelist.cc:371 +#: apt-pkg/contrib/fileutl.cc:223 #, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)" +msgid "Could not get lock %s" +msgstr "Não foi possível obter trava %s" -#: apt-pkg/sourcelist.cc:375 +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 #, 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/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "Você deve colocar algumas URIs 'source' em seu sources.list" +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/fileutl.cc:394 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Impossível analisar arquivo de pacote %s (1)" +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/fileutl.cc:412 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Impossível analisar arquivo de pacote %s (2)" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" -#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 -#, fuzzy +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -"Alguns arquivos de índice falharam para baixar, eles foram ignorados ou os " -"antigos foram usados no lugar." -#: apt-pkg/vendorlist.cc:85 -#, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Bloco fornecedor %s não contém impressão digital (\"fingerprint\")" - -#: apt-pkg/contrib/cdromutl.cc:65 -#, c-format -msgid "Unable to stat the mount point %s" -msgstr "Impossível executar \"stat\" no ponto de montagem %s" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "Impossível executar \"stat\" no cdrom" - -#: apt-pkg/contrib/cmndline.cc:121 -#, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, 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:168 -#, 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:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "Opção %s requer um argumento." - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "" -"Opção %s: Especificação de item de configuração deve possuir um =." - -#: apt-pkg/contrib/cmndline.cc:278 -#, 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:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "Opção '%s' é muito longa" - -#: apt-pkg/contrib/cmndline.cc:341 -#, 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:391 -#, c-format -msgid "Invalid operation %s" -msgstr "Operação %s inválida" - -#: apt-pkg/contrib/configuration.cc:519 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Abreviação de tipo desconhecida: '%c'" - -#: apt-pkg/contrib/configuration.cc:633 -#, c-format -msgid "Opening configuration file %s" -msgstr "Abrindo arquivo de configuração %s" - -#: apt-pkg/contrib/configuration.cc:801 -#, 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:820 -#, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Erro de sintaxe %s:%u: Tag mal formada" - -#: apt-pkg/contrib/configuration.cc:837 -#, 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:877 -#, 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:884 -#, 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:888 apt-pkg/contrib/configuration.cc:893 -#, 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:897 -#, 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:900 -#, 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:950 -#, 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/fileutl.cc:190 -#, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Não usando travamento para arquivo de trava somente leitura %s" - -#: apt-pkg/contrib/fileutl.cc:195 -#, c-format -msgid "Could not open lock file %s" -msgstr "Não foi possível abrir arquivo de trava %s" - -#: apt-pkg/contrib/fileutl.cc:218 -#, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Não usando travamento para arquivo de trava montado via nfs %s" - -#: apt-pkg/contrib/fileutl.cc:223 -#, c-format -msgid "Could not get lock %s" -msgstr "Não foi possível obter trava %s" - -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 -#, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:394 -#, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:412 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:421 -#, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/fileutl.cc:824 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-processo %s recebeu uma falha de segmentação." @@ -3339,11 +2853,25 @@ msgstr "Problema removendo o arquivo" msgid "Problem syncing the file" msgstr "Problema sincronizando o arquivo" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: apt-pkg/contrib/progress.cc:148 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... Erro!" + +#: apt-pkg/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Pronto" + +#: apt-pkg/contrib/progress.cc:181 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Abortando instalação." +msgid "%c%s... %u%%" +msgstr "%c%s... Pronto" #: apt-pkg/contrib/mmap.cc:79 msgid "Can't mmap an empty file" @@ -3397,215 +2925,682 @@ msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Erro!" +msgid "Unable to stat the mount point %s" +msgstr "Impossível executar \"stat\" no ponto de montagem %s" -#: apt-pkg/contrib/progress.cc:150 +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Impossível executar \"stat\" no cdrom" + +#: apt-pkg/contrib/configuration.cc:519 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Pronto" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Abreviação de tipo desconhecida: '%c'" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "" +#: apt-pkg/contrib/configuration.cc:633 +#, c-format +msgid "Opening configuration file %s" +msgstr "Abrindo arquivo de configuração %s" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Pronto" +#: apt-pkg/contrib/configuration.cc:801 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome." -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: apt-pkg/contrib/configuration.cc:820 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Erro de sintaxe %s:%u: Tag mal formada" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: apt-pkg/contrib/configuration.cc:837 #, c-format -msgid "%lih %limin %lis" -msgstr "" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "%limin %lis" +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" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "%lis" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Erro de sintaxe %s:%u: Muitos \"includes\" aninhados" + +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#, 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:897 +#, 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:900 +#, 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:950 +#, 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" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Abortando instalação." + +#: apt-pkg/contrib/cmndline.cc:124 +#, 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 +#, 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 +#, 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 +#, 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 +#, c-format +msgid "Option %s: Configuration item specification must have an =." +msgstr "" +"Opção %s: Especificação de item de configuração deve possuir um =." + +#: apt-pkg/contrib/cmndline.cc:281 +#, 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 +#, c-format +msgid "Option '%s' is too long" +msgstr "Opção '%s' é muito longa" + +#: apt-pkg/contrib/cmndline.cc:344 +#, 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 +#, c-format +msgid "Invalid operation %s" +msgstr "Operação %s inválida" + +#: apt-pkg/deb/dpkgpm.cc:110 +#, c-format +msgid "Installing %s" +msgstr "Instalando %s" + +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 +#, c-format +msgid "Configuring %s" +msgstr "Configurando %s" + +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 +#, c-format +msgid "Removing %s" +msgstr "Removendo %s" + +#: apt-pkg/deb/dpkgpm.cc:113 +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "%s completamente removido" + +#: apt-pkg/deb/dpkgpm.cc:114 +#, c-format +msgid "Noting disappearance of %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:115 +#, 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:845 +#, c-format +msgid "Directory '%s' missing" +msgstr "Diretório '%s' está faltando" + +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 +#, fuzzy, c-format +msgid "Could not open file '%s'" +msgstr "Não foi possível abrir arquivo %s" + +#: apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Preparing %s" +msgstr "Preparando %s" + +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr "Desempacotando %s" + +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing to configure %s" +msgstr "Preparando para configurar %s" + +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr "%s instalado" + +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "Preparando para a remoção de %s" + +#: apt-pkg/deb/dpkgpm.cc:1022 +#, c-format +msgid "Removed %s" +msgstr "%s removido" + +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Preparando para remover completamente %s" + +#: apt-pkg/deb/dpkgpm.cc:1028 +#, c-format +msgid "Completely removed %s" +msgstr "%s completamente removido" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Impossível escrever para %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "" + +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "" + +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n" +"\n" +"O apt-extracttemplates é uma ferramenta para extrair informações de modelo\n" +"(\"template\") e configuração de pacotes debian.\n" +"\n" +"Opções:\n" +" -h Este texto de ajuda\n" +" -t Define o diretório temporário\n" +" -c=? Lê o arquivo de configuração especificado.\n" +" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" +"tmp\n" + +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "Impossível executar \"stat\" em %s" + +#: cmdline/apt-extracttemplates.cc:300 +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 +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 +#, c-format +msgid "Error processing directory %s" +msgstr "Erro processando o diretório %s" + +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Lista de extensão de fontes é muito extensa" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Erro ao gravar cabeçalho no arquivo de conteúdo" + +#: ftparchive/apt-ftparchive.cc:431 +#, c-format +msgid "Error processing contents %s" +msgstr "Erro processando conteúdo %s" + +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Uso: apt-ftparchive [opções] comando\n" +"Comandos: packages caminho_binário [arquivo_override [prefixo_caminho]]\n" +" sources caminho_fonte [arquivo_override [prefixo_caminho]]\n" +" contents caminho\n" +" release caminho\n" +" generate config [grupos]\n" +" clean config\n" +"\n" +"O apt-ftparchive gera arquivos de índice para repositórios Debian. Ele\n" +"dá suporte a muitos estilos de geração, desde totalmente automatizadas até\n" +"substitutos funcionais para o dpkg-scanpackages e o dpkg-scansources\n" +"\n" +"O apt-ftparchive gera arquivos Package a partir de uma árvore de .debs.\n" +"O arquivo Package contém o conteúdo de todos os campos controle de\n" +"cada pacote bem como o hash MD5 e o tamanho do arquivo. Há suporte para\n" +"um arquivo override para forçar o valor da prioridade (\"Priority\") e a\n" +"a seção (\"Section\").\n" +"\n" +"Similarmente, o apt-ftparchive gera arquivos Sources a partir de uma\n" +"árvore de .dscs. A opção --source-override pode ser usada para\n" +"especificar um arquivo override de fontes.\n" +"\n" +"Os comandos 'packages' e 'sources' deverão ser executados na raiz da\n" +"árvore. Caminho_Binário deverá apontar para a base de procura recursiva\n" +"e o arquivo override deverá conter as \"flags override\". Caminho_Prefixo é\n" +"anexado aos campos do nome do arquivo se estiverem presentes. Exemplo de\n" +"uso do repositório Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Opções:\n" +" -h Este texto de ajuda\n" +" --md5 Controla a geração de MD5\n" +" -s=? Arquivo fonte (\"source\") override\n" +" -q Quieto\n" +" -d=? Seleciona o banco de dados de caching opcional\n" +" --no-delink Habilita o modo de depuração \"delinking\"\n" +" --contents Controla a geração do arquivo de conteúdo\n" +" -c=? Lê o arquivo de configuração especificado.\n" +" -o=? Define uma opção de configuração arbitrária" + +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Nenhuma seleção combinou" + +#: ftparchive/apt-ftparchive.cc:907 +#, 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'" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "BD estava corrompido, arquivo renomeado para %s.old" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "BD é antigo, tentando atualizar %s" + +#: ftparchive/cachedb.cc:94 +#, fuzzy +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"Formato do BD é inválido. Se você atualizou a partir de uma versão antiga do " +"apt, por favor, remova e recrie o banco de dados." + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Impossível abrir o arquivo BD %s: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Falhou ao executar \"readlink\" %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Repositório não possui registro de controle" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Impossível obter um cursor" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:91 #, c-format -msgid "Selection %s not found" -msgstr "Seleção %s não encontrada" +msgid "W: Unable to read directory %s\n" +msgstr "W: Impossível ler o diretório %s\n" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:96 #, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" +msgid "W: Unable to stat %s\n" +msgstr "W: Impossível executar \"stat\" em %s\n" -#: 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" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " -#. 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 "" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "W: " -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "" +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: Erros que se aplicam ao arquivo " -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "Installing %s" -msgstr "Instalando %s" +msgid "Failed to resolve %s" +msgstr "Falhou ao resolver %s" + +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Falhou ao percorrer a árvore" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:219 #, c-format -msgid "Configuring %s" -msgstr "Configurando %s" +msgid "Failed to open %s" +msgstr "Falhou ao abrir %s" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:278 #, c-format -msgid "Removing %s" -msgstr "Removendo %s" +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:98 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "%s completamente removido" +#: ftparchive/writer.cc:286 +#, c-format +msgid "Failed to readlink %s" +msgstr "Falhou ao executar \"readlink\" %s" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:290 #, c-format -msgid "Noting disappearance of %s" -msgstr "" +msgid "Failed to unlink %s" +msgstr "Falhou ao executar \"unlink\" %s" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:298 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Executando gatilho pós-instalação %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Falhou ao ligar %s a %s" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:308 #, c-format -msgid "Directory '%s' missing" -msgstr "Diretório '%s' está faltando" +msgid " DeLink limit of %sB hit.\n" +msgstr " Limite DeLink de %sB atingido.\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "Não foi possível abrir arquivo %s" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Repositório não possuía campo pacote" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Preparing %s" -msgstr "Preparando %s" +msgid " %s has no override entry\n" +msgstr " %s não possui entrada override\n" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Unpacking %s" -msgstr "Desempacotando %s" +msgid " %s maintainer is %s not %s\n" +msgstr " mantenedor de %s é %s, não %s\n" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing to configure %s" -msgstr "Preparando para configurar %s" +msgid " %s has no source override entry\n" +msgstr " %s não possui entrada override fonte\n" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/writer.cc:710 #, c-format -msgid "Installed %s" -msgstr "%s instalado" +msgid " %s has no binary override entry either\n" +msgstr " %s também não possui entrada override binária\n" -#: apt-pkg/deb/dpkgpm.cc:1005 -#, c-format -msgid "Preparing for removal of %s" -msgstr "Preparando para a remoção de %s" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Falha ao alocar memória" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Removed %s" -msgstr "%s removido" +msgid "Unable to open %s" +msgstr "Impossível abrir %s" -#: apt-pkg/deb/dpkgpm.cc:1012 -#, c-format -msgid "Preparing to completely remove %s" -msgstr "Preparando para remover completamente %s" +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Override malformado %s linha %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Completely removed %s" -msgstr "%s completamente removido" +msgid "Failed to read the override file %s" +msgstr "Falha ao ler o arquivo override %s" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/override.cc:166 #, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Impossível escrever para %s" +msgid "Malformed override %s line %llu #1" +msgstr "Override malformado %s linha %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "Override malformado %s linha %lu #2" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "Override malformado %s linha %lu #3" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" +#: ftparchive/multicompress.cc:73 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Algoritmo de compactação desconhecido '%s'" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Saída compactada %s precisa de um conjunto de compactação" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Falhou ao criar FILE*" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Falhou ao executar \"fork\"" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Compactar filho" -#: apt-pkg/deb/dpkgpm.cc:1707 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Erro interno, falhou ao criar %s" + +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "E/S para sub-processo/arquivo falhou" + +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Falhou ao ler durante o cálculo MD5" + +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Problema removendo %s" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-internal-solver.cc:49 +#, fuzzy msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n" +"\n" +"O apt-extracttemplates é uma ferramenta para extrair informações de modelo\n" +"(\"template\") e configuração de pacotes debian.\n" +"\n" +"Opções:\n" +" -h Este texto de ajuda\n" +" -t Define o diretório temporário\n" +" -c=? Lê o arquivo de configuração especificado.\n" +" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" +"tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Registro de pacote desconhecido!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Uso: apt-sortpkgs [opções] arquivo1 [arquivo2 ...]\n" +"\n" +"O apt-sortpkgs é uma ferramenta simples para ordenar arquivos de pacote.\n" +"A opção -s é usada para indicar que tipo de arquivo é.\n" +"\n" +"Opções:\n" +" -h Este texto de ajuda\n" +" -s Usar ordenação de arquivo fonte\n" +" -c=? Lê o arquivo de configuração especificado.\n" +" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" +"tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/ro.po b/po/ro.po index 2e556ef62..88b69ed27 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor \n" "Language-Team: Romanian \n" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Tabela de versiuni:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -360,7 +360,7 @@ msgstr "Nu s-a putut bloca directorul de descărcare" 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Nu s-a putut găsi o sursă pachet pentru %s" @@ -380,97 +380,97 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Sar peste fișierul deja descărcat '%s'\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "N-am putut determina spațiul disponibil în %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveți suficient spațiu în %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, 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:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Eșec la aducerea unor arhive." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Descărcare completă și în modul doar descărcare" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eșuată.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eșuată.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Procesul copil a eșuat" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependențe înglobate.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -479,7 +479,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:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -488,14 +488,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:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -504,7 +504,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:1358 +#: cmdline/apt-get.cc:1362 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -513,30 +513,30 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, 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:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Eșec la prelucrarea dependențelor de compilare" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Conectare la %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -679,7 +679,7 @@ msgstr "%s este deja la cea mai nouă versiune.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Așteptat %s, dar n-a fost acolo" @@ -773,16 +773,16 @@ msgstr "Nu se poate demonta CD-ul din %s, poate este încă utilizat." msgid "Disk not found." msgstr "Disc negăsit." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Fișier negăsit" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Eșec la „stat”" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Eșec la ajustarea timpului de modificare" @@ -836,7 +836,7 @@ msgstr "Scriptul „%s” cu comenzile de conectare a eșuat, serverul a spus: % msgid "TYPE failed, server said: %s" msgstr "„TYPE” a eșuat, serverul a spus: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Timpul de conectare a expirat" @@ -858,7 +858,7 @@ msgstr "Un răspuns a depășit zona de tampon." msgid "Protocol corruption" msgstr "Protocol corupt" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -921,7 +921,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:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Problemă la calcularea dispersiei pentru fișierul" @@ -930,7 +930,7 @@ msgstr "Problemă la calcularea dispersiei pentru fișierul" msgid "Unable to fetch file, server said '%s'" msgstr "Nu s-a putut aduce fișierul, serverul a spus „%s”" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Timp expirat pentru socket-ul de date" @@ -981,7 +981,7 @@ msgstr "Nu s-a putut realiza conexiunea cu %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Conectare la %s" @@ -1125,42 +1125,18 @@ msgstr "Conectare eșuată" msgid "Internal error" msgstr "Eroare internă" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Atins " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Luat:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ignorat " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Eroare" - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Aduși: %sB în %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [În lucru]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Schimbare de mediu: introduceți discul numit\n" -" „%s”\n" -"în unitatea „%s” și apăsați Enter\n" +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:93 msgid "Correcting dependencies..." @@ -1190,169 +1166,351 @@ msgstr "Ați putea să porniți 'apt-get -f install' pentru a corecta acestea." msgid "Unmet dependencies. Try using -f." msgstr "Dependențe neîndeplinite. Încercați să folosiți -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Instalat]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Avertisment de autentificare înlocuit.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [Instalat]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Unele pachete n-au putut fi autentificate" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Instalați aceste pachete fără verificare?" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Instalat]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Sunt unele probleme și -y a fost folosit fără --force-yes" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Instalat]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Eșec la aducerea lui %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!" - -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată." - -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Eroare internă, Ordering nu s-a terminat" +msgid "[upgradable from: %s]" +msgstr "" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" msgstr "" -"Ce ciudat... Dimensiunile nu se potrivesc, scrieți la 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 -#: apt-private/private-install.cc:155 +#: apt-private/private-output.cc:455 #, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "Este nevoie să descărcați %sB/%sB de arhive.\n" +msgid "but %s is installed" +msgstr "dar %s este instalat" -#. 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:160 +#: apt-private/private-output.cc:457 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "Este nevoie să descărcați %sB de arhive.\n" +msgid "but %s is to be installed" +msgstr "dar %s este pe cale de a fi instalat" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "După această operație vor fi folosiți din disc încă %sB.\n" +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "dar nu este instalabil" -#. 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:172 -#, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "dar este un pachet virtual" -#: apt-private/private-install.cc:200 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "Nu aveți suficient spațiu în %s." +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "dar nu este instalat" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "" -"A fost specificat 'doar neimportant' dar nu este o operațiune neimportantă." +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "dar nu este pe cale să fie instalat" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Da, fă cum îți spun!" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " sau" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Sunteți pe cale de a face ceva cu potențial distructiv.\n" -"Pentru a continua tastați fraza '%s'\n" -" ?] " +#: 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-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Renunțare." +#: 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-install.cc:243 -msgid "Do you want to continue?" -msgstr "Vreți să continuați?" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "Următoarele pachete vor fi ȘTERSE:" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Descărcarea unor fișiere a eșuat" +#: 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-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Nu s-au putut aduce unele arhive, poate ar fi o idee bună să rulați 'apt-get " -"update' sau încercați cu --fix-missing?" +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "Următoarele pachete vor fi ÎNNOITE:" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing și schimbul de mediu nu este deocamdată suportat" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" +msgstr "Următoarele pachete vor fi DE-GRADATE:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Nu pot corecta pachetele lipsă." +#: 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-install.cc:330 -msgid "Aborting install." -msgstr "Abandonez instalarea." +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (datorită %s) " -#: apt-private/private-install.cc:366 +#: apt-private/private-output.cc:696 msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: apt-private/private-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." +"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!" -# XXX: orice sugestie este bine-venită -#: apt-private/private-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover" - -#: apt-private/private-install.cc:499 -msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." -msgstr "" -"Hmm, se pare că AutoRemover a distrus ceva, lucru care n-ar trebui să se " -"întâmple. Sunteți rugat să trimiteți un raportați de defect pentru pachetul " -"apt." +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Eroare internă, Ordering nu s-a terminat" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Ce ciudat... Dimensiunile nu se potrivesc, scrieți la apt@packages.debian.org" + +#. 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Este nevoie să descărcați %sB/%sB de arhive.\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:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Este nevoie să descărcați %sB de arhive.\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:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "După această operație vor fi folosiți din disc încă %sB.\n" + +#. 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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Nu aveți suficient spațiu în %s." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Sunt unele probleme și -y a fost folosit fără --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "" +"A fost specificat 'doar neimportant' dar nu este o operațiune neimportantă." + +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Da, fă cum îți spun!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Sunteți pe cale de a face ceva cu potențial distructiv.\n" +"Pentru a continua tastați fraza '%s'\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Renunțare." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Vreți să continuați?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Descărcarea unor fișiere a eșuat" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Nu s-au putut aduce unele arhive, poate ar fi o idee bună să rulați 'apt-get " +"update' sau încercați cu --fix-missing?" + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing și schimbul de mediu nu este deocamdată suportat" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Nu pot corecta pachetele lipsă." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Abandonez instalarea." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "" + +# XXX: orice sugestie este bine-venită +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover" + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"Hmm, se pare că AutoRemover a distrus ceva, lucru care n-ar trebui să se " +"întâmple. Sunteți rugat să trimiteți un raportați de defect pentru pachetul " +"apt." + +#. #. if (Packages == 1) #. { #. c1out << std::endl; @@ -1486,208 +1644,26 @@ 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:129 -msgid "Listing" -msgstr "" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!" -#: apt-private/private-list.cc:159 -#, 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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Avertisment de autentificare înlocuit.\n" -#: 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:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Unele pachete n-au putut fi autentificate" -#: 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:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Eroare de compilare expresie regulată - %s" - -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Instalați aceste pachete fără verificare?" -#: apt-private/private-show.cc:156 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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 "" +msgid "Failed to fetch %s %s\n" +msgstr "Eșec la aducerea lui %s %s\n" #: apt-private/private-sources.cc:58 #, fuzzy, c-format @@ -1699,21 +1675,8 @@ msgstr "Eșec la redenumirea lui %s în %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: 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:90 -#, 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:94 -msgid "All packages are up to date." +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" #: apt-private/private-upgrade.cc:25 @@ -1724,20 +1687,57 @@ msgstr "Calculez înnoirea... " msgid "Done" msgstr "Terminat" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Atins " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Luat:" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ignorat " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Eroare" + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Aduși: %sB în %s (%sB/s)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [În lucru]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Schimbare de mediu: introduceți discul numit\n" +" „%s”\n" +"în unitatea „%s” și apăsați Enter\n" + #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, 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:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1771,7 +1771,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Eșec la crearea conexiunii IPC către subproces" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "Conexiune închisă prematur" @@ -1814,666 +1814,574 @@ msgstr "" msgid "Merging available information" msgstr "Se combină informațiile disponibile" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n" -"\n" -"apt-extracttemplates este o unealtă pentru extragerea informațiilor \n" -"de configurare și a șabloanelor dintr-un pachet Debian\n" -"\n" -"Opțiuni\n" -" -h Acest text de ajutor.\n" -" -t Impune directorul temporar\n" -" -c=? Citește acest fișier de configurare\n" -" -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" - -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Nu se poate executa „stat” pe %s" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "S-a chemat DropNode pe un nod încă „legat”" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "Nu s-a putut scrie în %s" +# XXX: nu-mi place, fie e hash, fie „element de dispersie” +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Eșec la localizarea elementului de dispersie!" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Nu s-a putut citi versiunea debconf. Este instalat debconf?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Eșec la alocarea redirectării" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Lista de extensii pentru pachet este prea lungă" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Eroare internă în „AddDiversion”" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "Eroare la prelucrarea directorului %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Lista de extensii pentru sursă este prea lungă" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Eroare la scrierea antetului în fișierul index" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Încercare de suprascriere a redirectării, %s -> %s și %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "Eroare la prelucrarea conținutului %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Utilizare: apt-ftparchive [opțiuni] comanda\n" -"Comenzi: packages cale_binare [fișier_înlocuire [prefix_cale]]\n" -" sources cale_src [fișier_înlocuire [prefix_cale]]\n" -" contents cale\n" -" release cale\n" -" generate config [grupuri]\n" -" clean config\n" -"\n" -"apt-ftparchive generează fișiere de indexare pentru arhivele Debian. " -"Suportă\n" -"multe stiluri de generare de la complet automat la înlocuiri funcționale\n" -"pentru dpkg-scanpackage și dpkg-scansources\n" -"\n" -"apt-ftparchive generează fișierele Package dintr-un arbore de .deb-uri.\n" -"Fișierul Pachet înglobează conținutul tuturor câmpurilor de control din " -"fiecare\n" -"pachet cât și MD5 hash și dimensiunea fișierului. Un fișier de înlocuire " -"este\n" -"furnizat pentru a forța valoarea Priorității și Secțiunii.\n" -"\n" -"În mod asemănator apt-ftparchive generează fișierele Sources dintr-un arbore " -"de .dsc-uri.\n" -"Opțiunea --source-override poate fi folosită pentru a specifica fișierul de " -"înlocuire\n" -"\n" -"Comenzile 'packages' și 'sources' ar trebui executate în rădăcina " -"arborelui.\n" -"Cale_binare ar trebui să indice baza căutării recursive și fișierul de " -"înlocuire ar\n" -"trebui să conțină semnalizatorul de înlocuire. Prefix_cale este adăugat " -"câmpului\n" -"de nume fișier dacă acesta este prezent. Exemplu de utilizare din arhiva\n" -"Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Opțiuni:\n" -" -h Acest text de ajutor.\n" -" --md5 Generarea controlului MD5\n" -" -s=? Fișierul de înlocuire pentru surse\n" -" -q În liniște\n" -" -d=? Selectează baza de date de cache opțională\n" -" --no-delink Activează modul de depanare dezlegare\n" -" --contents Generarea fișierului cu sumarul de control\n" -" -c=? Citește acest fișier de configurare\n" -" -o=? Ajustează o opțiune de configurare arbitrară" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Nu s-a potrivit nici o selecție" +msgid "Double add of diversion %s -> %s" +msgstr "Adăugare dublă de redirectare %s -> %s" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Unele fișiere lipsesc din grupul fișierului pachet '%s'" +msgid "Duplicate conf file %s/%s" +msgstr "Fișier „conf” duplicat %s/%s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB a fost corupt, fișierul a fost redenumit %s.old" +msgid "The path %s is too long" +msgstr "Calea %s este prea lungă" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "DB este vechi, se încearcă înnoirea %s" +msgid "Unpacking %s more than once" +msgstr "Se despachetează %s de mai multe ori" -#: ftparchive/cachedb.cc:94 -#, fuzzy -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"Formatul DB este nevalid. Dacă l-ați înnoit pe apt de la o versiune mai " -"veche, ștergeți și recreați baza de date." +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "Directorul %s este redirectat" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Nu s-a putut deschide fișierul DB %s: %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Pachetul încearcă să scrie în ținta redirectării %s/%s" + +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Calea de redirectare este prea lungă" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Eșec la „stat” pentru %s" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Eșec la „readlink” pentru %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Arhiva nu are înregistrare de control" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Nu s-a putut obține un cursor" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "A: Nu s-a putut citi directorul %s\n" +msgid "Failed to rename %s to %s" +msgstr "Eșec la redenumirea lui %s în %s" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "A: Nu s-a putut efectua „stat” pentru %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "Directorul %s este înlocuit de un non-director" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "A: " +# XXX: nu-mi place, hash bucket ar trebui tradus mai elegant +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Eșec la localizarea nodului în clasa lui din tabela de dispersie" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: Erori la fișierul " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Calea este prea lungă" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "Eșec la „resolve” pentru %s" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Parcurgerea arborelui a eșuat" +msgid "Overwrite package match with no version for %s" +msgstr "Pachet suprascris fără nici o versiune pentru %s" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to open %s" -msgstr "Eșec la „open” pentru %s" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Fișierul %s/%s îl suprascrie pe cel din pachetul %s" -#: ftparchive/writer.cc:278 +#: apt-inst/extract.cc:498 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " Dezlegare %s [%s]\n" +msgid "Unable to stat %s" +msgstr "Nu se poate executa „stat” pe %s" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Failed to readlink %s" -msgstr "Eșec la „readlink” pentru %s" +msgid "Failed to write file %s" +msgstr "Eșec la scrierea fișierului %s" -#: ftparchive/writer.cc:290 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to unlink %s" -msgstr "Eșec la „unlink” pentru %s" +msgid "Failed to close file %s" +msgstr "Eșec la închiderea fișierului %s" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Eșec la „link” între %s și %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Aceasta nu este o arhivă DEB validă, lipsește membrul „%s”" -#: ftparchive/writer.cc:308 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Limita de %sB a dezlegării a fost atinsă.\n" - -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Arhiva nu are câmp de pachet" +msgid "Internal error, could not locate member %s" +msgstr "Eroare internă, nu pot localiza membrul %s" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s nu are intrare de înlocuire\n" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Fișier de control neanalizabil" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " %s responsabil este %s nu %s\n" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Semnătură de arhivă necorespunzătoare" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s nu are nici o intrare sursă de înlocuire\n" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Eroare la citirea antetului membrului arhivei" -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s nu are nici intrare binară de înlocuire\n" +#: apt-inst/contrib/arfile.cc:96 +#, fuzzy, c-format +msgid "Invalid archive member header %s" +msgstr "Antet de membru de arhivă necorespunzător" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Eșec la alocarea memoriei" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Antet de membru de arhivă necorespunzător" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Nu s-a putut deschide %s" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Arhiva este prea scurtă" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Înlocuire greșită %s linia %lu #1" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Eșec la citirea antetelor arhivei" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Eșec la citirea fișierului de înlocuire a permisiunilor %s" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Eșec la crearea conexiunilor" -#: ftparchive/override.cc:166 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Înlocuire greșită %s linia %lu #1" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Eșec la executarea lui gzip " -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Înlocuire greșită %s linia %lu #2" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Arhivă deteriorată" -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Înlocuire greșită %s linia %lu #3" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "" +"Suma de control a arhivei tar nu s-a verificat, arhiva este deteriorată" -#: ftparchive/multicompress.cc:73 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Algoritm de compresie necunoscut '%s'" +msgid "Unknown TAR header type %u, member %s" +msgstr "Tip antet TAR %u necunoscut, membrul %s" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Rezultatul comprimat %s are nevoie de o ajustare a compresiei" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Eșec la crearea FIȘIERULUI*" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Eșec la „fork”" +msgid "Progress: [%3i%%]" +msgstr "" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Comprimare copil" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/init.cc:146 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Eroare internă, eșec la crearea lui %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "IE către subproces/fișier eșuat" +msgid "Packaging system '%s' is not supported" +msgstr "Sistemul de pachete '%s' nu este suportat" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Eșec la citire în timpul calculului sumei MD5" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Nu s-a putut determina un tip de sistem de împachetare potrivit" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Problem unlinking %s" -msgstr "Problemă la desfacerea %s" +msgid "Wrote %i records.\n" +msgstr "S-au scris %i înregistrări.\n" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Eșec la redenumirea lui %s în %s" - -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n" -"\n" -"apt-extracttemplates este o unealtă pentru extragerea informațiilor \n" -"de configurare și a șabloanelor dintr-un pachet Debian\n" -"\n" -"Opțiuni\n" -" -h Acest text de ajutor.\n" -" -t Impune directorul temporar\n" -" -c=? Citește acest fișier de configurare\n" -" -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "S-au scris %i înregistrări cu %i fișiere lipsă.\n" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Înregistrare de pachet necunoscut!" +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "S-au scris %i înregistrări cu %i fișiere nepotrivite\n" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"Utilizare: apt-sortpkgs [opțiuni] fișier1 [fișier2 ...]\n" -"\n" -"apt-sortpkgs este o unealtă simplă pentru sortarea fișierelor pachete. \n" -"Opțiunea -s este folosită pentru a indica ce fel de fișier este.\n" -"\n" -"Opțiuni:\n" -" -h Acest text de ajutor\n" -" -s Folosește sortarea de fișiere-sursă\n" -" -c=? Citește acest fișier de configurare\n" -" -o=? Ajustează o opțiune de configurare arbitrară, ex.: -o dir::cache=/" -"tmp\n" +"S-au scris %i înregistrări cu %i fișiere lipsă și %i fișiere nepotrivite\n" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Failed to write file %s" -msgstr "Eșec la scrierea fișierului %s" +msgid "Can't find authentication record for: %s" +msgstr "" -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "Eșec la închiderea fișierului %s" +#: apt-pkg/indexcopy.cc:521 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Nepotrivire la suma de căutare" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "The path %s is too long" -msgstr "Calea %s este prea lungă" +msgid "The method driver %s could not be found." +msgstr "Metoda driver %s nu poate fi găsită." -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" -msgstr "Se despachetează %s de mai multe ori" +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n" -#: apt-inst/extract.cc:142 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "The directory %s is diverted" -msgstr "Directorul %s este redirectat" +msgid "Method %s did not start correctly" +msgstr "Metoda %s nu s-a lansat corect" -#: apt-inst/extract.cc:152 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Pachetul încearcă să scrie în ținta redirectării %s/%s" +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-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Calea de redirectare este prea lungă" - -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Directorul %s este înlocuit de un non-director" - -# XXX: nu-mi place, hash bucket ar trebui tradus mai elegant -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Eșec la localizarea nodului în clasa lui din tabela de dispersie" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "" +"Listele de pachete sau fișierul de stare n-au putut fi analizate sau " +"deschise." -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Calea este prea lungă" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"Ați putea vrea să porniți 'apt-get update' pentru a corecta aceste probleme." -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Pachet suprascris fără nici o versiune pentru %s" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Lista surselor nu poate fi citită." -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Fișierul %s/%s îl suprascrie pe cel din pachetul %s" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Cache gol de pachet" -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "Nu se poate executa „stat” pe %s" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Cache-ul fișierului pachet este deteriorat" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "S-a chemat DropNode pe un nod încă „legat”" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Fișierul cache al pachetului este o versiune incompatibilă" -# XXX: nu-mi place, fie e hash, fie „element de dispersie” -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Eșec la localizarea elementului de dispersie!" +#: apt-pkg/pkgcache.cc:169 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "Cache-ul fișierului pachet este deteriorat" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Eșec la alocarea redirectării" +#: apt-pkg/pkgcache.cc:174 +#, c-format +msgid "This APT does not support the versioning system '%s'" +msgstr "Acest APT nu suportă versioning system '%s'" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Eroare internă în „AddDiversion”" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Cache-ul pachetului a fost construit pentru o arhitectură diferită" -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Încercare de suprascriere a redirectării, %s -> %s și %s/%s" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Depinde" -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Adăugare dublă de redirectare %s -> %s" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Pre-depinde" -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Fișier „conf” duplicat %s/%s" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Sugerează" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Semnătură de arhivă necorespunzătoare" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Recomandă" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Eroare la citirea antetului membrului arhivei" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Este în conflict" -#: apt-inst/contrib/arfile.cc:96 -#, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "Antet de membru de arhivă necorespunzător" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Înlocuiește" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Antet de membru de arhivă necorespunzător" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Învechit" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Arhiva este prea scurtă" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Corupe" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Eșec la citirea antetelor arhivei" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Eșec la crearea conexiunilor" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "important" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Eșec la executarea lui gzip " +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "cerut" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Arhivă deteriorată" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "standard" -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "" -"Suma de control a arhivei tar nu s-a verificat, arhiva este deteriorată" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "opțional" -#: apt-inst/contrib/extracttar.cc:308 -#, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Tip antet TAR %u necunoscut, membrul %s" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "extra" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Aceasta nu este o arhivă DEB validă, lipsește membrul „%s”" +msgid "Index file type '%s' is not supported" +msgstr "Tipul de fișier index '%s' nu este suportat" -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "Eroare internă, nu pot localiza membrul %s" +#: 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-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Fișier de control neanalizabil" +#: 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/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/sourcelist.cc:173 #, fuzzy, c-format -msgid "List directory %spartial is missing." -msgstr "Directorul de liste %spartial lipsește." +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "Linie greșită %lu în lista sursă %s (dist)" -#: apt-pkg/acquire.cc:91 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format -msgid "Archives directory %spartial is missing." -msgstr "Directorul de arhive %spartial lipsește." +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/acquire.cc:99 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "Nu pot încuia directorul cu lista" +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/acquire.cc:490 apt-pkg/clean.cc:39 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "Tipul de fișier index '%s' nu este suportat" +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.)" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Se descarcă fișierul %li din %li (%s rămas)" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Linie greșită %lu în lista sursă %s (URI)" -#: apt-pkg/acquire.cc:904 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Retrieving file %li of %li" -msgstr "Se descarcă fișierul %li din %li" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Linie greșită %lu în lista sursă %s (dist)" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "redenumire eșuată, %s (%s -> %s)." +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Linie greșită %lu în lista sursă %s (analiza URI)" -#: apt-pkg/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "Nepotrivire la suma de căutare" +#: 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/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "Nepotrivire dimensiune" +#: 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/acquire-item.cc:173 -#, fuzzy -msgid "Invalid file format" -msgstr "Operațiune invalidă %s" +#: apt-pkg/sourcelist.cc:335 +#, c-format +msgid "Opening %s" +msgstr "Deschidere %s" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" -msgstr "" +msgid "Line %u too long in source list %s." +msgstr "Linia %u prea lungă în lista sursă %s." -#: apt-pkg/acquire-item.cc:1589 -#, 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/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:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Tipul de fișier index '%s' nu este suportat" + +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." +msgstr "Nu pot determina starea %s." + +#: apt-pkg/pkgcachegen.cc:93 +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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, 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:257 +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:260 +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:263 +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:266 +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:576 +#, 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:1211 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "Nu pot determina starea listei surse de pachete %s" + +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Citire liste de pachete" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Colectare furnizori fișier" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Nu s-a putut scrie în %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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:241 +msgid "Send request to solver" +msgstr "" + +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "" + +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" + +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "redenumire eșuată, %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "Nepotrivire la suma de căutare" + +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "Nepotrivire dimensiune" + +#: apt-pkg/acquire-item.cc:173 +#, fuzzy +msgid "Invalid file format" +msgstr "Operațiune invalidă %s" + +#: apt-pkg/acquire-item.cc:1640 +#, 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:1656 +#, 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:1631 +#: apt-pkg/acquire-item.cc:1698 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:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2481,12 +2389,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2495,12 +2403,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:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2508,126 +2416,104 @@ msgstr "" "Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la " "pachetul %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Metoda driver %s nu poate fi găsită." +msgid "Vendor block %s contains no fingerprint" +msgstr "Blocul vânzător %s nu conține amprentă" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n" +msgid "List directory %spartial is missing." +msgstr "Directorul de liste %spartial lipsește." -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 +#, fuzzy, c-format +msgid "Archives directory %spartial is missing." +msgstr "Directorul de arhive %spartial lipsește." + +#: apt-pkg/acquire.cc:99 +#, fuzzy, c-format +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:902 #, c-format -msgid "Method %s did not start correctly" -msgstr "Metoda %s nu s-a lansat corect" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Se descarcă fișierul %li din %li (%s rămas)" -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:904 #, 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 "Retrieving file %li of %li" +msgstr "Se descarcă fișierul %li din %li" -#: apt-pkg/algorithms.cc:265 +#: 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/policy.cc:83 #, c-format msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -"Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el." -#: apt-pkg/algorithms.cc:1086 +#: apt-pkg/policy.cc:422 +#, fuzzy, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Înregistrare invalidă în fișierul de preferințe, fără antet de pachet" + +#: apt-pkg/policy.cc:444 +#, c-format +msgid "Did not understand pin type %s" +msgstr "Nu s-a înțeles tipul de pin %s" + +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Fără prioritate (sau zero) specificată pentru pin" + +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#, c-format msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -"Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi " -"cauzată de pachete ținute." -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Nu pot corecta problema, ați ținut pachete deteriorate." +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." +#: apt-pkg/packagemanager.cc:630 +#, 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 "" -"Listele de pachete sau fișierul de stare n-au putut fi analizate sau " -"deschise." +"Aceasta instalare va avea nevoie de ștergerea temporară a pachetului " +"esențial %s din cauza unui bucle conflict/pre-dependență. Asta de multe ori " +"nu-i de bine, dar dacă vreți întradevăr s-o faceți, activați opțiunea APT::" +"Force-LoopBreak." -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" +#: 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 "" -"Ați putea vrea să porniți 'apt-get update' pentru a corecta aceste probleme." - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Lista surselor nu poate fi citită." +"Descărcarea unor fișiere index a eșuat, acestea fie au fost ignorate, fie au " +"fost folosite în loc unele vechi." -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Release '%s' pentru '%s' n-a fost găsită" +#: apt-pkg/cdrom.cc:571 +msgid "Unmounting CD-ROM...\n" +msgstr "Se demontează CD-ul...\n" -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/cdrom.cc:586 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Versiunea '%s' pentru '%s' n-a fost găsită" - -#: apt-pkg/cacheset.cc:603 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "Nu s-a putut găsi sarcina %s" - -#: apt-pkg/cacheset.cc:609 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Nu pot găsi pachetul %s" - -#: apt-pkg/cacheset.cc:615 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Nu pot găsi pachetul %s" - -#: apt-pkg/cacheset.cc:626 -#, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "" - -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 -#, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" - -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" - -#: apt-pkg/cacheset.cc:655 -#, c-format -msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "" - -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" -msgstr "" - -#: 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/cdrom.cc:571 -msgid "Unmounting CD-ROM...\n" -msgstr "Se demontează CD-ul...\n" - -#: apt-pkg/cdrom.cc:586 -#, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "Utilizare punct de montare CD-ROM %s\n" +msgid "Using CD-ROM mount point %s\n" +msgstr "Utilizare punct de montare CD-ROM %s\n" #: apt-pkg/cdrom.cc:599 msgid "Waiting for disc...\n" @@ -2696,10 +2582,24 @@ msgstr "Scriere noua listă sursă\n" msgid "Source list entries for this disc are:\n" msgstr "Intrările listei surselor pentru acest disc sunt:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Nu pot determina starea %s." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi " +"cauzată de pachete ținute." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Nu pot corecta problema, ați ținut pachete deteriorate." #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2727,56 +2627,67 @@ msgstr "Eșec la deschiderea fișierului de stare %s" msgid "Failed to write temporary StateFile %s" msgstr "Eșec la scrierea fișierului temporar de stare %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Nu s-a putut analiza fișierul pachet %s (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Nu s-a putut analiza fișierul pachet %s (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Release '%s' pentru '%s' n-a fost găsită" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Versiunea '%s' pentru '%s' n-a fost găsită" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "Nu s-a putut găsi sarcina %s" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 -#, c-format -msgid "Wrote %i records.\n" -msgstr "S-au scris %i înregistrări.\n" +#: apt-pkg/cacheset.cc:609 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "Nu pot găsi pachetul %s" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Nu pot găsi pachetul %s" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "S-au scris %i înregistrări cu %i fișiere lipsă.\n" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "S-au scris %i înregistrări cu %i fișiere nepotrivite\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -"S-au scris %i înregistrări cu %i fișiere lipsă și %i fișiere nepotrivite\n" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "Nepotrivire la suma de căutare" +#: apt-pkg/cacheset.cc:663 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" #: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format @@ -2803,324 +2714,221 @@ msgstr "Linie necorespunzătoare în fișierul-redirectare: %s" msgid "Invalid 'Date' entry in Release file %s" msgstr "Nu s-a putut analiza fișierul pachet %s (1)" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Sistemul de pachete '%s' nu este suportat" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Nu s-a putut determina un tip de sistem de împachetare potrivit" +msgid "%lid %lih %limin %lis" +msgstr "" -#: apt-pkg/install-progress.cc:57 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Progress: [%3i%%]" +msgid "%lih %limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 +#, c-format +msgid "%limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "%lis" msgstr "" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "Nu s-a putut deschide fișierul %s" +#: apt-pkg/contrib/strutl.cc:1258 +#, c-format +msgid "Selection %s not found" +msgstr "Selecția %s nu a fost găsită" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" -"Aceasta instalare va avea nevoie de ștergerea temporară a pachetului " -"esențial %s din cauza unui bucle conflict/pre-dependență. Asta de multe ori " -"nu-i de bine, dar dacă vreți întradevăr s-o faceți, activați opțiunea APT::" -"Force-LoopBreak." +msgid "Not using locking for read only lock file %s" +msgstr "Nu s-a folosit închiderea pentru fișierul disponibil doar-citire %s" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Cache gol de pachet" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "Nu pot deschide fișierul blocat %s" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Cache-ul fișierului pachet este deteriorat" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Nu este folosit blocajul pentru fișierul montat nfs %s" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Fișierul cache al pachetului este o versiune incompatibilă" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Nu pot determina blocajul %s" -#: apt-pkg/pkgcache.cc:169 -#, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "Cache-ul fișierului pachet este deteriorat" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:394 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Acest APT nu suportă versioning system '%s'" +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "Cache-ul pachetului a fost construit pentru o arhitectură diferită" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Depinde" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Pre-depinde" - -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Sugerează" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Recomandă" - -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Este în conflict" - -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Înlocuiește" - -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Învechit" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Subprocesul %s a primit o eroare de segmentare." -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Corupe" +#: apt-pkg/contrib/fileutl.cc:826 +#, fuzzy, c-format +msgid "Sub-process %s received signal %u." +msgstr "Subprocesul %s a primit o eroare de segmentare." -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Subprocesul %s a întors un cod de eroare (%u)" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "important" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Subprocesul %s s-a terminat brusc" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "cerut" +#: apt-pkg/contrib/fileutl.cc:913 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problemă la închiderea fișierului" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "standard" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "opțional" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, fuzzy, c-format +msgid "Could not open file descriptor %d" +msgstr "Nu s-a putut deschide conexiunea pentru %s" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "extra" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Eșec la crearea IPC-ului pentru subproces" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Cache are un versioning system incompatibil" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Eșec la executarea compresorului" -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Eroare apărută în timpul procesării %s (FindPkg)" +msgid "read, still have %llu to read but none left" +msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic" -#: apt-pkg/pkgcachegen.cc:257 -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/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, fuzzy, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "scriere, încă mai am %lu de scris dar nu pot" -#: apt-pkg/pkgcachegen.cc:260 -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/contrib/fileutl.cc:1915 +#, fuzzy, c-format +msgid "Problem closing the file %s" +msgstr "Problemă la închiderea fișierului" -#: apt-pkg/pkgcachegen.cc:263 -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/contrib/fileutl.cc:1927 +#, fuzzy, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Problemă în timpul sincronizării fișierului" -#: apt-pkg/pkgcachegen.cc:266 -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/contrib/fileutl.cc:1938 +#, fuzzy, c-format +msgid "Problem unlinking the file %s" +msgstr "Problemă la dezlegarea fișierului" -#: apt-pkg/pkgcachegen.cc:576 -#, 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/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Problemă în timpul sincronizării fișierului" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Nu pot determina starea listei surse de pachete %s" - -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Citire liste de pachete" - -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Colectare furnizori fișier" - -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Eroare IO în timpul salvării sursei cache" +msgid "%c%s... Error!" +msgstr "%c%s... Eroare!" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Tipul de fișier index '%s' nu este suportat" +msgid "%c%s... Done" +msgstr "%c%s... Terminat" -#: 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" +#: apt-pkg/contrib/progress.cc:181 +msgid "..." msgstr "" -#: apt-pkg/policy.cc:422 +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Înregistrare invalidă în fișierul de preferințe, fără antet de pachet" - -#: apt-pkg/policy.cc:444 -#, c-format -msgid "Did not understand pin type %s" -msgstr "Nu s-a înțeles tipul de pin %s" +msgid "%c%s... %u%%" +msgstr "%c%s... Terminat" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Fără prioritate (sau zero) specificată pentru pin" +#: 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" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/mmap.cc:111 #, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Linie greșită %lu în lista sursă %s (analiza URI)" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Nu s-a putut deschide conexiunea pentru %s" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/mmap.cc:119 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" +msgid "Couldn't make mmap of %llu bytes" +msgstr "Nu s-a putut face mmap cu %lu octeți" -#: 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/contrib/mmap.cc:146 +#, fuzzy +msgid "Unable to close mmap" +msgstr "Nu s-a putut deschide %s" -#: 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/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "Nu s-a putut invoca" -#: 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/contrib/mmap.cc:290 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "Nu s-a putut face mmap cu %lu octeți" -#: 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/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Eșec la trunchierea fișierului" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/contrib/mmap.cc:341 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Linie greșită %lu în lista sursă %s (URI)" +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Linie greșită %lu în lista sursă %s (dist)" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" -#: 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/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" -#: 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: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/srcrecords.cc:52 -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/tagfile.cc:140 -#, 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:237 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Nu s-a putut analiza fișierul pachet %s (2)" - -#: 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/vendorlist.cc:85 -#, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Blocul vânzător %s nu conține amprentă" - -#: apt-pkg/contrib/cdromutl.cc:65 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format msgid "Unable to stat the mount point %s" msgstr "Nu pot determina starea punctului de montare %s" @@ -3129,53 +2937,6 @@ 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/cmndline.cc:121 -#, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, 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:168 -#, 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:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "Opțiunea %s necesită un argument" - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "" -"Opțiunea %s: Specificația configurării articolului trebuie să aibă o =." - -#: apt-pkg/contrib/cmndline.cc:278 -#, 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:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "Opțiunea '%s' este prea lungă" - -#: apt-pkg/contrib/cmndline.cc:341 -#, 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:391 -#, c-format -msgid "Invalid operation %s" -msgstr "Operațiune invalidă %s" - #: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" @@ -3233,386 +2994,620 @@ msgstr "" 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/fileutl.cc:190 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Abandonez instalarea." + +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Nu s-a folosit închiderea pentru fișierul disponibil doar-citire %s" +msgid "Command line option '%c' [from %s] is not known." +msgstr "Opțiunea linie de comandă '%c' [din %s] este necunoscută." -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Could not open lock file %s" -msgstr "Nu pot deschide fișierul blocat %s" +msgid "Command line option %s is not understood" +msgstr "Opțiunea linie de comandă %s nu este înțeleasă" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Nu este folosit blocajul pentru fișierul montat nfs %s" +msgid "Command line option %s is not boolean" +msgstr "Opțiunea linie de comandă %s nu este booleană" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "Could not get lock %s" -msgstr "Nu pot determina blocajul %s" +msgid "Option %s requires an argument." +msgstr "Opțiunea %s necesită un argument" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "List of files can't be created as '%s' is not a directory" +msgid "Option %s: Configuration item specification must have an =." msgstr "" +"Opțiunea %s: Specificația configurării articolului trebuie să aibă o =." -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Opțiunea %s necesită un argument integru, nu '%s'" -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" +msgid "Option '%s' is too long" +msgstr "Opțiunea '%s' este prea lungă" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" +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/fileutl.cc:824 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Subprocesul %s a primit o eroare de segmentare." +msgid "Invalid operation %s" +msgstr "Operațiune invalidă %s" -#: apt-pkg/contrib/fileutl.cc:826 -#, fuzzy, c-format -msgid "Sub-process %s received signal %u." -msgstr "Subprocesul %s a primit o eroare de segmentare." +#: apt-pkg/deb/dpkgpm.cc:110 +#, c-format +msgid "Installing %s" +msgstr "Se instalează %s" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Subprocesul %s a întors un cod de eroare (%u)" +msgid "Configuring %s" +msgstr "Se configurează %s" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Subprocesul %s s-a terminat brusc" +msgid "Removing %s" +msgstr "Se șterge %s" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/dpkgpm.cc:113 #, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problemă la închiderea fișierului" +msgid "Completely removing %s" +msgstr "Șters complet %s" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Could not open file %s" -msgstr "Nu s-a putut deschide fișierul %s" - -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 -#, fuzzy, c-format -msgid "Could not open file descriptor %d" -msgstr "Nu s-a putut deschide conexiunea pentru %s" +msgid "Noting disappearance of %s" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Eșec la crearea IPC-ului pentru subproces" +#: apt-pkg/deb/dpkgpm.cc:115 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Se rulează declanșatorul post-instalare %s" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Eșec la executarea compresorului" +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 +#, c-format +msgid "Directory '%s' missing" +msgstr "Directorul „%s” lipsește." -#: apt-pkg/contrib/fileutl.cc:1514 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, fuzzy, c-format -msgid "read, still have %llu to read but none left" -msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic" +msgid "Could not open file '%s'" +msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, fuzzy, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "scriere, încă mai am %lu de scris dar nu pot" +#: apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Preparing %s" +msgstr "Se pregătește %s" -#: apt-pkg/contrib/fileutl.cc:1915 -#, fuzzy, c-format -msgid "Problem closing the file %s" -msgstr "Problemă la închiderea fișierului" +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr "Se despachetează %s" -#: apt-pkg/contrib/fileutl.cc:1927 -#, fuzzy, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Problemă în timpul sincronizării fișierului" +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing to configure %s" +msgstr "Se pregătește configurarea %s" -#: apt-pkg/contrib/fileutl.cc:1938 -#, fuzzy, c-format -msgid "Problem unlinking the file %s" -msgstr "Problemă la dezlegarea fișierului" +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr "Instalat %s" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Problemă în timpul sincronizării fișierului" +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "Se pregătește ștergerea lui %s" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Abandonez instalarea." +#: apt-pkg/deb/dpkgpm.cc:1022 +#, c-format +msgid "Removed %s" +msgstr "Șters %s" -#: 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" +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Se pregătește ștergerea completă a %s" -#: apt-pkg/contrib/mmap.cc:111 -#, fuzzy, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Nu s-a putut deschide conexiunea pentru %s" +#: apt-pkg/deb/dpkgpm.cc:1028 +#, c-format +msgid "Completely removed %s" +msgstr "Șters complet %s" -#: apt-pkg/contrib/mmap.cc:119 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Nu s-a putut face mmap cu %lu octeți" +msgid "Can not write log (%s)" +msgstr "Nu s-a putut scrie în %s" -#: apt-pkg/contrib/mmap.cc:146 -#, fuzzy -msgid "Unable to close mmap" -msgstr "Nu s-a putut deschide %s" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -#, fuzzy -msgid "Unable to synchronize mmap" -msgstr "Nu s-a putut invoca" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Nu s-a putut face mmap cu %lu octeți" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Eșec la trunchierea fișierului" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "" -#: apt-pkg/contrib/mmap.cc:341 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1726 msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -#: apt-pkg/contrib/mmap.cc:446 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1732 msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +"No apport report written because the error message indicates a disk full " +"error" msgstr "" -#: apt-pkg/contrib/mmap.cc:449 +#: apt-pkg/deb/dpkgpm.cc:1739 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"No apport report written because the error message indicates a out of memory " +"error" msgstr "" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "%c%s... Error!" -msgstr "%c%s... Eroare!" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" -#: apt-pkg/contrib/progress.cc:150 +#: 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 "%c%s... Done" -msgstr "%c%s... Terminat" +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgstr "" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" msgstr "" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n" +"\n" +"apt-extracttemplates este o unealtă pentru extragerea informațiilor \n" +"de configurare și a șabloanelor dintr-un pachet Debian\n" +"\n" +"Opțiuni\n" +" -h Acest text de ajutor.\n" +" -t Impune directorul temporar\n" +" -c=? Citește acest fișier de configurare\n" +" -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:254 #, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Terminat" +msgid "Unable to mkstemp %s" +msgstr "Nu se poate executa „stat” pe %s" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: cmdline/apt-extracttemplates.cc:300 +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 +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 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "" +msgid "Error processing directory %s" +msgstr "Eroare la prelucrarea directorului %s" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Lista de extensii pentru sursă este prea lungă" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Eroare la scrierea antetului în fișierul index" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "%lih %limin %lis" +msgid "Error processing contents %s" +msgstr "Eroare la prelucrarea conținutului %s" + +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" +"Utilizare: apt-ftparchive [opțiuni] comanda\n" +"Comenzi: packages cale_binare [fișier_înlocuire [prefix_cale]]\n" +" sources cale_src [fișier_înlocuire [prefix_cale]]\n" +" contents cale\n" +" release cale\n" +" generate config [grupuri]\n" +" clean config\n" +"\n" +"apt-ftparchive generează fișiere de indexare pentru arhivele Debian. " +"Suportă\n" +"multe stiluri de generare de la complet automat la înlocuiri funcționale\n" +"pentru dpkg-scanpackage și dpkg-scansources\n" +"\n" +"apt-ftparchive generează fișierele Package dintr-un arbore de .deb-uri.\n" +"Fișierul Pachet înglobează conținutul tuturor câmpurilor de control din " +"fiecare\n" +"pachet cât și MD5 hash și dimensiunea fișierului. Un fișier de înlocuire " +"este\n" +"furnizat pentru a forța valoarea Priorității și Secțiunii.\n" +"\n" +"În mod asemănator apt-ftparchive generează fișierele Sources dintr-un arbore " +"de .dsc-uri.\n" +"Opțiunea --source-override poate fi folosită pentru a specifica fișierul de " +"înlocuire\n" +"\n" +"Comenzile 'packages' și 'sources' ar trebui executate în rădăcina " +"arborelui.\n" +"Cale_binare ar trebui să indice baza căutării recursive și fișierul de " +"înlocuire ar\n" +"trebui să conțină semnalizatorul de înlocuire. Prefix_cale este adăugat " +"câmpului\n" +"de nume fișier dacă acesta este prezent. Exemplu de utilizare din arhiva\n" +"Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Opțiuni:\n" +" -h Acest text de ajutor.\n" +" --md5 Generarea controlului MD5\n" +" -s=? Fișierul de înlocuire pentru surse\n" +" -q În liniște\n" +" -d=? Selectează baza de date de cache opțională\n" +" --no-delink Activează modul de depanare dezlegare\n" +" --contents Generarea fișierului cu sumarul de control\n" +" -c=? Citește acest fișier de configurare\n" +" -o=? Ajustează o opțiune de configurare arbitrară" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Nu s-a potrivit nici o selecție" + +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "%limin %lis" +msgid "Some files are missing in the package file group `%s'" +msgstr "Unele fișiere lipsesc din grupul fișierului pachet '%s'" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB a fost corupt, fișierul a fost redenumit %s.old" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "DB este vechi, se încearcă înnoirea %s" + +#: ftparchive/cachedb.cc:94 +#, fuzzy +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" +"Formatul DB este nevalid. Dacă l-ați înnoit pe apt de la o versiune mai " +"veche, ștergeți și recreați baza de date." + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Nu s-a putut deschide fișierul DB %s: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Eșec la „readlink” pentru %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Arhiva nu are înregistrare de control" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Nu s-a putut obține un cursor" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:91 #, c-format -msgid "%lis" -msgstr "" +msgid "W: Unable to read directory %s\n" +msgstr "A: Nu s-a putut citi directorul %s\n" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:96 #, c-format -msgid "Selection %s not found" -msgstr "Selecția %s nu a fost găsită" +msgid "W: Unable to stat %s\n" +msgstr "A: Nu s-a putut efectua „stat” pentru %s\n" -#: apt-pkg/deb/debsystem.cc:91 -#, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " -#: 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" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "A: " -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: Erori la fișierul " + +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "" +msgid "Failed to resolve %s" +msgstr "Eșec la „resolve” pentru %s" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Parcurgerea arborelui a eșuat" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:219 #, c-format -msgid "Installing %s" -msgstr "Se instalează %s" +msgid "Failed to open %s" +msgstr "Eșec la „open” pentru %s" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:278 #, c-format -msgid "Configuring %s" -msgstr "Se configurează %s" +msgid " DeLink %s [%s]\n" +msgstr " Dezlegare %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:286 #, c-format -msgid "Removing %s" -msgstr "Se șterge %s" - -#: apt-pkg/deb/dpkgpm.cc:98 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "Șters complet %s" +msgid "Failed to readlink %s" +msgstr "Eșec la „readlink” pentru %s" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:290 #, c-format -msgid "Noting disappearance of %s" -msgstr "" +msgid "Failed to unlink %s" +msgstr "Eșec la „unlink” pentru %s" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:298 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Se rulează declanșatorul post-instalare %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Eșec la „link” între %s și %s" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:308 #, c-format -msgid "Directory '%s' missing" -msgstr "Directorul „%s” lipsește." +msgid " DeLink limit of %sB hit.\n" +msgstr " Limita de %sB a dezlegării a fost atinsă.\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "Nu s-a putut deschide fișierul %s" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Arhiva nu are câmp de pachet" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Preparing %s" -msgstr "Se pregătește %s" +msgid " %s has no override entry\n" +msgstr " %s nu are intrare de înlocuire\n" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Unpacking %s" -msgstr "Se despachetează %s" +msgid " %s maintainer is %s not %s\n" +msgstr " %s responsabil este %s nu %s\n" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing to configure %s" -msgstr "Se pregătește configurarea %s" +msgid " %s has no source override entry\n" +msgstr " %s nu are nici o intrare sursă de înlocuire\n" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/writer.cc:710 #, c-format -msgid "Installed %s" -msgstr "Instalat %s" +msgid " %s has no binary override entry either\n" +msgstr " %s nu are nici intrare binară de înlocuire\n" -#: apt-pkg/deb/dpkgpm.cc:1005 -#, c-format -msgid "Preparing for removal of %s" -msgstr "Se pregătește ștergerea lui %s" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Eșec la alocarea memoriei" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Removed %s" -msgstr "Șters %s" +msgid "Unable to open %s" +msgstr "Nu s-a putut deschide %s" -#: apt-pkg/deb/dpkgpm.cc:1012 -#, c-format -msgid "Preparing to completely remove %s" -msgstr "Se pregătește ștergerea completă a %s" +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Înlocuire greșită %s linia %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Completely removed %s" -msgstr "Șters complet %s" +msgid "Failed to read the override file %s" +msgstr "Eșec la citirea fișierului de înlocuire a permisiunilor %s" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/override.cc:166 #, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Nu s-a putut scrie în %s" +msgid "Malformed override %s line %llu #1" +msgstr "Înlocuire greșită %s linia %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "Înlocuire greșită %s linia %lu #2" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "Înlocuire greșită %s linia %lu #3" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" +#: ftparchive/multicompress.cc:73 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Algoritm de compresie necunoscut '%s'" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Rezultatul comprimat %s are nevoie de o ajustare a compresiei" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Eșec la crearea FIȘIERULUI*" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Eșec la „fork”" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Comprimare copil" -#: apt-pkg/deb/dpkgpm.cc:1707 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Eroare internă, eșec la crearea lui %s" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "IE către subproces/fișier eșuat" + +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Eșec la citire în timpul calculului sumei MD5" + +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Problemă la desfacerea %s" + +#: cmdline/apt-internal-solver.cc:49 +#, fuzzy msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n" +"\n" +"apt-extracttemplates este o unealtă pentru extragerea informațiilor \n" +"de configurare și a șabloanelor dintr-un pachet Debian\n" +"\n" +"Opțiuni\n" +" -h Acest text de ajutor.\n" +" -t Impune directorul temporar\n" +" -c=? Citește acest fișier de configurare\n" +" -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Înregistrare de pachet necunoscut!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Utilizare: apt-sortpkgs [opțiuni] fișier1 [fișier2 ...]\n" +"\n" +"apt-sortpkgs este o unealtă simplă pentru sortarea fișierelor pachete. \n" +"Opțiunea -s este folosită pentru a indica ce fel de fișier este.\n" +"\n" +"Opțiuni:\n" +" -h Acest text de ajutor\n" +" -s Folosește sortarea de fișiere-sursă\n" +" -c=? Citește acest fișier de configurare\n" +" -o=? Ajustează o opțiune de configurare arbitrară, ex.: -o dir::cache=/" +"tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/ru.po b/po/ru.po index 93d5163fb..81cc4201c 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2012-06-30 08:47+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -163,7 +163,7 @@ msgid " Version table:" msgstr " Таблица версий:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -361,7 +361,7 @@ msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, исходный код которого необходимо получить" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходным кодом для %s" @@ -386,80 +386,80 @@ msgstr "" "bzr branch %s\n" "для получения последних (возможно не выпущенных) обновлений пакета.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаем уже скачанный файл «%s»\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо получить %sб архивов исходного кода.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Получение исходного кода %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось получить." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Указан режим «только скачивание», и скачивание завершено" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n" -#: cmdline/apt-get.cc:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки «%s» завершилась неудачно.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -468,17 +468,17 @@ msgstr "" "У %s отсутствует информация об архитектуре. Для её настройки смотрите apt." "conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -487,7 +487,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как %s не " "разрешён для пакетов «%s»" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -496,14 +496,14 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -512,7 +512,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как версия-" "кандидат пакета %s не может удовлетворить требованиям по версии" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -521,30 +521,30 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "имеет версии-кандидата" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog для %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -691,7 +691,7 @@ msgstr "%s уже помечен как не зафиксированный.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ожидалось завершение процесса %s, но он не был запущен" @@ -808,16 +808,16 @@ msgstr "Невозможно размонтировать CD-ROM в %s, возм msgid "Disk not found." msgstr "Диск не найден." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Файл не найден" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Не удалось получить атрибуты" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Не удалось установить время модификации" @@ -873,7 +873,7 @@ msgstr "" msgid "TYPE failed, server said: %s" msgstr "Команда TYPE не выполнена, сервер сообщил: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Допустимое время ожидания для соединения истекло" @@ -895,7 +895,7 @@ msgstr "Ответ переполнил буфер." msgid "Protocol corruption" msgstr "Искажение протокола" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -958,7 +958,7 @@ msgstr "Время установления соединения для соке msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Проблема при хешировании файла" @@ -967,7 +967,7 @@ msgstr "Проблема при хешировании файла" msgid "Unable to fetch file, server said '%s'" msgstr "Невозможно получить файл, сервер сообщил: «%s»" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Время ожидания соединения для сокета данных истекло" @@ -1017,7 +1017,7 @@ msgstr "Не удаётся соединиться с %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Соединение с %s" @@ -1158,42 +1158,18 @@ msgstr "Соединение разорвано" msgid "Internal error" msgstr "Внутренняя ошибка" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "В кэше " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Получено:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Игн " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Ош " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Получено %sБ за %s (%sБ/c)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Обработка]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Смена носителя: вставьте диск с меткой\n" -" «%s»\n" -"в устройство «%s» и нажмите ввод\n" +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:93 msgid "Correcting dependencies..." @@ -1225,165 +1201,352 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Установлен]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Предупреждение об аутентификации не принято в внимание.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [Установлен]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Некоторые пакеты невозможно аутентифицировать" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Установить эти пакеты без проверки?" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Установлен]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Существуют проблемы, а параметр -y указан без --force-yes" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Установлен]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Не удалось получить %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" +msgid "[upgradable from: %s]" msgstr "" -"Внутренняя ошибка, InstallPackages была вызвана с неработоспособными " -"пакетами!" - -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "Пакеты необходимо удалить, но удаление запрещено." -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Внутренняя ошибка, Ordering не завершилась" - -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" -msgstr "Странно. Несовпадение размеров, напишите на apt@packages.debian.org" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" +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 -#: apt-private/private-install.cc:155 +#: apt-private/private-output.cc:455 #, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "Необходимо скачать %sB/%sB архивов.\n" +msgid "but %s is installed" +msgstr "но %s уже установлен" -#. 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:160 +#: apt-private/private-output.cc:457 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "Необходимо скачать %sБ архивов.\n" +msgid "but %s is to be installed" +msgstr "но %s будет установлен" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "" -"После данной операции, объём занятого дискового пространства возрастёт на " -"%sB.\n" +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +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 -#: apt-private/private-install.cc:172 -#, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "" -"После данной операции, объём занятого дискового пространства уменьшится на " -"%sB.\n" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "но это виртуальный пакет" -#: apt-private/private-install.cc:200 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "Недостаточно свободного места в %s." +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "но он не установлен" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "" -"Запрошено выполнение только тривиальных операций, но это не тривиальная " -"операция." +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "но он не будет установлен" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Да, делать, как я скажу!" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " или" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"То, что вы хотите сделать, может иметь нежелательные последствия.\n" -"Чтобы продолжить, введите фразу: «%s»\n" -" ?] " +#: apt-private/private-output.cc:488 apt-private/private-output.cc:500 +msgid "The following packages have unmet dependencies:" +msgstr "Пакеты, имеющие неудовлетворённые зависимости:" -#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Аварийное завершение." +#: apt-private/private-output.cc:523 +msgid "The following NEW packages will be installed:" +msgstr "НОВЫЕ пакеты, которые будут установлены:" -#: apt-private/private-install.cc:243 -msgid "Do you want to continue?" -msgstr "Хотите продолжить?" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "Пакеты, которые будут УДАЛЕНЫ:" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Некоторые файлы скачать не удалось" +#: apt-private/private-output.cc:571 +msgid "The following packages have been kept back:" +msgstr "Пакеты, которые будут оставлены в неизменном виде:" -#: apt-private/private-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Невозможно получить некоторые архивы, вероятно надо запустить apt-get update " -"или попытаться повторить запуск с ключом --fix-missing" +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "Пакеты, которые будут обновлены:" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing и смена носителя в данный момент не поддерживаются" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" +msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Невозможно исправить ситуацию с пропущенными пакетами." +#: apt-private/private-output.cc:633 +msgid "The following held packages will be changed:" +msgstr "" +"Пакеты, которые должны были бы остаться без изменений, но будут заменены:" -#: apt-private/private-install.cc:330 -msgid "Aborting install." -msgstr "Аварийное завершение установки." +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (вследствие %s) " -#: apt-private/private-install.cc:366 +#: apt-private/private-output.cc:696 msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"Следующий пакет исчез из системы, так как все их файлы\n" -"теперь берутся из других пакетов:" -msgstr[1] "" -"Следующие пакеты исчез из системы, так как все их файлы\n" -"теперь берутся из других пакетов:" -msgstr[2] "" -"Следующие пакеты исчез из системы, так как все их файлы\n" -"теперь берутся из других пакетов:" +"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-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Замечание: это сделано автоматически и специально программой dpkg." +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "" +"Внутренняя ошибка, InstallPackages была вызвана с неработоспособными " +"пакетами!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "Пакеты необходимо удалить, но удаление запрещено." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Внутренняя ошибка, Ordering не завершилась" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "Странно. Несовпадение размеров, напишите на 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of 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 +#: apt-private/private-install.cc:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Необходимо скачать %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 +#: apt-private/private-install.cc:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "" +"После данной операции, объём занятого дискового пространства возрастёт на " +"%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 +#: apt-private/private-install.cc:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "" +"После данной операции, объём занятого дискового пространства уменьшится на " +"%sB.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Недостаточно свободного места в %s." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Существуют проблемы, а параметр -y указан без --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "" +"Запрошено выполнение только тривиальных операций, но это не тривиальная " +"операция." + +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Да, делать, как я скажу!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"То, что вы хотите сделать, может иметь нежелательные последствия.\n" +"Чтобы продолжить, введите фразу: «%s»\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Аварийное завершение." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Хотите продолжить?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Некоторые файлы скачать не удалось" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Невозможно получить некоторые архивы, вероятно надо запустить apt-get update " +"или попытаться повторить запуск с ключом --fix-missing" + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing и смена носителя в данный момент не поддерживаются" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Невозможно исправить ситуацию с пропущенными пакетами." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Аварийное завершение установки." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"Следующий пакет исчез из системы, так как все их файлы\n" +"теперь берутся из других пакетов:" +msgstr[1] "" +"Следующие пакеты исчез из системы, так как все их файлы\n" +"теперь берутся из других пакетов:" +msgstr[2] "" +"Следующие пакеты исчез из системы, так как все их файлы\n" +"теперь берутся из других пакетов:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Замечание: это сделано автоматически и специально программой dpkg." #: apt-private/private-install.cc:391 msgid "We are not supposed to delete stuff, can't start AutoRemover" @@ -1528,213 +1691,26 @@ msgstr "" msgid "Package '%s' is not installed, so not removed\n" msgstr "Пакет «%s» не установлен, поэтому не может быть удалён\n" -#: apt-private/private-list.cc:129 -msgid "Listing" -msgstr "" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!" -#: apt-private/private-list.cc:159 -#, 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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Предупреждение об аутентификации не принято в внимание.\n" -#: 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-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:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Ошибка компиляции регулярного выражения — %s" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Некоторые пакеты невозможно аутентифицировать" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Установить эти пакеты без проверки?" -#: apt-private/private-show.cc:156 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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 "" +msgid "Failed to fetch %s %s\n" +msgstr "Не удалось получить %s %s\n" #: apt-private/private-sources.cc:58 #, fuzzy, c-format @@ -1746,21 +1722,8 @@ msgstr "Не удалось переименовать %s в %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Команде update не нужны аргументы" - -#: apt-private/private-update.cc:90 -#, 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:94 -msgid "All packages are up to date." +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" #: apt-private/private-upgrade.cc:25 @@ -1771,20 +1734,57 @@ msgstr "Расчёт обновлений…" msgid "Done" msgstr "Готово" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "В кэше " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Получено:" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Игн " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Ош " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Получено %sБ за %s (%sБ/c)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Обработка]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Смена носителя: вставьте диск с меткой\n" +" «%s»\n" +"в устройство «%s» и нажмите ввод\n" + #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format msgid "Unable to read %s" msgstr "Невозможно прочитать %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1818,7 +1818,7 @@ msgstr "[Зеркало: %s]" msgid "Failed to create IPC pipe to subprocess" msgstr "Не удалось создать IPC-канал для порождённого процесса" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "Соединение закрыто преждевременно" @@ -1860,662 +1860,573 @@ msgstr "" msgid "Merging available information" msgstr "Слияние доступной информации" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Использование: apt-extracttemplates файл1 [файл2…]\n" -"\n" -"apt-extracttemplates извлекает из пакетов Debian данные config и template\n" -"\n" -"Параметры:\n" -" -h Этот текст\n" -" -t Задать каталог для временных файлов\n" -" -c=? Читать указанный файл настройки\n" -" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" - -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Невозможно получить атрибуты %s" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode вызван для узла, который ещё используется" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "Невозможно записать в %s" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Не удалось найти элемент хеша!" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Невозможно определить версию debconf. Он установлен?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Не удалось создать diversion" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Список расширений, допустимых для пакетов, слишком длинен" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Внутренняя ошибка в AddDiversion" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "Ошибка обработки каталога %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Список расширений источников слишком длинен" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "" -"Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Попытка изменения diversion, %s -> %s и %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Использование: apt-ftparchive [параметры] команда\n" -"Команды: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive генерирует индексные файлы архивов Debian. Он поддерживает\n" -"множество стилей генерации: от полностью автоматического до функциональной " -"замены\n" -"программ dpkg-scanpackages и dpkg-scansources\n" -"\n" -"apt-ftparchive генерирует файлы Package (списки пакетов) для дерева\n" -"каталогов, содержащих файлы .deb. Файл Package включает в себя управляющие\n" -"поля каждого пакета, а также хеш MD5 и размер файла. Значения управляющих\n" -"полей «приоритет» (Priority) и «секция» (Section) могут быть изменены с\n" -"помощью файла override.\n" -"\n" -"Кроме того, apt-ftparchive может генерировать файлы Sources из дерева\n" -"каталогов, содержащих файлы .dsc. Для указания файла override в этом \n" -"режиме можно использовать параметр --source-override.\n" -"\n" -"Команды «packages» и «sources» надо выполнять, находясь в корневом каталоге\n" -"дерева, которое вы хотите обработать. BinaryPath должен указывать на место,\n" -"с которого начинается рекурсивный обход, а файл переназначений (override)\n" -"должен содержать записи о переназначениях управляющих полей. Если был " -"указан\n" -"Pathprefix, то его значение добавляется к управляющим полям, содержащим\n" -"имена файлов. Пример использования для архива Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Параметры:\n" -" -h Этот текст\n" -" --md5 Управление генерацией MD5-хешей\n" -" -s=? Указать файл переназначений (override) для источников\n" -" -q Не выводить сообщения в процессе работы\n" -" -d=? Указать кэширующую базу данных (не обязательно)\n" -" --no-delink Включить режим отладки процесса удаления файлов\n" -" --contents Управление генерацией полного перечня содержимого пакетов\n" -" (файла Contents)\n" -" -c=? Использовать указанный файл настройки\n" -" -o=? Задать значение произвольному параметру настройки" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Совпадений не обнаружено" +msgid "Double add of diversion %s -> %s" +msgstr "Двойное добавление diversion %s -> %s" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "В группе пакетов «%s» отсутствуют некоторые файлы" +msgid "Duplicate conf file %s/%s" +msgstr "Повторно указан файл настройки %s/%s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "БД была повреждена, файл переименован в %s.old" +msgid "The path %s is too long" +msgstr "Слишком длинный путь %s" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "DB устарела, попытка обновить %s" +msgid "Unpacking %s more than once" +msgstr "Повторная распаковка %s" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите " -"и создайте базу данных заново." +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "Каталог %s входит в список diverted" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Не удалось открыть DB файл %s: %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Пакет пытается писать в diversion %s/%s" + +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Путь diversion слишком длинен" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Не удалось получить атрибуты %s" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Не удалось прочесть ссылку %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "В архиве нет поля control" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Невозможно получить курсор" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: Не удалось прочитать каталог %s\n" +msgid "Failed to rename %s to %s" +msgstr "Не удалось переименовать %s в %s" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "W: Не удалось прочитать атрибуты %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "Каталог %s был заменён не-каталогом" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "W: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Не удалось разместить узел в хеше" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: Ошибки относятся к файлу " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Путь слишком длинен" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "Не удалось проследовать по ссылке %s" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Не удалось совершить обход дерева" +msgid "Overwrite package match with no version for %s" +msgstr "Файлы заменяются содержимым пакета %s без версии" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to open %s" -msgstr "Не удалось открыть %s" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Файл %s/%s переписывает файл в пакете %s" -#: ftparchive/writer.cc:278 +#: apt-inst/extract.cc:498 #, c-format -msgid " DeLink %s [%s]\n" -msgstr "DeLink %s [%s]\n" +msgid "Unable to stat %s" +msgstr "Невозможно получить атрибуты %s" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Failed to readlink %s" -msgstr "Не удалось прочесть ссылку %s" +msgid "Failed to write file %s" +msgstr "Не удалось записать в файл %s" -#: ftparchive/writer.cc:290 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to unlink %s" -msgstr "Не удалось удалить %s" +msgid "Failed to close file %s" +msgstr "Не удалось закрыть файл %s" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Не удалось создать ссылку %s на %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Это неправильный DEB-архив — отсутствует составная часть «%s»" -#: ftparchive/writer.cc:308 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Превышен лимит в %sB в DeLink.\n" - -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "В архиве нет поля package" +msgid "Internal error, could not locate member %s" +msgstr "Внутренняя ошибка, не удалось найти составную часть %s" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " Нет записи о переназначении (override) для %s\n" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Не удалось прочесть содержимое control-файла" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " пакет %s сопровождает %s, а не %s\n" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Неверная сигнатура архива" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " Нет записи source override для %s\n" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Ошибка чтения заголовка элемента архива" -#: ftparchive/writer.cc:710 +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid " %s has no binary override entry either\n" -msgstr " Нет записи binary override для %s\n" +msgid "Invalid archive member header %s" +msgstr "Неправильный заголовок элемента архива %s" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc — не удалось выделить память" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Неправильный заголовок элемента архива" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Не удалось открыть %s" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Слишком короткий архив" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Не удалось прочитать заголовки архива" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Не удалось прочесть файл переназначений (override) %s" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Не удалось создать каналы" -#: ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Не удалось выполнить gzip " -#: ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Неправильная запись о переназначении (override) %s в строке %llu #2" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Повреждённый архив" -#: ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Неправильная запись о переназначении (override) %s в строке %llu #3" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Неправильная контрольная сумма Tar, архив повреждён" -#: ftparchive/multicompress.cc:73 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Неизвестный алгоритм сжатия «%s»" +msgid "Unknown TAR header type %u, member %s" +msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Compressed output %s needs a compression set" +msgid "Progress: [%3i%%]" msgstr "" -"Для получения сжатого вывода %s необходимо включить использования сжатия" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Не удалось создать FILE*" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Не удалось запустить порождённый процесс" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Процесс-потомок, производящий сжатие" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "Запускается dpkg" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/init.cc:146 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Внутренняя ошибка, не удалось создать %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Ошибка ввода/вывода в подпроцесс/файл" +msgid "Packaging system '%s' is not supported" +msgstr "Система пакетирования «%s» не поддерживается" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Ошибка чтения во время вычисления MD5" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Невозможно определить подходящий тип системы пакетирования" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Problem unlinking %s" -msgstr "Не удалось удалить %s" +msgid "Wrote %i records.\n" +msgstr "Сохранено %i записей.\n" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Не удалось переименовать %s в %s" - -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Использование: apt-internal-solver\n" -"\n" -"apt-internal-solver — интерфейс к внутреннему решателю, предназначен\n" -"для отладки, подобен интерфейсу внешнего решателя семейства APT\n" -"\n" -"Параметры:\n" -" -h Этот текст\n" -" -q Вывод протокола работы — индикатор выполнения отключён\n" -" -c=? Читать указанный файл настройки\n" -" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Сохранено %i записей с %i отсутствующими файлами.\n" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Запись о неизвестном пакете!" +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Сохранено %i записей с %i несовпадающими файлами\n" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"Использование: apt-sortpkgs [параметры] файл1 [файл2…]\n" -"\n" -"apt-sortpkgs — простой инструмент для сортировки списков пакетов. Параметр -" -"s\n" -"используется для указания типа списка.\n" -"\n" -"Параметры:\n" -" -h этот текст\n" -" -s сортировать список файлов пакетов исходного кода\n" -" -c=? читать указанный файл настройки\n" -" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" +"Сохранено %i записей с %i отсутствующими файлами и с %i несовпадающими " +"файлами\n" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Failed to write file %s" -msgstr "Не удалось записать в файл %s" +msgid "Can't find authentication record for: %s" +msgstr "Не удалось найти аутентификационную запись для: %s" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "Failed to close file %s" -msgstr "Не удалось закрыть файл %s" +msgid "Hash mismatch for: %s" +msgstr "Не совпадает хеш сумма для: %s" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "The path %s is too long" -msgstr "Слишком длинный путь %s" +msgid "The method driver %s could not be found." +msgstr "Драйвер для метода %s не найден." -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" -msgstr "Повторная распаковка %s" +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n" -#: apt-inst/extract.cc:142 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "The directory %s is diverted" -msgstr "Каталог %s входит в список diverted" +msgid "Method %s did not start correctly" +msgstr "Метод %s запустился не корректно" -#: apt-inst/extract.cc:152 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Пакет пытается писать в diversion %s/%s" +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод." -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Путь diversion слишком длинен" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "Списки пакетов или файл состояния не могут быть открыты или прочитаны." -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Каталог %s был заменён не-каталогом" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Вы можете запустить «apt-get update» для исправления этих ошибок" -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Не удалось разместить узел в хеше" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Не читается перечень источников." -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Путь слишком длинен" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Кэш пакетов пуст" -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Файлы заменяются содержимым пакета %s без версии" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Кэш пакетов повреждён" -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Файл %s/%s переписывает файл в пакете %s" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Не поддерживаемая версия кэша пакетов" -#: apt-inst/extract.cc:498 +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" +msgstr "Кэш пакетов повреждён, он слишком мал" + +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Unable to stat %s" -msgstr "Невозможно получить атрибуты %s" +msgid "This APT does not support the versioning system '%s'" +msgstr "Эта версия APT не поддерживает систему версий «%s»" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "DropNode вызван для узла, который ещё используется" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Кэш пакетов был собран для другой архитектуры" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Не удалось найти элемент хеша!" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Зависит" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Не удалось создать diversion" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "ПредЗависит" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Внутренняя ошибка в AddDiversion" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Предлагает" -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Попытка изменения diversion, %s -> %s и %s/%s" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Рекомендует" -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Двойное добавление diversion %s -> %s" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Конфликтует" -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Повторно указан файл настройки %s/%s" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Заменяет" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Неверная сигнатура архива" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Замещает" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Ошибка чтения заголовка элемента архива" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Ломает" -#: apt-inst/contrib/arfile.cc:96 -#, c-format -msgid "Invalid archive member header %s" -msgstr "Неправильный заголовок элемента архива %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Улучшает" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Неправильный заголовок элемента архива" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "важный" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Слишком короткий архив" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "необходимый" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Не удалось прочитать заголовки архива" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "стандартный" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Не удалось создать каналы" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "необязательный" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Не удалось выполнить gzip " +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "дополнительный" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Повреждённый архив" +#: apt-pkg/pkgrecords.cc:38 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "Не поддерживается индексный файл типа «%s»" -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Неправильная контрольная сумма Tar, архив повреждён" +#: apt-pkg/sourcelist.cc:127 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" -#: apt-inst/contrib/extracttar.cc:308 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s" +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "Искажённая строка %lu в списке источников %s ([параметр] неразбираем)" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Это неправильный DEB-архив — отсутствует составная часть «%s»" +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "" +"Искажённая строка %lu в списке источников %s ([параметр] слишком короткий)" -#: apt-inst/deb/debfile.cc:132 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "Внутренняя ошибка, не удалось найти составную часть %s" - -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Не удалось прочесть содержимое control-файла" +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgstr "Искажённая строка %lu в списке источников %s (([%s] не назначаем)" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/sourcelist.cc:190 #, c-format -msgid "List directory %spartial is missing." -msgstr "Каталог списка %spartial отсутствует." +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "Искажённая строка %lu в списке источников %s ([%s] не имеет ключа)" -#: apt-pkg/acquire.cc:91 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "Archives directory %spartial is missing." -msgstr "Архивный каталог %spartial отсутствует." +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgstr "" +"Искажённая строка %lu в списке источников %s (([%s] ключ %s не имеет " +"значения)" -#: apt-pkg/acquire.cc:99 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Unable to lock directory %s" -msgstr "Невозможно заблокировать каталог %s" - -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "Не поддерживается индексный файл типа «%s»" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Скачивается файл %li из %li (осталось %s)" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "" +"Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)" -#: apt-pkg/acquire.cc:904 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Retrieving file %li of %li" -msgstr "Скачивается файл %li из %li" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "переименовать не удалось, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "Хеш сумма не совпадает" - -#: apt-pkg/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "Не совпадает размер" - -#: apt-pkg/acquire-item.cc:173 -#, fuzzy -msgid "Invalid file format" -msgstr "Неверная операция %s" +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "Искажённая строка %lu в списке источников %s (absolute dist)" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" -msgstr "" -"Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись " -"в sources.list или файл)" +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "Искажённая строка %lu в списке источников %s (dist parse)" -#: apt-pkg/acquire-item.cc:1589 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "Unable to find hash sum for '%s' in Release file" -msgstr "Невозможно найти хеш-сумму «%s» в файле Release" - -#: apt-pkg/acquire-item.cc:1631 -msgid "There is no public key available for the following key IDs:\n" -msgstr "Недоступен открытый ключ для следующих ID ключей:\n" +msgid "Opening %s" +msgstr "Открытие %s" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "" -"Release file for %s is expired (invalid since %s). Updates for this " -"repository will not be applied." -msgstr "" -"Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого " -"репозитория производиться не будет." +msgid "Line %u too long in source list %s." +msgstr "Строка %u в списке источников %s слишком длинна." -#: apt-pkg/acquire-item.cc:1691 +#: 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:490 +#, fuzzy, 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:93 +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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Произошла ошибка во время обработки %s (%s%d)" + +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "" +"Превышено допустимое количество имён пакетов, которое способен обработать " +"APT." + +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "" +"Превышено допустимое количество версий, которое способен обработать APT." + +#: apt-pkg/pkgcachegen.cc:263 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Превышено допустимое количество описаний, которое способен обработать APT." + +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "" +"Превышено допустимое количество зависимостей, которое способен обработать " +"APT." + +#: apt-pkg/pkgcachegen.cc:576 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Во время обработки файла зависимостей не найден пакет %s %s" + +#: apt-pkg/pkgcachegen.cc:1211 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s" + +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Чтение списков пакетов" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Сбор информации о Provides" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Невозможно записать в %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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:241 +msgid "Send request to solver" +msgstr "Отправка запроса решателю" + +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "Подготовка к приёму решения" + +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "Запустить внешний решатель" + +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "переименовать не удалось, %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "Хеш сумма не совпадает" + +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "Не совпадает размер" + +#: apt-pkg/acquire-item.cc:173 +#, fuzzy +msgid "Invalid file format" +msgstr "Неверная операция %s" + +#: apt-pkg/acquire-item.cc:1640 +#, c-format +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +msgstr "" +"Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись " +"в sources.list или файл)" + +#: apt-pkg/acquire-item.cc:1656 +#, c-format +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "Невозможно найти хеш-сумму «%s» в файле Release" + +#: apt-pkg/acquire-item.cc:1698 +msgid "There is no public key available for the following key IDs:\n" +msgstr "Недоступен открытый ключ для следующих ID ключей:\n" + +#: apt-pkg/acquire-item.cc:1736 +#, c-format +msgid "" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." +msgstr "" +"Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого " +"репозитория производиться не будет." + +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2525,12 +2436,12 @@ msgstr "" "использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "Ошибка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2539,133 +2450,110 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Драйвер для метода %s не найден." - -#: apt-pkg/acquire-worker.cc:118 -#, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n" +msgid "Vendor block %s contains no fingerprint" +msgstr "Блок поставщика %s не содержит отпечатка (fingerprint)" -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Method %s did not start correctly" -msgstr "Метод %s запустился не корректно" +msgid "List directory %spartial is missing." +msgstr "Каталог списка %spartial отсутствует." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод." +msgid "Archives directory %spartial is missing." +msgstr "Архивный каталог %spartial отсутствует." -#: apt-pkg/algorithms.cc:265 +#: apt-pkg/acquire.cc:99 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"Пакет %s нуждается в переустановке, но найти архив для него не удалось." - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это " -"может быть вызвано отложенными (held) пакетами." - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты." - -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." -msgstr "Списки пакетов или файл состояния не могут быть открыты или прочитаны." - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Вы можете запустить «apt-get update» для исправления этих ошибок" +msgid "Unable to lock directory %s" +msgstr "Невозможно заблокировать каталог %s" -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Не читается перечень источников." +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 +#, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Скачивается файл %li из %li (осталось %s)" -#: apt-pkg/cacheset.cc:489 +#: apt-pkg/acquire.cc:904 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Выпуск «%s» для «%s» не найден" +msgid "Retrieving file %li of %li" +msgstr "Скачивается файл %li из %li" -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "Вы должны заполнить sources.list, поместив туда URI источников пакетов" + +#: apt-pkg/policy.cc:83 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Версия «%s» для «%s» не найдена" +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/cacheset.cc:603 +#: apt-pkg/policy.cc:422 #, c-format -msgid "Couldn't find task '%s'" -msgstr "Не удалось найти задачу «%s»" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Неверная запись в файле параметров %s: отсутствует заголовок Package" -#: apt-pkg/cacheset.cc:609 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Не удалось найти пакет по регулярному выражению «%s»" +msgid "Did not understand pin type %s" +msgstr "Неизвестный тип фиксации %s" -#: apt-pkg/cacheset.cc:615 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Не удалось найти пакет по регулярному выражению «%s»" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Для фиксации не указан приоритет (или указан нулевой)" -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -"Не удалось выбрать версии из пакета «%s», так как он полностью виртуальный" - -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 -#, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" -"Не удалось выбрать ни установленную, ни версию кандидата из пакета «%s», так " -"как в нём нет ни той, ни другой" +"Не удалось выполнить оперативную настройку «%s». Подробней, смотрите в man 5 " +"apt.conf о APT::Immediate-Configure. (%d)" -#: apt-pkg/cacheset.cc:647 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" -"Не удалось выбрать самую новую версию из пакета «%s», так как он полностью " -"виртуальный" +msgid "Could not configure '%s'. " +msgstr "Не удалось настроить «%s»." -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -"Не удалось выбрать самую версию кандидата из пакета %s, так как у него нет " -"кандидатов" +"Вследствие возникновения циклических зависимостей типа Конфликтует/" +"ПредЗависит, для продолжения установки необходимо временно удалить " +"существенно важный пакет %s. Это может привести к фатальным последствиям. " +"Если вы действительно хотите продолжить, установите параметр APT::Force-" +"LoopBreak." -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +#: 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 "" -"Не удалось выбрать установленную версию из пакета %s, так как он не " -"установлен" - -#: 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/cdrom.cc:571 msgid "Unmounting CD-ROM...\n" @@ -2744,10 +2632,24 @@ msgstr "Запись нового списка источников\n" msgid "Source list entries for this disc are:\n" msgstr "Записи в списке источников для этого диска:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Невозможно получить атрибуты %s." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Пакет %s нуждается в переустановке, но найти архив для него не удалось." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это " +"может быть вызвано отложенными (held) пакетами." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты." #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2775,57 +2677,76 @@ msgstr "Не удалось открыть StateFile %s" msgid "Failed to write temporary StateFile %s" msgstr "Не удалось записать временный StateFile %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "Отправка сценария решателю" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Невозможно разобрать содержимое пакета %s (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "Отправка запроса решателю" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Невозможно разобрать содержимое пакета %s (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "Подготовка к приёму решения" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Выпуск «%s» для «%s» не найден" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Версия «%s» для «%s» не найдена" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "Запустить внешний решатель" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Не удалось найти задачу «%s»" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "Сохранено %i записей.\n" +msgid "Couldn't find any package by regex '%s'" +msgstr "Не удалось найти пакет по регулярному выражению «%s»" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Не удалось найти пакет по регулярному выражению «%s»" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Сохранено %i записей с %i отсутствующими файлами.\n" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "" +"Не удалось выбрать версии из пакета «%s», так как он полностью виртуальный" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Сохранено %i записей с %i несовпадающими файлами\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"Не удалось выбрать ни установленную, ни версию кандидата из пакета «%s», так " +"как в нём нет ни той, ни другой" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -"Сохранено %i записей с %i отсутствующими файлами и с %i несовпадающими " -"файлами\n" +"Не удалось выбрать самую новую версию из пакета «%s», так как он полностью " +"виртуальный" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "Не удалось найти аутентификационную запись для: %s" +msgid "Can't select candidate version from package %s as it has no candidate" +msgstr "" +"Не удалось выбрать самую версию кандидата из пакета %s, так как у него нет " +"кандидатов" -#: apt-pkg/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:663 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Не совпадает хеш сумма для: %s" +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" +"Не удалось выбрать установленную версию из пакета %s, так как он не " +"установлен" #: apt-pkg/indexrecords.cc:78 #, c-format @@ -2852,329 +2773,230 @@ msgstr "Неправильный элемент «Valid-Until» в файле Re msgid "Invalid 'Date' entry in Release file %s" msgstr "Неправильный элемент «Date» в файле Release %s" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Система пакетирования «%s» не поддерживается" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Невозможно определить подходящий тип системы пакетирования" +msgid "%lid %lih %limin %lis" +msgstr "%liд %liч %liмин %liс" -#: apt-pkg/install-progress.cc:57 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Progress: [%3i%%]" -msgstr "" +msgid "%lih %limin %lis" +msgstr "%liч %liмин %liс" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "Запускается dpkg" +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 +#, c-format +msgid "%limin %lis" +msgstr "%liмин %liс" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" -"Не удалось выполнить оперативную настройку «%s». Подробней, смотрите в man 5 " -"apt.conf о APT::Immediate-Configure. (%d)" +msgid "%lis" +msgstr "%liс" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "Could not configure '%s'. " -msgstr "Не удалось настроить «%s»." +msgid "Selection %s not found" +msgstr "Не найдено: %s" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:190 #, 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." +msgid "Not using locking for read only lock file %s" msgstr "" -"Вследствие возникновения циклических зависимостей типа Конфликтует/" -"ПредЗависит, для продолжения установки необходимо временно удалить " -"существенно важный пакет %s. Это может привести к фатальным последствиям. " -"Если вы действительно хотите продолжить, установите параметр APT::Force-" -"LoopBreak." +"Блокировка не используется, так как файл блокировки %s доступен только для " +"чтения" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Кэш пакетов пуст" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "Не удалось открыть файл блокировки %s" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Кэш пакетов повреждён" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "" +"Блокировка не используется, так как файл блокировки %s находится на файловой " +"системе nfs" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Не поддерживаемая версия кэша пакетов" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Не удалось получить доступ к файлу блокировки %s" -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" -msgstr "Кэш пакетов повреждён, он слишком мал" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "Список файлов не может быть создан, так как «%s» не является каталогом" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:394 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Эта версия APT не поддерживает систему версий «%s»" +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "Файл «%s» в каталоге «%s» игнорируется, так как это необычный файл" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "Кэш пакетов был собран для другой архитектуры" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "Файл «%s» в каталоге «%s» игнорируется, так как он не имеет расширения" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Зависит" - -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "ПредЗависит" - -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Предлагает" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Рекомендует" - -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Конфликтует" - -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Заменяет" - -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Замещает" - -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Ломает" - -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Улучшает" - -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "важный" - -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "необходимый" - -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "стандартный" - -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "необязательный" - -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "дополнительный" - -#: apt-pkg/pkgcachegen.cc:93 -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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/fileutl.cc:421 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Произошла ошибка во время обработки %s (%s%d)" - -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "" -"Превышено допустимое количество имён пакетов, которое способен обработать " -"APT." - -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "" -"Превышено допустимое количество версий, которое способен обработать APT." - -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -"Превышено допустимое количество описаний, которое способен обработать APT." +"Файл «%s» в каталоге «%s» игнорируется, так как он не имеет неправильное " +"расширение" -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." msgstr "" -"Превышено допустимое количество зависимостей, которое способен обработать " -"APT." +"Нарушение защиты памяти (segmentation fault) в порождённом процессе %s." -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/fileutl.cc:826 #, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "Во время обработки файла зависимостей не найден пакет %s %s" +msgid "Sub-process %s received signal %u." +msgstr "Порождённый процесс %s получил сигнал %u." -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s" - -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Чтение списков пакетов" - -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Сбор информации о Provides" - -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников" +msgid "Sub-process %s returned an error code (%u)" +msgstr "Порождённый процесс %s вернул код ошибки (%u)" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Не поддерживается индексный файл типа «%s»" +msgid "Sub-process %s exited unexpectedly" +msgstr "Порождённый процесс %s неожиданно завершился" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/fileutl.cc:913 #, 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, так как выпуск " -"недоступен в источниках" +msgid "Problem closing the gzip file %s" +msgstr "Проблема закрытия gzip-файла %s" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/fileutl.cc:1101 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Неверная запись в файле параметров %s: отсутствует заголовок Package" +msgid "Could not open file %s" +msgstr "Не удалось открыть файл %s" -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 #, c-format -msgid "Did not understand pin type %s" -msgstr "Неизвестный тип фиксации %s" - -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Для фиксации не указан приоритет (или указан нулевой)" +msgid "Could not open file descriptor %d" +msgstr "Не удалось открыть файловый дескриптор %d" -#: apt-pkg/sourcelist.cc:127 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Не удалось создать IPC с порождённым процессом" -#: apt-pkg/sourcelist.cc:170 -#, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "Искажённая строка %lu в списке источников %s ([параметр] неразбираем)" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Не удалось выполнить компрессор " -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" +msgid "read, still have %llu to read but none left" msgstr "" -"Искажённая строка %lu в списке источников %s ([параметр] слишком короткий)" +"ошибка при чтении; собирались прочесть ещё %llu байт, но ничего больше нет" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "Искажённая строка %lu в списке источников %s (([%s] не назначаем)" +msgid "write, still have %llu to write but couldn't" +msgstr "ошибка при записи; собирались записать ещё %llu байт, но не смогли" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/fileutl.cc:1915 #, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "Искажённая строка %lu в списке источников %s ([%s] не имеет ключа)" +msgid "Problem closing the file %s" +msgstr "Проблема закрытия файла %s" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/fileutl.cc:1927 #, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" -msgstr "" -"Искажённая строка %lu в списке источников %s (([%s] ключ %s не имеет " -"значения)" +msgid "Problem renaming the file %s to %s" +msgstr "Проблема при переименовании файла %s в %s" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)" +msgid "Problem unlinking the file %s" +msgstr "Проблема при удалении файла %s" -#: apt-pkg/sourcelist.cc:208 -#, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "" -"Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Проблема при синхронизации файла" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" +msgid "%c%s... Error!" +msgstr "%c%s… Ошибка!" -#: apt-pkg/sourcelist.cc:217 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Искажённая строка %lu в списке источников %s (absolute dist)" +msgid "%c%s... Done" +msgstr "%c%s… Готово" -#: apt-pkg/sourcelist.cc:224 -#, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Искажённая строка %lu в списке источников %s (dist parse)" +#: apt-pkg/contrib/progress.cc:181 +msgid "..." +msgstr "…" -#: apt-pkg/sourcelist.cc:335 +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 #, c-format -msgid "Opening %s" -msgstr "Открытие %s" +msgid "%c%s... %u%%" +msgstr "%c%s… %u%%" -#: apt-pkg/sourcelist.cc:371 +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Невозможно отобразить в память пустой файл" + +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Искажённая строка %u в списке источников %s (тип)" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Не удалось сделать копию файлового дескриптора %i" -#: apt-pkg/sourcelist.cc:375 +#: apt-pkg/contrib/mmap.cc:119 #, c-format -msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Неизвестный тип «%s» в строке %u в списке источников %s" +msgid "Couldn't make mmap of %llu bytes" +msgstr "Невозможно отобразить в память %llu байт" -#: 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/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Не удалось закрыть mmap" -#: apt-pkg/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "Вы должны заполнить sources.list, поместив туда URI источников пакетов" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Не удалось синхронизировать mmap" -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Невозможно разобрать содержимое пакета %s (1)" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Невозможно отобразить в память %lu байт" -#: apt-pkg/tagfile.cc:237 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Невозможно разобрать содержимое пакета %s (2)" +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Не удалось обрезать файл" -#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 +#: apt-pkg/contrib/mmap.cc:341 +#, c-format msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"Некоторые индексные файлы не скачались. Они были проигнорированы или вместо " -"них были использованы старые версии." +"Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Start. " +"Текущее значение: %lu. (man 5 apt.conf)" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Блок поставщика %s не содержит отпечатка (fingerprint)" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" +"Не удалось увеличить размер MMap, так как уже достигнут предел в %lu байт." + +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Не удалось увеличить размер MMap, так как автоматическое увеличение " +"отключено пользователем." #: apt-pkg/contrib/cdromutl.cc:65 #, c-format @@ -3185,52 +3007,6 @@ msgstr "Невозможно прочитать атрибуты точки мо msgid "Failed to stat the cdrom" msgstr "Невозможно получить атрибуты cdrom" -#: apt-pkg/contrib/cmndline.cc:121 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "Неизвестный параметр командной строки «%c» [из %s]." - -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "Не распознанный параметр командной строки %s" - -#: apt-pkg/contrib/cmndline.cc:168 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "Параметр командной строки %s — не логический переключатель \"да/нет\"" - -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "Для параметра %s требуется аргумент." - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "Значение параметра %s должно иметь вид =." - -#: apt-pkg/contrib/cmndline.cc:278 -#, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "Для параметра %s требуется аргумент в виде целого числа, а не «%s»" - -#: apt-pkg/contrib/cmndline.cc:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "Параметр «%s» слишком длинный" - -#: apt-pkg/contrib/cmndline.cc:341 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "Смысл %s не ясен, используйте true или false." - -#: apt-pkg/contrib/cmndline.cc:391 -#, c-format -msgid "Invalid operation %s" -msgstr "Неверная операция %s" - #: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" @@ -3290,414 +3066,633 @@ msgstr "" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтаксическая ошибка %s:%u: лишние символы в конце файла" -#: apt-pkg/contrib/fileutl.cc:190 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "" -"Блокировка не используется, так как файл блокировки %s доступен только для " -"чтения" +msgid "No keyring installed in %s." +msgstr "Связка ключей в %s не установлена." -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Could not open lock file %s" -msgstr "Не удалось открыть файл блокировки %s" +msgid "Command line option '%c' [from %s] is not known." +msgstr "Неизвестный параметр командной строки «%c» [из %s]." -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "" -"Блокировка не используется, так как файл блокировки %s находится на файловой " -"системе nfs" +msgid "Command line option %s is not understood" +msgstr "Не распознанный параметр командной строки %s" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Could not get lock %s" -msgstr "Не удалось получить доступ к файлу блокировки %s" +msgid "Command line option %s is not boolean" +msgstr "Параметр командной строки %s — не логический переключатель \"да/нет\"" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "Список файлов не может быть создан, так как «%s» не является каталогом" +msgid "Option %s requires an argument." +msgstr "Для параметра %s требуется аргумент." -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "Файл «%s» в каталоге «%s» игнорируется, так как это необычный файл" +msgid "Option %s: Configuration item specification must have an =." +msgstr "Значение параметра %s должно иметь вид =." -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "Файл «%s» в каталоге «%s» игнорируется, так как он не имеет расширения" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Для параметра %s требуется аргумент в виде целого числа, а не «%s»" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" -"Файл «%s» в каталоге «%s» игнорируется, так как он не имеет неправильное " -"расширение" +msgid "Option '%s' is too long" +msgstr "Параметр «%s» слишком длинный" -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "" -"Нарушение защиты памяти (segmentation fault) в порождённом процессе %s." +msgid "Sense %s is not understood, try true or false." +msgstr "Смысл %s не ясен, используйте true или false." -#: apt-pkg/contrib/fileutl.cc:826 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s received signal %u." -msgstr "Порождённый процесс %s получил сигнал %u." +msgid "Invalid operation %s" +msgstr "Неверная операция %s" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Порождённый процесс %s вернул код ошибки (%u)" +msgid "Installing %s" +msgstr "Устанавливается %s" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Порождённый процесс %s неожиданно завершился" +msgid "Configuring %s" +msgstr "Настраивается %s" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Problem closing the gzip file %s" -msgstr "Проблема закрытия gzip-файла %s" +msgid "Removing %s" +msgstr "Удаляется %s" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Could not open file %s" -msgstr "Не удалось открыть файл %s" +msgid "Completely removing %s" +msgstr "Выполняется полное удаление %s" -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Could not open file descriptor %d" -msgstr "Не удалось открыть файловый дескриптор %d" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Не удалось создать IPC с порождённым процессом" +msgid "Noting disappearance of %s" +msgstr "Уведомление об исчезновении %s" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Не удалось выполнить компрессор " +#: apt-pkg/deb/dpkgpm.cc:115 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Выполняется послеустановочный триггер %s" -#: apt-pkg/contrib/fileutl.cc:1514 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "read, still have %llu to read but none left" -msgstr "" -"ошибка при чтении; собирались прочесть ещё %llu байт, но ничего больше нет" +msgid "Directory '%s' missing" +msgstr "Отсутствует каталог «%s»" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "ошибка при записи; собирались записать ещё %llu байт, но не смогли" +msgid "Could not open file '%s'" +msgstr "Не удалось открыть файл «%s»" -#: apt-pkg/contrib/fileutl.cc:1915 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Problem closing the file %s" -msgstr "Проблема закрытия файла %s" +msgid "Preparing %s" +msgstr "Подготавливается %s" -#: apt-pkg/contrib/fileutl.cc:1927 +#: apt-pkg/deb/dpkgpm.cc:1008 #, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Проблема при переименовании файла %s в %s" +msgid "Unpacking %s" +msgstr "Распаковывается %s" -#: apt-pkg/contrib/fileutl.cc:1938 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Problem unlinking the file %s" -msgstr "Проблема при удалении файла %s" +msgid "Preparing to configure %s" +msgstr "Подготавливается для настройки %s" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Проблема при синхронизации файла" +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr "Установлен %s" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "No keyring installed in %s." -msgstr "Связка ключей в %s не установлена." +msgid "Preparing for removal of %s" +msgstr "Подготавливается для удаления %s" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Невозможно отобразить в память пустой файл" +#: apt-pkg/deb/dpkgpm.cc:1022 +#, c-format +msgid "Removed %s" +msgstr "Удалён %s" -#: apt-pkg/contrib/mmap.cc:111 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Не удалось сделать копию файлового дескриптора %i" +msgid "Preparing to completely remove %s" +msgstr "Подготовка к полному удалению %s" -#: apt-pkg/contrib/mmap.cc:119 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Невозможно отобразить в память %llu байт" +msgid "Completely removed %s" +msgstr "%s полностью удалён" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Не удалось закрыть mmap" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Невозможно записать в %s" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Не удалось синхронизировать mmap" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Невозможно отобразить в память %lu байт" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "Действие прервано до его завершения" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Не удалось обрезать файл" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "Отчёты apport не записаны, так достигнут MaxReports" -#: apt-pkg/contrib/mmap.cc:341 +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "проблемы с зависимостями — оставляем ненастроенным" + +#: apt-pkg/deb/dpkgpm.cc:1726 +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:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" +"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " +"места на диске" + +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" +"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " +"памяти" + +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +#, fuzzy +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" +"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " +"места на диске" + +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"Unable to lock the administration directory (%s), is another process using " +"it?" msgstr "" -"Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Start. " -"Текущее значение: %lu. (man 5 apt.conf)" +"Не удалось выполнить блокировку управляющего каталога (%s); он уже " +"используется другим процессом?" -#: apt-pkg/contrib/mmap.cc:446 +#: 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 "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +"dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -"Не удалось увеличить размер MMap, так как уже достигнут предел в %lu байт." +"Работа dpkg прервана, вы должны вручную запустить «%s» для устранения " +"проблемы. " -#: apt-pkg/contrib/mmap.cc:449 +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "Не заблокирован" + +#: cmdline/apt-extracttemplates.cc:224 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Не удалось увеличить размер MMap, так как автоматическое увеличение " -"отключено пользователем." +"Использование: apt-extracttemplates файл1 [файл2…]\n" +"\n" +"apt-extracttemplates извлекает из пакетов Debian данные config и template\n" +"\n" +"Параметры:\n" +" -h Этот текст\n" +" -t Задать каталог для временных файлов\n" +" -c=? Читать указанный файл настройки\n" +" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" -#: apt-pkg/contrib/progress.cc:148 +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "Невозможно получить атрибуты %s" + +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Невозможно определить версию debconf. Он установлен?" + +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +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 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s… Ошибка!" +msgid "Error processing directory %s" +msgstr "Ошибка обработки каталога %s" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Список расширений источников слишком длинен" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "" +"Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "%c%s... Done" -msgstr "%c%s… Готово" +msgid "Error processing contents %s" +msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "…" +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Использование: apt-ftparchive [параметры] команда\n" +"Команды: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive генерирует индексные файлы архивов Debian. Он поддерживает\n" +"множество стилей генерации: от полностью автоматического до функциональной " +"замены\n" +"программ dpkg-scanpackages и dpkg-scansources\n" +"\n" +"apt-ftparchive генерирует файлы Package (списки пакетов) для дерева\n" +"каталогов, содержащих файлы .deb. Файл Package включает в себя управляющие\n" +"поля каждого пакета, а также хеш MD5 и размер файла. Значения управляющих\n" +"полей «приоритет» (Priority) и «секция» (Section) могут быть изменены с\n" +"помощью файла override.\n" +"\n" +"Кроме того, apt-ftparchive может генерировать файлы Sources из дерева\n" +"каталогов, содержащих файлы .dsc. Для указания файла override в этом \n" +"режиме можно использовать параметр --source-override.\n" +"\n" +"Команды «packages» и «sources» надо выполнять, находясь в корневом каталоге\n" +"дерева, которое вы хотите обработать. BinaryPath должен указывать на место,\n" +"с которого начинается рекурсивный обход, а файл переназначений (override)\n" +"должен содержать записи о переназначениях управляющих полей. Если был " +"указан\n" +"Pathprefix, то его значение добавляется к управляющим полям, содержащим\n" +"имена файлов. Пример использования для архива Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Параметры:\n" +" -h Этот текст\n" +" --md5 Управление генерацией MD5-хешей\n" +" -s=? Указать файл переназначений (override) для источников\n" +" -q Не выводить сообщения в процессе работы\n" +" -d=? Указать кэширующую базу данных (не обязательно)\n" +" --no-delink Включить режим отладки процесса удаления файлов\n" +" --contents Управление генерацией полного перечня содержимого пакетов\n" +" (файла Contents)\n" +" -c=? Использовать указанный файл настройки\n" +" -o=? Задать значение произвольному параметру настройки" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Совпадений не обнаружено" + +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "%c%s... %u%%" -msgstr "%c%s… %u%%" +msgid "Some files are missing in the package file group `%s'" +msgstr "В группе пакетов «%s» отсутствуют некоторые файлы" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%liд %liч %liмин %liс" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "БД была повреждена, файл переименован в %s.old" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "%lih %limin %lis" -msgstr "%liч %liмин %liс" +msgid "DB is old, attempting to upgrade %s" +msgstr "DB устарела, попытка обновить %s" + +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите " +"и создайте базу данных заново." + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Не удалось открыть DB файл %s: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Не удалось прочесть ссылку %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "В архиве нет поля control" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Невозможно получить курсор" + +#: ftparchive/writer.cc:91 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "W: Не удалось прочитать каталог %s\n" + +#: ftparchive/writer.cc:96 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "W: Не удалось прочитать атрибуты %s\n" + +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "W: " + +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: Ошибки относятся к файлу " -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%limin %lis" -msgstr "%liмин %liс" +msgid "Failed to resolve %s" +msgstr "Не удалось проследовать по ссылке %s" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 -#, c-format -msgid "%lis" -msgstr "%liс" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Не удалось совершить обход дерева" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:219 #, c-format -msgid "Selection %s not found" -msgstr "Не найдено: %s" +msgid "Failed to open %s" +msgstr "Не удалось открыть %s" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:278 #, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" -"Не удалось выполнить блокировку управляющего каталога (%s); он уже " -"используется другим процессом?" +msgid " DeLink %s [%s]\n" +msgstr "DeLink %s [%s]\n" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:286 #, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "" -"Не удалось выполнить блокировку управляющего каталога (%s); у вас есть права " -"суперпользователя?" +msgid "Failed to readlink %s" +msgstr "Не удалось прочесть ссылку %s" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:290 #, 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 "Failed to unlink %s" +msgstr "Не удалось удалить %s" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:298 #, c-format -msgid "Installing %s" -msgstr "Устанавливается %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Не удалось создать ссылку %s на %s" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:308 #, c-format -msgid "Configuring %s" -msgstr "Настраивается %s" +msgid " DeLink limit of %sB hit.\n" +msgstr " Превышен лимит в %sB в DeLink.\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 -#, c-format -msgid "Removing %s" -msgstr "Удаляется %s" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "В архиве нет поля package" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Completely removing %s" -msgstr "Выполняется полное удаление %s" +msgid " %s has no override entry\n" +msgstr " Нет записи о переназначении (override) для %s\n" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Noting disappearance of %s" -msgstr "Уведомление об исчезновении %s" +msgid " %s maintainer is %s not %s\n" +msgstr " пакет %s сопровождает %s, а не %s\n" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:706 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Выполняется послеустановочный триггер %s" +msgid " %s has no source override entry\n" +msgstr " Нет записи source override для %s\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:710 #, c-format -msgid "Directory '%s' missing" -msgstr "Отсутствует каталог «%s»" +msgid " %s has no binary override entry either\n" +msgstr " Нет записи binary override для %s\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, c-format -msgid "Could not open file '%s'" -msgstr "Не удалось открыть файл «%s»" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc — не удалось выделить память" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing %s" -msgstr "Подготавливается %s" +msgid "Unable to open %s" +msgstr "Не удалось открыть %s" -#: apt-pkg/deb/dpkgpm.cc:993 -#, c-format -msgid "Unpacking %s" -msgstr "Распаковывается %s" +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing to configure %s" -msgstr "Подготавливается для настройки %s" +msgid "Failed to read the override file %s" +msgstr "Не удалось прочесть файл переназначений (override) %s" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/override.cc:166 #, c-format -msgid "Installed %s" -msgstr "Установлен %s" +msgid "Malformed override %s line %llu #1" +msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:178 #, c-format -msgid "Preparing for removal of %s" -msgstr "Подготавливается для удаления %s" +msgid "Malformed override %s line %llu #2" +msgstr "Неправильная запись о переназначении (override) %s в строке %llu #2" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:191 #, c-format -msgid "Removed %s" -msgstr "Удалён %s" +msgid "Malformed override %s line %llu #3" +msgstr "Неправильная запись о переназначении (override) %s в строке %llu #3" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Подготовка к полному удалению %s" +msgid "Unknown compression algorithm '%s'" +msgstr "Неизвестный алгоритм сжатия «%s»" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:103 #, c-format -msgid "Completely removed %s" -msgstr "%s полностью удалён" - -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Невозможно записать в %s" - -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" +msgid "Compressed output %s needs a compression set" msgstr "" +"Для получения сжатого вывода %s необходимо включить использования сжатия" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Не удалось создать FILE*" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "Действие прервано до его завершения" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Не удалось запустить порождённый процесс" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "Отчёты apport не записаны, так достигнут MaxReports" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Процесс-потомок, производящий сжатие" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "проблемы с зависимостями — оставляем ненастроенным" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Внутренняя ошибка, не удалось создать %s" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" -"Отчёты apport не записаны, так как сообщение об ошибке указывает на " -"повторную ошибку от предыдущего отказа." +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "Ошибка ввода/вывода в подпроцесс/файл" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" -"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " -"места на диске" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Ошибка чтения во время вычисления MD5" -#: apt-pkg/deb/dpkgpm.cc:1707 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" -"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " -"памяти" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Не удалось удалить %s" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -#, fuzzy +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке " -"места на диске" +"Использование: apt-internal-solver\n" +"\n" +"apt-internal-solver — интерфейс к внутреннему решателю, предназначен\n" +"для отладки, подобен интерфейсу внешнего решателя семейства APT\n" +"\n" +"Параметры:\n" +" -h Этот текст\n" +" -q Вывод протокола работы — индикатор выполнения отключён\n" +" -c=? Читать указанный файл настройки\n" +" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Запись о неизвестном пакете!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Отчёты apport не записаны, так как получено сообщение об ошибке об ошибке " -"ввода-выводы dpkg" +"Использование: apt-sortpkgs [параметры] файл1 [файл2…]\n" +"\n" +"apt-sortpkgs — простой инструмент для сортировки списков пакетов. Параметр -" +"s\n" +"используется для указания типа списка.\n" +"\n" +"Параметры:\n" +" -h этот текст\n" +" -s сортировать список файлов пакетов исходного кода\n" +" -c=? читать указанный файл настройки\n" +" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/sk.po b/po/sk.po index acfd4cf5b..6a455ea1d 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2012-06-28 20:49+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Tabuľka verzií:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -357,7 +357,7 @@ msgstr "Adresár pre sťahovanie sa nedá zamknúť" 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Nedá sa nájsť zdrojový balík pre %s" @@ -384,80 +384,80 @@ msgstr "" "ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie " "balíka.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskakuje sa už stiahnutý súbor „%s“\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Na %s sa nedá zistiť veľkosť voľného miesta" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatok voľného miesta" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, 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:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Stiahnuť zdroj %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Sťahovanie ukončené v režime „iba stiahnuť“" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz na zostavenie „%s“ zlyhal.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -466,17 +466,17 @@ 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:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti na zostavenie.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -485,20 +485,20 @@ msgstr "" "%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch " "„%s“" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, 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:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -507,7 +507,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:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -515,30 +515,30 @@ msgid "" msgstr "" "%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti na zostavenie %s nemožno splniť." -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí na zostavenie zlyhalo" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Záznam zmien %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -680,7 +680,7 @@ msgstr "%s bol už nastavený na nepodržanie.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čakalo sa na %s, ale nebolo to tam" @@ -794,16 +794,16 @@ msgstr "Nedá sa odpojiť CD-ROM v %s - možno sa ešte používa." msgid "Disk not found." msgstr "Disk sa nenašiel." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Súbor sa nenašiel" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Vyhodnotenie zlyhalo" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Zlyhalo nastavenie času zmeny" @@ -857,7 +857,7 @@ msgstr "Príkaz „%s“ prihlasovacieho skriptu zlyhal, server odpovedal: %s" msgid "TYPE failed, server said: %s" msgstr "Zlyhalo zadanie typu, server odpovedal: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Uplynul čas spojenia" @@ -879,7 +879,7 @@ msgstr "Odpoveď preplnila zásobník." msgid "Protocol corruption" msgstr "Narušenie protokolu" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -940,7 +940,7 @@ msgstr "Uplynulo spojenie dátového socketu" msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijať" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Problém s hašovaním súboru" @@ -949,7 +949,7 @@ msgstr "Problém s hašovaním súboru" msgid "Unable to fetch file, server said '%s'" msgstr "Súbor sa nedá stiahnuť, server odpovedal „%s“" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Uplynula doba dátového socketu" @@ -999,7 +999,7 @@ msgstr "Nedá sa pripojiť k %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Pripája sa k %s" @@ -1138,42 +1138,18 @@ msgstr "Spojenie zlyhalo" msgid "Internal error" msgstr "Vnútorná chyba" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Už existuje " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Získava sa:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ign " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Chyba " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "%sB sa stiahlo za %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Prebieha spracovanie]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Výmena nosiča: Vložte disk s názvom\n" -" „%s“\n" -"do mechaniky „%s“ a stlačte Enter\n" +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:93 msgid "Correcting dependencies..." @@ -1203,163 +1179,349 @@ msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“." msgid "Unmet dependencies. Try using -f." msgstr "Nesplnené závislosti. Skúste použiť -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Nainštalovaný]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Upozornenie o vierohodnosti bolo potlačené.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [Nainštalovaný]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Nainštalovať tieto nekontrolované balíky?" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Nainštalovaný]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Nastali problémy a -y bolo použité bez --force-yes" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Nainštalovaný]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Zlyhalo stiahnutie %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!" - -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá." - -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Vnútorná chyba, Triedenie sa neukončilo" +msgid "[upgradable from: %s]" +msgstr "" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" msgstr "" -"Nezvyčajná udalosť... Veľkosti nesúhlasia, pošlite e-mail na 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 -#: apt-private/private-install.cc:155 +#: apt-private/private-output.cc:455 #, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "Je potrebné stiahnuť %sB/%sB archívov.\n" +msgid "but %s is installed" +msgstr "ale nainštalovaný je %s" -#. 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:160 +#: apt-private/private-output.cc:457 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "Je potrebné stiahnuť %sB archívov.\n" +msgid "but %s is to be installed" +msgstr "ale inštalovať sa bude %s" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Po tejto operácii sa na disku použije ďalších %sB.\n" +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "ale sa nedá nainštalovať" -#. 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:172 -#, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Po tejto operácii sa na disku uvoľní %sB.\n" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "ale je to virtuálny balík" -#: apt-private/private-install.cc:200 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "Na %s nemáte dostatok voľného miesta." +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "ale nie je nainštalovaný" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Zadané „iba triviálne“, ale toto nie je triviálna operácia." +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "ale sa nebude inštalovať" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Áno, urob to, čo vravím!" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " alebo" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Možno sa chystáte vykonať niečo škodlivé.\n" -"Ak chcete pokračovať, opíšte frázu „%s“\n" -" ?]" +#: 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-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Prerušené." +#: 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-install.cc:243 -msgid "Do you want to continue?" -msgstr "Chcete pokračovať?" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "Nasledovné balíky sa ODSTRÁNIA:" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Niektoré súbory sa nedajú stiahnuť" +#: 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-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --" -"fix-missing" +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "Nasledovné balíky sa aktualizujú:" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing a výmena nosiča nie sú momentálne podporované" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" +msgstr "Nasledovné balíky sa DEGRADUJÚ:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Chýbajúce balíky sa nedajú opraviť." +#: 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-install.cc:330 -msgid "Aborting install." -msgstr "Inštalácia sa prerušuje." +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (kvôli %s) " -#: apt-private/private-install.cc:366 +#: apt-private/private-output.cc:696 msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"Nasledovný balík zmizol z vášho systému, pretože\n" -"všetky súbory boli prepísané inými balíkmi:" -msgstr[1] "" -"Nasledovné balíky zmizli z vášho systému, pretože\n" -"všetky súbory boli prepísané inými balíkmi:" -msgstr[2] "" -"Nasledovné balíky zmizli z vášho systému, pretože\n" -"všetky súbory boli prepísané inými balíkmi:" +"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-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Pozn.: Toto robí dpkg automaticky a zámerne." +#: 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-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "Nemajú sa odstraňovať veci, nespustí sa AutoRemover" +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Vnútorná chyba, Triedenie sa neukončilo" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Nezvyčajná udalosť... Veľkosti nesúhlasia, pošlite e-mail na apt@packages." +"debian.org" + +#. 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Je potrebné stiahnuť %sB/%sB 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 +#: apt-private/private-install.cc:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Je potrebné stiahnuť %sB 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 +#: apt-private/private-install.cc:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Po tejto operácii sa na disku použije ďalších %sB.\n" + +#. 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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Po tejto operácii sa na disku uvoľní %sB.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Na %s nemáte dostatok voľného miesta." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Nastali problémy a -y bolo použité bez --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "Zadané „iba triviálne“, ale toto nie je triviálna operácia." + +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Áno, urob to, čo vravím!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Možno sa chystáte vykonať niečo škodlivé.\n" +"Ak chcete pokračovať, opíšte frázu „%s“\n" +" ?]" + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Prerušené." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Chcete pokračovať?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Niektoré súbory sa nedajú stiahnuť" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --" +"fix-missing" + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing a výmena nosiča nie sú momentálne podporované" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Chýbajúce balíky sa nedajú opraviť." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Inštalácia sa prerušuje." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"Nasledovný balík zmizol z vášho systému, pretože\n" +"všetky súbory boli prepísané inými balíkmi:" +msgstr[1] "" +"Nasledovné balíky zmizli z vášho systému, pretože\n" +"všetky súbory boli prepísané inými balíkmi:" +msgstr[2] "" +"Nasledovné balíky zmizli z vášho systému, pretože\n" +"všetky súbory boli prepísané inými balíkmi:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Pozn.: Toto robí dpkg automaticky a zámerne." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Nemajú sa odstraňovať veci, nespustí sa AutoRemover" #: apt-private/private-install.cc:499 msgid "" @@ -1503,212 +1665,26 @@ 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:129 -msgid "Listing" -msgstr "" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!" -#: apt-private/private-list.cc:159 -#, 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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Upozornenie o vierohodnosti bolo potlačené.\n" -#: 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:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov" -#: 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:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Chyba pri preklade regulárneho výrazu - %s" - -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Nainštalovať tieto nekontrolované balíky?" -#: apt-private/private-show.cc:156 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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 "" +msgid "Failed to fetch %s %s\n" +msgstr "Zlyhalo stiahnutie %s %s\n" #: apt-private/private-sources.cc:58 #, fuzzy, c-format @@ -1720,21 +1696,8 @@ msgstr "Premenovanie %s na %s zlyhalo" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: 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:90 -#, 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:94 -msgid "All packages are up to date." +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" #: apt-private/private-upgrade.cc:25 @@ -1745,20 +1708,57 @@ msgstr "Prepočítava sa aktualizácia... " msgid "Done" msgstr "Hotovo" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Už existuje " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Získava sa:" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ign " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Chyba " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "%sB sa stiahlo za %s (%sB/s)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Prebieha spracovanie]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Výmena nosiča: Vložte disk s názvom\n" +" „%s“\n" +"do mechaniky „%s“ a stlačte Enter\n" + #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, 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:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 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 "[Zrkadlo: %s]" msgid "Failed to create IPC pipe to subprocess" msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "Spojenie bolo predčasne ukončené" @@ -1832,509 +1832,124 @@ msgstr "" msgid "Merging available information" msgstr "Zlučujú sa dostupné informácie" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Použitie: apt-extracttemplates súbor1 [súbor2 ...]\n" -"\n" -"apt-extracttemplates je nástroj na vyňatie konfiguračných skriptov\n" -"a šablón z balíkov Debian\n" -"\n" -"Voľby:\n" -" -h Tento pomocník.\n" -" -t Nastaví dočasný adresár\n" -" -c=? Načíta tento konfiguračný súbor\n" -" -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" - -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Nedá sa vyhodnotiť %s" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "Pokus o uvoľnenie uzla (DropNode) na stále prepojenom uzle" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "Do %s sa nedá zapisovať" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Hašovací prvok sa nedá nájsť!" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Nedá sa určiť verzia programu debconf. Je debconf nainštalovaný?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Nedá sa alokovať diverzia" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Zoznam rozšírení balíka je príliš dlhý" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Vnútorná chyba pri AddDiversion" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "Chyba pri spracovávaní adresára %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Zoznam zdrojových rozšírení je príliš dlhý" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Chyba pri zapisovaní hlavičky do súboru" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Pokus o prepísanie diverzie, %s -> %s a %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "Chyba pri spracovávaní obsahu %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Použitie: apt-ftparchive [voľby] príkaz\n" -"Príkazy: packages binárna_cesta [súbor_override [prefix_cesty]]\n" -" sources zdrojová_cesta [súbor_override [prefix_cesty]]\n" -" contents cesta\n" -" release cesta\n" -" generate konfiguračný_súbor [skupiny]\n" -" clean konfiguračný_súbor\n" -"\n" -"apt-ftparchive generuje indexové súbory archívov Debianu. Podporuje\n" -"niekoľko režimov vytvárania - od plne automatického až po funkčnú\n" -"náhradu príkazov dpkg-scanpackages a dpkg-scansources.\n" -"\n" -"apt-ftparchive zo stromu .deb súborov vygeneruje súbory Packages. Súbor\n" -"Packages okrem všetkých riadiacich polí každého balíka obsahuje tiež jeho\n" -"veľkosť a MD5 súčet. Podporovaný je tiež súbor „override“, pomocou ktorého\n" -"môžete vynútiť hodnoty polí Priority a Section.\n" -"\n" -"Podobne vie apt-ftparchive vygenerovať zo stromu súborov .dsc súbory\n" -"Sources. Voľbou --source-override môžete určiť zdrojový súbor „override“.\n" -"\n" -"Príkazy „packages“ a „sources“ by sa mali spúšťať v koreni stromu.\n" -"Binárna_cesta by mala ukazovať na začiatok rekurzívneho hľadania\n" -"a súbor „override“ by mal obsahovať príznaky pre nahradenie. Ak je udaný\n" -"prefix_cesty, pridá sa do polí „filename“.\n" -"Skutočný príklad z archívu Debianu:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Voľby:\n" -" -h Tento pomocník\n" -" --md5 Vygeneruje kontrolný súčet MD5\n" -" -s=? Zdrojový súbor „override“\n" -" -q Tichý režim\n" -" -d=? Zvolí voliteľnú databázu pre vyrovnávaciu pamäť\n" -" --no-delink Povolí ladiaci režim\n" -" --contents Vygeneruje súbor Contents\n" -" -c=? Načíta tento konfiguračný súbor\n" -" -o=? Nastaví ľubovoľnú voľbu" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Nevyhovel žiaden výber" +msgid "Double add of diversion %s -> %s" +msgstr "Dvojité pridanie diverzie %s -> %s" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, 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" +msgid "Duplicate conf file %s/%s" +msgstr "Duplicitný konfiguračný súbor %s/%s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB je narušená, súbor je premenovaný na %s.old" +msgid "The path %s is too long" +msgstr "Cesta %s je príliš dlhá" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s" +msgid "Unpacking %s more than once" +msgstr "%s sa rozbaľuje viackrát" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"Formát DB je neplatný. Ak ste aktualizovali staršiu verziu apt, musíte " -"odstrániť a znovu vytvoriť databázu." +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "Adresár %s je divertovaný" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Nedá sa otvoriť DB súbor %s: %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Balík sa pokúša zapisovať do diverzného cieľa %s/%s" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Diverzná cesta je príliš dlhá" + +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "%s sa nedá vyhodnotiť" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Nie je možné vykonať readlink %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Archív nemá riadiaci záznam" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Nedá sa získať kurzor" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: Adresár %s sa nedá čítať\n" +msgid "Failed to rename %s to %s" +msgstr "Premenovanie %s na %s zlyhalo" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "W: %s sa nedá vyhodnotiť\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "Adresár %s sa nahradí neadresárom" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "W: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Nedá sa nájsť uzol na adrese jeho hašu" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: Chyby sa týkajú súboru " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Cesta je príliš dlhá" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "Chyba pri preklade %s" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Prechod stromom zlyhal" +msgid "Overwrite package match with no version for %s" +msgstr "Prepísať zodpovedajúci balík bez udania verzie pre %s" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to open %s" -msgstr "%s sa nedá otvoriť" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Súbor %s/%s prepisuje ten z balíka %s" -#: ftparchive/writer.cc:278 +#: apt-inst/extract.cc:498 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " Odlinkovanie %s [%s]\n" +msgid "Unable to stat %s" +msgstr "Nedá sa vyhodnotiť %s" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Failed to readlink %s" -msgstr "Nie je možné vykonať readlink %s" +msgid "Failed to write file %s" +msgstr "Zápis súboru %s zlyhal" -#: ftparchive/writer.cc:290 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to unlink %s" -msgstr "Nie je možné vykonať unlink %s" +msgid "Failed to close file %s" +msgstr "Zatvorenie súboru %s zlyhalo" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Nepodarilo sa zlinkovať %s s %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Toto nie je platný DEB archív, chýba časť „%s“" -#: ftparchive/writer.cc:308 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Bol dosiahnutý odlinkovací limit %sB.\n" - -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Archív neobsahuje pole „package“" - -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s nemá žiadnu položku override\n" - -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " správcom %s je %s, nie %s\n" - -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s nemá žiadnu položku „source override“\n" - -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s nemá žiadnu položku „binary override“\n" - -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Zlyhal pokus o pridelenie pamäti" - -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Nedá sa otvoriť %s" - -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Skomolený „override“ %s riadok %llu #1" - -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Nepodarilo sa prečítať „override“ súbor %s" - -#: ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Skomolený „override“ %s riadok %llu #1" - -#: ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Skomolený „override“ %s riadok %llu #2" - -#: ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Skomolený „override“ %s riadok %llu #3" - -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Neznámy kompresný algoritmus „%s“" - -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Komprimovaný výstup %s potrebuje kompresnú sadu" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Zlyhalo vytvorenie FILE*" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Volanie fork() zlyhalo" - -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Komprimovať potomka" - -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "Vnútorná chyba, nepodarilo sa vytvoriť %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "V/V operácia s podprocesom/súborom zlyhala" - -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Chyba čítania pri výpočte MD5" - -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "Problém s odlinkovaním %s" - -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "Premenovanie %s na %s zlyhalo" - -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Použitie: apt-internal-solver\n" -"\n" -"apt-internal-solver je rozhranie na použitie aktuálneho vnútorného\n" -"riešiteľa ako vonkajší pre rodinu APT na ladenie a pod.\n" -"\n" -"Voľby:\n" -" -h Tento pomocník.\n" -" -q Výstup vhodný do záznamu - bez indikátora priebehu\n" -" -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 -msgid "Unknown package record!" -msgstr "Neznámy záznam o balíku!" - -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Použitie: apt-sortpkgs [voľby] súbor1 [súbor2 ...]\n" -"\n" -"apt-sortpkgs je jednoduchý nástroj na zotriedenie súborov Packages.\n" -"Voľbou -s si zvolíte typ súboru.\n" -"\n" -"Voľby:\n" -" -h Tento pomocník\n" -" -s Zotriedi zdrojový súbor\n" -" -c=? Načíta tento konfiguračný súbor\n" -" -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" - -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" -msgstr "Zápis súboru %s zlyhal" - -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "Zatvorenie súboru %s zlyhalo" - -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "Cesta %s je príliš dlhá" - -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" -msgstr "%s sa rozbaľuje viackrát" - -#: apt-inst/extract.cc:142 -#, c-format -msgid "The directory %s is diverted" -msgstr "Adresár %s je divertovaný" - -#: apt-inst/extract.cc:152 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Balík sa pokúša zapisovať do diverzného cieľa %s/%s" - -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Diverzná cesta je príliš dlhá" - -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Adresár %s sa nahradí neadresárom" - -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Nedá sa nájsť uzol na adrese jeho hašu" - -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Cesta je príliš dlhá" - -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Prepísať zodpovedajúci balík bez udania verzie pre %s" - -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Súbor %s/%s prepisuje ten z balíka %s" - -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "Nedá sa vyhodnotiť %s" - -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "Pokus o uvoľnenie uzla (DropNode) na stále prepojenom uzle" - -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Hašovací prvok sa nedá nájsť!" - -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Nedá sa alokovať diverzia" - -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Vnútorná chyba pri AddDiversion" - -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Pokus o prepísanie diverzie, %s -> %s a %s/%s" - -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Dvojité pridanie diverzie %s -> %s" +msgid "Internal error, could not locate member %s" +msgstr "Vnútorná chyba, nedá sa nájsť časť %s" -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Duplicitný konfiguračný súbor %s/%s" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Nespracovateľný riadiaci súbor" #: apt-inst/contrib/arfile.cc:76 msgid "Invalid archive signature" @@ -2382,137 +1997,53 @@ msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený" msgid "Unknown TAR header type %u, member %s" msgstr "Neznáma TAR hlavička typu %u, člen %s" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 -#, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Toto nie je platný DEB archív, chýba časť „%s“" - -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "Vnútorná chyba, nedá sa nájsť časť %s" - -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Nespracovateľný riadiaci súbor" - -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, c-format -msgid "List directory %spartial is missing." -msgstr "Adresár zoznamov %spartial chýba." - -#: apt-pkg/acquire.cc:91 -#, c-format -msgid "Archives directory %spartial is missing." -msgstr "Archívny adresár %spartial chýba." - -#: apt-pkg/acquire.cc:99 -#, c-format -msgid "Unable to lock directory %s" -msgstr "Adresár %s sa nedá zamknúť" - -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "Indexový súbor typu „%s“ nie je podporovaný" - -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, 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:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "Sťahuje sa %li. súbor z %li" - -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "premenovanie zlyhalo, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "Nezhoda kontrolných haš súčtov" - -#: apt-pkg/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "Veľkosti sa nezhodujú" - -#: apt-pkg/acquire-item.cc:173 -#, fuzzy -msgid "Invalid file format" -msgstr "Neplatná operácia %s" - -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" +msgid "Progress: [%3i%%]" 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:1589 -#, 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:1631 -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/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "Spúšťa sa dpkg" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/init.cc:146 #, c-format -msgid "" -"Release file for %s is expired (invalid since %s). Updates for this " -"repository will not be applied." -msgstr "" -"Súbor Release pre %s vypršal (neplatný od %s). Aktualizácie tohto zdroja " -"softvéru sa nepoužijú." +msgid "Packaging system '%s' is not supported" +msgstr "Systém balíkov „%s“ nie je podporovaný" + +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Nedá sa určiť vhodný typ systému balíkov" -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, 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)" +msgid "Wrote %i records.\n" +msgstr "Zapísaných %i záznamov.\n" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "" -"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" -msgstr "" -"Počas overovania podpisu sa vyskytla chyba. Repozitár nie je aktualizovaný a " -"použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n" -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "GPG error: %s: %s" -msgstr "Chyba GPG: %s: %s" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, 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 "" -"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)." +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/indexcopy.cc:515 #, 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“" +msgid "Can't find authentication record for: %s" +msgstr "Nebolo možné nájsť autentifikačný záznam pre: %s" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/indexcopy.cc:521 #, 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." +msgid "Hash mismatch for: %s" +msgstr "Nezhoda kontrolných haš súčtov: %s" #: apt-pkg/acquire-worker.cc:116 #, c-format @@ -2534,24 +2065,6 @@ msgstr "Spôsob %s nebol správne spustený" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Vložte disk nazvaný „%s“ do mechaniky „%s“ a stlačte Enter." -#: apt-pkg/algorithms.cc:265 -#, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "Je nutné preinštalovať balík %s, ale nedá sa nájsť jeho archív." - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené " -"pridržanými balíkmi." - -#: apt-pkg/algorithms.cc:1088 -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/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ť." @@ -2564,177 +2077,247 @@ 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/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Nebolo nájdené vydanie „%s“ pre „%s“" - -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Nebola nájdená verzia „%s“ pre „%s“" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Vyrovnávacia pamäť balíkov je prázdna" -#: apt-pkg/cacheset.cc:603 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "Nebolo možné nájsť úlohu „%s“" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený" -#: apt-pkg/cacheset.cc:609 -#, 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/pkgcache.cc:166 +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/cacheset.cc:615 -#, 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/pkgcache.cc:169 +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/cacheset.cc:626 +#: apt-pkg/pkgcache.cc:174 #, 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" +msgid "This APT does not support the versioning system '%s'" +msgstr "Tento APT nepodporuje systém na správu verzií „%s“" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 -#, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" -"Nie je možné vybrať nainštalované ani kandidátske verzie z balíka „%s“, " -"pretože nemá žiadnu z nich" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Súbor vyrovnávacej pamäti balíkov bol vytvorený pre inú architektúru" -#: apt-pkg/cacheset.cc:647 -#, 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/pkgcache.cc:321 +msgid "Depends" +msgstr "Závisí na" -#: apt-pkg/cacheset.cc:655 -#, 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/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Predzávisí na" -#: apt-pkg/cacheset.cc:663 -#, 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/pkgcache.cc:321 +msgid "Suggests" +msgstr "Navrhuje" -#: 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/pkgcache.cc:322 +msgid "Recommends" +msgstr "Odporúča" -#: apt-pkg/cdrom.cc:571 -msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM sa odpája...\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Koliduje s" -#: apt-pkg/cdrom.cc:586 -#, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "Použije sa prípojný bod CD-ROM %s\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Nahrádza" -#: apt-pkg/cdrom.cc:599 -msgid "Waiting for disc...\n" -msgstr "Čaká sa na disk...\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Zneplatňuje" -#: apt-pkg/cdrom.cc:609 -msgid "Mounting CD-ROM...\n" -msgstr "Pripája sa CD-ROM...\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Kazí" -#: apt-pkg/cdrom.cc:620 -msgid "Identifying... " -msgstr "Identifikuje sa..." +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Rozširuje" -#: apt-pkg/cdrom.cc:662 +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "dôležitý" + +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "požadovaný" + +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "štandardný" + +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "voliteľný" + +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "extra" + +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Stored label: %s\n" -msgstr "Uložená menovka: %s \n" +msgid "Index file type '%s' is not supported" +msgstr "Indexový súbor typu „%s“ nie je podporovaný" -#: apt-pkg/cdrom.cc:680 -msgid "Scanning disc for index files...\n" -msgstr "Na disku sa hľadajú indexové súbory...\n" +#: 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/cdrom.cc:734 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "" -"Found %zu package indexes, %zu source indexes, %zu translation indexes and " -"%zu signatures\n" +msgid "Malformed line %lu in source list %s ([option] unparseable)" msgstr "" -"Nájdených %zu indexov balíkov, %zu indexov zdrojových balíkov, %zu indexov " -"prekladov a %zu signatúr\n" +"Skomolený riadok %lu v zozname zdrojov %s (nie je možné spracovať [option])" -#: apt-pkg/cdrom.cc:744 -msgid "" -"Unable to locate any package files, perhaps this is not a Debian Disc or the " -"wrong architecture?" -msgstr "" -"Nepodarilo sa nájsť žiadne súbory balíkov, možno toto nie je disk s Debianom " -"alebo je pre nesprávnu architektúru?" +#: apt-pkg/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/cdrom.cc:771 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "Found label '%s'\n" -msgstr "Nájdená menovka: „%s“\n" +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/cdrom.cc:800 -msgid "That is not a valid name, try again.\n" -msgstr "Neplatný názov, skúste znova.\n" +#: 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/cdrom.cc:817 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "" -"This disc is called: \n" -"'%s'\n" -msgstr "" -"Názov tohto disku je: \n" -"„%s“\n" +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/cdrom.cc:819 -msgid "Copying package lists..." -msgstr "Kopírujú sa zoznamy balíkov..." +#: 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/cdrom.cc:863 -msgid "Writing new source list\n" -msgstr "Zapisuje sa nový zoznam zdrojov\n" +#: 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/cdrom.cc:874 -msgid "Source list entries for this disc are:\n" -msgstr "Položky zoznamu zdrojov pre tento disk sú:\n" +#: 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:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Indexový súbor typu „%s“ nie je podporovaný" #: apt-pkg/clean.cc:64 #, c-format msgid "Unable to stat %s." msgstr "Nie je možné vykonať stat %s." -#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 -msgid "Building dependency tree" -msgstr "Vytvára sa strom závislostí" +#: apt-pkg/pkgcachegen.cc:93 +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:139 -msgid "Candidate versions" -msgstr "Kandidátske verzie" +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)" -#: apt-pkg/depcache.cc:168 -msgid "Dependency generation" -msgstr "Generovanie závislostí" +#: apt-pkg/pkgcachegen.cc:257 +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: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:260 +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/depcache.cc:250 +#: apt-pkg/pkgcachegen.cc:263 +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:266 +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:576 #, 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:1211 #, 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:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Načítavajú sa zoznamy balíkov" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Collecting File poskytuje" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Do %s sa nedá zapisovať" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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" @@ -2756,78 +2339,149 @@ msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy" msgid "Execute external solver" msgstr "Spustiť externého riešiteľa" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format -msgid "Wrote %i records.\n" -msgstr "Zapísaných %i záznamov.\n" +msgid "rename failed, %s (%s -> %s)." +msgstr "premenovanie zlyhalo, %s (%s -> %s)." -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 -#, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n" +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "Nezhoda kontrolných haš súčtov" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 -#, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n" +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "Veľkosti sa nezhodujú" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 -#, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n" +#: apt-pkg/acquire-item.cc:173 +#, fuzzy +msgid "Invalid file format" +msgstr "Neplatná operácia %s" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/acquire-item.cc:1640 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "Nebolo možné nájsť autentifikačný záznam pre: %s" +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +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/indexcopy.cc:521 +#: apt-pkg/acquire-item.cc:1656 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Nezhoda kontrolných haš súčtov: %s" - -#: apt-pkg/indexrecords.cc:78 +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:1698 +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:1736 #, c-format -msgid "Unable to parse Release file %s" -msgstr "Nedá spracovať súbor Release %s" +msgid "" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." +msgstr "" +"Súbor Release pre %s vypršal (neplatný od %s). Aktualizácie tohto zdroja " +"softvéru sa nepoužijú." -#: apt-pkg/indexrecords.cc:86 +#: apt-pkg/acquire-item.cc:1758 #, c-format -msgid "No sections in Release file %s" -msgstr "Žiadne sekcie v Release súbore %s" +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/indexrecords.cc:117 +#: apt-pkg/acquire-item.cc:1788 #, c-format -msgid "No Hash entry in Release file %s" -msgstr "Chýba položka „Hash“ v súbore Release %s" +msgid "" +"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" +msgstr "" +"Počas overovania podpisu sa vyskytla chyba. Repozitár nie je aktualizovaný a " +"použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n" -#: apt-pkg/indexrecords.cc:130 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format -msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "Chýba položka „Valid-Until“ v súbore Release %s" +msgid "GPG error: %s: %s" +msgstr "Chyba GPG: %s: %s" -#: apt-pkg/indexrecords.cc:149 +#: apt-pkg/acquire-item.cc:1926 #, c-format -msgid "Invalid 'Date' entry in Release file %s" -msgstr "Chýba položka „Date“ v súbore Release %s" +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 "" +"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/init.cc:146 +#: apt-pkg/acquire-item.cc:1992 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Systém balíkov „%s“ nie je podporovaný" +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/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Nedá sa určiť vhodný typ systému balíkov" +#: apt-pkg/acquire-item.cc:2050 +#, 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/install-progress.cc:57 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "Progress: [%3i%%]" +msgid "Vendor block %s contains no fingerprint" +msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)" + +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#, c-format +msgid "List directory %spartial is missing." +msgstr "Adresár zoznamov %spartial chýba." + +#: apt-pkg/acquire.cc:91 +#, c-format +msgid "Archives directory %spartial is missing." +msgstr "Archívny adresár %spartial chýba." + +#: apt-pkg/acquire.cc:99 +#, 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:902 +#, 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:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Sťahuje sa %li. súbor z %li" + +#: 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/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“ nie je platná hodnota pre APT::Default-Release, pretože také vydanie " +"nie je dostupné v zdrojoch" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "Spúšťa sa dpkg" +#: apt-pkg/policy.cc:422 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Neplatný záznam v súbore nastavení %s, chýba hlavička Package" + +#: apt-pkg/policy.cc:444 +#, c-format +msgid "Did not understand pin type %s" +msgstr "Nezrozumiteľné pridržanie typu %s" + +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie" #: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format @@ -2854,411 +2508,279 @@ 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/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Vyrovnávacia pamäť balíkov je prázdna" - -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený" - -#: apt-pkg/pkgcache.cc:166 -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/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/pkgcache.cc:169 -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/cdrom.cc:571 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM sa odpája...\n" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/cdrom.cc:586 #, 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:179 -msgid "The package cache was built for a different architecture" -msgstr "Súbor vyrovnávacej pamäti balíkov bol vytvorený pre inú architektúru" - -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Závisí na" +msgid "Using CD-ROM mount point %s\n" +msgstr "Použije sa prípojný bod CD-ROM %s\n" -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Predzávisí na" +#: apt-pkg/cdrom.cc:599 +msgid "Waiting for disc...\n" +msgstr "Čaká sa na disk...\n" -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Navrhuje" +#: apt-pkg/cdrom.cc:609 +msgid "Mounting CD-ROM...\n" +msgstr "Pripája sa CD-ROM...\n" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Odporúča" +#: apt-pkg/cdrom.cc:620 +msgid "Identifying... " +msgstr "Identifikuje sa..." -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Koliduje s" +#: apt-pkg/cdrom.cc:662 +#, c-format +msgid "Stored label: %s\n" +msgstr "Uložená menovka: %s \n" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Nahrádza" +#: apt-pkg/cdrom.cc:680 +msgid "Scanning disc for index files...\n" +msgstr "Na disku sa hľadajú indexové súbory...\n" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Zneplatňuje" +#: apt-pkg/cdrom.cc:734 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" +msgstr "" +"Nájdených %zu indexov balíkov, %zu indexov zdrojových balíkov, %zu indexov " +"prekladov a %zu signatúr\n" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Kazí" +#: apt-pkg/cdrom.cc:744 +msgid "" +"Unable to locate any package files, perhaps this is not a Debian Disc or the " +"wrong architecture?" +msgstr "" +"Nepodarilo sa nájsť žiadne súbory balíkov, možno toto nie je disk s Debianom " +"alebo je pre nesprávnu architektúru?" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Rozširuje" +#: apt-pkg/cdrom.cc:771 +#, c-format +msgid "Found label '%s'\n" +msgstr "Nájdená menovka: „%s“\n" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "dôležitý" +#: apt-pkg/cdrom.cc:800 +msgid "That is not a valid name, try again.\n" +msgstr "Neplatný názov, skúste znova.\n" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "požadovaný" +#: apt-pkg/cdrom.cc:817 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"Názov tohto disku je: \n" +"„%s“\n" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "štandardný" +#: apt-pkg/cdrom.cc:819 +msgid "Copying package lists..." +msgstr "Kopírujú sa zoznamy balíkov..." -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "voliteľný" +#: apt-pkg/cdrom.cc:863 +msgid "Writing new source list\n" +msgstr "Zapisuje sa nový zoznam zdrojov\n" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "extra" +#: apt-pkg/cdrom.cc:874 +msgid "Source list entries for this disc are:\n" +msgstr "Položky zoznamu zdrojov pre tento disk sú:\n" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií" +#: apt-pkg/algorithms.cc:265 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "Je nutné preinštalovať balík %s, ale nedá sa nájsť jeho archív." -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 -#, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)" - -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." msgstr "" -"Fíha, prekročili ste počet názvov balíkov, ktoré toto APT zvládne spracovať." +"Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené " +"pridržanými balíkmi." -#: apt-pkg/pkgcachegen.cc:260 -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/algorithms.cc:1088 +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/pkgcachegen.cc:263 -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/depcache.cc:138 apt-pkg/depcache.cc:167 +msgid "Building dependency tree" +msgstr "Vytvára sa strom závislostí" -#: apt-pkg/pkgcachegen.cc:266 -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/depcache.cc:139 +msgid "Candidate versions" +msgstr "Kandidátske verzie" -#: apt-pkg/pkgcachegen.cc:576 -#, 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/depcache.cc:168 +msgid "Dependency generation" +msgstr "Generovanie závislostí" -#: apt-pkg/pkgcachegen.cc:1211 -#, c-format -msgid "Couldn't stat source package list %s" -msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s" +#: 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:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Načítavajú sa zoznamy balíkov" +#: apt-pkg/depcache.cc:250 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Nie je možné otvoriť StateFile %s" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Collecting File poskytuje" +#: apt-pkg/depcache.cc:256 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Nie je možné zapísať dočasný StateFile %s" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Súbor %s sa nedá spracovať (1)" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/tagfile.cc:237 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Indexový súbor typu „%s“ nie je podporovaný" +msgid "Unable to parse package file %s (2)" +msgstr "Súbor %s sa nedá spracovať (2)" -#: apt-pkg/policy.cc:83 +#: apt-pkg/cacheset.cc:489 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" -msgstr "" -"„%s“ nie je platná hodnota pre APT::Default-Release, pretože také vydanie " -"nie je dostupné v zdrojoch" +msgid "Release '%s' for '%s' was not found" +msgstr "Nebolo nájdené vydanie „%s“ pre „%s“" -#: apt-pkg/policy.cc:422 +#: apt-pkg/cacheset.cc:492 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Neplatný záznam v súbore nastavení %s, chýba hlavička Package" +msgid "Version '%s' for '%s' was not found" +msgstr "Nebola nájdená verzia „%s“ pre „%s“" -#: apt-pkg/policy.cc:444 +#: apt-pkg/cacheset.cc:603 #, c-format -msgid "Did not understand pin type %s" -msgstr "Nezrozumiteľné pridržanie typu %s" +msgid "Couldn't find task '%s'" +msgstr "Nebolo možné nájsť úlohu „%s“" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie" +#: apt-pkg/cacheset.cc:609 +#, 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/sourcelist.cc:127 +#: apt-pkg/cacheset.cc:615 #, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" +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/sourcelist.cc:170 +#: apt-pkg/cacheset.cc:626 #, 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])" +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/sourcelist.cc:173 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, 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)" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"Nie je možné vybrať nainštalované ani kandidátske verzie z balíka „%s“, " +"pretože nemá žiadnu z nich" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/cacheset.cc:647 #, 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)" +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/sourcelist.cc:190 +#: apt-pkg/cacheset.cc:655 #, 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ľúč)" +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/sourcelist.cc:193 +#: apt-pkg/cacheset.cc:663 #, 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)" +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/sourcelist.cc:206 +#: apt-pkg/indexrecords.cc:78 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)" +msgid "Unable to parse Release file %s" +msgstr "Nedá spracovať súbor Release %s" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/indexrecords.cc:86 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)" +msgid "No sections in Release file %s" +msgstr "Žiadne sekcie v Release súbore %s" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/indexrecords.cc:117 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" +msgid "No Hash entry in Release file %s" +msgstr "Chýba položka „Hash“ v súbore Release %s" -#: apt-pkg/sourcelist.cc:217 +#: apt-pkg/indexrecords.cc:130 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)" +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "Chýba položka „Valid-Until“ v súbore Release %s" -#: apt-pkg/sourcelist.cc:224 +#: apt-pkg/indexrecords.cc:149 #, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)" +msgid "Invalid 'Date' entry in Release file %s" +msgstr "Chýba položka „Date“ v súbore Release %s" -#: apt-pkg/sourcelist.cc:335 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Opening %s" -msgstr "Otvára sa %s" +msgid "%lid %lih %limin %lis" +msgstr "%li d %li h %li min %li s" -#: apt-pkg/sourcelist.cc:371 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)" +msgid "%lih %limin %lis" +msgstr "%li h %li min %li s" -#: apt-pkg/sourcelist.cc:375 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, 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" +msgid "%limin %lis" +msgstr "%li min %li 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" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" +msgstr "%li s" -#: apt-pkg/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI" +#: apt-pkg/contrib/strutl.cc:1258 +#, c-format +msgid "Selection %s not found" +msgstr "Voľba %s nenájdená" -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Súbor %s sa nedá spracovať (1)" +msgid "Not using locking for read only lock file %s" +msgstr "Zamykanie pre súbor zámku %s, ktorý je iba na čítanie, sa nepoužíva" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Súbor %s sa nedá spracovať (2)" +msgid "Could not open lock file %s" +msgstr "Súbor zámku %s sa nedá otvoriť" -#: 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/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Zamykanie pre súbor zámku %s pripojený cez NFS sa nepoužíva" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/fileutl.cc:223 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)" +msgid "Could not get lock %s" +msgstr "Zámok %s sa nedá získať" -#: apt-pkg/contrib/cdromutl.cc:65 -#, c-format -msgid "Unable to stat the mount point %s" -msgstr "Prípojný bod %s sa nedá vyhodnotiť" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "Nedá sa vykonať stat() CD-ROM" - -#: apt-pkg/contrib/cmndline.cc:121 -#, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "Nezrozumiteľný parameter %s na príkazovom riadku" - -#: apt-pkg/contrib/cmndline.cc:168 -#, 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:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "Voľba %s vyžaduje argument." - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "Parameter %s: Zadanie konfiguračnej položky musí obsahovať =." - -#: apt-pkg/contrib/cmndline.cc:278 -#, 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:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "Voľba „%s“ je príliš dlhá" - -#: apt-pkg/contrib/cmndline.cc:341 -#, 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:391 -#, c-format -msgid "Invalid operation %s" -msgstr "Neplatná operácia %s" - -#: apt-pkg/contrib/configuration.cc:519 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Nerozpoznaná skratka typu: „%c“" - -#: apt-pkg/contrib/configuration.cc:633 -#, c-format -msgid "Opening configuration file %s" -msgstr "Otvára sa konfiguračný súbor %s" - -#: apt-pkg/contrib/configuration.cc:801 -#, 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:820 -#, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Syntaktická chyba %s:%u: Skomolená značka" - -#: apt-pkg/contrib/configuration.cc:837 -#, 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:877 -#, 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:884 -#, 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:888 apt-pkg/contrib/configuration.cc:893 -#, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ" - -#: apt-pkg/contrib/configuration.cc:897 -#, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva „%s“" - -#: apt-pkg/contrib/configuration.cc:900 -#, 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:950 -#, 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/fileutl.cc:190 -#, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Zamykanie pre súbor zámku %s, ktorý je iba na čítanie, sa nepoužíva" - -#: apt-pkg/contrib/fileutl.cc:195 -#, c-format -msgid "Could not open lock file %s" -msgstr "Súbor zámku %s sa nedá otvoriť" - -#: apt-pkg/contrib/fileutl.cc:218 -#, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Zamykanie pre súbor zámku %s pripojený cez NFS sa nepoužíva" - -#: apt-pkg/contrib/fileutl.cc:223 -#, c-format -msgid "Could not get lock %s" -msgstr "Zámok %s sa nedá získať" - -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "Zoznam súborov nemožno vytvoriť, pretože „%s“ nie je adresár" @@ -3352,11 +2874,25 @@ msgstr "Problém pri odstraňovaní súboru %s" msgid "Problem syncing the file" msgstr "Problém pri synchronizovaní súboru" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "No keyring installed in %s." -msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov." +msgid "%c%s... Error!" +msgstr "%c%s... Chyba!" + +#: apt-pkg/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Hotovo" + +#: apt-pkg/contrib/progress.cc:181 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Hotovo" #: apt-pkg/contrib/mmap.cc:79 msgid "Can't mmap an empty file" @@ -3413,225 +2949,684 @@ msgstr "" "Napodarilo sa zväčšiť veľkosť MMap, pretože automatické zväčovanie vypol " "používateľ." -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Chyba!" +msgid "Unable to stat the mount point %s" +msgstr "Prípojný bod %s sa nedá vyhodnotiť" -#: apt-pkg/contrib/progress.cc:150 +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Nedá sa vykonať stat() CD-ROM" + +#: apt-pkg/contrib/configuration.cc:519 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Hotovo" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Nerozpoznaná skratka typu: „%c“" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +#: apt-pkg/contrib/configuration.cc:633 +#, c-format +msgid "Opening configuration file %s" +msgstr "Otvára sa konfiguračný súbor %s" + +#: apt-pkg/contrib/configuration.cc:801 +#, 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:820 +#, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Syntaktická chyba %s:%u: Skomolená značka" + +#: apt-pkg/contrib/configuration.cc:837 +#, 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:877 +#, 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" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Hotovo" +#: apt-pkg/contrib/configuration.cc:884 +#, c-format +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Syntaktická chyba %s:%u: Príliš mnoho vnorených prepojení (include)" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%li d %li h %li min %li s" +msgid "Syntax error %s:%u: Included from here" +msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: apt-pkg/contrib/configuration.cc:897 #, c-format -msgid "%lih %limin %lis" -msgstr "%li h %li min %li s" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva „%s“" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: apt-pkg/contrib/configuration.cc:900 #, c-format -msgid "%limin %lis" -msgstr "%li min %li s" +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:950 +#, 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" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, c-format +msgid "No keyring installed in %s." +msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov." + +#: apt-pkg/contrib/cmndline.cc:124 +#, 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 +#, 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 +#, 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 +#, 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 +#, c-format +msgid "Option %s: Configuration item specification must have an =." +msgstr "Parameter %s: Zadanie konfiguračnej položky musí obsahovať =." + +#: apt-pkg/contrib/cmndline.cc:281 +#, 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 +#, c-format +msgid "Option '%s' is too long" +msgstr "Voľba „%s“ je príliš dlhá" + +#: apt-pkg/contrib/cmndline.cc:344 +#, 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 +#, c-format +msgid "Invalid operation %s" +msgstr "Neplatná operácia %s" + +#: apt-pkg/deb/dpkgpm.cc:110 +#, c-format +msgid "Installing %s" +msgstr "Inštaluje sa %s" + +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 +#, c-format +msgid "Configuring %s" +msgstr "Nastavuje sa %s" + +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 +#, c-format +msgid "Removing %s" +msgstr "Odstraňuje sa %s" + +#: apt-pkg/deb/dpkgpm.cc:113 +#, c-format +msgid "Completely removing %s" +msgstr "Úplne sa odstraňuje %s" + +#: apt-pkg/deb/dpkgpm.cc:114 +#, c-format +msgid "Noting disappearance of %s" +msgstr "Zaznamenali sme zmiznutie %s" + +#: apt-pkg/deb/dpkgpm.cc:115 +#, 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:845 +#, c-format +msgid "Directory '%s' missing" +msgstr "Adresár „%s“ chýba" + +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 +#, c-format +msgid "Could not open file '%s'" +msgstr "Nedá sa otvoriť súbor „%s“" + +#: apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Preparing %s" +msgstr "Pripravuje sa %s" + +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr "Rozbaľuje sa %s" + +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing to configure %s" +msgstr "Pripravuje sa nastavenie %s" + +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr "Nainštalovaný balík %s" + +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "Pripravuje sa odstránenie %s" + +#: apt-pkg/deb/dpkgpm.cc:1022 +#, c-format +msgid "Removed %s" +msgstr "Odstránený balík %s" + +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Pripravuje sa úplné odstránenie %s" + +#: apt-pkg/deb/dpkgpm.cc:1028 +#, c-format +msgid "Completely removed %s" +msgstr "Balík „%s“ je úplne odstránený" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Do %s sa nedá zapisovať" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1657 +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:1719 +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:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "problém so závislosťami - ponecháva sa nenakonfigurované" + +#: apt-pkg/deb/dpkgpm.cc:1726 +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:1732 +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:1739 +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:1746 apt-pkg/deb/dpkgpm.cc:1752 +#, 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:1774 +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é" + +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Použitie: apt-extracttemplates súbor1 [súbor2 ...]\n" +"\n" +"apt-extracttemplates je nástroj na vyňatie konfiguračných skriptov\n" +"a šablón z balíkov Debian\n" +"\n" +"Voľby:\n" +" -h Tento pomocník.\n" +" -t Nastaví dočasný adresár\n" +" -c=? Načíta tento konfiguračný súbor\n" +" -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "Nedá sa vyhodnotiť %s" + +#: cmdline/apt-extracttemplates.cc:300 +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 +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 +#, c-format +msgid "Error processing directory %s" +msgstr "Chyba pri spracovávaní adresára %s" + +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Zoznam zdrojových rozšírení je príliš dlhý" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Chyba pri zapisovaní hlavičky do súboru" + +#: ftparchive/apt-ftparchive.cc:431 +#, c-format +msgid "Error processing contents %s" +msgstr "Chyba pri spracovávaní obsahu %s" + +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Použitie: apt-ftparchive [voľby] príkaz\n" +"Príkazy: packages binárna_cesta [súbor_override [prefix_cesty]]\n" +" sources zdrojová_cesta [súbor_override [prefix_cesty]]\n" +" contents cesta\n" +" release cesta\n" +" generate konfiguračný_súbor [skupiny]\n" +" clean konfiguračný_súbor\n" +"\n" +"apt-ftparchive generuje indexové súbory archívov Debianu. Podporuje\n" +"niekoľko režimov vytvárania - od plne automatického až po funkčnú\n" +"náhradu príkazov dpkg-scanpackages a dpkg-scansources.\n" +"\n" +"apt-ftparchive zo stromu .deb súborov vygeneruje súbory Packages. Súbor\n" +"Packages okrem všetkých riadiacich polí každého balíka obsahuje tiež jeho\n" +"veľkosť a MD5 súčet. Podporovaný je tiež súbor „override“, pomocou ktorého\n" +"môžete vynútiť hodnoty polí Priority a Section.\n" +"\n" +"Podobne vie apt-ftparchive vygenerovať zo stromu súborov .dsc súbory\n" +"Sources. Voľbou --source-override môžete určiť zdrojový súbor „override“.\n" +"\n" +"Príkazy „packages“ a „sources“ by sa mali spúšťať v koreni stromu.\n" +"Binárna_cesta by mala ukazovať na začiatok rekurzívneho hľadania\n" +"a súbor „override“ by mal obsahovať príznaky pre nahradenie. Ak je udaný\n" +"prefix_cesty, pridá sa do polí „filename“.\n" +"Skutočný príklad z archívu Debianu:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Voľby:\n" +" -h Tento pomocník\n" +" --md5 Vygeneruje kontrolný súčet MD5\n" +" -s=? Zdrojový súbor „override“\n" +" -q Tichý režim\n" +" -d=? Zvolí voliteľnú databázu pre vyrovnávaciu pamäť\n" +" --no-delink Povolí ladiaci režim\n" +" --contents Vygeneruje súbor Contents\n" +" -c=? Načíta tento konfiguračný súbor\n" +" -o=? Nastaví ľubovoľnú voľbu" + +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Nevyhovel žiaden výber" + +#: ftparchive/apt-ftparchive.cc:907 +#, 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" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB je narušená, súbor je premenovaný na %s.old" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s" + +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"Formát DB je neplatný. Ak ste aktualizovali staršiu verziu apt, musíte " +"odstrániť a znovu vytvoriť databázu." + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Nedá sa otvoriť DB súbor %s: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Nie je možné vykonať readlink %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Archív nemá riadiaci záznam" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Nedá sa získať kurzor" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:91 #, c-format -msgid "%lis" -msgstr "%li s" +msgid "W: Unable to read directory %s\n" +msgstr "W: Adresár %s sa nedá čítať\n" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:96 #, c-format -msgid "Selection %s not found" -msgstr "Voľba %s nenájdená" +msgid "W: Unable to stat %s\n" +msgstr "W: %s sa nedá vyhodnotiť\n" -#: 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?" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " -#: 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?" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "W: " -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: Chyby sa týkajú súboru " + +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, 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“. " +msgid "Failed to resolve %s" +msgstr "Chyba pri preklade %s" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "Nie je zamknuté" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Prechod stromom zlyhal" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:219 #, c-format -msgid "Installing %s" -msgstr "Inštaluje sa %s" +msgid "Failed to open %s" +msgstr "%s sa nedá otvoriť" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:278 #, c-format -msgid "Configuring %s" -msgstr "Nastavuje sa %s" +msgid " DeLink %s [%s]\n" +msgstr " Odlinkovanie %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:286 #, c-format -msgid "Removing %s" -msgstr "Odstraňuje sa %s" +msgid "Failed to readlink %s" +msgstr "Nie je možné vykonať readlink %s" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:290 #, c-format -msgid "Completely removing %s" -msgstr "Úplne sa odstraňuje %s" +msgid "Failed to unlink %s" +msgstr "Nie je možné vykonať unlink %s" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:298 #, c-format -msgid "Noting disappearance of %s" -msgstr "Zaznamenali sme zmiznutie %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Nepodarilo sa zlinkovať %s s %s" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:308 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Vykonáva sa spúšťač post-installation %s" +msgid " DeLink limit of %sB hit.\n" +msgstr " Bol dosiahnutý odlinkovací limit %sB.\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Archív neobsahuje pole „package“" + +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Directory '%s' missing" -msgstr "Adresár „%s“ chýba" +msgid " %s has no override entry\n" +msgstr " %s nemá žiadnu položku override\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Could not open file '%s'" -msgstr "Nedá sa otvoriť súbor „%s“" +msgid " %s maintainer is %s not %s\n" +msgstr " správcom %s je %s, nie %s\n" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing %s" -msgstr "Pripravuje sa %s" +msgid " %s has no source override entry\n" +msgstr " %s nemá žiadnu položku „source override“\n" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:710 #, c-format -msgid "Unpacking %s" -msgstr "Rozbaľuje sa %s" +msgid " %s has no binary override entry either\n" +msgstr " %s nemá žiadnu položku „binary override“\n" + +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Zlyhal pokus o pridelenie pamäti" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing to configure %s" -msgstr "Pripravuje sa nastavenie %s" +msgid "Unable to open %s" +msgstr "Nedá sa otvoriť %s" -#: apt-pkg/deb/dpkgpm.cc:1000 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Skomolený „override“ %s riadok %llu #1" + +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Installed %s" -msgstr "Nainštalovaný balík %s" +msgid "Failed to read the override file %s" +msgstr "Nepodarilo sa prečítať „override“ súbor %s" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:166 #, c-format -msgid "Preparing for removal of %s" -msgstr "Pripravuje sa odstránenie %s" +msgid "Malformed override %s line %llu #1" +msgstr "Skomolený „override“ %s riadok %llu #1" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:178 #, c-format -msgid "Removed %s" -msgstr "Odstránený balík %s" +msgid "Malformed override %s line %llu #2" +msgstr "Skomolený „override“ %s riadok %llu #2" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:191 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Pripravuje sa úplné odstránenie %s" +msgid "Malformed override %s line %llu #3" +msgstr "Skomolený „override“ %s riadok %llu #3" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Completely removed %s" -msgstr "Balík „%s“ je úplne odstránený" +msgid "Unknown compression algorithm '%s'" +msgstr "Neznámy kompresný algoritmus „%s“" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Do %s sa nedá zapisovať" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Komprimovaný výstup %s potrebuje kompresnú sadu" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Zlyhalo vytvorenie FILE*" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Volanie fork() zlyhalo" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "Operácia bola prerušená predtým, než sa stihla dokončiť" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Komprimovať potomka" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Vnútorná chyba, nepodarilo sa vytvoriť %s" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "problém so závislosťami - ponecháva sa nenakonfigurované" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "V/V operácia s podprocesom/súborom zlyhala" -#: apt-pkg/deb/dpkgpm.cc:1694 -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." +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Chyba čítania pri výpočte MD5" -#: apt-pkg/deb/dpkgpm.cc:1700 -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ý" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Problém s odlinkovaním %s" -#: apt-pkg/deb/dpkgpm.cc:1707 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku " -"pamäte" +"Použitie: apt-internal-solver\n" +"\n" +"apt-internal-solver je rozhranie na použitie aktuálneho vnútorného\n" +"riešiteľa ako vonkajší pre rodinu APT na ladenie a pod.\n" +"\n" +"Voľby:\n" +" -h Tento pomocník.\n" +" -q Výstup vhodný do záznamu - bez indikátora priebehu\n" +" -c=? Načíta tento konfiguračný súbor\n" +" -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -#, 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ý" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Neznámy záznam o balíku!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Nezapíše sa správa apport, pretože chybová správa indikuje V/V chybu dpkg" +"Použitie: apt-sortpkgs [voľby] súbor1 [súbor2 ...]\n" +"\n" +"apt-sortpkgs je jednoduchý nástroj na zotriedenie súborov Packages.\n" +"Voľbou -s si zvolíte typ súboru.\n" +"\n" +"Voľby:\n" +" -h Tento pomocník\n" +" -s Zotriedi zdrojový súbor\n" +" -c=? Načíta tento konfiguračný súbor\n" +" -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/sl.po b/po/sl.po index 69bf678d0..daf96ddaf 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2012-06-27 21:29+0000\n" "Last-Translator: Andrej Znidarsic \n" "Language-Team: Slovenian \n" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Preglednica različic:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -356,7 +356,7 @@ 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoče najti" @@ -381,80 +381,80 @@ msgstr "" "bzr branch %s\n" "za pridobitev zadnjih (morda še neizdanih) posodobitev paketa.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskok že prejete datoteke '%s'\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ni mogoče določiti prostega prostora v %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoče pridobiti." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Prejem je dokončan in uporabljen je način samo prejema" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Podrejeno opravilo ni uspelo" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -463,17 +463,17 @@ msgstr "" "Za %s ni bilo mogoče najti podatkov o arhitekturi. Za nastavitev si oglejte " "apt.conf(5) APT::Architectures" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -481,20 +481,20 @@ msgid "" msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker %s ni dovoljen na paketih '%s'" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, 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:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -503,7 +503,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:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -512,30 +512,30 @@ msgstr "" "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa " "%s nima različice kandidata" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, 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:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo je spodletela" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Dnevnik sprememb za %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -677,7 +677,7 @@ msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Program je čakal na %s a ga ni bilo tam" @@ -790,16 +790,16 @@ msgstr "Ni mogoče odklopiti CD-ROM-a v %s, ker je morda še v uporabi." msgid "Disk not found." msgstr "Diska ni mogoče najti." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Datoteke ni mogoče najti" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Določitev ni uspela" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Nastavitev časa spremembe je spodletela" @@ -853,7 +853,7 @@ msgstr "Ukaz prijavne skripte '%s' ni uspel, strežnik je odgovoril: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE je spodletel, strežnik je odgovoril: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Povezava je zakasnela" @@ -875,7 +875,7 @@ msgstr "Odgovor je prekoračil predpomnilnik." msgid "Protocol corruption" msgstr "Okvara protokola" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -936,7 +936,7 @@ msgstr "Povezava podatkovne vtičnice je zakasnela" msgid "Unable to accept connection" msgstr "Ni mogoče sprejeti povezave" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Težava med razprševanjem datoteke" @@ -945,7 +945,7 @@ msgstr "Težava med razprševanjem datoteke" msgid "Unable to fetch file, server said '%s'" msgstr "Ni mogoče pridobiti datoteke, strežnik je odgovoril '%s'" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Podatkovna vtič je potekel" @@ -995,7 +995,7 @@ msgstr "Ni se mogoče povezati z %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Povezovanje z %s" @@ -1134,42 +1134,19 @@ msgstr "Povezava ni uspela" msgid "Internal error" msgstr "Notranja napaka" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Zadetek " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Dobi:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Prezr " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Nap " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Pridobljenih %sB v %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Delo]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Sprememba medija: vstavite disk z oznako\n" -" '%s'\n" -"v enoto '%s' in pritisnite vnosno tipko\n" +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:93 msgid "Correcting dependencies..." @@ -1199,171 +1176,359 @@ msgstr "Če želite popraviti napake, poskusite pognati 'apt-get -f install'." msgid "Unmet dependencies. Try using -f." msgstr "Nerešene odvisnosti. Poskusite uporabiti -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "POZOR: Naslednjih paketov ni bilo mogoče overiti!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Nameščeno]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Opozorilo overitve je bilo prepisano.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [Nameščeno]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Nekaterih paketkov bi bilo mogoče overiti" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Ali želite te pakete namestiti brez preverjanja?" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Nameščeno]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Prišlo je do težav in -y je bil uporabljen brez --force-yes" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Nameščeno]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Ni mogoče dobiti %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!" - -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "Odstraniti je treba pakete, a je odstranjevanje onemogočeno." - -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Notranja napaka, Urejanje se ni končalo" +msgid "[upgradable from: %s]" +msgstr "" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" msgstr "" -"Kako čudno ... Velikosti se ne ujemata, pošljite sporočilo na 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 -#: apt-private/private-install.cc:155 +#: apt-private/private-output.cc:455 #, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "Potrebno je dobiti %sB/%sB arhivov.\n" +msgid "but %s is installed" +msgstr "vendar je paket %s nameščen" -#. 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:160 +#: apt-private/private-output.cc:457 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "Potrebno je dobiti %sB arhivov.\n" +msgid "but %s is to be installed" +msgstr "vendar bo paket %s nameščen" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Po tem opravilu bo porabljenega %sB dodatnega prostora.\n" +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "vendar se ga ne da namestiti" -#. 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:172 -#, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Po tem opravilu bo sproščenega %sB prostora na disku.\n" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "vendar je navidezen paket" -#: apt-private/private-install.cc:200 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "Na %s je premalo prostora." +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "vendar ni nameščen" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Navedena je možnost Samo preprosto, a to opravilo ni preprosto." +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "vendar ne bo nameščen" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Da, naredi tako kot pravim!" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " ali" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Naredili boste nekaj, kar je morda lahko škodljivo.\n" -"Za nadaljevanje vtipkajte frazo '%s'\n" -" ?] " +#: 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-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Prekini." +#: apt-private/private-output.cc:523 +msgid "The following NEW packages will be installed:" +msgstr "Naslednji NOVI paketi bodo nameščeni:" -#: apt-private/private-install.cc:243 -msgid "Do you want to continue?" -msgstr "Ali želite nadaljevati?" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "Naslednji novi paketi bodo ODSTRANJENI:" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Prejem nekaterih datotek ni uspel" +#: apt-private/private-output.cc:571 +msgid "The following packages have been kept back:" +msgstr "Naslednji paketi so bili zadržani:" -#: apt-private/private-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Nekaterih arhivov ni mogoče dobiti. Poskusite uporabiti apt-get update ali --" -"fix-missing." +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "Naslednji paketi bodo nadgrajeni:" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing in izmenjava medija trenutno nista podprta" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" +msgstr "Naslednji paketi bodo POSTARANI:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Ni mogoče popraviti manjkajočih paketov." +#: apt-private/private-output.cc:633 +msgid "The following held packages will be changed:" +msgstr "Naslednji zadržani paketi bodo spremenjeni:" -#: apt-private/private-install.cc:330 -msgid "Aborting install." -msgstr "Prekinjanje namestitve." +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (zaradi %s) " -#: apt-private/private-install.cc:366 +#: apt-private/private-output.cc:696 msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"Naslednji paketi so izginili z vašega sistema, ker so vse\n" -"datoteke prepisali drugi paketi:" -msgstr[1] "" -"Naslednji paketi je izginil z vašega sistema, ker so vse\n" -"datoteke prepisali drugi paketi:" -msgstr[2] "" -"Naslednja paketa sta izginila z vašega sistema, ker so vse\n" -"datoteke prepisali drugi paketi:" -msgstr[3] "" -"Naslednji paketi so izginili z vašega sistema, ker so vse\n" -"datoteke prepisali drugi paketi:" - -#: apt-private/private-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Opomba: To je dpkg storil samodejno in namenoma." - -#: apt-private/private-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" msgstr "" -"Program ne bi smel brisati stvari, ni mogoče zagnati " -"SamodejnegaOdstranjevalnika" +"OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n" +"Tega NE storite, razen če ne veste natanko kaj počenjate!" -#: apt-private/private-install.cc:499 -msgid "" +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "Odstraniti je treba pakete, a je odstranjevanje onemogočeno." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Notranja napaka, Urejanje se ni končalo" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Kako čudno ... Velikosti se ne ujemata, pošljite sporočilo na 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Potrebno je dobiti %sB/%sB 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 +#: apt-private/private-install.cc:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Potrebno je dobiti %sB 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 +#: apt-private/private-install.cc:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Po tem opravilu bo porabljenega %sB dodatnega prostora.\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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Po tem opravilu bo sproščenega %sB prostora na disku.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Na %s je premalo prostora." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Prišlo je do težav in -y je bil uporabljen brez --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "Navedena je možnost Samo preprosto, a to opravilo ni preprosto." + +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Da, naredi tako kot pravim!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Naredili boste nekaj, kar je morda lahko škodljivo.\n" +"Za nadaljevanje vtipkajte frazo '%s'\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Prekini." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Ali želite nadaljevati?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Prejem nekaterih datotek ni uspel" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Nekaterih arhivov ni mogoče dobiti. Poskusite uporabiti apt-get update ali --" +"fix-missing." + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing in izmenjava medija trenutno nista podprta" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Ni mogoče popraviti manjkajočih paketov." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Prekinjanje namestitve." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"Naslednji paketi so izginili z vašega sistema, ker so vse\n" +"datoteke prepisali drugi paketi:" +msgstr[1] "" +"Naslednji paketi je izginil z vašega sistema, ker so vse\n" +"datoteke prepisali drugi paketi:" +msgstr[2] "" +"Naslednja paketa sta izginila z vašega sistema, ker so vse\n" +"datoteke prepisali drugi paketi:" +msgstr[3] "" +"Naslednji paketi so izginili z vašega sistema, ker so vse\n" +"datoteke prepisali drugi paketi:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Opomba: To je dpkg storil samodejno in namenoma." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" +"Program ne bi smel brisati stvari, ni mogoče zagnati " +"SamodejnegaOdstranjevalnika" + +#: apt-private/private-install.cc:499 +msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" @@ -1501,214 +1666,26 @@ 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:129 -msgid "Listing" -msgstr "" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "POZOR: Naslednjih paketov ni bilo mogoče overiti!" -#: apt-private/private-list.cc:159 -#, 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-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-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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Opozorilo overitve je bilo prepisano.\n" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Napaka med prevajanjem logičnega izraza - %s" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Nekaterih paketkov bi bilo mogoče overiti" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Ali želite te pakete namestiti brez preverjanja?" -#: apt-private/private-show.cc:156 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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 "" +msgid "Failed to fetch %s %s\n" +msgstr "Ni mogoče dobiti %s %s\n" #: apt-private/private-sources.cc:58 #, fuzzy, c-format @@ -1720,22 +1697,8 @@ msgstr "Ni mogoče preimenovati %s v %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Ukaz update ne sprejema argumentov" - -#: apt-private/private-update.cc:90 -#, 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:94 -msgid "All packages are up to date." +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" #: apt-private/private-upgrade.cc:25 @@ -1746,20 +1709,57 @@ msgstr "Preračunavanje nadgradnje ... " msgid "Done" msgstr "Opravljeno" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Zadetek " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Dobi:" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Prezr " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Nap " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Pridobljenih %sB v %s (%sB/s)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Delo]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Sprememba medija: vstavite disk z oznako\n" +" '%s'\n" +"v enoto '%s' in pritisnite vnosno tipko\n" + #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, 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:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1793,7 +1793,7 @@ msgstr "[Zrcalni strežnik: %s]" msgid "Failed to create IPC pipe to subprocess" msgstr "Ustvarjanje cevi IPC do podopravila je spodletelo" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "Povezava se je prezgodaj zaprla" @@ -1834,642 +1834,555 @@ 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:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Uporaba: apt-extracttemplates dat1 [dat2 ...]\n" -"\n" -"apt-extracttemplates je orodje za pridobivanje podatkov o\n" -"nastavitvah in predlogah debianovih paketov\n" -"\n" -"Možnosti:\n" -" -h To besedilo pomoči\n" -" -t Nastavi začasno mapo\n" -" -c=? Prebere podano datoteko z nastavitvami\n" -" -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n" - -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Ni mogoče določiti %s" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode je poklical stabilno povezano vozlišče" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "Ni mogoče pisati na %s" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Ni mogoče najti razpršenega elementa!" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Ni mogoče ugotoviti različice debconfa. Je sploh nameščen?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Ni mogoče dodeliti odklona" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Seznam razširitev paketov je predolg" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Notranja napaka v AddDiversion" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "Napaka med obdelavo mape %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Seznam razširitev virov je predolg" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Napaka med pisanjem glave v datoteko vsebine" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Poskus prepisovanja odklona, %s -> %s in %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "Napaka med obdelavo vsebine %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Uporaba: apt-ftparchive [možnosti] ukaz\n" -"Ukazi: packages, binarypath [datoteka prepisa [predpona poti]]\n" -" sources srcpath [datoteka prepisa [predpona poti]]\n" -" contents path\n" -" release path\n" -" generate config [skupine]\n" -" clean config\n" -"\n" -"apt-ftparchive ustvari datoteke kazala za arhive Debian. Podpira\n" -"več slogov ustvarjanja od popolnoma samodejnih do funkcionalnih zamenjav\n" -"za dpkg-scanpackages in dpkg-scansources\n" -"\n" -"apt-ftparchive ustvari datoteke paketov iz drevesa .debs. Datoteka\n" -"paketa vsebuje vsebino vseh nadzornih polj iz vsakega paketa kot tudi\n" -"razpršilo MD5 in velikost datoteke. Datoteka prepisa podpira vsiljenje\n" -"vrednosti Prednosti in Odseka.\n" -"\n" -"Podobno apt-ftparchive ustvari datoteke paketov iz drevesa .dscs.\n" -"Možnost --source-override je mogoče uporabiti za navedbo datoteke prepisa " -"src\n" -"\n" -"Ukaza 'packages' in 'sources' je treba zagnati v korenu drevesa.\n" -"BinaryPath bi morala kazati na osnovno mapo rekurzivnega iskanja in\n" -"datoteka prepisa bi morala vsebovati zastavice prepisa Predpona je pripeta\n" -"v polja imena datoteke, če je prisotna. Primer uporabe iz arhiva Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Možnosti:\n" -" -h To besedilo pomoči\n" -" --md5 ustvarjanje nadzorne vsote MD5\n" -" -s=? datoteka prepisa vira\n" -" -q tiho\n" -" -d=? izbere izbirno podatkovno zbirko pomnilnika\n" -" --no-delink omogoči način razhroščevanja razvezovanja\n" -" --contents nadzira ustvarjanje datoteke vsebine\n" -" -c=? prebere to nastavitveno datoteko\n" -" -o=? nastavi poljubno možnost nastavitve" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Nobena izbira se ne ujema" +msgid "Double add of diversion %s -> %s" +msgstr "Dvojni seštevek odklona %s -> %s" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Nekatere datoteke manjkajo v skupini datotek paketov `%s'" +msgid "Duplicate conf file %s/%s" +msgstr "Dvojnik datoteke z nastavitvami %s/%s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Podatkovna zbirka je pokvarjena, datoteka je preimenovana v %s.old" +msgid "The path %s is too long" +msgstr "Pot %s je predolga" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "PZ je star, poskušanje nadgradnje %s" +msgid "Unpacking %s more than once" +msgstr "Odpakiranje %s več kot enkrat" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"Oblika podatkovne zbirke je neveljavna. V kolikor ste nadgradili s starejše " -"različice apt, podatkovno zbirko odstranite in jo znova ustvarite." +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "Mapa %s je odklonjena" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Ni mogoče odprti datoteke PZ %s: %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Paket poskuša pisati v tarčo odklona %s/%s" + +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Pot odklona je predloga" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Napaka med določitvijo %s" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Napaka med branjem povezave %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Arhiv nima nadzornega zapisa" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Ni mogoče najti kazalke" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "O: ni mogoče brati mape %s\n" +msgid "Failed to rename %s to %s" +msgstr "Ni mogoče preimenovati %s v %s" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "O: Ni mogoče določiti %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "Mapa %s je bil zamenjana z ne-mapo" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "O: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Iskanje vozlišča v njegovem razpršenem vedru ni uspelo" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "N: Napake se sklicujejo na datoteko " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Pot je predolga" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "Ni mogoče razrešiti %s" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Hoja drevesa je spodletela" +msgid "Overwrite package match with no version for %s" +msgstr "Prepiši zadetek paketa brez vnosa različice za %s" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to open %s" -msgstr "Ni mogoče odprti %s" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s" -#: ftparchive/writer.cc:278 +#: apt-inst/extract.cc:498 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " RazVeži %s [%s]\n" +msgid "Unable to stat %s" +msgstr "Ni mogoče določiti %s" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Failed to readlink %s" -msgstr "Napaka med branjem povezave %s" +msgid "Failed to write file %s" +msgstr "Zapisovanje datoteke %s je spodletelo" -#: ftparchive/writer.cc:290 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to unlink %s" -msgstr "Napaka med odvezovanjem %s" +msgid "Failed to close file %s" +msgstr "Napaka med zapiranjem datoteke %s" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Napaka med povezovanjem %s in %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "To ni veljaven arhiv DEB. Manjka član '%s'." -#: ftparchive/writer.cc:308 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Dosežena meja RazVezovanja %sB.\n" - -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Arhiv ni imel polja s paketom" +msgid "Internal error, could not locate member %s" +msgstr "Notranja napaka. Ni mogoče najti člana %s." -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s nima prepisanega vnosa\n" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Nadzorne datoteke ni mogoče razčleniti" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " Vzdrževalec %s je %s in ne %s\n" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Neveljaven podpis arhiva" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s nima izvornega vnosa prepisa\n" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Napaka med branjem glave člana arhiva" -#: ftparchive/writer.cc:710 +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s nima tudi binarnega vnosa prepisa\n" +msgid "Invalid archive member header %s" +msgstr "Neveljavna glava arhiva člana %s" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Napaka med dodeljevanjem pomnilnika" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Neveljavna glava člana arhiva" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Ni mogoče odpreti %s" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Arhiv je prekratek" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Glav arhiva ni mogoče brati" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Napaka med branjem prepisane datoteke %s" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Ni mogoče ustvariti pip" -#: ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Ni mogoče izvesti gzip " -#: ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Pokvarjen arhiv" -#: ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 3" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Nadzorna vsota tar ni uspela, arhiv je pokvarjen" -#: ftparchive/multicompress.cc:73 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Neznan algoritem stiskanja '%s'" +msgid "Unknown TAR header type %u, member %s" +msgstr "Neznana vrsta glave TAR %u, član %s" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Stisnjen izhod %s potrebuje niz stiskanja" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Ustvarjanje DATOTEKE* ni uspelo" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Vejitev ni uspela" +msgid "Progress: [%3i%%]" +msgstr "" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Podrejeni predmet stiskanja" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "Poganjanje dpkg" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/init.cc:146 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Notranja napaka. Ni mogoče ustvariti %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "VI podopravila/datoteke je spodletel" +msgid "Packaging system '%s' is not supported" +msgstr "Paketni sistem '%s' ni podprt" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Med računanjem MD5 ni mogoče brati" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Ni mogoče določiti ustrezne vrste paketnega sistema" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Problem unlinking %s" -msgstr "Napaka med odvezovanjem %s" +msgid "Wrote %i records.\n" +msgstr "Zapisanih je bilo %i zapisov.\n" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Ni mogoče preimenovati %s v %s" - -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Uporaba: apt-internal-solver\n" -"\n" -"apt-internal-solver je vmesnik za uporabo trenutnega notranjega\n" -"reševalnika kot zunanji reševalnik za družino APT za razhroščevanje ali " -"podobno.\n" -"\n" -"Možnosti:\n" -" -h To besedilo pomoči\n" -" -q Izhod se beleži - ni kazalnika napredka\n" -" -c=? Prebere to nastavitveno datoteko\n" -" -o=? Nastavi poljubno nastavitveno možnost, na primer dir::cache=/tmp\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami.\n" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Neznan zapis paketa!" +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Zapisanih je bilo %i zapisov z %i neujemajočimi datotekami.\n" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"Uporaba: apt-sortpkgs [možnosti] dat1 [dat2 ...]\n" -"\n" -"apt-sortpkgs je preprosto orodje za razvrščanje paketnih datotek. Možnost -" -"s\n" -"določa vrsto datoteke.\n" -"\n" -"Možnosti:\n" -" -h to besedilo pomoči\n" -" -s uporabi razvrščanje izvornih datotek\n" -" -c=? Prebere podano datoteko z nastavitvami\n" -" -o=? Nastavi poljubno nastavitveno možnost, npr. -o dir::cache=/tmp\n" +"Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami in %i " +"neujemajočimi datotekami.\n" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Failed to write file %s" -msgstr "Zapisovanje datoteke %s je spodletelo" +msgid "Can't find authentication record for: %s" +msgstr "Ni mogoče najti zapisa overitve za: %s" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "Failed to close file %s" -msgstr "Napaka med zapiranjem datoteke %s" +msgid "Hash mismatch for: %s" +msgstr "Neujemanje razpršila za: %s" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "The path %s is too long" -msgstr "Pot %s je predolga" +msgid "The method driver %s could not be found." +msgstr "Gonilnika načinov %s ni mogoče najti." -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" -msgstr "Odpakiranje %s več kot enkrat" +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n" -#: apt-inst/extract.cc:142 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "The directory %s is diverted" -msgstr "Mapa %s je odklonjena" +msgid "Method %s did not start correctly" +msgstr "Način %s se ni začel pravilno" -#: apt-inst/extract.cc:152 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Paket poskuša pisati v tarčo odklona %s/%s" - -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Pot odklona je predloga" +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-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Mapa %s je bil zamenjana z ne-mapo" +#: 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." -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Iskanje vozlišča v njegovem razpršenem vedru ni uspelo" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Za odpravljanje težav poskusite zagnati apt-get update." -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Pot je predolga" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Seznama virov ni mogoče brati." -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Prepiši zadetek paketa brez vnosa različice za %s" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Prazen predpomnilnik paketov" -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Datoteka s predpomnilnikom paketov je pokvarjena" -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "Ni mogoče določiti %s" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Različica datoteke s predpomnilnikom paketov ni združljiva" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "DropNode je poklical stabilno povezano vozlišče" +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" +msgstr "Datoteka predpomnilnika paketa je okvarjena. Je premajhna" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Ni mogoče najti razpršenega elementa!" +#: apt-pkg/pkgcache.cc:174 +#, c-format +msgid "This APT does not support the versioning system '%s'" +msgstr "Ta APT ne podpira sistema različic '%s'" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Ni mogoče dodeliti odklona" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Predpomnilnik paketov je bil izgrajen za drugačno arhitekturo" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Notranja napaka v AddDiversion" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Odvisen od" -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Poskus prepisovanja odklona, %s -> %s in %s/%s" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Predodvisen od" -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Dvojni seštevek odklona %s -> %s" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Priporoča" -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Dvojnik datoteke z nastavitvami %s/%s" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Priporoča" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Neveljaven podpis arhiva" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "V sporu z" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Napaka med branjem glave člana arhiva" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Zamenja" -#: apt-inst/contrib/arfile.cc:96 -#, c-format -msgid "Invalid archive member header %s" -msgstr "Neveljavna glava arhiva člana %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Zastara" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Neveljavna glava člana arhiva" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Pokvari" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Arhiv je prekratek" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Izboljša" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Glav arhiva ni mogoče brati" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "pomembno" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Ni mogoče ustvariti pip" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "obvezno" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Ni mogoče izvesti gzip " +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "običajni" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Pokvarjen arhiv" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "izbirno" -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Nadzorna vsota tar ni uspela, arhiv je pokvarjen" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "dodatno" -#: apt-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Neznana vrsta glave TAR %u, član %s" +msgid "Index file type '%s' is not supported" +msgstr "Vrsta datoteke s kazalom '%s' ni podprta" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 -#, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "To ni veljaven arhiv DEB. Manjka član '%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-inst/deb/debfile.cc:132 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "Notranja napaka. Ni mogoče najti člana %s." - -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Nadzorne datoteke ni mogoče razčleniti" +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.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "List directory %spartial is missing." -msgstr "Mapa seznama %spartial manjka." +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/acquire.cc:91 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "Archives directory %spartial is missing." -msgstr "Mapa arhivov %spartial manjka." +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/acquire.cc:99 +#: apt-pkg/sourcelist.cc:190 #, c-format -msgid "Unable to lock directory %s" -msgstr "Mape %s ni mogoče zakleniti" - -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "Vrsta datoteke s kazalom '%s' ni podprta" +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)" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Pridobivanje datoteke %li od %li (%s preostalo)" +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/acquire.cc:904 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Retrieving file %li of %li" -msgstr "Pridobivanje datoteke %li od %li" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "preimenovanje je spodletelo, %s (%s -> %s)." - -#: apt-pkg/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "Neujemanje vsote razpršil" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (distribucija)" -#: apt-pkg/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "Neujemanje velikosti" +#: 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/acquire-item.cc:173 -#, fuzzy -msgid "Invalid file format" -msgstr "Neveljavno opravilo %s" +#: 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/acquire-item.cc:1573 +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" +msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -"Ni mogoče najti pričakovanega vnosa '%s' v datoteki Release (napačen vnos " -"sources.list ali slabo oblikovana datoteka)" +"Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev distribucije)" -#: apt-pkg/acquire-item.cc:1589 +#: apt-pkg/sourcelist.cc:335 #, 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" +msgid "Opening %s" +msgstr "Odpiranje %s" -#: apt-pkg/acquire-item.cc:1631 +#: 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:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Vrsta datoteke s kazalom '%s' ni podprta" + +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." +msgstr "Ni mogoče določiti %s." + +#: apt-pkg/pkgcachegen.cc:93 +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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, 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:257 +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:260 +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:263 +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:266 +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:576 +#, 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:1211 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "Ni mogoče določiti seznama izvornih paketov %s" + +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Branje seznama paketov" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Zbiranje dobaviteljev datotek" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Ni mogoče pisati na %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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:241 +msgid "Send request to solver" +msgstr "Pošlji zahtevo reševalniku" + +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "Priprava za rešitev prejemanja" + +#: apt-pkg/edsp.cc:327 +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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "Izvedi zunanji reševalnik" + +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "preimenovanje je spodletelo, %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "Neujemanje vsote razpršil" + +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "Neujemanje velikosti" + +#: apt-pkg/acquire-item.cc:173 +#, fuzzy +msgid "Invalid file format" +msgstr "Neveljavno opravilo %s" + +#: apt-pkg/acquire-item.cc:1640 +#, c-format +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +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:1656 +#, 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:1698 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:1669 +#: apt-pkg/acquire-item.cc:1736 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2478,12 +2391,12 @@ msgstr "" "Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to " "skladišče ne bo uveljavljena." -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/acquire-item.cc:1758 #, 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:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2493,12 +2406,12 @@ 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:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "Napaka GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2507,12 +2420,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:1925 +#: apt-pkg/acquire-item.cc:1992 #, 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:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2520,116 +2433,97 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket " "%s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, 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:118 -#, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n" +msgid "Vendor block %s contains no fingerprint" +msgstr "Ponudnikov blok %s ne vsebuje prstnega podpisa" -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Method %s did not start correctly" -msgstr "Način %s se ni začel pravilno" +msgid "List directory %spartial is missing." +msgstr "Mapa seznama %spartial manjka." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:91 #, 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 "Archives directory %spartial is missing." +msgstr "Mapa arhivov %spartial manjka." -#: apt-pkg/algorithms.cc:265 +#: apt-pkg/acquire.cc:99 #, c-format -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:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Napaka. pkgProblemResolver::Resolve pri razrešitvi, ki so jih morda " -"povzročili zadržani paketi." - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete." - -#: 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." - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Za odpravljanje težav poskusite zagnati apt-get update." - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Seznama virov ni mogoče brati." +msgid "Unable to lock directory %s" +msgstr "Mape %s ni mogoče zakleniti" -#: apt-pkg/cacheset.cc:489 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Izdaje '%s' za '%s' ni mogoče najti" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Pridobivanje datoteke %li od %li (%s preostalo)" -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/acquire.cc:904 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Različice '%s' za '%s' ni mogoče najti" +msgid "Retrieving file %li of %li" +msgstr "Pridobivanje datoteke %li od %li" -#: apt-pkg/cacheset.cc:603 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "Ni mogoče najti naloge '%s'" +#: 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/cacheset.cc:609 +#: apt-pkg/policy.cc:83 #, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa" +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" +msgstr "" +"Vrednost '%s' je neveljavna za APT::Default-Release in zato takšna izdaja ni " +"na voljo v virih" -#: apt-pkg/cacheset.cc:615 -#, 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/policy.cc:422 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Neveljaven zapis v datoteki možnosti %s, ni glave paketa" -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/policy.cc:444 #, 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" +msgid "Did not understand pin type %s" +msgstr "Ni mogoče razumeti vrste bucike %s" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Prednost bucike ni navedena ali pa je nič." + +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -"Ni mogoče izbrati nameščene različice ali različice kandidata iz paketa " -"'%s', saj nima nobenega od njiju" +"Ni mogoče izvesti takojąnje nastavitve na '%s'. Oglejte si man5 apt.conf pod " +"APT::Immediate-Configure za podrobnosti. (%d)" -#: apt-pkg/cacheset.cc:647 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, 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:655 -#, 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" +msgid "Could not configure '%s'. " +msgstr "Ni mogoče nastaviti '%s' " -#: apt-pkg/cacheset.cc:663 +#: apt-pkg/packagemanager.cc:630 #, 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" +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 "" +"Ta krog namestitve zahteva začasno odstranitev ključnega paketa %s zaradi " +"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" @@ -2708,10 +2602,23 @@ msgstr "Pisanje novega seznama virov\n" msgid "Source list entries for this disc are:\n" msgstr "Izvorni vnosi za ta disk so:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Ni mogoče določiti %s." +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:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Napaka. pkgProblemResolver::Resolve pri razrešitvi, ki so jih morda " +"povzročili zadržani paketi." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete." #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2739,57 +2646,71 @@ msgstr "Odpiranje DatotekeStanja %s je spodletelo" msgid "Failed to write temporary StateFile %s" msgstr "Pisanje začasne DatotekeStanja %s je spodletelo" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "Pošlji scenarij reševalniku" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Ni mogoče razčleniti datoteke paketa %s (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "Pošlji zahtevo reševalniku" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Ni mogoče razčleniti datoteke paketa %s (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "Priprava za rešitev prejemanja" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Izdaje '%s' za '%s' ni mogoče najti" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Različice '%s' za '%s' ni mogoče najti" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "Izvedi zunanji reševalnik" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Ni mogoče najti naloge '%s'" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "Zapisanih je bilo %i zapisov.\n" +msgid "Couldn't find any package by regex '%s'" +msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, 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:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami.\n" +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/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Zapisanih je bilo %i zapisov z %i neujemajočimi datotekami.\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"Ni mogoče izbrati nameščene različice ali različice kandidata iz paketa " +"'%s', saj nima nobenega od njiju" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -"Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami in %i " -"neujemajočimi datotekami.\n" +"Ni mogoče izbrati najnovejše različice iz paketa '%s', saj je popolnoma " +"navidezen" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "Ni mogoče najti zapisa overitve za: %s" +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/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:663 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Neujemanje razpršila za: %s" +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/indexrecords.cc:78 #, c-format @@ -2816,831 +2737,905 @@ msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s" msgid "Invalid 'Date' entry in Release file %s" msgstr "Neveljavne vnos 'Datum' v Release datoteki %s" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Paketni sistem '%s' ni podprt" +msgid "%lid %lih %limin %lis" +msgstr "%lid %lih %limin %lis" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Ni mogoče določiti ustrezne vrste paketnega sistema" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" +msgstr "%lih %limin %lis" -#: apt-pkg/install-progress.cc:57 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Progress: [%3i%%]" -msgstr "" +msgid "%limin %lis" +msgstr "%limin %lis" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "Poganjanje dpkg" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" +msgstr "%lis" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" -"Ni mogoče izvesti takojąnje nastavitve na '%s'. Oglejte si man5 apt.conf pod " -"APT::Immediate-Configure za podrobnosti. (%d)" +msgid "Selection %s not found" +msgstr "Izbire %s ni mogoče najti" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "Could not configure '%s'. " -msgstr "Ni mogoče nastaviti '%s' " +msgid "Not using locking for read only lock file %s" +msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko le za branje %s" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:195 #, 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 "" -"Ta krog namestitve zahteva začasno odstranitev ključnega paketa %s zaradi " -"zanke spora/predodvisnosti. To je ponavadi slabo, toda če zares želite " -"nadaljevati, vključite možnost APT::Force-LoopBreak." +msgid "Could not open lock file %s" +msgstr "Ni mogoče odprti zaklenjene datoteke %s" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Prazen predpomnilnik paketov" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Datoteka s predpomnilnikom paketov je pokvarjena" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Ni mogoče zakleniti datoteke %s" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Različica datoteke s predpomnilnikom paketov ni združljiva" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "Seznama datotek ni mogoče ustvariti, ker '%s' ni mapa" -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" -msgstr "Datoteka predpomnilnika paketa je okvarjena. Je premajhna" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "Preziranje '%s' v mapi '%s', ker ni običajna datoteka" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:412 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Ta APT ne podpira sistema različic '%s'" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "Preziranje datoteke '%s' v mapi '%s', ker nima pripone imena datotek" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "Predpomnilnik paketov je bil izgrajen za drugačno arhitekturo" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" +"Preziranje datoteke '%s' v mapi '%s', ker nima veljavne pripone imena datotek" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Odvisen od" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Pod-opravilo %s je prejelo segmentacijsko napako." -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Predodvisen od" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "Pod-opravilo %s je prejelo signal %u." -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Priporoča" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Pod-opravilo %s je vrnilo kodo napake (%u)" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Priporoča" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Pod-opravilo %s se je nepričakovano zaključilo" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "V sporu z" +#: apt-pkg/contrib/fileutl.cc:913 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Težava med zapiranjem gzip datoteke %s" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Zamenja" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Ni mogoče odpreti datoteke %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Zastara" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "Ni mogoče odpreti opisnika datotek %d" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Pokvari" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Ni mogoče ustvariti podopravila IPD" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Izboljša" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Ni mogoče izvesti stiskanja " -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "pomembno" +#: apt-pkg/contrib/fileutl.cc:1514 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "Prebrano, še vedno je treba prebrati %llu bajtov, vendar ni nič ostalo" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "obvezno" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "pisanje, preostalo je še %llu za pisanje, vendar ni bilo mogoče pisati" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "običajni" +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" +msgstr "Težava med zapiranjem datoteke %s" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "izbirno" +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Težava med preimenovanje datoteke %s v %s" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "dodatno" +#: apt-pkg/contrib/fileutl.cc:1938 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "Težava med razvezovanjem datoteke %s" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Predpomnilnik ima neustrezen sistem različic" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Težava med usklajevanjem datoteke" -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Med obdelovanjem %s je prišlo do napake (%s%d)" +msgid "%c%s... Error!" +msgstr "%c%s ... Napaka!" -#: apt-pkg/pkgcachegen.cc:257 -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/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s ... Narejeno" -#: apt-pkg/pkgcachegen.cc:260 -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/contrib/progress.cc:181 +msgid "..." +msgstr "" -#: apt-pkg/pkgcachegen.cc:263 -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." +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s ... Narejeno" -#: apt-pkg/pkgcachegen.cc:266 -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/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "mmap prazne datoteke ni mogoč" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/mmap.cc:111 #, 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" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Ni mogoče podvojiti opisnika datotek %i" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/mmap.cc:119 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Ni mogoče določiti seznama izvornih paketov %s" - -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Branje seznama paketov" +msgid "Couldn't make mmap of %llu bytes" +msgstr "Ni mogoče narediti mmap %llu bajtov" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Zbiranje dobaviteljev datotek" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Ni mogoče zapreti mmap" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Napaka VI med shranjevanjem predpomnilnika virov" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Ni mogoče uskladiti mmap" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Vrsta datoteke s kazalom '%s' ni podprta" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Ni mogoče narediti mmap %lu bajtov" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Ni mogoče obrezati datoteke" + +#: apt-pkg/contrib/mmap.cc:341 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"Vrednost '%s' je neveljavna za APT::Default-Release in zato takšna izdaja ni " -"na voljo v virih" +"Dinamičnemu MMap je zmanjkalo prostora. Povečajte velikost APT::Cache-Start. " +"Trenutna vrednost: %lu. (man 5 apt.conf)" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Neveljaven zapis v datoteki možnosti %s, ni glave paketa" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" +"Ni mogoče povečati velikosti MMap, ker je omejitev %lu bajtov že dosežena." -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Ni mogoče povečati velikosti MMap, ker je samodejno povečevanje onemogočeno." + +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "Did not understand pin type %s" -msgstr "Ni mogoče razumeti vrste bucike %s" +msgid "Unable to stat the mount point %s" +msgstr "Ni mogoče določiti priklopne točke %s" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Prednost bucike ni navedena ali pa je nič." +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Ni mogoče določiti CD-ROM-a" -#: 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/contrib/configuration.cc:519 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Neprepoznana vrsta okrajšave: '%c'" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/configuration.cc:633 #, 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)" +msgid "Opening configuration file %s" +msgstr "Odpiranje nastavitvene datoteke %s" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/configuration.cc:801 #, 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)" +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Skladenjska napaka %s:%u: Blok se začne brez imena." -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/configuration.cc:820 #, 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)" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Skladenjska napaka %s:%u: Slabo oblikovana oznaka." -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/configuration.cc:837 #, 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)" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Skladenjska napaka %s:%u: Dodatna krama za vrednostjo." -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -"Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] ključ %s nima " -"vrednosti)" +"Skladenjska napaka %s:%u: Napotki se lahko izvedejo le na vrhnji ravni." -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Skladenjska napaka %s:%u: Preveč vgnezdenih vključitev" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (distribucija)" +msgid "Syntax error %s:%u: Included from here" +msgstr "Skladenjska napaka %s:%u: Vključeno od tu" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/configuration.cc:897 #, 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: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/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "V sources.list morate vstaviti URI-je z viri" - -#: apt-pkg/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Ni mogoče razčleniti datoteke paketa %s (1)" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/configuration.cc:900 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Ni mogoče razčleniti datoteke paketa %s (2)" - -#: 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." +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -"Prejem nekaterih datotek kazala je spodletel. Bile so prezrte ali pa so bile " -"namesto njih uporabljene stare." +"Skladenjska napaka %s:%u: počisti ukaz zahteva drevo možnosti kot argument" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/configuration.cc:950 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Ponudnikov blok %s ne vsebuje prstnega podpisa" +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Skladenjska napaka %s:%u: Dodatna krama na koncu datoteke" -#: apt-pkg/contrib/cdromutl.cc:65 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "Ni mogoče določiti priklopne točke %s" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "Ni mogoče določiti CD-ROM-a" +msgid "No keyring installed in %s." +msgstr "V %s ni nameščenih zbirk ključev." -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, 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:168 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format msgid "Command line option %s is not boolean" msgstr "Možnost ukazne vrstice %s ni boolova vrednost" -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format msgid "Option %s requires an argument." msgstr "Možnost %s zahteva argument." -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Možnost %s: Določilo predmeta nastavitve zahtevajo =." -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, 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:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "Možnost '%s' je predolga" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, 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:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "Neveljavno opravilo %s" -#: apt-pkg/contrib/configuration.cc:519 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Neprepoznana vrsta okrajšave: '%c'" +msgid "Installing %s" +msgstr "Nameščanje %s" -#: apt-pkg/contrib/configuration.cc:633 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Opening configuration file %s" -msgstr "Odpiranje nastavitvene datoteke %s" +msgid "Configuring %s" +msgstr "Nastavljanje %s" -#: apt-pkg/contrib/configuration.cc:801 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Skladenjska napaka %s:%u: Blok se začne brez imena." +msgid "Removing %s" +msgstr "Odstranjevanje %s" -#: apt-pkg/contrib/configuration.cc:820 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Skladenjska napaka %s:%u: Slabo oblikovana oznaka." +msgid "Completely removing %s" +msgstr "%s je bil popolnoma odstranjen" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Skladenjska napaka %s:%u: Dodatna krama za vrednostjo." +msgid "Noting disappearance of %s" +msgstr "%s je izginil" -#: apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/deb/dpkgpm.cc:115 #, 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." +msgid "Running post-installation trigger %s" +msgstr "Poganjanje sprožilca po namestitvi %s" -#: apt-pkg/contrib/configuration.cc:884 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Skladenjska napaka %s:%u: Preveč vgnezdenih vključitev" +msgid "Directory '%s' missing" +msgstr "Mapa '%s' manjka" -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Skladenjska napaka %s:%u: Vključeno od tu" +msgid "Could not open file '%s'" +msgstr "Ni mogoče odpreti datoteke '%s'" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'" +msgid "Preparing %s" +msgstr "Pripravljanje %s" -#: apt-pkg/contrib/configuration.cc:900 +#: apt-pkg/deb/dpkgpm.cc:1008 #, 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" +msgid "Unpacking %s" +msgstr "Razširjanje %s" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Skladenjska napaka %s:%u: Dodatna krama na koncu datoteke" +msgid "Preparing to configure %s" +msgstr "Pripravljanje na nastavljanje %s" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko le za branje %s" +msgid "Installed %s" +msgstr "%s je bil nameščen" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "Could not open lock file %s" -msgstr "Ni mogoče odprti zaklenjene datoteke %s" +msgid "Preparing for removal of %s" +msgstr "Pripravljanje na odstranitev %s" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS" +msgid "Removed %s" +msgstr "%s je bil odstranjen" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Could not get lock %s" -msgstr "Ni mogoče zakleniti datoteke %s" +msgid "Preparing to completely remove %s" +msgstr "Pripravljanje na popolno odstranitev %s" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "Seznama datotek ni mogoče ustvariti, ker '%s' ni mapa" +msgid "Completely removed %s" +msgstr "%s je bil popolnoma odstranjen" -#: apt-pkg/contrib/fileutl.cc:394 -#, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "Preziranje '%s' v mapi '%s', ker ni običajna datoteka" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Ni mogoče pisati na %s" -#: apt-pkg/contrib/fileutl.cc:412 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "Preziranje datoteke '%s' v mapi '%s', ker nima pripone imena datotek" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:421 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo" + +#: apt-pkg/deb/dpkgpm.cc:1719 +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:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "težave odvisnosti - puščanje nenastavljenega" + +#: apt-pkg/deb/dpkgpm.cc:1726 msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -"Preziranje datoteke '%s' v mapi '%s', ker nima veljavne pripone imena datotek" +"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na " +"navezujočo napako iz predhodne napake." -#: apt-pkg/contrib/fileutl.cc:824 -#, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Pod-opravilo %s je prejelo segmentacijsko napako." +#: apt-pkg/deb/dpkgpm.cc:1732 +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/contrib/fileutl.cc:826 -#, c-format -msgid "Sub-process %s received signal %u." -msgstr "Pod-opravilo %s je prejelo signal %u." +#: apt-pkg/deb/dpkgpm.cc:1739 +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/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Pod-opravilo %s je vrnilo kodo napake (%u)" +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +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/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 -#, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Pod-opravilo %s se je nepričakovano zaključilo" +#: apt-pkg/deb/dpkgpm.cc:1774 +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/contrib/fileutl.cc:913 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "Problem closing the gzip file %s" -msgstr "Težava med zapiranjem gzip datoteke %s" +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/contrib/fileutl.cc:1101 +#: apt-pkg/deb/debsystem.cc:94 #, c-format -msgid "Could not open file %s" -msgstr "Ni mogoče odpreti datoteke %s" +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Skrbniške mape (%s) ni mogoče zakleniti. Ali ste skrbnik?" -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 #, c-format -msgid "Could not open file descriptor %d" -msgstr "Ni mogoče odpreti opisnika datotek %d" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Ni mogoče ustvariti podopravila IPD" +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/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Ni mogoče izvesti stiskanja " - -#: apt-pkg/contrib/fileutl.cc:1514 -#, c-format -msgid "read, still have %llu to read but none left" -msgstr "Prebrano, še vedno je treba prebrati %llu bajtov, vendar ni nič ostalo" - -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "pisanje, preostalo je še %llu za pisanje, vendar ni bilo mogoče pisati" - -#: apt-pkg/contrib/fileutl.cc:1915 -#, c-format -msgid "Problem closing the file %s" -msgstr "Težava med zapiranjem datoteke %s" - -#: apt-pkg/contrib/fileutl.cc:1927 -#, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Težava med preimenovanje datoteke %s v %s" - -#: apt-pkg/contrib/fileutl.cc:1938 -#, c-format -msgid "Problem unlinking the file %s" -msgstr "Težava med razvezovanjem datoteke %s" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "Ni zaklenjeno" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Težava med usklajevanjem datoteke" +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Uporaba: apt-extracttemplates dat1 [dat2 ...]\n" +"\n" +"apt-extracttemplates je orodje za pridobivanje podatkov o\n" +"nastavitvah in predlogah debianovih paketov\n" +"\n" +"Možnosti:\n" +" -h To besedilo pomoči\n" +" -t Nastavi začasno mapo\n" +" -c=? Prebere podano datoteko z nastavitvami\n" +" -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 -#, c-format -msgid "No keyring installed in %s." -msgstr "V %s ni nameščenih zbirk ključev." +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "Ni mogoče določiti %s" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "mmap prazne datoteke ni mogoč" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Ni mogoče ugotoviti različice debconfa. Je sploh nameščen?" -#: apt-pkg/contrib/mmap.cc:111 -#, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Ni mogoče podvojiti opisnika datotek %i" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "Seznam razširitev paketov je predolg" -#: apt-pkg/contrib/mmap.cc:119 +#: 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 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Ni mogoče narediti mmap %llu bajtov" +msgid "Error processing directory %s" +msgstr "Napaka med obdelavo mape %s" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Ni mogoče zapreti mmap" +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Seznam razširitev virov je predolg" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Ni mogoče uskladiti mmap" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Napaka med pisanjem glave v datoteko vsebine" -#: apt-pkg/contrib/mmap.cc:290 +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Ni mogoče narediti mmap %lu bajtov" - -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Ni mogoče obrezati datoteke" +msgid "Error processing contents %s" +msgstr "Napaka med obdelavo vsebine %s" -#: apt-pkg/contrib/mmap.cc:341 -#, c-format +#: ftparchive/apt-ftparchive.cc:626 msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" -"Dinamičnemu MMap je zmanjkalo prostora. Povečajte velikost APT::Cache-Start. " -"Trenutna vrednost: %lu. (man 5 apt.conf)" +"Uporaba: apt-ftparchive [možnosti] ukaz\n" +"Ukazi: packages, binarypath [datoteka prepisa [predpona poti]]\n" +" sources srcpath [datoteka prepisa [predpona poti]]\n" +" contents path\n" +" release path\n" +" generate config [skupine]\n" +" clean config\n" +"\n" +"apt-ftparchive ustvari datoteke kazala za arhive Debian. Podpira\n" +"več slogov ustvarjanja od popolnoma samodejnih do funkcionalnih zamenjav\n" +"za dpkg-scanpackages in dpkg-scansources\n" +"\n" +"apt-ftparchive ustvari datoteke paketov iz drevesa .debs. Datoteka\n" +"paketa vsebuje vsebino vseh nadzornih polj iz vsakega paketa kot tudi\n" +"razpršilo MD5 in velikost datoteke. Datoteka prepisa podpira vsiljenje\n" +"vrednosti Prednosti in Odseka.\n" +"\n" +"Podobno apt-ftparchive ustvari datoteke paketov iz drevesa .dscs.\n" +"Možnost --source-override je mogoče uporabiti za navedbo datoteke prepisa " +"src\n" +"\n" +"Ukaza 'packages' in 'sources' je treba zagnati v korenu drevesa.\n" +"BinaryPath bi morala kazati na osnovno mapo rekurzivnega iskanja in\n" +"datoteka prepisa bi morala vsebovati zastavice prepisa Predpona je pripeta\n" +"v polja imena datoteke, če je prisotna. Primer uporabe iz arhiva Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Možnosti:\n" +" -h To besedilo pomoči\n" +" --md5 ustvarjanje nadzorne vsote MD5\n" +" -s=? datoteka prepisa vira\n" +" -q tiho\n" +" -d=? izbere izbirno podatkovno zbirko pomnilnika\n" +" --no-delink omogoči način razhroščevanja razvezovanja\n" +" --contents nadzira ustvarjanje datoteke vsebine\n" +" -c=? prebere to nastavitveno datoteko\n" +" -o=? nastavi poljubno možnost nastavitve" -#: apt-pkg/contrib/mmap.cc:446 -#, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "" -"Ni mogoče povečati velikosti MMap, ker je omejitev %lu bajtov že dosežena." +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Nobena izbira se ne ujema" -#: apt-pkg/contrib/mmap.cc:449 -msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." -msgstr "" -"Ni mogoče povečati velikosti MMap, ker je samodejno povečevanje onemogočeno." +#: ftparchive/apt-ftparchive.cc:907 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "Nekatere datoteke manjkajo v skupini datotek paketov `%s'" -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s ... Napaka!" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Podatkovna zbirka je pokvarjena, datoteka je preimenovana v %s.old" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "%c%s... Done" -msgstr "%c%s ... Narejeno" +msgid "DB is old, attempting to upgrade %s" +msgstr "PZ je star, poskušanje nadgradnje %s" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" +"Oblika podatkovne zbirke je neveljavna. V kolikor ste nadgradili s starejše " +"različice apt, podatkovno zbirko odstranite in jo znova ustvarite." -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -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:418 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%lid %lih %limin %lis" +msgid "Unable to open DB file %s: %s" +msgstr "Ni mogoče odprti datoteke PZ %s: %s" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" -msgstr "%lih %limin %lis" +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Napaka med branjem povezave %s" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 -#, c-format -msgid "%limin %lis" -msgstr "%limin %lis" +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Arhiv nima nadzornega zapisa" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 -#, c-format -msgid "%lis" -msgstr "%lis" +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Ni mogoče najti kazalke" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:91 #, c-format -msgid "Selection %s not found" -msgstr "Izbire %s ni mogoče najti" +msgid "W: Unable to read directory %s\n" +msgstr "O: ni mogoče brati mape %s\n" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:96 #, 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 "W: Unable to stat %s\n" +msgstr "O: Ni mogoče določiti %s\n" -#: 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?" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "O: " + +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "N: Napake se sklicujejo na datoteko " + +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, 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'. " +msgid "Failed to resolve %s" +msgstr "Ni mogoče razrešiti %s" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "Ni zaklenjeno" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Hoja drevesa je spodletela" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:219 #, c-format -msgid "Installing %s" -msgstr "Nameščanje %s" +msgid "Failed to open %s" +msgstr "Ni mogoče odprti %s" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:278 #, c-format -msgid "Configuring %s" -msgstr "Nastavljanje %s" +msgid " DeLink %s [%s]\n" +msgstr " RazVeži %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:286 #, c-format -msgid "Removing %s" -msgstr "Odstranjevanje %s" +msgid "Failed to readlink %s" +msgstr "Napaka med branjem povezave %s" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:290 #, c-format -msgid "Completely removing %s" -msgstr "%s je bil popolnoma odstranjen" +msgid "Failed to unlink %s" +msgstr "Napaka med odvezovanjem %s" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:298 #, c-format -msgid "Noting disappearance of %s" -msgstr "%s je izginil" +msgid "*** Failed to link %s to %s" +msgstr "*** Napaka med povezovanjem %s in %s" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:308 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Poganjanje sprožilca po namestitvi %s" +msgid " DeLink limit of %sB hit.\n" +msgstr " Dosežena meja RazVezovanja %sB.\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Arhiv ni imel polja s paketom" + +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Directory '%s' missing" -msgstr "Mapa '%s' manjka" +msgid " %s has no override entry\n" +msgstr " %s nima prepisanega vnosa\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Could not open file '%s'" -msgstr "Ni mogoče odpreti datoteke '%s'" +msgid " %s maintainer is %s not %s\n" +msgstr " Vzdrževalec %s je %s in ne %s\n" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing %s" -msgstr "Pripravljanje %s" +msgid " %s has no source override entry\n" +msgstr " %s nima izvornega vnosa prepisa\n" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:710 #, c-format -msgid "Unpacking %s" -msgstr "Razširjanje %s" +msgid " %s has no binary override entry either\n" +msgstr " %s nima tudi binarnega vnosa prepisa\n" + +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Napaka med dodeljevanjem pomnilnika" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing to configure %s" -msgstr "Pripravljanje na nastavljanje %s" +msgid "Unable to open %s" +msgstr "Ni mogoče odpreti %s" + +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Installed %s" -msgstr "%s je bil nameščen" +msgid "Failed to read the override file %s" +msgstr "Napaka med branjem prepisane datoteke %s" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:166 #, c-format -msgid "Preparing for removal of %s" -msgstr "Pripravljanje na odstranitev %s" +msgid "Malformed override %s line %llu #1" +msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:178 #, c-format -msgid "Removed %s" -msgstr "%s je bil odstranjen" +msgid "Malformed override %s line %llu #2" +msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:191 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Pripravljanje na popolno odstranitev %s" +msgid "Malformed override %s line %llu #3" +msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 3" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Completely removed %s" -msgstr "%s je bil popolnoma odstranjen" +msgid "Unknown compression algorithm '%s'" +msgstr "Neznan algoritem stiskanja '%s'" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Ni mogoče pisati na %s" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Stisnjen izhod %s potrebuje niz stiskanja" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Ustvarjanje DATOTEKE* ni uspelo" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Vejitev ni uspela" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Podrejeni predmet stiskanja" -#: apt-pkg/deb/dpkgpm.cc:1687 -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" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Notranja napaka. Ni mogoče ustvariti %s" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "težave odvisnosti - puščanje nenastavljenega" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "VI podopravila/datoteke je spodletel" -#: apt-pkg/deb/dpkgpm.cc:1694 -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." +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Med računanjem MD5 ni mogoče brati" -#: apt-pkg/deb/dpkgpm.cc:1700 -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" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Napaka med odvezovanjem %s" -#: apt-pkg/deb/dpkgpm.cc:1707 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " -"zaradi pomanjkanja pomnilnika" +"Uporaba: apt-internal-solver\n" +"\n" +"apt-internal-solver je vmesnik za uporabo trenutnega notranjega\n" +"reševalnika kot zunanji reševalnik za družino APT za razhroščevanje ali " +"podobno.\n" +"\n" +"Možnosti:\n" +" -h To besedilo pomoči\n" +" -q Izhod se beleži - ni kazalnika napredka\n" +" -c=? Prebere to nastavitveno datoteko\n" +" -o=? Nastavi poljubno nastavitveno možnost, na primer dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -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" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Neznan zapis paketa!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako " -"dpkg V/I" +"Uporaba: apt-sortpkgs [možnosti] dat1 [dat2 ...]\n" +"\n" +"apt-sortpkgs je preprosto orodje za razvrščanje paketnih datotek. Možnost -" +"s\n" +"določa vrsto datoteke.\n" +"\n" +"Možnosti:\n" +" -h to besedilo pomoči\n" +" -s uporabi razvrščanje izvornih datotek\n" +" -c=? Prebere podano datoteko z nastavitvami\n" +" -o=? Nastavi poljubno nastavitveno možnost, npr. -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/sv.po b/po/sv.po index 5d11f06c2..bc79643a5 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2010-08-24 21:18+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " Versionstabell:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -356,7 +356,7 @@ msgstr "Kunde inte låsa hämtningskatalogen" 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta något källkodspaket för %s" @@ -382,95 +382,95 @@ msgstr "" "bzr get %s\n" "för att hämta senaste (möjligen inte utgivna) uppdateringar av paketet.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar över redan hämtade filen \"%s\"\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte fastställa ledigt utrymme i %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behöver hämta %sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Hämtar källkoden %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Misslyckades med att hämta vissa arkiv." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -479,7 +479,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -488,14 +488,14 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -504,7 +504,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:1358 +#: cmdline/apt-get.cc:1362 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -513,31 +513,31 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden för %s kunde inte tillfredsställas." -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Misslyckades med att behandla byggberoenden" # Felmeddelande för misslyckad chdir -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Ansluter till %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Moduler som stöds:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -679,7 +679,7 @@ msgstr "%s är redan den senaste versionen.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Väntade på %s men den fanns inte där" @@ -773,16 +773,16 @@ msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande används." msgid "Disk not found." msgstr "Skivan hittades inte." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Filen hittades inte" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Kunde inte ta status" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Misslyckades ställa in ändringstid" @@ -836,7 +836,7 @@ msgstr "Kommandot \"%s\" i inloggningsskriptet misslyckades, servern sade: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE misslyckades, servern sade: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Tidsgränsen för anslutningen överskreds" @@ -858,7 +858,7 @@ msgstr "Ett svar spillde bufferten." msgid "Protocol corruption" msgstr "Protokollet skadat" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -919,7 +919,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:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Problem med att lägga filen till hashtabellen" @@ -928,7 +928,7 @@ msgstr "Problem med att lägga filen till hashtabellen" msgid "Unable to fetch file, server said '%s'" msgstr "Kunde inte hämta filen, servern sade \"%s\"" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Datauttag (socket) fick inte svar inom tidsgränsen" @@ -981,7 +981,7 @@ msgstr "Kunde inte ansluta till %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Ansluter till %s" @@ -1125,47 +1125,17 @@ msgstr "Anslutningen misslyckades" msgid "Internal error" msgstr "Internt fel" -# Måste vara tre bokstäver(?) -# "Hit" = aktuell version är fortfarande giltig -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Bra " - -# "Get:" = hämtar ny version -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Läs:" - -# "Ign" = hoppar över -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ign " - -# "Err" = fel vid hämtning -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Fel " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Hämtade %sB på %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Arbetar]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Mediabyte: Mata in skivan med etiketten\n" -" \"%s\"\n" -"i enheten \"%s\" och tryck på Enter\n" +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:93 msgid "Correcting dependencies..." @@ -1195,171 +1165,355 @@ msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa." msgid "Unmet dependencies. Try using -f." msgstr "Otillfredsställda beroenden. Prova med -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "VARNING: Följande paket kunde inte autentiseras!" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Installerat]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Autentiseringsvarning åsidosatt.\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [Installerat]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Några av paketen kunde inte autentiseras" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Installera dessa paket utan verifiering?" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Installerat]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Problem har uppstått och -y användes utan --force-yes" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Installerat]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Misslyckades med att hämta %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Internt fel. InstallPackages anropades med trasiga paket!" - -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat." - -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Internt fel. Sorteringen färdigställdes inte" - -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgid "[upgradable from: %s]" msgstr "" -"Konstigt... storlekarna stämde inte överens, skicka e-post till 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 -#: apt-private/private-install.cc:155 -#, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "Behöver hämta %sB/%sB arkiv.\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:160 -#, c-format -msgid "Need to get %sB of archives.\n" -msgstr "Behöver hämta %sB arkiv.\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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" msgstr "" -"Efter denna åtgärd kommer ytterligare %sB utrymme användas på disken.\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:172 +#: apt-private/private-output.cc:455 #, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n" +msgid "but %s is installed" +msgstr "men %s är installerat" -#: apt-private/private-install.cc:200 +#: apt-private/private-output.cc:457 #, c-format -msgid "You don't have enough free space in %s." -msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" +msgid "but %s is to be installed" +msgstr "men %s kommer att installeras" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling." +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "men det kan inte installeras" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Ja, gör som jag säger!" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "men det är ett virtuellt paket" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Du är på väg att göra någonting som kan vara skadligt\n" -"Skriv in frasen \"%s\" för att fortsätta\n" -" ?] " +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "men det är inte installerat" -# Visas då man svarar nej -#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Avbryter." +#: 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-install.cc:243 -msgid "Do you want to continue?" -msgstr "Vill du fortsätta?" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " eller" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Misslyckades med att hämta vissa filer" +#: 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-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Vissa arkiv kunte inte hämtas. Prova att köra \"apt-get update\" eller med --" -"fix-missing." +#: 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-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing och mediabyte stöds inte för tillfället" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "Följande paket kommer att TAS BORT:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Kunde inte korrigera saknade paket." +#: 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-install.cc:330 -msgid "Aborting install." -msgstr "Avbryter installationen." +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "Följande paket kommer att uppgraderas:" -#: apt-private/private-install.cc:366 -msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"Följande paket har försvunnit från ditt system eftersom\n" -"alla filer har skrivits över av andra paket:" -msgstr[1] "" -"Följande paket har försvunnit från ditt system eftersom\n" -"alla filer har skrivits över av andra paket:" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" +msgstr "Följande paket kommer att NEDGRADERAS:" -#: apt-private/private-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Observera: Detta sker med automatik och vid behov av dpkg." +#: 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-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "" -"Det är inte meningen att vi ska ta bort något, kan inte starta AutoRemover" +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (på grund av %s) " -#: apt-private/private-install.cc:499 +#: apt-private/private-output.cc:696 msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" msgstr "" -"Hmm, det verkar som AutoRemover förstörde något som verkligen\n" -"inte skulle hända. Skicka in en felrapport mot paketet apt." +"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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Internt fel. InstallPackages anropades med trasiga paket!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Internt fel. Sorteringen färdigställdes inte" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Konstigt... storlekarna stämde inte överens, skicka e-post till apt@packages." +"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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Behöver hämta %sB/%sB arkiv.\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:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Behöver hämta %sB arkiv.\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:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "" +"Efter denna åtgärd kommer ytterligare %sB utrymme användas på disken.\n" + +#. 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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Problem har uppstått och -y användes utan --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling." + +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Ja, gör som jag säger!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Du är på väg att göra någonting som kan vara skadligt\n" +"Skriv in frasen \"%s\" för att fortsätta\n" +" ?] " + +# Visas då man svarar nej +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Avbryter." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Vill du fortsätta?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Misslyckades med att hämta vissa filer" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Vissa arkiv kunte inte hämtas. Prova att köra \"apt-get update\" eller med --" +"fix-missing." + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing och mediabyte stöds inte för tillfället" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Kunde inte korrigera saknade paket." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Avbryter installationen." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"Följande paket har försvunnit från ditt system eftersom\n" +"alla filer har skrivits över av andra paket:" +msgstr[1] "" +"Följande paket har försvunnit från ditt system eftersom\n" +"alla filer har skrivits över av andra paket:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Observera: Detta sker med automatik och vid behov av dpkg." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" +"Det är inte meningen att vi ska ta bort något, kan inte starta AutoRemover" + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"Hmm, det verkar som AutoRemover förstörde något som verkligen\n" +"inte skulle hända. Skicka in en felrapport mot paketet apt." #. #. if (Packages == 1) @@ -1491,210 +1645,26 @@ 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:129 -msgid "Listing" -msgstr "" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "VARNING: Följande paket kunde inte autentiseras!" -#: apt-private/private-list.cc:159 -#, 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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Autentiseringsvarning åsidosatt.\n" -#: 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-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:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Fel vid kompilering av reguljärt uttryck - %s" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Några av paketen kunde inte autentiseras" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Installera dessa paket utan verifiering?" -#: apt-private/private-show.cc:156 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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 "" +msgid "Failed to fetch %s %s\n" +msgstr "Misslyckades med att hämta %s %s\n" #: apt-private/private-sources.cc:58 #, fuzzy, c-format @@ -1706,20 +1676,8 @@ msgstr "Misslyckades med att byta namn på %s till %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Uppdateringskommandot tar inga argument" - -#: apt-private/private-update.cc:90 -#, 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:94 -msgid "All packages are up to date." +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" #: apt-private/private-upgrade.cc:25 @@ -1730,21 +1688,63 @@ msgstr "Beräknar uppgradering... " msgid "Done" msgstr "Färdig" +# Måste vara tre bokstäver(?) +# "Hit" = aktuell version är fortfarande giltig +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Bra " + +# "Get:" = hämtar ny version +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Läs:" + +# "Ign" = hoppar över +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ign " + +# "Err" = fel vid hämtning +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Fel " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Hämtade %sB på %s (%sB/s)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Arbetar]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Mediabyte: Mata in skivan med etiketten\n" +" \"%s\"\n" +"i enheten \"%s\" och tryck på Enter\n" + #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, 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:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1778,7 +1778,7 @@ msgstr "[Spegel: %s]" msgid "Failed to create IPC pipe to subprocess" msgstr "Misslyckades med att skapa IPC-rör till underprocess" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "Anslutningen stängdes i förtid" @@ -1820,658 +1820,565 @@ 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:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Användning: apt-extracttemplates fil1 [fil2 ...]\n" -"\n" -"apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n" -"och mallinformation från paket\n" -"\n" -"Flaggor:\n" -" -h Denna hjälptext.\n" -" -t Ställ in temporärkatalogen.\n" -" -c=? Läs denna konfigurationsfil.\n" -" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" - -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Kunde inte ta status på %s" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode anropat på fortfarande länkad nod" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "Kunde inte skriva till %s" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Misslyckades med att hitta hash-elementet!" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Kan inte ta reda på debconf-version. Är debconf installerat?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Misslyckades med att allokera omdirigering" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Listan över filtillägg för Packages är för lång" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Internt fel i AddDiversion" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "Fel vid behandling av katalogen %s" - -#: ftparchive/apt-ftparchive.cc:281 -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 -msgid "Error writing header to contents file" -msgstr "Fel vid skrivning av rubrik till innehållsfil" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Försöker att skriva över en omdirigering, %s -> %s och %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "Fel vid behandling av innehållet %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Användning: apt-ftparchive [flaggor] kommando\n" -"Kommandon: packages binärsökväg [åsidosättningsfil [sökvägsprefix]]\n" -" sources källsökväg [åsidosättningsfil [sökvägsprefix]]\n" -" contents sökväg\n" -" release sökväg\n" -" generate konfiguration [grupper]\n" -" clean konfiguration\n" -"\n" -"apt-ftparchive genererar indexfiler för Debianarkiv. Det stöder många\n" -"former av generering, allt från helautomatiserat till funktionella\n" -"ersättningar till dpkg-scanpackages och dpkg-scansources\n" -"\n" -"apt-ftparchive skapar Package-filer från ett träd med .deb-filer.\n" -"Packagefilen innehåller alla styrfälten från paketen samt MD5-hashvärdet\n" -"och filstorlek. En overrride-fil stöds för att tvinga värden på Priority\n" -"och Section.\n" -"\n" -"På samma sätt skapar apt-ftparchive Sources-filer från ett träd med\n" -".dsc-filer. Flaggan --source-override kan användas för att ange en\n" -"override-fil för källkoden.\n" -"\n" -"Kommandona \"packages\" och \"sources\" bör köras från rotet på trädet.\n" -"Binärsökvägen bör peka på basen på den rekursiva sökningen och\n" -"override-filen bör innehålla override-flaggorna de framtvingade flaggorna.\n" -"Sökvägsprefixet läggs till i filnamnsfälten om det anges. Ett exempel på\n" -"hur programmet kan användas från Debianarkivet:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Flaggor:\n" -" -h Denna hjälptext\n" -" --md5 Kontrollera generering av MD5\n" -" -s=? Källkods-override-fil\n" -" -q Tyst\n" -" -d=? Väljer den valfria cachedatabasen\n" -" --no-delink Aktivera \"delinkning\"-felsökningsläget\n" -" --contents Styr skapande av contents-fil\n" -" -c=? Läs denna konfigurationsfil\n" -" -o=? Ställ in en godtycklig konfigurationsflagga" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Inga val träffades" +msgid "Double add of diversion %s -> %s" +msgstr "Omdirigeringen %s -> %s inlagd två gånger" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Några filer saknas i paketfilsgruppen \"%s\"" +msgid "Duplicate conf file %s/%s" +msgstr "Duplicerad konfigurationsfil %s/%s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB var skadad, filen omdöpt till %s.old" +msgid "The path %s is too long" +msgstr "Sökvägen %s är för lång" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "DB är gammal, försöker uppgradera %s" +msgid "Unpacking %s more than once" +msgstr "Packar upp %s flera gånger" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"DB-formatet är ogiltigt. Ta bort och återskapa databasen om du uppgraderar " -"från en äldre version av apt." +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "Katalogen %s är omdirigerad" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Kunde inte öppna DB-filen %s: %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Paketet försöker att skriva till omdirigeringsmålet %s/%s" + +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Omdirigeringssökvägen är för lång" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Misslyckades med att ta status på %s" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Misslyckades med att läsa länken %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Arkivet har ingen styrpost" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Kunde inte få tag i någon markör" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "V: Kunde inte läsa katalogen %s\n" +msgid "Failed to rename %s to %s" +msgstr "Misslyckades med att byta namn på %s till %s" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "V: Kunde inte ta status på %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "F: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "Katalogen %s ersätts av en icke-katalog" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "V: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Misslyckades med att hitta noden i sin hashkorg" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "F: Felen gäller filen " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Sökvägen är för lång" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "Misslyckades med att slå upp %s" - -# ??? -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Trädvandring misslyckades" +msgid "Overwrite package match with no version for %s" +msgstr "Skriv över paketträff utan version för %s" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to open %s" -msgstr "Misslyckades med att öppna %s" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Filen %s/%s skriver över den i paketet %s" -#: ftparchive/writer.cc:278 +#: apt-inst/extract.cc:498 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " Avlänka %s [%s]\n" +msgid "Unable to stat %s" +msgstr "Kunde inte ta status på %s" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Failed to readlink %s" -msgstr "Misslyckades med att läsa länken %s" +msgid "Failed to write file %s" +msgstr "Misslyckades med att skriva filen %s" -#: ftparchive/writer.cc:290 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to unlink %s" -msgstr "Misslyckades med att länka ut %s" +msgid "Failed to close file %s" +msgstr "Misslyckades med att stänga filen %s" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Misslyckades med att länka %s till %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas" -#: ftparchive/writer.cc:308 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Avlänkningsgränsen på %sB nåddes.\n" - -# Fält vid namn "Package" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Arkivet har inget package-fält" +msgid "Internal error, could not locate member %s" +msgstr "Internt fel, kunde inta hitta delen %s" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s har ingen post i override-filen\n" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Kunde inte tolka control-filen" -# parametrar: paket, ny, gammal -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " ansvarig för paketet %s är %s ej %s\n" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Ogiltig arkivsignatur" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s har ingen källåsidosättningspost\n" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Fel vid läsning av rubrik för arkivdel" -#: ftparchive/writer.cc:710 +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s har heller ingen binär åsidosättningspost\n" +msgid "Invalid archive member header %s" +msgstr "Ogiltig arkivdelsrubrik %s" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Misslyckades med att allokera minne" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Ogiltigt arkivdelsrubrik" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Kunde inte öppna %s" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Arkivet är för kort" -# parametrar: filnamn, radnummer -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Felaktig override %s rad %lu #1" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Misslyckades med att läsa arkivrubriker" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Misslyckades med att läsa åsidosättningsfilen %s" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Misslyckades med att skapa rör" -# parametrar: filnamn, radnummer -#: ftparchive/override.cc:166 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Felaktig override %s rad %lu #1" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Misslyckades med att köra gzip" -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Felaktig override %s rad %lu #2" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Skadat arkiv" -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Felaktig override %s rad %lu #3" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Tar-kontrollsumma misslyckades, arkivet skadat" -#: ftparchive/multicompress.cc:73 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Okänd komprimeringsalgoritm \"%s\"" +msgid "Unknown TAR header type %u, member %s" +msgstr "Okänd TAR-rubriktyp %u, del %s" -# ??? -#: ftparchive/multicompress.cc:103 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Komprimerade utdata %s behöver en komprimeringsuppsättning" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Misslyckades med att skapa FILE*" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Misslyckades med att grena process" +msgid "Progress: [%3i%%]" +msgstr "" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Barnprocess för komprimering" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "Kör dpkg" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/init.cc:146 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Internt fel, misslyckades med att skapa %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "In/ut för underprocess/fil misslyckades" +msgid "Packaging system '%s' is not supported" +msgstr "Paketsystemet \"%s\" stöds inte" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Misslyckades med att läsa vid beräkning av MD5" +# +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Kunde inte fastställa en lämplig paketsystemstyp" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Problem unlinking %s" -msgstr "Problem med att länka ut %s" +msgid "Wrote %i records.\n" +msgstr "Skrev %i poster.\n" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Misslyckades med att byta namn på %s till %s" - -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Användning: apt-extracttemplates fil1 [fil2 ...]\n" -"\n" -"apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n" -"och mallinformation från paket\n" -"\n" -"Flaggor:\n" -" -h Denna hjälptext.\n" -" -t Ställ in temporärkatalogen.\n" -" -c=? Läs denna konfigurationsfil.\n" -" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Okänd paketpost!" - -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Användning: apt-sortpkgs [flaggor] fil1 [fil2 ...]\n" -"\n" -"apt-sortpkgs är ett enkelt verktyg för att sortera paketfiler. Flaggan\n" -"-s anges för att ange filens typ.\n" -"\n" -"Flaggor:\n" -" -h Denna hjälptext.\n" -" -s Använd källkodsfilssortering.\n" -" -c=? Läs denna konfigurationsfil.\n" -" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Skrev %i poster med %i saknade filer.\n" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "Failed to write file %s" -msgstr "Misslyckades med att skriva filen %s" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Skrev %i poster med %i filer som inte stämmer\n" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "Failed to close file %s" -msgstr "Misslyckades med att stänga filen %s" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "The path %s is too long" -msgstr "Sökvägen %s är för lång" +msgid "Can't find authentication record for: %s" +msgstr "Kan inte hitta autentiseringspost för: %s" -#: apt-inst/extract.cc:132 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "Unpacking %s more than once" -msgstr "Packar upp %s flera gånger" +msgid "Hash mismatch for: %s" +msgstr "Hash-kontrollsumman stämmer inte för: %s" -#: apt-inst/extract.cc:142 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "The directory %s is diverted" -msgstr "Katalogen %s är omdirigerad" +msgid "The method driver %s could not be found." +msgstr "Metoddrivrutinen %s kunde inte hittas." -#: apt-inst/extract.cc:152 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Paketet försöker att skriva till omdirigeringsmålet %s/%s" +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Omdirigeringssökvägen är för lång" +#: apt-pkg/acquire-worker.cc:169 +#, c-format +msgid "Method %s did not start correctly" +msgstr "Metoden %s startade inte korrekt" -#: apt-inst/extract.cc:249 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Katalogen %s ersätts av en icke-katalog" +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-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Misslyckades med att hitta noden i sin hashkorg" +#: 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." -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Sökvägen är för lång" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Du kan möjligen rätta till problemet genom att köra \"apt-get update\"" -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Skriv över paketträff utan version för %s" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Listan över källor kunde inte läsas." -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Filen %s/%s skriver över den i paketet %s" +# Felmeddelande +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Paketcachen är tom" -#: apt-inst/extract.cc:498 +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Paketcachefilen är skadad" + +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Paketcachefilens version är inkompatibel" + +#: apt-pkg/pkgcache.cc:169 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "Paketcachefilen är skadad" + +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Unable to stat %s" -msgstr "Kunde inte ta status på %s" +msgid "This APT does not support the versioning system '%s'" +msgstr "Denna APT saknar stöd för versionssystemet \"%s\"" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "DropNode anropat på fortfarande länkad nod" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Paketcachen byggdes för en annan arkitektur" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Misslyckades med att hitta hash-elementet!" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Beroende av" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Misslyckades med att allokera omdirigering" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Förberoende av" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Internt fel i AddDiversion" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Föreslår" -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Försöker att skriva över en omdirigering, %s -> %s och %s/%s" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Rekommenderar" -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Omdirigeringen %s -> %s inlagd två gånger" +# "Konfliktar"? +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Står i konflikt med" -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Duplicerad konfigurationsfil %s/%s" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Ersätter" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Ogiltig arkivsignatur" +# "Föråldrar"? +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Föråldrar" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Fel vid läsning av rubrik för arkivdel" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Gör sönder" -#: apt-inst/contrib/arfile.cc:96 -#, c-format -msgid "Invalid archive member header %s" -msgstr "Ogiltig arkivdelsrubrik %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Utökar" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Ogiltigt arkivdelsrubrik" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "viktigt" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Arkivet är för kort" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "nödvändigt" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Misslyckades med att läsa arkivrubriker" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "standard" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Misslyckades med att skapa rör" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "valfri" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Misslyckades med att köra gzip" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "extra" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Skadat arkiv" +#: apt-pkg/pkgrecords.cc:38 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "Indexfiler av typ \"%s\" stöds inte" -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Tar-kontrollsumma misslyckades, arkivet skadat" +#: 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-inst/contrib/extracttar.cc:308 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Okänd TAR-rubriktyp %u, del %s" +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "Rad %lu i källistan %s har fel format ([option] ej tolkningsbar)" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas" +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-inst/deb/debfile.cc:132 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "Internt fel, kunde inta hitta delen %s" +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-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Kunde inte tolka control-filen" +#: 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/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "List directory %spartial is missing." -msgstr "Listkatalogen %spartial saknas." +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/acquire.cc:91 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Archives directory %spartial is missing." -msgstr "Arkivkatalogen %spartial saknas." +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Rad %lu i källistan %s har (URI)" -#: apt-pkg/acquire.cc:99 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Unable to lock directory %s" -msgstr "Kunde inte låsa katalogen %s" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Rad %lu i källistan %s har fel format (dist)" -#: apt-pkg/acquire.cc:490 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/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)" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Hämtar fil %li av %li (%s återstår)" +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "Rad %lu i källistan %s har fel format (Absolut dist)" -#: apt-pkg/acquire.cc:904 +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "Retrieving file %li of %li" -msgstr "Hämtar fil %li av %li" +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)" -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "namnbyte misslyckades, %s (%s -> %s)." +msgid "Opening %s" +msgstr "Öppnar %s" -#: apt-pkg/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "Hash-kontrollsumman stämmer inte" +#: 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/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "Storleken stämmer inte" +#: 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/acquire-item.cc:173 -#, fuzzy +#: 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:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Indexfiler av typ \"%s\" stöds inte" + +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." +msgstr "Kunde inte ta status på %s." + +#: apt-pkg/pkgcachegen.cc:93 +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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Fel uppstod vid hantering av %s (FindPkg)" + +#: apt-pkg/pkgcachegen.cc:257 +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:260 +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:263 +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:266 +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:576 +#, 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:1211 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "Kunde inte ta status på källkodspaketlistan %s" + +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Läser paketlistor" + +# Bättre ord? +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Samlar filtillhandahållningar" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Kunde inte skriva till %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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:241 +msgid "Send request to solver" +msgstr "" + +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "" + +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" + +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "namnbyte misslyckades, %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "Hash-kontrollsumman stämmer inte" + +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "Storleken stämmer inte" + +#: apt-pkg/acquire-item.cc:173 +#, fuzzy msgid "Invalid file format" msgstr "Felaktig åtgärd %s" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, 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:1589 +#: apt-pkg/acquire-item.cc:1656 #, 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:1631 +#: apt-pkg/acquire-item.cc:1698 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:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, 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:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2482,12 +2389,12 @@ msgstr "" "%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "GPG-fel: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2496,140 +2403,115 @@ 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:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna är skadede. Inget \"Filename:\"-fält för paketet %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Metoddrivrutinen %s kunde inte hittas." - -#: apt-pkg/acquire-worker.cc:118 -#, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n" +msgid "Vendor block %s contains no fingerprint" +msgstr "Leverantörsblocket %s saknar fingeravtryck" -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Method %s did not start correctly" -msgstr "Metoden %s startade inte korrekt" +msgid "List directory %spartial is missing." +msgstr "Listkatalogen %spartial saknas." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:91 #, 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 "Archives directory %spartial is missing." +msgstr "Arkivkatalogen %spartial saknas." -#: apt-pkg/algorithms.cc:265 +#: apt-pkg/acquire.cc:99 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det." - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på " -"tillbakahållna paket." - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket." +msgid "Unable to lock directory %s" +msgstr "Kunde inte låsa katalogen %s" -#: 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." +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 +#, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Hämtar fil %li av %li (%s återstår)" -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Du kan möjligen rätta till problemet genom att köra \"apt-get update\"" +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Hämtar fil %li av %li" -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Listan över källor kunde inte läsas." +#: 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/cacheset.cc:489 +#: apt-pkg/policy.cc:83 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Utgåvan \"%s\" för \"%s\" hittades inte" +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" +msgstr "" -#: apt-pkg/cacheset.cc:492 +# "Package" är en sträng i konfigurationsfilen +#: apt-pkg/policy.cc:422 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Version \"%s\" för \"%s\" hittades inte" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Ogiltig post i konfigurationsfilen %s, \"Package\"-rubriken saknas" -#: apt-pkg/cacheset.cc:603 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Couldn't find task '%s'" -msgstr "Kunde inte hitta funktionen \"%s\"" +msgid "Did not understand pin type %s" +msgstr "Förstod inte nåltypen %s" -#: apt-pkg/cacheset.cc:609 +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Prioritet ej angiven (eller noll) för nål" + +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\"" +msgid "" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" +"Kunde inte genomföra omedelbar konfiguration på \"%s\". Se man 5 apt.conf " +"under APT::Immediate-Configure för information. (%d)" -#: apt-pkg/cacheset.cc:615 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\"" +msgid "Could not configure '%s'. " +msgstr "Kunde inte öppna filen \"%s\"" -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" +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 "" -"Kan inte välja versioner från paketet \"%s\" eftersom det är helt virtuellt" +"För att genomföra installationen måste det systemkritiska paketet %s " +"tillfälligt tas bort på grund av en beroendespiral i Conflicts/Pre-Depends. " +"Detta är oftast en dålig idé, men om du verkligen vill göra det kan du " +"aktivera flaggan \"APT::Force-LoopBreak\"." -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 -#, c-format +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 +#, fuzzy msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Some index files failed to download. They have been ignored, or old ones " +"used instead." msgstr "" -"Kan inte välja installerad version eller kandidatversion från paketet \"%s\" " -"eftersom det inte har någon av dem" +"Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla " +"använts istället." -#: apt-pkg/cacheset.cc:647 -#, 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:655 -#, 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:663 -#, 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/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/cdrom.cc:571 -msgid "Unmounting CD-ROM...\n" -msgstr "Avmonterar CD-ROM...\n" - -#: apt-pkg/cdrom.cc:586 +#: apt-pkg/cdrom.cc:571 +msgid "Unmounting CD-ROM...\n" +msgstr "Avmonterar CD-ROM...\n" + +#: apt-pkg/cdrom.cc:586 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Använder cd-rom-monteringspunkten %s\n" @@ -2702,10 +2584,24 @@ msgstr "Skriver ny källista\n" msgid "Source list entries for this disc are:\n" msgstr "Poster i källistan för denna skiva:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Kunde inte ta status på %s." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på " +"tillbakahållna paket." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket." #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2733,55 +2629,76 @@ msgstr "Misslyckades med att öppna StateFile %s" msgid "Failed to write temporary StateFile %s" msgstr "Misslyckades med att skriva temporär StateFile %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Kunde inte tolka paketfilen %s (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Kunde inte tolka paketfilen %s (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Utgåvan \"%s\" för \"%s\" hittades inte" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Version \"%s\" för \"%s\" hittades inte" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Kunde inte hitta funktionen \"%s\"" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "Skrev %i poster.\n" +msgid "Couldn't find any package by regex '%s'" +msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\"" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, 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:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Skrev %i poster med %i saknade filer.\n" +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/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Skrev %i poster med %i filer som inte stämmer\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"Kan inte välja installerad version eller kandidatversion från paketet \"%s\" " +"eftersom det inte har någon av dem" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n" +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/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "Kan inte hitta autentiseringspost för: %s" +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/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:663 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Hash-kontrollsumman stämmer inte för: %s" +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/indexrecords.cc:78 #, c-format @@ -2808,834 +2725,912 @@ msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s" msgid "Invalid 'Date' entry in Release file %s" msgstr "Ogiltig \"Date\"-post i Release-filen %s" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Paketsystemet \"%s\" stöds inte" +msgid "%lid %lih %limin %lis" +msgstr "%lid %lih %limin %lis" -# -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Kunde inte fastställa en lämplig paketsystemstyp" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" +msgstr "%lih %limin %lis" -#: apt-pkg/install-progress.cc:57 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Progress: [%3i%%]" -msgstr "" +msgid "%limin %lis" +msgstr "%limin %lis" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "Kör dpkg" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" +msgstr "%lis" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" -"Kunde inte genomföra omedelbar konfiguration på \"%s\". Se man 5 apt.conf " -"under APT::Immediate-Configure för information. (%d)" +msgid "Selection %s not found" +msgstr "Valet %s hittades inte" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "Kunde inte öppna filen \"%s\"" +#: apt-pkg/contrib/fileutl.cc:190 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "Använder inte låsning för skrivskyddade låsfilen %s" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" -"För att genomföra installationen måste det systemkritiska paketet %s " -"tillfälligt tas bort på grund av en beroendespiral i Conflicts/Pre-Depends. " -"Detta är oftast en dålig idé, men om du verkligen vill göra det kan du " -"aktivera flaggan \"APT::Force-LoopBreak\"." +msgid "Could not open lock file %s" +msgstr "Kunde inte öppna låsfilen %s" -# Felmeddelande -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Paketcachen är tom" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Använder inte låsning för nfs-monterade låsfilen %s" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Paketcachefilen är skadad" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Kunde inte erhålla låset %s" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Paketcachefilens version är inkompatibel" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" -#: apt-pkg/pkgcache.cc:169 -#, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "Paketcachefilen är skadad" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:412 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Denna APT saknar stöd för versionssystemet \"%s\"" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "Paketcachen byggdes för en annan arkitektur" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Beroende av" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Underprocessen %s råkade ut för ett segmenteringsfel." -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Förberoende av" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "Underprocessen %s tog emot signal %u." -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Föreslår" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Rekommenderar" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Underprocessen %s svarade med en felkod (%u)" -# "Konfliktar"? -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Står i konflikt med" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Underprocessen %s avslutades oväntat" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Ersätter" +#: apt-pkg/contrib/fileutl.cc:913 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Problem med att stänga gzip-filen %s" -# "Föråldrar"? -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Föråldrar" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Kunde inte öppna filen %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Gör sönder" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "Kunde inte öppna filhandtag %d" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Utökar" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Misslyckades med att skapa underprocess-IPC" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "viktigt" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Misslyckades med att starta komprimerare " -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "nödvändigt" +#: apt-pkg/contrib/fileutl.cc:1514 +#, fuzzy, c-format +msgid "read, still have %llu to read but none left" +msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "standard" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, fuzzy, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "skrivning, har fortfarande %lu att skriva men kunde inte" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "valfri" +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" +msgstr "Problem med att stänga filen %s" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "extra" +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Problem med att byta namn på filen %s till %s" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Cachen har ett inkompatibelt versionssystem" +#: apt-pkg/contrib/fileutl.cc:1938 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "Problem med att avlänka filen %s" -# 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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 -#, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Fel uppstod vid hantering av %s (FindPkg)" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Problem med att synkronisera filen" -#: apt-pkg/pkgcachegen.cc:257 -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/contrib/progress.cc:148 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... Fel!" -#: apt-pkg/pkgcachegen.cc:260 -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/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Färdig" -#: apt-pkg/pkgcachegen.cc:263 -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/contrib/progress.cc:181 +msgid "..." +msgstr "" -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera." +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Färdig" -#: apt-pkg/pkgcachegen.cc:576 -#, 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/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Kan inte utföra mmap på en tom fil" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Kunde inte ta status på källkodspaketlistan %s" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Kunde inte duplicera filhandtag %i" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Läser paketlistor" +#: apt-pkg/contrib/mmap.cc:119 +#, fuzzy, c-format +msgid "Couldn't make mmap of %llu bytes" +msgstr "Kunde inte utföra mmap på %lu byte" -# Bättre ord? -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Samlar filtillhandahållningar" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Kunde inte stänga mmap" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "In-/utfel vid lagring av källcache" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Kunde inte synkronisera mmap" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Indexfiler av typ \"%s\" stöds inte" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Kunde inte utföra mmap på %lu byte" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Misslyckades med att kapa av filen" + +#: apt-pkg/contrib/mmap.cc:341 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" +"Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Start. " +"Aktuellt värde: %lu. (man 5 apt.conf)" -# "Package" är en sträng i konfigurationsfilen -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Ogiltig post i konfigurationsfilen %s, \"Package\"-rubriken saknas" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" +"Kunde inte öka storleken för MMap eftersom gränsen på %lu byte redan har " +"uppnåtts." -#: apt-pkg/policy.cc:444 -#, c-format -msgid "Did not understand pin type %s" -msgstr "Förstod inte nåltypen %s" +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Kunde inte öka storleken för MMap eftersom automatisk växt har inaktiverats " +"av användaren." -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Prioritet ej angiven (eller noll) för nål" +#: apt-pkg/contrib/cdromutl.cc:65 +#, c-format +msgid "Unable to stat the mount point %s" +msgstr "Kunde inte ta status på monteringspunkten %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/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Kunde inte ta status på cd-romen." -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/configuration.cc:519 #, 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)" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Okänd typförkortning: \"%c\"" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/configuration.cc:633 #, 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)" +msgid "Opening configuration file %s" +msgstr "Öppnar konfigurationsfilen %s" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/configuration.cc:801 #, 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)" +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Syntaxfel %s:%u: Block börjar utan namn." -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/configuration.cc:820 #, 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)" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Syntaxfel %s:%u: Felformat märke" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/configuration.cc:837 #, 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)" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Syntaxfel %s:%u: Överflödigt skräp efter värde" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Rad %lu i källistan %s har (URI)" +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/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:371 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Rad %u i källistan %s har fel format (typ)" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Syntaxfel %s:%u: För många nästlade inkluderingar" -#: apt-pkg/sourcelist.cc:375 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, 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/srcrecords.cc:52 -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" +msgid "Syntax error %s:%u: Included from here" +msgstr "Syntaxfel %s:%u: Inkluderad härifrån" -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/configuration.cc:897 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Kunde inte tolka paketfilen %s (1)" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds inte" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/configuration.cc:900 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Kunde inte tolka paketfilen %s (2)" - -#: 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." +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/vendorlist.cc:85 +#: apt-pkg/contrib/configuration.cc:950 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Leverantörsblocket %s saknar fingeravtryck" +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/cdromutl.cc:65 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "Kunde inte ta status på monteringspunkten %s." - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "Kunde inte ta status på cd-romen." +msgid "No keyring installed in %s." +msgstr "Ingen nyckelring installerad i %s." -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format msgid "Command line option %s is not understood" msgstr "Förstår inte kommandoradsflaggan %s" -#: apt-pkg/contrib/cmndline.cc:168 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format msgid "Command line option %s is not boolean" msgstr "Kommandoradsflaggan %s är inte boolsk" -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format msgid "Option %s requires an argument." msgstr "Flaggan %s kräver ett argument." -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Flaggan %s: Den angivna konfigurationsposten måste innehålla ett =." -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, 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:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "Flaggan \"%s\" är för lång" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, 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:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "Felaktig åtgärd %s" -#: apt-pkg/contrib/configuration.cc:519 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Okänd typförkortning: \"%c\"" +msgid "Installing %s" +msgstr "Installerar %s" -#: apt-pkg/contrib/configuration.cc:633 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Opening configuration file %s" -msgstr "Öppnar konfigurationsfilen %s" +msgid "Configuring %s" +msgstr "Konfigurerar %s" -#: apt-pkg/contrib/configuration.cc:801 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Syntaxfel %s:%u: Block börjar utan namn." +msgid "Removing %s" +msgstr "Tar bort %s" -#: apt-pkg/contrib/configuration.cc:820 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Syntaxfel %s:%u: Felformat märke" +msgid "Completely removing %s" +msgstr "Tar bort hela %s" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Syntaxfel %s:%u: Överflödigt skräp efter värde" +msgid "Noting disappearance of %s" +msgstr "Uppmärksammar försvinnandet av %s" -#: apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/deb/dpkgpm.cc:115 #, 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" +msgid "Running post-installation trigger %s" +msgstr "Kör efterinstallationsutlösare %s" -#: apt-pkg/contrib/configuration.cc:884 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Syntaxfel %s:%u: För många nästlade inkluderingar" +msgid "Directory '%s' missing" +msgstr "Katalogen \"%s\" saknas" -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Syntaxfel %s:%u: Inkluderad härifrån" +msgid "Could not open file '%s'" +msgstr "Kunde inte öppna filen \"%s\"" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds inte" +msgid "Preparing %s" +msgstr "Förbereder %s" -#: apt-pkg/contrib/configuration.cc:900 +#: apt-pkg/deb/dpkgpm.cc:1008 #, 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" +msgid "Unpacking %s" +msgstr "Packar upp %s" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Syntaxfel %s:%u: Överflödigt skräp vid filens slut" +msgid "Preparing to configure %s" +msgstr "Förbereder konfigurering av %s" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Använder inte låsning för skrivskyddade låsfilen %s" +msgid "Installed %s" +msgstr "Installerade %s" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "Could not open lock file %s" -msgstr "Kunde inte öppna låsfilen %s" +msgid "Preparing for removal of %s" +msgstr "Förbereder borttagning av %s" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Använder inte låsning för nfs-monterade låsfilen %s" +msgid "Removed %s" +msgstr "Tog bort %s" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Could not get lock %s" -msgstr "Kunde inte erhålla låset %s" +msgid "Preparing to completely remove %s" +msgstr "Förbereder borttagning av hela %s" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "" +msgid "Completely removed %s" +msgstr "Tog bort hela %s" -#: apt-pkg/contrib/fileutl.cc:394 -#, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Kunde inte skriva till %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/contrib/fileutl.cc:412 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/contrib/fileutl.cc:421 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1719 +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:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "beroendeproblem - lämnar okonfigurerad" + +#: apt-pkg/deb/dpkgpm.cc:1726 msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +"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/contrib/fileutl.cc:824 -#, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Underprocessen %s råkade ut för ett segmenteringsfel." +#: apt-pkg/deb/dpkgpm.cc:1732 +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/contrib/fileutl.cc:826 -#, c-format -msgid "Sub-process %s received signal %u." -msgstr "Underprocessen %s tog emot signal %u." +#: apt-pkg/deb/dpkgpm.cc:1739 +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/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Underprocessen %s svarade med en felkod (%u)" +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +#, 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/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 -#, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Underprocessen %s avslutades oväntat" +#: apt-pkg/deb/dpkgpm.cc:1774 +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/contrib/fileutl.cc:913 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problem med att stänga gzip-filen %s" +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/contrib/fileutl.cc:1101 +#: apt-pkg/deb/debsystem.cc:94 #, c-format -msgid "Could not open file %s" -msgstr "Kunde inte öppna filen %s" +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Kunde inte låsa administrationskatalogen (%s). Är du root?" -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 #, c-format -msgid "Could not open file descriptor %d" -msgstr "Kunde inte öppna filhandtag %d" +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/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Misslyckades med att skapa underprocess-IPC" - -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Misslyckades med att starta komprimerare " +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "Inte låst" -#: apt-pkg/contrib/fileutl.cc:1514 -#, fuzzy, c-format -msgid "read, still have %llu to read but none left" -msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar" +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Användning: apt-extracttemplates fil1 [fil2 ...]\n" +"\n" +"apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n" +"och mallinformation från paket\n" +"\n" +"Flaggor:\n" +" -h Denna hjälptext.\n" +" -t Ställ in temporärkatalogen.\n" +" -c=? Läs denna konfigurationsfil.\n" +" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#: cmdline/apt-extracttemplates.cc:254 #, fuzzy, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "skrivning, har fortfarande %lu att skriva men kunde inte" - -#: apt-pkg/contrib/fileutl.cc:1915 -#, c-format -msgid "Problem closing the file %s" -msgstr "Problem med att stänga filen %s" - -#: apt-pkg/contrib/fileutl.cc:1927 -#, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Problem med att byta namn på filen %s till %s" - -#: apt-pkg/contrib/fileutl.cc:1938 -#, c-format -msgid "Problem unlinking the file %s" -msgstr "Problem med att avlänka filen %s" - -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Problem med att synkronisera filen" +msgid "Unable to mkstemp %s" +msgstr "Kunde inte ta status på %s" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 -#, c-format -msgid "No keyring installed in %s." -msgstr "Ingen nyckelring installerad i %s." +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Kan inte ta reda på debconf-version. Är debconf installerat?" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Kan inte utföra mmap på en tom fil" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "Listan över filtillägg för Packages är för lång" -#: apt-pkg/contrib/mmap.cc:111 +#: 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 #, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Kunde inte duplicera filhandtag %i" - -#: apt-pkg/contrib/mmap.cc:119 -#, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Kunde inte utföra mmap på %lu byte" - -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Kunde inte stänga mmap" - -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Kunde inte synkronisera mmap" +msgid "Error processing directory %s" +msgstr "Fel vid behandling av katalogen %s" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Kunde inte utföra mmap på %lu byte" +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Listan över filtillägg för Sources är för lång" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Misslyckades med att kapa av filen" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Fel vid skrivning av rubrik till innehållsfil" -#: apt-pkg/contrib/mmap.cc:341 +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "" -"Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Start. " -"Aktuellt värde: %lu. (man 5 apt.conf)" +msgid "Error processing contents %s" +msgstr "Fel vid behandling av innehållet %s" -#: apt-pkg/contrib/mmap.cc:446 -#, c-format +#: ftparchive/apt-ftparchive.cc:626 msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" -"Kunde inte öka storleken för MMap eftersom gränsen på %lu byte redan har " -"uppnåtts." +"Användning: apt-ftparchive [flaggor] kommando\n" +"Kommandon: packages binärsökväg [åsidosättningsfil [sökvägsprefix]]\n" +" sources källsökväg [åsidosättningsfil [sökvägsprefix]]\n" +" contents sökväg\n" +" release sökväg\n" +" generate konfiguration [grupper]\n" +" clean konfiguration\n" +"\n" +"apt-ftparchive genererar indexfiler för Debianarkiv. Det stöder många\n" +"former av generering, allt från helautomatiserat till funktionella\n" +"ersättningar till dpkg-scanpackages och dpkg-scansources\n" +"\n" +"apt-ftparchive skapar Package-filer från ett träd med .deb-filer.\n" +"Packagefilen innehåller alla styrfälten från paketen samt MD5-hashvärdet\n" +"och filstorlek. En overrride-fil stöds för att tvinga värden på Priority\n" +"och Section.\n" +"\n" +"På samma sätt skapar apt-ftparchive Sources-filer från ett träd med\n" +".dsc-filer. Flaggan --source-override kan användas för att ange en\n" +"override-fil för källkoden.\n" +"\n" +"Kommandona \"packages\" och \"sources\" bör köras från rotet på trädet.\n" +"Binärsökvägen bör peka på basen på den rekursiva sökningen och\n" +"override-filen bör innehålla override-flaggorna de framtvingade flaggorna.\n" +"Sökvägsprefixet läggs till i filnamnsfälten om det anges. Ett exempel på\n" +"hur programmet kan användas från Debianarkivet:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Flaggor:\n" +" -h Denna hjälptext\n" +" --md5 Kontrollera generering av MD5\n" +" -s=? Källkods-override-fil\n" +" -q Tyst\n" +" -d=? Väljer den valfria cachedatabasen\n" +" --no-delink Aktivera \"delinkning\"-felsökningsläget\n" +" --contents Styr skapande av contents-fil\n" +" -c=? Läs denna konfigurationsfil\n" +" -o=? Ställ in en godtycklig konfigurationsflagga" -#: apt-pkg/contrib/mmap.cc:449 -msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." -msgstr "" -"Kunde inte öka storleken för MMap eftersom automatisk växt har inaktiverats " -"av användaren." +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Inga val träffades" -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Fel!" +msgid "Some files are missing in the package file group `%s'" +msgstr "Några filer saknas i paketfilsgruppen \"%s\"" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Färdig" - -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "" - -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Färdig" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB var skadad, filen omdöpt till %s.old" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%lid %lih %limin %lis" +msgid "DB is old, attempting to upgrade %s" +msgstr "DB är gammal, försöker uppgradera %s" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" -msgstr "%lih %limin %lis" +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"DB-formatet är ogiltigt. Ta bort och återskapa databasen om du uppgraderar " +"från en äldre version av apt." -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "%limin %lis" -msgstr "%limin %lis" +msgid "Unable to open DB file %s: %s" +msgstr "Kunde inte öppna DB-filen %s: %s" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 -#, c-format -msgid "%lis" -msgstr "%lis" +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Misslyckades med att läsa länken %s" -#: apt-pkg/contrib/strutl.cc:1258 -#, c-format -msgid "Selection %s not found" -msgstr "Valet %s hittades inte" +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Arkivet har ingen styrpost" -#: 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?" +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Kunde inte få tag i någon markör" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:91 #, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Kunde inte låsa administrationskatalogen (%s). Är du root?" +msgid "W: Unable to read directory %s\n" +msgstr "V: Kunde inte läsa katalogen %s\n" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:96 #, 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. " +msgid "W: Unable to stat %s\n" +msgstr "V: Kunde inte ta status på %s\n" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "Inte låst" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "F: " -#: apt-pkg/deb/dpkgpm.cc:95 -#, c-format -msgid "Installing %s" -msgstr "Installerar %s" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "V: " -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 -#, c-format -msgid "Configuring %s" -msgstr "Konfigurerar %s" +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "F: Felen gäller filen " -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "Removing %s" -msgstr "Tar bort %s" +msgid "Failed to resolve %s" +msgstr "Misslyckades med att slå upp %s" -#: apt-pkg/deb/dpkgpm.cc:98 -#, c-format -msgid "Completely removing %s" -msgstr "Tar bort hela %s" +# ??? +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Trädvandring misslyckades" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:219 #, c-format -msgid "Noting disappearance of %s" -msgstr "Uppmärksammar försvinnandet av %s" +msgid "Failed to open %s" +msgstr "Misslyckades med att öppna %s" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:278 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Kör efterinstallationsutlösare %s" +msgid " DeLink %s [%s]\n" +msgstr " Avlänka %s [%s]\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:286 #, c-format -msgid "Directory '%s' missing" -msgstr "Katalogen \"%s\" saknas" +msgid "Failed to readlink %s" +msgstr "Misslyckades med att läsa länken %s" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:290 #, c-format -msgid "Could not open file '%s'" -msgstr "Kunde inte öppna filen \"%s\"" +msgid "Failed to unlink %s" +msgstr "Misslyckades med att länka ut %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:298 #, c-format -msgid "Preparing %s" -msgstr "Förbereder %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Misslyckades med att länka %s till %s" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:308 #, c-format -msgid "Unpacking %s" -msgstr "Packar upp %s" +msgid " DeLink limit of %sB hit.\n" +msgstr " Avlänkningsgränsen på %sB nåddes.\n" + +# Fält vid namn "Package" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Arkivet har inget package-fält" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Preparing to configure %s" -msgstr "Förbereder konfigurering av %s" +msgid " %s has no override entry\n" +msgstr " %s har ingen post i override-filen\n" -#: apt-pkg/deb/dpkgpm.cc:1000 +# parametrar: paket, ny, gammal +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Installed %s" -msgstr "Installerade %s" +msgid " %s maintainer is %s not %s\n" +msgstr " ansvarig för paketet %s är %s ej %s\n" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing for removal of %s" -msgstr "Förbereder borttagning av %s" +msgid " %s has no source override entry\n" +msgstr " %s har ingen källåsidosättningspost\n" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/writer.cc:710 #, c-format -msgid "Removed %s" -msgstr "Tog bort %s" +msgid " %s has no binary override entry either\n" +msgstr " %s har heller ingen binär åsidosättningspost\n" + +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Misslyckades med att allokera minne" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Förbereder borttagning av hela %s" +msgid "Unable to open %s" +msgstr "Kunde inte öppna %s" -#: apt-pkg/deb/dpkgpm.cc:1013 +# parametrar: filnamn, radnummer +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Felaktig override %s rad %lu #1" + +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Completely removed %s" -msgstr "Tog bort hela %s" +msgid "Failed to read the override file %s" +msgstr "Misslyckades med att läsa åsidosättningsfilen %s" + +# parametrar: filnamn, radnummer +#: ftparchive/override.cc:166 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #1" +msgstr "Felaktig override %s rad %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/override.cc:178 #, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Kunde inte skriva till %s" +msgid "Malformed override %s line %llu #2" +msgstr "Felaktig override %s rad %lu #2" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "Felaktig override %s rad %lu #3" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/multicompress.cc:73 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Okänd komprimeringsalgoritm \"%s\"" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" +# ??? +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Komprimerade utdata %s behöver en komprimeringsuppsättning" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "Ingen apport-rapport skrevs därför att MaxReports redan har uppnåtts" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Misslyckades med att skapa FILE*" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "beroendeproblem - lämnar okonfigurerad" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Misslyckades med att grena process" -#: apt-pkg/deb/dpkgpm.cc:1694 -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." +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Barnprocess för komprimering" -#: apt-pkg/deb/dpkgpm.cc:1700 -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" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Internt fel, misslyckades med att skapa %s" -#: apt-pkg/deb/dpkgpm.cc:1707 -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" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "In/ut för underprocess/fil misslyckades" + +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Misslyckades med att läsa vid beräkning av MD5" + +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Problem med att länka ut %s" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-internal-solver.cc:49 #, fuzzy msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att " -"diskutrymmet är slut" +"Användning: apt-extracttemplates fil1 [fil2 ...]\n" +"\n" +"apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n" +"och mallinformation från paket\n" +"\n" +"Flaggor:\n" +" -h Denna hjälptext.\n" +" -t Ställ in temporärkatalogen.\n" +" -c=? Läs denna konfigurationsfil.\n" +" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Okänd paketpost!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Ingen apport-rapport skrevs därför att felmeddelandet indikerar ett in-/ut-" -"fel för dpkg" +"Användning: apt-sortpkgs [flaggor] fil1 [fil2 ...]\n" +"\n" +"apt-sortpkgs är ett enkelt verktyg för att sortera paketfiler. Flaggan\n" +"-s anges för att ange filens typ.\n" +"\n" +"Flaggor:\n" +" -h Denna hjälptext.\n" +" -s Använd källkodsfilssortering.\n" +" -c=? Läs denna konfigurationsfil.\n" +" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/th.po b/po/th.po index 5d04c5cda..ee636ef4f 100644 --- a/po/th.po +++ b/po/th.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2014-04-20 09:38+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" @@ -156,7 +156,7 @@ msgid " Version table:" msgstr " ตารางรุ่น:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -353,7 +353,7 @@ msgstr "ไม่สามารถล็อคไดเรกทอรีดา msgid "Must specify at least one package to fetch source for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s" @@ -378,78 +378,78 @@ msgstr "" "bzr branch %s\n" "เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออกมา) ของตัวแพกเกจ\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "ดาวน์โหลดซอร์ส %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม" -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n" -#: cmdline/apt-get.cc:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "คำสั่ง build '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "โพรเซสลูกล้มเหลว" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -457,17 +457,17 @@ msgid "" msgstr "" "ไม่มีข้อมูลสถาปัตยกรรมสำหรับ %s ดูวิธีตั้งค่าที่หัวข้อ APT::Architectures ของ apt.conf(5)" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -475,19 +475,19 @@ msgid "" msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่สามารถใช้ %s กับแพกเกจ '%s' ได้" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, 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:1313 +#: cmdline/apt-get.cc:1317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -496,37 +496,37 @@ msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s " "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1362 #, 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:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้" -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "ปูมการแก้ไขสำหรับ %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "มอดูลที่รองรับ:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -676,7 +676,7 @@ msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้ #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่" @@ -809,16 +809,16 @@ msgstr "ไม่สามารถเลิกเมานท์ซีดีร msgid "Disk not found." msgstr "ไม่พบแผ่น" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "ไม่พบแฟ้ม" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "stat ไม่สำเร็จ" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ" @@ -870,7 +870,7 @@ msgstr "คำสั่งสคริปต์เข้าระบบ '%s' ล msgid "TYPE failed, server said: %s" msgstr "TYPE ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "หมดเวลารอเชื่อมต่อ" @@ -892,7 +892,7 @@ msgstr "คำตอบท่วมบัฟเฟอร์" msgid "Protocol corruption" msgstr "มีความเสียหายของโพรโทคอล" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -953,7 +953,7 @@ msgstr "หมดเวลารอเชื่อมต่อซ็อกเก msgid "Unable to accept connection" msgstr "ไม่สามารถรับการเชื่อมต่อ" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม" @@ -962,7 +962,7 @@ msgstr "เกิดปัญหาขณะคำนวณค่าแฮชข msgid "Unable to fetch file, server said '%s'" msgstr "ไม่สามารถดาวน์โหลดแฟ้ม เซิร์ฟเวอร์ตอบว่า: '%s'" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "หมดเวลาคอยที่ซ็อกเก็ตข้อมูล" @@ -1012,7 +1012,7 @@ msgstr "ไม่สามารถเชื่อมต่อไปยัง %s #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "เชื่อมต่อไปยัง %s" @@ -1151,42 +1151,16 @@ msgstr "เชื่อมต่อไม่สำเร็จ" msgid "Internal error" msgstr "ข้อผิดพลาดภายใน" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "เจอ " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "ดึง:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "ข้าม " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "ปัญหา " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [กำลังทำงาน]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "กำลังแสดงรายชื่อ" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"เปลี่ยนแผ่น: กรุณาใส่แผ่นชื่อ\n" -" '%s'\n" -"ลงในไดรว์ %s แล้วกด enter\n" +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:93 msgid "Correcting dependencies..." @@ -1216,34 +1190,209 @@ msgstr "คุณอาจต้องเรียก 'apt-get -f install' เ msgid "Unmet dependencies. Try using -f." msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f" -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" -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-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "*คำเตือน*: แพกเกจต่อไปนี้ไม่สามารถยืนยันแหล่งต้นตอได้!" +#: apt-private/private-output.cc:265 +#, c-format +msgid "[installed,upgradable to: %s]" +msgstr "[ติดตั้งอยู่,สามารถปรับรุ่นเป็น: %s]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "จะข้ามการเตือนเกี่ยวกับการยืนยันแหล่งต้นตอ\n" +#: apt-private/private-output.cc:268 +msgid "[installed,local]" +msgstr "[ติดตั้งอยู่,ในเครื่อง]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "มีบางแพกเกจไม่สามารถยืนยันแหล่งต้นตอได้" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "[ติดตั้งอยู่,ถอดถอนอัตโนมัติได้]" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "จะติดตั้งแพกเกจเหล่านี้โดยไม่ตรวจสอบหรือไม่?" +#: apt-private/private-output.cc:272 +msgid "[installed,automatic]" +msgstr "[ติดตั้งอยู่,อัตโนมัติ]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --force-yes" +#: apt-private/private-output.cc:274 +msgid "[installed]" +msgstr "[ติดตั้งอยู่]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "ไม่สามารถดาวน์โหลด %s %s\n" +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:35 +#, 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:97 +#, 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:101 +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:82 msgid "Internal error, InstallPackages was called with broken packages!" @@ -1294,6 +1443,10 @@ msgstr "หลังจากการกระทำนี้ เนื้อ msgid "You don't have enough free space in %s." msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --force-yes" + #: apt-private/private-install.cc:216 apt-private/private-install.cc:238 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only ถูกกำหนดไว้ แต่คำสั่งนี้ไม่ใช่คำสั่งเล็กน้อย" @@ -1492,916 +1645,674 @@ msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ msgid "Package '%s' is not installed, so not removed\n" msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n" -#: apt-private/private-list.cc:129 -msgid "Listing" -msgstr "กำลังแสดงรายชื่อ" - -#: apt-private/private-list.cc:159 -#, 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-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-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-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "*คำเตือน*: แพกเกจต่อไปนี้ไม่สามารถยืนยันแหล่งต้นตอได้!" -#: apt-private/private-output.cc:270 -msgid "[installed,auto-removable]" -msgstr "[ติดตั้งอยู่,ถอดถอนอัตโนมัติได้]" +#: apt-private/private-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "จะข้ามการเตือนเกี่ยวกับการยืนยันแหล่งต้นตอ\n" -#: apt-private/private-output.cc:272 -msgid "[installed,automatic]" -msgstr "[ติดตั้งอยู่,อัตโนมัติ]" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "มีบางแพกเกจไม่สามารถยืนยันแหล่งต้นตอได้" -#: apt-private/private-output.cc:274 -msgid "[installed]" -msgstr "[ติดตั้งอยู่]" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "จะติดตั้งแพกเกจเหล่านี้โดยไม่ตรวจสอบหรือไม่?" -#: apt-private/private-output.cc:277 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, c-format -msgid "[upgradable from: %s]" -msgstr "[สามารถปรับรุ่นจาก: %s]" - -#: apt-private/private-output.cc:281 -msgid "[residual-config]" -msgstr "[ค่าตั้งตกค้าง]" +msgid "Failed to fetch %s %s\n" +msgstr "ไม่สามารถดาวน์โหลด %s %s\n" -#: apt-private/private-output.cc:455 +#: apt-private/private-sources.cc:58 #, c-format -msgid "but %s is installed" -msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s" +msgid "Failed to parse %s. Edit again? " +msgstr "แจง %s ไม่สำเร็จ จะแก้ไขอีกครั้งหรือไม่? " -#: apt-private/private-output.cc:457 +#: apt-private/private-sources.cc:70 #, 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 "แต่แพกเกจนี้จะไม่ถูกติดตั้ง" +msgid "Your '%s' file changed, please run 'apt-get update'." +msgstr "แฟ้ม '%s' ของคุณมีการเปลี่ยนแปลง กรุณาเรียก 'apt-get update'" -#: apt-private/private-output.cc:474 -msgid " or" -msgstr " หรือ" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" +msgstr "ค้นทั่วทั้งเนื้อความ" -#: apt-private/private-output.cc:488 apt-private/private-output.cc:500 -msgid "The following packages have unmet dependencies:" -msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:" +#: apt-private/private-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "กำลังคำนวณการปรับรุ่น... " -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "เสร็จแล้ว" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "จะ *ลบ* แพกเกจต่อไปนี้:" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "เจอ " -#: apt-private/private-output.cc:571 -msgid "The following packages have been kept back:" -msgstr "จะคงรุ่นแพกเกจต่อไปนี้:" +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "ดึง:" -#: apt-private/private-output.cc:592 -msgid "The following packages will be upgraded:" -msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:" +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "ข้าม " -#: apt-private/private-output.cc:613 -msgid "The following packages will be DOWNGRADED:" -msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:" +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "ปัญหา " -#: apt-private/private-output.cc:633 -msgid "The following held packages will be changed:" -msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:" +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n" -#: apt-private/private-output.cc:688 +#: apt-private/acqprogress.cc:236 #, c-format -msgid "%s (due to %s) " -msgstr "%s (เนื่องจาก %s) " +msgid " [Working]" +msgstr " [กำลังทำงาน]" -#: apt-private/private-output.cc:696 +#: apt-private/acqprogress.cc:297 +#, c-format msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" msgstr "" -"*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n" -"คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!" +"เปลี่ยนแผ่น: กรุณาใส่แผ่นชื่อ\n" +" '%s'\n" +"ลงในไดรว์ %s แล้วกด enter\n" -#: apt-private/private-output.cc:727 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, " +msgid "Unable to read %s" +msgstr "ไม่สามารถอ่าน %s" -#: apt-private/private-output.cc:731 +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 #, c-format -msgid "%lu reinstalled, " -msgstr "ติดตั้งซ้ำ %lu, " +msgid "Unable to change to %s" +msgstr "ไม่สามารถเปลี่ยนไดเรกทอรีไปยัง %s" -#: apt-private/private-output.cc:733 +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 #, c-format -msgid "%lu downgraded, " -msgstr "ปรับรุ่นลง %lu, " +msgid "No mirror file '%s' found " +msgstr "ไม่พบแฟ้มแหล่งสำเนา '%s'" -#: apt-private/private-output.cc:735 +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 #, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n" +msgid "Can not read mirror file '%s'" +msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำเนา '%s'" -#: apt-private/private-output.cc:739 +#: methods/mirror.cc:315 #, 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]" +msgid "No entry found in mirror file '%s'" +msgstr "ไม่พบรายการในแฟ้มแหล่งสำเนา '%s'" -#. 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]" +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" +msgstr "[แหล่งสำเนา: %s]" -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:778 -msgid "Y" -msgstr "Y" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "ไม่สามารถสร้างไปป์ IPC ไปยังโพรเซสย่อย" -#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:784 -msgid "N" -msgstr "N" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "การเชื่อมต่อถูกปิดก่อนเวลาอันควร" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "ค่าตั้งปริยายผิดพลาด!" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "ค้นทั่วทั้งเนื้อความ" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "กด enter เพื่อดำเนินการต่อ" -#: 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' หากต้องการดูเพิ่ม" +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "คุณต้องการจะลบแฟ้ม .deb ต่างๆ ที่ได้ดาวน์โหลดมาก่อนหน้านี้หรือไม่?" -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" -msgstr "ไม่ใช่แพกเกจจริง (เสมือน)" +#: dselect/install:102 +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "เกิดข้อผิดพลาดขณะแตกแพกเกจ โปรแกรมจะตั้งค่าแพกเกจที่ติดตั้งแล้ว" -#: apt-private/private-sources.cc:58 -#, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "แจง %s ไม่สำเร็จ จะแก้ไขอีกครั้งหรือไม่? " +#: dselect/install:103 +msgid "will be configured. This may result in duplicate errors" +msgstr "อาจทำให้เกิดข้อความแจ้งข้อผิดพลาดซ้ำ หรือข้อผิดพลาดเนื่องจากแพกเกจที่ต้องใช้ขาดหาย" -#: apt-private/private-sources.cc:70 -#, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "แฟ้ม '%s' ของคุณมีการเปลี่ยนแปลง กรุณาเรียก 'apt-get update'" +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "ซึ่งไม่มีปัญหาอะไร มีเฉพาะข้อผิดพลาดก่อนหน้าข้อความนี้เท่านั้นที่สำคัญ" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม" +#: dselect/install:105 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "กรุณาแก้ปัญหาเหล่านั้น แล้วเรียกติดตั้งใหม่อีกครั้ง" -#: apt-private/private-update.cc:90 -#, 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] "" +#: dselect/update:30 +msgid "Merging available information" +msgstr "กำลังผสานรายชื่อของแพกเกจที่มี" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." -msgstr "" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode ถูกเรียกใช้กับโหนดที่ยังลิงก์อยู่" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "กำลังคำนวณการปรับรุ่น... " +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "หาสมาชิกในตารางแฮชไม่สำเร็จ!" -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "เสร็จแล้ว" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "จองเนื้อที่สำหรับการเบนแฟ้มไม่สำเร็จ" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "ข้อผิดพลาดภายในที่ AddDiversion" + +#: apt-inst/filelist.cc:477 #, c-format -msgid "Unable to read %s" -msgstr "ไม่สามารถอ่าน %s" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "พยายามเขียนทับการเบนแฟ้ม: %s -> %s กับ %s/%s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Unable to change to %s" -msgstr "ไม่สามารถเปลี่ยนไดเรกทอรีไปยัง %s" +msgid "Double add of diversion %s -> %s" +msgstr "เพิ่มการเบนแฟ้ม %s -> %s ซ้ำสอง" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 +#: apt-inst/filelist.cc:549 #, c-format -msgid "No mirror file '%s' found " -msgstr "ไม่พบแฟ้มแหล่งสำเนา '%s'" +msgid "Duplicate conf file %s/%s" +msgstr "แฟ้มค่าตั้ง %s/%s ซ้ำ" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:287 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "Can not read mirror file '%s'" -msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำเนา '%s'" +msgid "The path %s is too long" +msgstr "พาธ %s ยาวเกินไป" -#: methods/mirror.cc:315 +#: apt-inst/extract.cc:132 #, c-format -msgid "No entry found in mirror file '%s'" -msgstr "ไม่พบรายการในแฟ้มแหล่งสำเนา '%s'" +msgid "Unpacking %s more than once" +msgstr "พยายามแตกแพกเกจ %s มากกว่าหนึ่งครั้ง" -#: methods/mirror.cc:445 +#: apt-inst/extract.cc:142 #, c-format -msgid "[Mirror: %s]" -msgstr "[แหล่งสำเนา: %s]" +msgid "The directory %s is diverted" +msgstr "ไดเรกทอรี %s ถูก divert" -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "ไม่สามารถสร้างไปป์ IPC ไปยังโพรเซสย่อย" +#: apt-inst/extract.cc:152 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "แพกเกจนี้พยายามเขียนลงปลายทางของการเบนแฟ้ม %s/%s" -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" -msgstr "การเชื่อมต่อถูกปิดก่อนเวลาอันควร" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "พาธของการเบนแฟ้มยาวเกินไป" -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "ค่าตั้งปริยายผิดพลาด!" +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 +#, c-format +msgid "Failed to stat %s" +msgstr "stat %s ไม่สำเร็จ" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "กด enter เพื่อดำเนินการต่อ" +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s" -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "คุณต้องการจะลบแฟ้ม .deb ต่างๆ ที่ได้ดาวน์โหลดมาก่อนหน้านี้หรือไม่?" +#: apt-inst/extract.cc:249 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "ไดเรกทอรี %s กำลังจะถูกแทนที่ด้วยสิ่งที่ไม่ใช่ไดเรกทอรี" -#: dselect/install:102 -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "เกิดข้อผิดพลาดขณะแตกแพกเกจ โปรแกรมจะตั้งค่าแพกเกจที่ติดตั้งแล้ว" +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "หาโหนดใน bucket ของแฮชไม่พบ" -#: dselect/install:103 -msgid "will be configured. This may result in duplicate errors" -msgstr "อาจทำให้เกิดข้อความแจ้งข้อผิดพลาดซ้ำ หรือข้อผิดพลาดเนื่องจากแพกเกจที่ต้องใช้ขาดหาย" +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "พาธยาวเกินไป" -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "ซึ่งไม่มีปัญหาอะไร มีเฉพาะข้อผิดพลาดก่อนหน้าข้อความนี้เท่านั้นที่สำคัญ" +#: apt-inst/extract.cc:421 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "พบแพกเกจที่เขียนทับโดยไม่มีข้อมูลรุ่นสำหรับ %s" -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" -msgstr "กรุณาแก้ปัญหาเหล่านั้น แล้วเรียกติดตั้งใหม่อีกครั้ง" +#: apt-inst/extract.cc:438 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพกเกจ %s" -#: dselect/update:30 -msgid "Merging available information" -msgstr "กำลังผสานรายชื่อของแพกเกจที่มี" +#: apt-inst/extract.cc:498 +#, c-format +msgid "Unable to stat %s" +msgstr "ไม่สามารถ stat %s" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"วิธีใช้: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates เป็นเครื่องมือสำหรับแยกเอาข้อมูลการตั้งค่าและเทมเพลต\n" -"ออกมาจากแพกเกจเดเบียน\n" -"\n" -"ตัวเลือก:\n" -" -h แสดงข้อความช่วยเหลือนี้\n" -" -t กำหนดไดเรกทอรีทำงานชั่วคราว\n" -" -c=? อ่านแฟ้มค่าตั้งนี้\n" -" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#, c-format +msgid "Failed to write file %s" +msgstr "ไม่สามารถเขียนแฟ้ม %s" -#: cmdline/apt-extracttemplates.cc:254 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Unable to mkstemp %s" -msgstr "ไม่สามารถ mkstemp %s" +msgid "Failed to close file %s" +msgstr "ไม่สามารถปิดแฟ้ม %s" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "Unable to write to %s" -msgstr "ไม่สามารถเขียนลงแฟ้ม %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "แฟ้มนี้ไม่ใช่แพกเกจ DEB ที่ใช้การได้ ขาดสมาชิก '%s'" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?" +#: apt-inst/deb/debfile.cc:132 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิก %s" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "รายชื่อนามสกุลแพกเกจยาวเกินไป" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +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 +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "เอกลักษณ์ของแฟ้มจัดเก็บไม่ถูกต้อง" + +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บ" + +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid "Error processing directory %s" -msgstr "เกิดข้อผิดพลาดขณะประมวลผลไดเรกทอรี %s" +msgid "Invalid archive member header %s" +msgstr "ข้อมูลส่วนหัว %s ของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง" -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "รายชื่อนามสกุลซอร์สยาวเกินไป" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "ข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "เกิดข้อผิดพลาดขณะเขียนข้อมูลส่วนหัวลงในแฟ้มสารบัญ" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "แฟ้มจัดเก็บสั้นเกินไป" -#: ftparchive/apt-ftparchive.cc:431 -#, c-format -msgid "Error processing contents %s" -msgstr "เกิดข้อผิดพลาดขณะประมวลผลสารบัญ %s" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "อ่านข้อมูลส่วนหัวของแฟ้มจัดเก็บไม่สำเร็จ" -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"วิธีใช้: apt-ftparchive [ตัวเลือก] คำสั่ง\n" -"คำสั่ง: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive ใช้สร้างแฟ้มดัชนีสำหรับแหล่งแพกเกจเดเบียน รองรับวิธีสร้างหลายแบบ\n" -"ตั้งแต่แบบอัตโนมัติทั้งหมด ไปจนถึงการใช้แทน dpkg-scanpackages และ dpkg-scansources\n" -"\n" -"apt-ftparchive สร้างแฟ้ม Package จากต้นไม้ไดเรกทอรีที่เก็บ .deb แฟ้ม Package\n" -"จะรวมเนื้อหาข้อมูลควบคุมทุกรายการของแต่ละแพกเกจ รวมถึง MD5 hash และขนาดแฟ้ม\n" -"และรองรับการสร้างแฟ้ม override เพื่อบังคับค่าลำดับความสำคัญและหมวดแพกเกจด้วย\n" -"\n" -"ในทำนองเดียวกัน apt-ftparchive จะสร้างแฟ้ม Sources จากต้นไม้ไดเรกทอรีที่เก็บ .dsc\n" -"คุณสามารถใช้ตัวเลือก --source-override เพื่อระบุแฟ้ม override สำหรับซอร์สได้\n" -"\n" -"คำสั่ง 'packages' และ 'sources' ควรเรียกที่ตำแหน่งรากของต้นไม้ไดเรกทอรี\n" -"ค่า binarypath ควรชี้ไปที่ตำแหน่งฐานที่จะค้นหาแบบทั่วถึง และแฟ้ม override ก็ควรมีแฟล็ก\n" -"override ต่างๆ สำหรับแพกเกจ ค่า pathprefix จะถูกเพิ่มเข้าที่หน้าข้อมูล filename ถ้ามี\n" -"ตัวอย่างการใช้งานจากแหล่งแพกเกจเดเบียน:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"ตัวเลือก:\n" -" -h แสดงข้อความช่วยเหลือนี้\n" -" --md5 ควบคุมการสร้าง MD5\n" -" -s=? แฟ้ม override สำหรับซอร์ส\n" -" -q ทำงานแบบเงียบ\n" -" -d=? เลือกฐานข้อมูลแคชอื่น\n" -" --no-delink เปิดโหมดดีบั๊กสำหรับการตัดลิงก์\n" -" --contents ควบคุมการสร้างแฟ้มสารบัญ\n" -" -c=? อ่านแฟ้มค่าตั้งนี้\n" -" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "ไม่มีรายการเลือกที่ตรง" - -#: ftparchive/apt-ftparchive.cc:907 -#, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "บางแฟ้มขาดหายไปในกลุ่มแฟ้มแพกเกจ `%s'" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "สร้างไปป์ไม่สำเร็จ" -#: ftparchive/cachedb.cc:65 -#, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB เสีย จะเปลี่ยนชื่อแฟ้มเป็น %s.old" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "เรียก gzip ไม่สำเร็จ" -#: ftparchive/cachedb.cc:83 -#, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "DB เป็นรุ่นเก่า จะพยายามปรับรุ่น %s ขึ้น" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "แฟ้มจัดเก็บเสียหาย" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ่งปรับรุ่นมาจาก apt รุ่นเก่า กรุณาลบฐานข้อมูลแล้วสร้างใหม่" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "checksum ของแฟ้ม tar ผิดพลาด แฟ้มจัดเก็บเสียหาย" -#: ftparchive/cachedb.cc:99 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "ไม่สามารถเปิดแฟ้ม DB %s: %s" +msgid "Unknown TAR header type %u, member %s" +msgstr "พบชนิด %u ของข้อมูลส่วนหัว TAR ที่ไม่รู้จัก ที่สมาชิก %s" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Failed to stat %s" -msgstr "stat %s ไม่สำเร็จ" +msgid "Progress: [%3i%%]" +msgstr "ความคืบหน้า: [%3i%%]" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "readlink %s ไม่สำเร็จ" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "กำลังเรียก dpkg" -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "แพกเกจไม่มีระเบียนควบคุม" +#: apt-pkg/init.cc:146 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "ไม่รองรับระบบแพกเกจ '%s'" -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "ไม่สามารถระบุชนิดของระบบแพกเกจที่เหมาะสมได้" -#: ftparchive/writer.cc:91 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: อ่านไดเรกทอรี %s ไม่สำเร็จ\n" +msgid "Wrote %i records.\n" +msgstr "เขียนแล้ว %i ระเบียน\n" -#: ftparchive/writer.cc:96 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "W: stat %s ไม่สำเร็จ\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " - -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "W: " - -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: ข้อผิดพลาดเกิดกับแฟ้ม " +msgid "Wrote %i records with %i missing files.\n" +msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "Failed to resolve %s" -msgstr "หาพาธเต็มของ %s ไม่สำเร็จ" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "เดินท่องต้นไม้ไม่สำเร็จ" +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n" -#: ftparchive/writer.cc:219 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Failed to open %s" -msgstr "เปิด %s ไม่สำเร็จ" +msgid "Can't find authentication record for: %s" +msgstr "ไม่พบระเบียนยืนยันความแท้สำหรับ: %s" -#: ftparchive/writer.cc:278 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgid "Hash mismatch for: %s" +msgstr "แฮชไม่ตรงกันสำหรับ: %s" -#: ftparchive/writer.cc:286 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "Failed to readlink %s" -msgstr "readlink %s ไม่สำเร็จ" +msgid "The method driver %s could not be found." +msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s" -#: ftparchive/writer.cc:290 +#: apt-pkg/acquire-worker.cc:118 #, c-format -msgid "Failed to unlink %s" -msgstr "unlink %s ไม่สำเร็จ" +msgid "Is the package %s installed?" +msgstr "ได้ติดตั้งแพกเกจ %s ไว้หรือไม่?" -#: ftparchive/writer.cc:298 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ" +msgid "Method %s did not start correctly" +msgstr "ไม่สามารถเรียกทำงานวิธีการ %s" -#: ftparchive/writer.cc:308 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n" +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "ไม่สามารถแจงหรือเปิดรายชื่อแพกเกจหรือสถานะแพกเกจได้" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s ไม่มีข้อมูล override\n" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "คุณอาจเรียก `apt-get update' เพื่อแก้ปัญหาเหล่านี้ได้" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " ผู้ดูแล %s คือ %s ไม่ใช่ %s\n" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s ไม่มีข้อมูล override สำหรับซอร์ส\n" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "แคชของแพกเกจว่างเปล่า" -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "แฟ้มแคชของแพกเกจเสียหาย" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - จองหน่วยความจำไม่สำเร็จ" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "แฟ้มแคชของแพกเกจเป็นคนละรุ่นกัน" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "ไม่สามารถเปิด %s" +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" +msgstr "แฟ้มแคชของแพกเกจเสียหาย แฟ้มมีขนาดเล็กกว่าที่ควรจะเป็น" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu (%s)" +msgid "This APT does not support the versioning system '%s'" +msgstr "APT รุ่นนี้ไม่รองรับระบบนับรุ่นแบบ '%s'" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "ไม่สามารถอ่านแฟ้ม override %s" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "แคชของแพกเกจถูกสร้างมาสำหรับสถาปัตยกรรมอื่น" -#: ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" -msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #1" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "ต้องใช้" -#: ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %llu #2" -msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #2" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "ต้องใช้ขณะติดตั้ง" -#: ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %llu #3" -msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #3" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "แนะนำ" -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "ไม่รู้จักอัลกอริทึมบีบอัด '%s'" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "ควรใช้ร่วมกับ" -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "ผลลัพธ์ของการบีบอัด %s ต้องมีชุดของการบีบอัดด้วย" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "ขัดแย้งกับ" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "สร้าง FILE* ไม่สำเร็จ" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "แทนที่" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "fork ไม่สำเร็จ" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "ใช้แทน" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "โพรเซสลูกสำหรับบีบอัด" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "ทำให้พัง" -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "ข้อผิดพลาดภายใน: ไม่สามารถสร้าง %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "เพิ่มความสามารถ" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "IO ไปยังโพรเซสย่อยหรือแฟ้มล้มเหลว" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "สำคัญ" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนวณ MD5" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "จำเป็น" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "มาตรฐาน" + +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "ตัวเลือก" + +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "ส่วนเสริม" + +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Problem unlinking %s" -msgstr "มีปัญหาขณะลบแฟ้ม %s" +msgid "Index file type '%s' is not supported" +msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/sourcelist.cc:127 #, c-format -msgid "Failed to rename %s to %s" -msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s" +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "วรรคที่ %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)" -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"วิธีใช้: apt-internal-solver\n" -"\n" -"apt-internal-solver " -"เป็นเครื่องมือสำหรับเรียกใช้กลไกภายในปัจจุบันเสมือนเป็นกลไกการแก้ปัญหาภายนอกสำหรับโปรแกรมตระกูล " -"APT เพื่อการดีบั๊กหรืออะไรทำนองนี้\n" -"\n" -"ตัวเลือก:\n" -" -h แสดงข้อความช่วยเหลือนี้\n" -" -q แสดงผลลัพธ์แบบบันทึกลงแฟ้มได้ - ไม่ต้องแสดงความคืบหน้า\n" -" -c=? อ่านแฟ้มค่าตั้งนี้\n" -" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" +#: apt-pkg/sourcelist.cc:170 +#, c-format +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] แจงไม่ผ่าน)" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "พบระเบียนแพกเกจที่ไม่รู้จัก!" +#: apt-pkg/sourcelist.cc:173 +#, c-format +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] สั้นเกินไป)" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"วิธีใช้: apt-sortpkgs [ตัวเลือก] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs เป็นเครื่องมืออย่างง่ายสำหรับเรียงลำดับแฟ้มรายชื่อแพกเกจ ตัวเลือก -s\n" -"ใช้สำหรับระบุชนิดของแฟ้มที่เรียง\n" -"\n" -"ตัวเลือก:\n" -" -h แสดงข้อความช่วยเหลือนี้\n" -" -s เรียงตามแฟ้มซอร์สโค้ด\n" -" -c=? อ่านแฟ้มค่าตั้งนี้\n" -" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" +#: 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-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/sourcelist.cc:190 #, c-format -msgid "Failed to write file %s" -msgstr "ไม่สามารถเขียนแฟ้ม %s" +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่มีคีย์)" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "Failed to close file %s" -msgstr "ไม่สามารถปิดแฟ้ม %s" +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] คีย์ %s ไม่มีค่า)" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "The path %s is too long" -msgstr "พาธ %s ยาวเกินไป" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)" -#: apt-inst/extract.cc:132 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Unpacking %s more than once" -msgstr "พยายามแตกแพกเกจ %s มากกว่าหนึ่งครั้ง" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)" -#: apt-inst/extract.cc:142 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "The directory %s is diverted" -msgstr "ไดเรกทอรี %s ถูก divert" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)" -#: apt-inst/extract.cc:152 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "แพกเกจนี้พยายามเขียนลงปลายทางของการเบนแฟ้ม %s/%s" +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "พาธของการเบนแฟ้มยาวเกินไป" +#: apt-pkg/sourcelist.cc:224 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)" -#: apt-inst/extract.cc:249 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "ไดเรกทอรี %s กำลังจะถูกแทนที่ด้วยสิ่งที่ไม่ใช่ไดเรกทอรี" +msgid "Opening %s" +msgstr "กำลังเปิด %s" -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "หาโหนดใน bucket ของแฮชไม่พบ" +#: 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-inst/extract.cc:293 -msgid "The path is too long" -msgstr "พาธยาวเกินไป" +#: apt-pkg/sourcelist.cc:371 +#, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)" -#: apt-inst/extract.cc:421 +#: apt-pkg/sourcelist.cc:375 #, c-format -msgid "Overwrite package match with no version for %s" -msgstr "พบแพกเกจที่เขียนทับโดยไม่มีข้อมูลรุ่นสำหรับ %s" +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" -#: apt-inst/extract.cc:438 +#: apt-pkg/sourcelist.cc:416 #, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพกเกจ %s" +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "ไม่รู้จักชนิด '%s' ที่วรรคที่ %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" -#: apt-inst/extract.cc:498 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'" + +#: apt-pkg/clean.cc:64 #, c-format -msgid "Unable to stat %s" +msgid "Unable to stat %s." msgstr "ไม่สามารถ stat %s" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "DropNode ถูกเรียกใช้กับโหนดที่ยังลิงก์อยู่" - -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "หาสมาชิกในตารางแฮชไม่สำเร็จ!" - -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "จองเนื้อที่สำหรับการเบนแฟ้มไม่สำเร็จ" - -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "ข้อผิดพลาดภายในที่ AddDiversion" - -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "พยายามเขียนทับการเบนแฟ้ม: %s -> %s กับ %s/%s" - -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "เพิ่มการเบนแฟ้ม %s -> %s ซ้ำสอง" - -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "แฟ้มค่าตั้ง %s/%s ซ้ำ" - -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "เอกลักษณ์ของแฟ้มจัดเก็บไม่ถูกต้อง" - -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บ" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "แคชมีระบบนับรุ่นที่ไม่ตรงกัน" -#: apt-inst/contrib/arfile.cc:96 +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format -msgid "Invalid archive member header %s" -msgstr "ข้อมูลส่วนหัว %s ของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง" - -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "ข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง" - -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "แฟ้มจัดเก็บสั้นเกินไป" - -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "อ่านข้อมูลส่วนหัวของแฟ้มจัดเก็บไม่สำเร็จ" +msgid "Error occurred while processing %s (%s%d)" +msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "สร้างไปป์ไม่สำเร็จ" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "เรียก gzip ไม่สำเร็จ" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "แฟ้มจัดเก็บเสียหาย" +#: apt-pkg/pkgcachegen.cc:263 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว" -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "checksum ของแฟ้ม tar ผิดพลาด แฟ้มจัดเก็บเสียหาย" +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว" -#: apt-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "พบชนิด %u ของข้อมูลส่วนหัว TAR ที่ไม่รู้จัก ที่สมาชิก %s" +msgid "Package %s %s was not found while processing file dependencies" +msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "แฟ้มนี้ไม่ใช่แพกเกจ DEB ที่ใช้การได้ ขาดสมาชิก '%s'" +msgid "Couldn't stat source package list %s" +msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s" -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิก %s" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "กำลังอ่านรายชื่อแพกเกจ" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "ไม่สามารถแจงแฟ้มควบคุมได้" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "List directory %spartial is missing." -msgstr "ไม่มีไดเรกทอรีรายชื่อแพกเกจ %spartial" +msgid "Unable to write to %s" +msgstr "ไม่สามารถเขียนลงแฟ้ม %s" -#: apt-pkg/acquire.cc:91 -#, c-format -msgid "Archives directory %spartial is missing." -msgstr "ไม่มีไดเรกทอรีแพกเกจ %spartial" +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส" -#: apt-pkg/acquire.cc:99 -#, c-format -msgid "Unable to lock directory %s" -msgstr "ไม่สามารถล็อคไดเรกทอรี %s" +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "ส่งสภาวการณ์ไปยังกลไกการแก้ปัญหา" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li (เหลืออีก %s)" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "เตรียมรับคำตอบ" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "เรียกกลไกการแก้ปัญหาภายนอก" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2420,7 +2331,7 @@ msgstr "ขนาดไม่ตรงกัน" msgid "Invalid file format" msgstr "รูปแบบของแฟ้มไม่ถูกต้อง" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2429,16 +2340,16 @@ msgstr "" "ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง " "หรือแฟ้มผิดรูปแบบ)" -#: apt-pkg/acquire-item.cc:1589 +#: apt-pkg/acquire-item.cc:1656 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "ไม่พบผลรวมแฮชสำหรับ '%s' ในแฟ้ม Release" -#: apt-pkg/acquire-item.cc:1631 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2447,12 +2358,12 @@ msgstr "" "แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ " "ของคลังแพกเกจนี้" -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2462,136 +2373,117 @@ msgstr "" "ข้อผิดพลาดจาก GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "ข้อผิดพลาดจาก GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, 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:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s" -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s" +msgid "Vendor block %s contains no fingerprint" +msgstr "บล็อคผู้ผลิต %s ไม่มีลายนิ้วมือ" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Is the package %s installed?" -msgstr "ได้ติดตั้งแพกเกจ %s ไว้หรือไม่?" +msgid "List directory %spartial is missing." +msgstr "ไม่มีไดเรกทอรีรายชื่อแพกเกจ %spartial" -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Method %s did not start correctly" -msgstr "ไม่สามารถเรียกทำงานวิธีการ %s" +msgid "Archives directory %spartial is missing." +msgstr "ไม่มีไดเรกทอรีแพกเกจ %spartial" -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 #, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter" +msgid "Unable to lock directory %s" +msgstr "ไม่สามารถล็อคไดเรกทอรี %s" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "จำเป็นต้องติดตั้งแพกเกจ %s ซ้ำ แต่หาตัวแพกเกจไม่พบ" - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เกิดแพกเกจเสีย " -"อาจเกิดจากแพกเกจที่ถูกกำหนดให้คงรุ่นไว้" - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้" - -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." -msgstr "ไม่สามารถแจงหรือเปิดรายชื่อแพกเกจหรือสถานะแพกเกจได้" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li (เหลืออีก %s)" -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "คุณอาจเรียก `apt-get update' เพื่อแก้ปัญหาเหล่านี้ได้" +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li" -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้" +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย" -#: apt-pkg/cacheset.cc:489 +#: apt-pkg/policy.cc:83 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'" +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/cacheset.cc:492 +#: apt-pkg/policy.cc:422 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "ไม่พบรุ่น '%s' ของ '%s'" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "ระเบียนผิดรูปแบบในแฟ้มค่าปรับแต่ง %s: ไม่มีข้อมูลส่วนหัว 'Package'" -#: apt-pkg/cacheset.cc:603 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Couldn't find task '%s'" -msgstr "ไม่พบงานติดตั้ง '%s'" +msgid "Did not understand pin type %s" +msgstr "ไม่เข้าใจชนิดการตรึง %s" -#: apt-pkg/cacheset.cc:609 -#, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง" -#: apt-pkg/cacheset.cc:615 -#, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "ไม่พบแพกเกจที่ตรงกับ glob '%s'" - -#: apt-pkg/cacheset.cc:626 -#, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "ไม่สามารถเลือกรุ่นต่างๆ ของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง" - -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -"ไม่สามารถเลือกรุ่นที่ติดตั้งไว้หรือรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีทั้งสองอย่าง" - -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "ไม่สามารถเลือกรุ่นใหม่ที่สุดของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง" +"ไม่สามารถตั้งค่า '%s' แบบทันทีได้ กรุณาอ่านรายละเอียดเพิ่มเติมจาก man 5 apt.conf ที่หัวข้อ " +"APT::Immediate-Configure (%d)" -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "ไม่สามารถเลือกรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีรุ่นสำหรับติดตั้ง" +msgid "Could not configure '%s'. " +msgstr "ไม่สามารถตั้งค่า '%s'" -#: apt-pkg/cacheset.cc:663 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select installed version from package %s as it is not installed" -msgstr "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้ของแพกเกจ '%s' ได้ เนื่องจากแพกเกจไม่ได้ติดตั้งไว้" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." +msgstr "" +"การติดตั้งครั้งนี้จำเป็นต้องลบแพกเกจ %s ชั่วคราว " +"อันเนื่องมาจากความขัดแย้งหรือความขึ้นต่อกันระหว่างติดตั้งที่เป็นวงรอบ " +"ซึ่งแพกเกจดังกล่าวเป็นแพกเกจที่จำเป็นสำหรับระบบ การลบดังกล่าวมักเป็นอันตราย " +"แต่ถ้าคุณต้องการทำเช่นนั้นจริงๆ ก็ให้เปิดตัวเลือก APT::Force-LoopBreak" -#: apt-pkg/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" @@ -2668,10 +2560,23 @@ msgstr "กำลังเขียนรายชื่อแหล่งแพ msgid "Source list entries for this disc are:\n" msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "ไม่สามารถ stat %s" +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "จำเป็นต้องติดตั้งแพกเกจ %s ซ้ำ แต่หาตัวแพกเกจไม่พบ" + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เกิดแพกเกจเสีย " +"อาจเกิดจากแพกเกจที่ถูกกำหนดให้คงรุ่นไว้" + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้" #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2699,55 +2604,68 @@ msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s" msgid "Failed to write temporary StateFile %s" msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "ส่งสภาวการณ์ไปยังกลไกการแก้ปัญหา" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "เตรียมรับคำตอบ" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "ไม่พบรุ่น '%s' ของ '%s'" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "เรียกกลไกการแก้ปัญหาภายนอก" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "ไม่พบงานติดตั้ง '%s'" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "เขียนแล้ว %i ระเบียน\n" +msgid "Couldn't find any package by regex '%s'" +msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n" +msgid "Couldn't find any package by glob '%s'" +msgstr "ไม่พบแพกเกจที่ตรงกับ glob '%s'" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "ไม่สามารถเลือกรุ่นต่างๆ ของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"ไม่สามารถเลือกรุ่นที่ติดตั้งไว้หรือรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีทั้งสองอย่าง" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "ไม่พบระเบียนยืนยันความแท้สำหรับ: %s" +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "ไม่สามารถเลือกรุ่นใหม่ที่สุดของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง" -#: apt-pkg/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Hash mismatch for: %s" -msgstr "แฮชไม่ตรงกันสำหรับ: %s" +msgid "Can't select candidate version from package %s as it has no candidate" +msgstr "ไม่สามารถเลือกรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีรุ่นสำหรับติดตั้ง" + +#: apt-pkg/cacheset.cc:663 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้ของแพกเกจ '%s' ได้ เนื่องจากแพกเกจไม่ได้ติดตั้งไว้" #: apt-pkg/indexrecords.cc:78 #, c-format @@ -2774,808 +2692,888 @@ msgstr "รายการ 'Valid-Until' ไม่ถูกต้องในแ msgid "Invalid 'Date' entry in Release file %s" msgstr "รายการ 'Date' ไม่ถูกต้องในแฟ้ม Release %s" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "ไม่รองรับระบบแพกเกจ '%s'" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "ไม่สามารถระบุชนิดของระบบแพกเกจที่เหมาะสมได้" +msgid "%lid %lih %limin %lis" +msgstr "%liวัน %liชม. %liนาที %liวิ" -#: apt-pkg/install-progress.cc:57 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Progress: [%3i%%]" -msgstr "ความคืบหน้า: [%3i%%]" +msgid "%lih %limin %lis" +msgstr "%liชม. %liนาที %liวิ" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "กำลังเรียก dpkg" +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 +#, c-format +msgid "%limin %lis" +msgstr "%liนาที %liวิ" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" -"ไม่สามารถตั้งค่า '%s' แบบทันทีได้ กรุณาอ่านรายละเอียดเพิ่มเติมจาก man 5 apt.conf ที่หัวข้อ " -"APT::Immediate-Configure (%d)" +msgid "%lis" +msgstr "%liวิ" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "Could not configure '%s'. " -msgstr "ไม่สามารถตั้งค่า '%s'" +msgid "Selection %s not found" +msgstr "ไม่พบรายการเลือก %s" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" -"การติดตั้งครั้งนี้จำเป็นต้องลบแพกเกจ %s ชั่วคราว " -"อันเนื่องมาจากความขัดแย้งหรือความขึ้นต่อกันระหว่างติดตั้งที่เป็นวงรอบ " -"ซึ่งแพกเกจดังกล่าวเป็นแพกเกจที่จำเป็นสำหรับระบบ การลบดังกล่าวมักเป็นอันตราย " -"แต่ถ้าคุณต้องการทำเช่นนั้นจริงๆ ก็ให้เปิดตัวเลือก APT::Force-LoopBreak" +msgid "Not using locking for read only lock file %s" +msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่อ่านได้อย่างเดียว" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "แคชของแพกเกจว่างเปล่า" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "ไม่สามารถเปิดแฟ้มล็อค %s" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "แฟ้มแคชของแพกเกจเสียหาย" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่เมานท์ผ่าน nfs" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "แฟ้มแคชของแพกเกจเป็นคนละรุ่นกัน" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "ไม่สามารถล็อค %s" -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" -msgstr "แฟ้มแคชของแพกเกจเสียหาย แฟ้มมีขนาดเล็กกว่าที่ควรจะเป็น" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "ไม่สามารถสร้างรายชื่อแฟ้มได้ เนื่องจาก '%s' ไม่ใช่ไดเรกทอรี" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:394 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "APT รุ่นนี้ไม่รองรับระบบนับรุ่นแบบ '%s'" +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่ใช่แฟ้มธรรมดา" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "แคชของแพกเกจถูกสร้างมาสำหรับสถาปัตยกรรมอื่น" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่มีส่วนขยายในชื่อแฟ้ม" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "ต้องใช้" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากส่วนขยายในชื่อแฟ้มไม่สามารถใช้การได้" -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "ต้องใช้ขณะติดตั้ง" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)" -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "แนะนำ" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "ควรใช้ร่วมกับ" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "โพรเซสย่อย %s ได้รับสัญญาณ %u" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "ขัดแย้งกับ" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "แทนที่" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "โพรเซสย่อย %s จบการทำงานกะทันหัน" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "ใช้แทน" +#: apt-pkg/contrib/fileutl.cc:913 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "เกิดปัญหาขณะปิดแฟ้ม gzip %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "ทำให้พัง" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "ไม่สามารถเปิดแฟ้ม %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "เพิ่มความสามารถ" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "ไม่สามารถเปิด file destriptor %d" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "สำคัญ" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "สร้าง IPC ของโพรเซสย่อยไม่สำเร็จ" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "จำเป็น" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "เรียกทำงานตัวบีบอัดไม่สำเร็จ" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "มาตรฐาน" +#: apt-pkg/contrib/fileutl.cc:1514 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "read: ยังเหลือ %llu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "ตัวเลือก" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "write: ยังเหลือ %llu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "ส่วนเสริม" +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" +msgstr "เกิดปัญหาขณะปิดแฟ้ม %s" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "แคชมีระบบนับรุ่นที่ไม่ตรงกัน" +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "เกิดปัญหาขณะเปลี่ยนชื่อแฟ้ม %s ไปเป็น %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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)" +msgid "Problem unlinking the file %s" +msgstr "เกิดปัญหาขณะลบแฟ้ม %s" -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "เกิดปัญหาขณะ sync แฟ้ม" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว" +#: apt-pkg/contrib/progress.cc:148 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... ผิดพลาด!" -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว" +#: apt-pkg/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... เสร็จแล้ว" -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว" +#: apt-pkg/contrib/progress.cc:181 +msgid "..." +msgstr "..." -#: apt-pkg/pkgcachegen.cc:576 +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 #, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม" +msgid "%c%s... %u%%" +msgstr "%c%s... %u%%" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "ไม่สามารถ mmap แฟ้มเปล่า" + +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s" +msgid "Couldn't duplicate file descriptor %i" +msgstr "ไม่สามารถทำซ้ำ file descriptor %i" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "กำลังอ่านรายชื่อแพกเกจ" +#: apt-pkg/contrib/mmap.cc:119 +#, c-format +msgid "Couldn't make mmap of %llu bytes" +msgstr "ไม่สามารถสร้าง mmap ขนาด %llu ไบต์" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "ไม่สามารถปิด mmap" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "ไม่สามารถปรับ mmap ให้ตรงกัน" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'" +msgid "Couldn't make mmap of %lu bytes" +msgstr "ไม่สามารถสร้าง mmap ขนาด %lu ไบต์" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "ไม่สามารถตัดท้ายแฟ้ม" + +#: apt-pkg/contrib/mmap.cc:341 #, 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 ได้ เนื่องจากรุ่นดังกล่าวไม่มีในแหล่ง" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" +"MMap แบบพลวัตมีเนื้อที่ไม่พอ กรุณาเพิ่มขนาดของ APT::Cache-Start ค่าปัจจุบัน: %lu (man 5 " +"apt.conf)" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "ระเบียนผิดรูปแบบในแฟ้มค่าปรับแต่ง %s: ไม่มีข้อมูลส่วนหัว 'Package'" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากถึงขีดจำกัด %lu ไบต์แล้ว" -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากผู้ใช้ปิดการขยายขนาดอัตโนมัติ" + +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "Did not understand pin type %s" -msgstr "ไม่เข้าใจชนิดการตรึง %s" +msgid "Unable to stat the mount point %s" +msgstr "ไม่สามารถ stat จุดเมานท์ %s" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง" +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "ไม่สามารถ stat ซีดีรอม" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/configuration.cc:519 #, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "วรรคที่ %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "พบตัวย่อของชนิดที่ข้อมูลไม่รู้จัก: '%c'" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/configuration.cc:633 #, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] แจงไม่ผ่าน)" +msgid "Opening configuration file %s" +msgstr "ขณะเปิดแฟ้มค่าตั้ง %s" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/configuration.cc:801 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] สั้นเกินไป)" +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "ไวยากรณ์ผิดพลาด %s:%u: เริ่มบล็อคโดยไม่มีชื่อ" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/configuration.cc:820 #, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่ใช่การกำหนดค่า)" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "ไวยากรณ์ผิดพลาด %s:%u: แท็กผิดรูปแบบ" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/configuration.cc:837 #, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่มีคีย์)" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังค่า" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/configuration.cc:877 #, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" -msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] คีย์ %s ไม่มีค่า)" +msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgstr "ไวยากรณ์ผิดพลาด %s:%u: สามารถใช้ directive ที่ระดับบนสุดได้เท่านั้น" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/contrib/configuration.cc:884 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "ไวยากรณ์ผิดพลาด %s:%u: ใช้ include ซ้อนกันมากเกินไป" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, 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 ผิดรูปแบบ (ชนิด)" - -#: 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/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย" +msgid "Syntax error %s:%u: Included from here" +msgstr "ไวยากรณ์ผิดพลาด %s:%u: include จากที่นี่" -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/configuration.cc:897 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "ไวยากรณ์ผิดพลาด %s:%u: พบ directive '%s' ที่ไม่รองรับ" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/configuration.cc:900 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)" - -#: 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 "ดาวน์โหลดแฟ้มดัชนีบางแฟ้มไม่สำเร็จ จะข้ามรายการดังกล่าวไป หรือใช้ข้อมูลเก่าแทน" +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" +msgstr "ไวยากรณ์ผิดพลาด %s:%u: directive 'clear' ต้องมีอาร์กิวเมนต์เป็นลำดับชั้นตัวเลือก" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/configuration.cc:950 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "บล็อคผู้ผลิต %s ไม่มีลายนิ้วมือ" +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังจบแฟ้ม" -#: apt-pkg/contrib/cdromutl.cc:65 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "ไม่สามารถ stat จุดเมานท์ %s" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "ไม่สามารถ stat ซีดีรอม" +msgid "No keyring installed in %s." +msgstr "ไม่มีพวงกุญแจติดตั้งไว้ใน %s" -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "ไม่รู้จักตัวเลือกบรรทัดคำสั่ง '%c' [จาก %s]" -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format msgid "Command line option %s is not understood" msgstr "ไม่เข้าใจตัวเลือกบรรทัดคำสั่ง %s" -#: apt-pkg/contrib/cmndline.cc:168 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format msgid "Command line option %s is not boolean" msgstr "ตัวเลือกบรรทัดคำสั่ง %s ไม่ได้เป็นค่าบูลีน" -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format msgid "Option %s requires an argument." msgstr "ตัวเลือก %s ต้องมีอาร์กิวเมนต์" -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "ตัวเลือก %s: การกำหนดรายการค่าตั้งต้องมี =" -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "ตัวเลือก %s ต้องการอาร์กิวเมนต์จำนวนเต็ม ไม่ใช่ '%s'" -#: apt-pkg/contrib/cmndline.cc:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "ตัวเลือก '%s' ยาวเกินไป" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "ไม่เข้าใจค่าบูลีน %s กรุณาลองใช้ true หรือ false" -#: apt-pkg/contrib/cmndline.cc:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "ไม่รู้จักคำสั่ง %s" -#: apt-pkg/contrib/configuration.cc:519 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "พบตัวย่อของชนิดที่ข้อมูลไม่รู้จัก: '%c'" - -#: apt-pkg/contrib/configuration.cc:633 -#, c-format -msgid "Opening configuration file %s" -msgstr "ขณะเปิดแฟ้มค่าตั้ง %s" - -#: apt-pkg/contrib/configuration.cc:801 -#, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "ไวยากรณ์ผิดพลาด %s:%u: เริ่มบล็อคโดยไม่มีชื่อ" - -#: apt-pkg/contrib/configuration.cc:820 -#, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "ไวยากรณ์ผิดพลาด %s:%u: แท็กผิดรูปแบบ" +msgid "Installing %s" +msgstr "กำลังติดตั้ง %s" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังค่า" +msgid "Configuring %s" +msgstr "กำลังตั้งค่า %s" -#: apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "ไวยากรณ์ผิดพลาด %s:%u: สามารถใช้ directive ที่ระดับบนสุดได้เท่านั้น" +msgid "Removing %s" +msgstr "กำลังถอดถอน %s" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "ไวยากรณ์ผิดพลาด %s:%u: ใช้ include ซ้อนกันมากเกินไป" +msgid "Completely removing %s" +msgstr "กำลังถอดถอน %s อย่างสมบูรณ์" -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "ไวยากรณ์ผิดพลาด %s:%u: include จากที่นี่" +msgid "Noting disappearance of %s" +msgstr "กำลังจดบันทึกการหายไปของ %s" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:115 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "ไวยากรณ์ผิดพลาด %s:%u: พบ directive '%s' ที่ไม่รองรับ" +msgid "Running post-installation trigger %s" +msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง" -#: apt-pkg/contrib/configuration.cc:900 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "Syntax error %s:%u: clear directive requires an option tree as argument" -msgstr "ไวยากรณ์ผิดพลาด %s:%u: directive 'clear' ต้องมีอาร์กิวเมนต์เป็นลำดับชั้นตัวเลือก" +msgid "Directory '%s' missing" +msgstr "ไม่มีไดเรกทอรี '%s'" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังจบแฟ้ม" +msgid "Could not open file '%s'" +msgstr "ไม่สามารถเปิดแฟ้ม '%s'" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่อ่านได้อย่างเดียว" +msgid "Preparing %s" +msgstr "กำลังเตรียม %s" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1008 #, c-format -msgid "Could not open lock file %s" -msgstr "ไม่สามารถเปิดแฟ้มล็อค %s" +msgid "Unpacking %s" +msgstr "กำลังแตกแพกเกจ %s" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่เมานท์ผ่าน nfs" +msgid "Preparing to configure %s" +msgstr "กำลังเตรียมตั้งค่า %s" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Could not get lock %s" -msgstr "ไม่สามารถล็อค %s" +msgid "Installed %s" +msgstr "ติดตั้ง %s แล้ว" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "ไม่สามารถสร้างรายชื่อแฟ้มได้ เนื่องจาก '%s' ไม่ใช่ไดเรกทอรี" +msgid "Preparing for removal of %s" +msgstr "กำลังเตรียมถอดถอน %s" -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่ใช่แฟ้มธรรมดา" +msgid "Removed %s" +msgstr "ถอดถอน %s แล้ว" -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่มีส่วนขยายในชื่อแฟ้ม" +msgid "Preparing to completely remove %s" +msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากส่วนขยายในชื่อแฟ้มไม่สามารถใช้การได้" +msgid "Completely removed %s" +msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว" -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)" +msgid "Can not write log (%s)" +msgstr "ไม่สามารถเขียนปูม (%s)" -#: apt-pkg/contrib/fileutl.cc:826 -#, c-format -msgid "Sub-process %s received signal %u." -msgstr "โพรเซสย่อย %s ได้รับสัญญาณ %u" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "ได้เมานท์ /dev/pts ไว้หรือไม่?" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 -#, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "โพรเซสย่อย %s จบการทำงานกะทันหัน" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "ไม่มีการเขียนรายงาน apport เพราะถึงขีดจำกัด MaxReports แล้ว" -#: apt-pkg/contrib/fileutl.cc:913 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "เกิดปัญหาขณะปิดแฟ้ม gzip %s" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า" -#: apt-pkg/contrib/fileutl.cc:1101 -#, c-format -msgid "Could not open file %s" -msgstr "ไม่สามารถเปิดแฟ้ม %s" +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" +"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเป็นสิ่งที่ตามมาจากข้อผิดพลาดก่อนหน้า" -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 -#, c-format -msgid "Could not open file descriptor %d" -msgstr "ไม่สามารถเปิด file destriptor %d" +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม" -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "สร้าง IPC ของโพรเซสย่อยไม่สำเร็จ" +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "เรียกทำงานตัวบีบอัดไม่สำเร็จ" +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" +"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากปัญหาของระบบในเครื่อง" -#: apt-pkg/contrib/fileutl.cc:1514 -#, c-format -msgid "read, still have %llu to read but none left" -msgstr "read: ยังเหลือ %llu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว" +#: apt-pkg/deb/dpkgpm.cc:1774 +msgid "" +"No apport report written because the error message indicates a dpkg I/O error" +msgstr "" +"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากปัญหาการอ่าน/เขียนของ dpkg" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "write: ยังเหลือ %llu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) มีโพรเซสอื่นใช้งานอยู่หรือเปล่า?" -#: apt-pkg/contrib/fileutl.cc:1915 +#: apt-pkg/deb/debsystem.cc:94 #, c-format -msgid "Problem closing the file %s" -msgstr "เกิดปัญหาขณะปิดแฟ้ม %s" +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) คุณเป็น root หรือเปล่า?" -#: apt-pkg/contrib/fileutl.cc:1927 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 #, c-format -msgid "Problem renaming the file %s to %s" -msgstr "เกิดปัญหาขณะเปลี่ยนชื่อแฟ้ม %s ไปเป็น %s" +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรียก '%s' เองเพื่อแก้ปัญหา" -#: apt-pkg/contrib/fileutl.cc:1938 -#, c-format -msgid "Problem unlinking the file %s" -msgstr "เกิดปัญหาขณะลบแฟ้ม %s" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "ไม่ได้ล็อคอยู่" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "เกิดปัญหาขณะ sync แฟ้ม" +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"วิธีใช้: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates เป็นเครื่องมือสำหรับแยกเอาข้อมูลการตั้งค่าและเทมเพลต\n" +"ออกมาจากแพกเกจเดเบียน\n" +"\n" +"ตัวเลือก:\n" +" -h แสดงข้อความช่วยเหลือนี้\n" +" -t กำหนดไดเรกทอรีทำงานชั่วคราว\n" +" -c=? อ่านแฟ้มค่าตั้งนี้\n" +" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: cmdline/apt-extracttemplates.cc:254 #, c-format -msgid "No keyring installed in %s." -msgstr "ไม่มีพวงกุญแจติดตั้งไว้ใน %s" +msgid "Unable to mkstemp %s" +msgstr "ไม่สามารถ mkstemp %s" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "ไม่สามารถ mmap แฟ้มเปล่า" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?" -#: apt-pkg/contrib/mmap.cc:111 -#, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "ไม่สามารถทำซ้ำ file descriptor %i" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "รายชื่อนามสกุลแพกเกจยาวเกินไป" -#: apt-pkg/contrib/mmap.cc:119 +#: 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 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "ไม่สามารถสร้าง mmap ขนาด %llu ไบต์" +msgid "Error processing directory %s" +msgstr "เกิดข้อผิดพลาดขณะประมวลผลไดเรกทอรี %s" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "ไม่สามารถปิด mmap" +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "รายชื่อนามสกุลซอร์สยาวเกินไป" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "ไม่สามารถปรับ mmap ให้ตรงกัน" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "เกิดข้อผิดพลาดขณะเขียนข้อมูลส่วนหัวลงในแฟ้มสารบัญ" -#: apt-pkg/contrib/mmap.cc:290 +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "ไม่สามารถสร้าง mmap ขนาด %lu ไบต์" - -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "ไม่สามารถตัดท้ายแฟ้ม" +msgid "Error processing contents %s" +msgstr "เกิดข้อผิดพลาดขณะประมวลผลสารบัญ %s" -#: apt-pkg/contrib/mmap.cc:341 -#, c-format +#: ftparchive/apt-ftparchive.cc:626 msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" -"MMap แบบพลวัตมีเนื้อที่ไม่พอ กรุณาเพิ่มขนาดของ APT::Cache-Start ค่าปัจจุบัน: %lu (man 5 " -"apt.conf)" +"วิธีใช้: apt-ftparchive [ตัวเลือก] คำสั่ง\n" +"คำสั่ง: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive ใช้สร้างแฟ้มดัชนีสำหรับแหล่งแพกเกจเดเบียน รองรับวิธีสร้างหลายแบบ\n" +"ตั้งแต่แบบอัตโนมัติทั้งหมด ไปจนถึงการใช้แทน dpkg-scanpackages และ dpkg-scansources\n" +"\n" +"apt-ftparchive สร้างแฟ้ม Package จากต้นไม้ไดเรกทอรีที่เก็บ .deb แฟ้ม Package\n" +"จะรวมเนื้อหาข้อมูลควบคุมทุกรายการของแต่ละแพกเกจ รวมถึง MD5 hash และขนาดแฟ้ม\n" +"และรองรับการสร้างแฟ้ม override เพื่อบังคับค่าลำดับความสำคัญและหมวดแพกเกจด้วย\n" +"\n" +"ในทำนองเดียวกัน apt-ftparchive จะสร้างแฟ้ม Sources จากต้นไม้ไดเรกทอรีที่เก็บ .dsc\n" +"คุณสามารถใช้ตัวเลือก --source-override เพื่อระบุแฟ้ม override สำหรับซอร์สได้\n" +"\n" +"คำสั่ง 'packages' และ 'sources' ควรเรียกที่ตำแหน่งรากของต้นไม้ไดเรกทอรี\n" +"ค่า binarypath ควรชี้ไปที่ตำแหน่งฐานที่จะค้นหาแบบทั่วถึง และแฟ้ม override ก็ควรมีแฟล็ก\n" +"override ต่างๆ สำหรับแพกเกจ ค่า pathprefix จะถูกเพิ่มเข้าที่หน้าข้อมูล filename ถ้ามี\n" +"ตัวอย่างการใช้งานจากแหล่งแพกเกจเดเบียน:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"ตัวเลือก:\n" +" -h แสดงข้อความช่วยเหลือนี้\n" +" --md5 ควบคุมการสร้าง MD5\n" +" -s=? แฟ้ม override สำหรับซอร์ส\n" +" -q ทำงานแบบเงียบ\n" +" -d=? เลือกฐานข้อมูลแคชอื่น\n" +" --no-delink เปิดโหมดดีบั๊กสำหรับการตัดลิงก์\n" +" --contents ควบคุมการสร้างแฟ้มสารบัญ\n" +" -c=? อ่านแฟ้มค่าตั้งนี้\n" +" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว" -#: apt-pkg/contrib/mmap.cc:446 -#, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากถึงขีดจำกัด %lu ไบต์แล้ว" +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "ไม่มีรายการเลือกที่ตรง" -#: apt-pkg/contrib/mmap.cc:449 -msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." -msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากผู้ใช้ปิดการขยายขนาดอัตโนมัติ" +#: ftparchive/apt-ftparchive.cc:907 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "บางแฟ้มขาดหายไปในกลุ่มแฟ้มแพกเกจ `%s'" -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... ผิดพลาด!" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB เสีย จะเปลี่ยนชื่อแฟ้มเป็น %s.old" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... เสร็จแล้ว" +msgid "DB is old, attempting to upgrade %s" +msgstr "DB เป็นรุ่นเก่า จะพยายามปรับรุ่น %s ขึ้น" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "..." +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ่งปรับรุ่นมาจาก apt รุ่นเก่า กรุณาลบฐานข้อมูลแล้วสร้างใหม่" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... %u%%" +msgid "Unable to open DB file %s: %s" +msgstr "ไม่สามารถเปิดแฟ้ม DB %s: %s" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "%liวัน %liชม. %liนาที %liวิ" +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "readlink %s ไม่สำเร็จ" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" -msgstr "%liชม. %liนาที %liวิ" +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "แพกเกจไม่มีระเบียนควบคุม" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 -#, c-format -msgid "%limin %lis" -msgstr "%liนาที %liวิ" +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:91 #, c-format -msgid "%lis" -msgstr "%liวิ" +msgid "W: Unable to read directory %s\n" +msgstr "W: อ่านไดเรกทอรี %s ไม่สำเร็จ\n" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:96 #, c-format -msgid "Selection %s not found" -msgstr "ไม่พบรายการเลือก %s" +msgid "W: Unable to stat %s\n" +msgstr "W: stat %s ไม่สำเร็จ\n" -#: apt-pkg/deb/debsystem.cc:91 -#, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) มีโพรเซสอื่นใช้งานอยู่หรือเปล่า?" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " -#: apt-pkg/deb/debsystem.cc:94 -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) คุณเป็น root หรือเปล่า?" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "W: " -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: ข้อผิดพลาดเกิดกับแฟ้ม " + +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรียก '%s' เองเพื่อแก้ปัญหา" +msgid "Failed to resolve %s" +msgstr "หาพาธเต็มของ %s ไม่สำเร็จ" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "ไม่ได้ล็อคอยู่" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "เดินท่องต้นไม้ไม่สำเร็จ" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:219 #, c-format -msgid "Installing %s" -msgstr "กำลังติดตั้ง %s" +msgid "Failed to open %s" +msgstr "เปิด %s ไม่สำเร็จ" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:278 #, c-format -msgid "Configuring %s" -msgstr "กำลังตั้งค่า %s" +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:286 #, c-format -msgid "Removing %s" -msgstr "กำลังถอดถอน %s" +msgid "Failed to readlink %s" +msgstr "readlink %s ไม่สำเร็จ" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:290 #, c-format -msgid "Completely removing %s" -msgstr "กำลังถอดถอน %s อย่างสมบูรณ์" +msgid "Failed to unlink %s" +msgstr "unlink %s ไม่สำเร็จ" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:298 #, c-format -msgid "Noting disappearance of %s" -msgstr "กำลังจดบันทึกการหายไปของ %s" +msgid "*** Failed to link %s to %s" +msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:308 #, c-format -msgid "Running post-installation trigger %s" -msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง" +msgid " DeLink limit of %sB hit.\n" +msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'" + +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Directory '%s' missing" -msgstr "ไม่มีไดเรกทอรี '%s'" +msgid " %s has no override entry\n" +msgstr " %s ไม่มีข้อมูล override\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Could not open file '%s'" -msgstr "ไม่สามารถเปิดแฟ้ม '%s'" +msgid " %s maintainer is %s not %s\n" +msgstr " ผู้ดูแล %s คือ %s ไม่ใช่ %s\n" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing %s" -msgstr "กำลังเตรียม %s" +msgid " %s has no source override entry\n" +msgstr " %s ไม่มีข้อมูล override สำหรับซอร์ส\n" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:710 #, c-format -msgid "Unpacking %s" -msgstr "กำลังแตกแพกเกจ %s" +msgid " %s has no binary override entry either\n" +msgstr " %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n" + +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - จองหน่วยความจำไม่สำเร็จ" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing to configure %s" -msgstr "กำลังเตรียมตั้งค่า %s" +msgid "Unable to open %s" +msgstr "ไม่สามารถเปิด %s" -#: apt-pkg/deb/dpkgpm.cc:1000 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 #, c-format -msgid "Installed %s" -msgstr "ติดตั้ง %s แล้ว" +msgid "Malformed override %s line %llu (%s)" +msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu (%s)" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing for removal of %s" -msgstr "กำลังเตรียมถอดถอน %s" +msgid "Failed to read the override file %s" +msgstr "ไม่สามารถอ่านแฟ้ม override %s" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:166 #, c-format -msgid "Removed %s" -msgstr "ถอดถอน %s แล้ว" +msgid "Malformed override %s line %llu #1" +msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #1" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:178 #, c-format -msgid "Preparing to completely remove %s" -msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์" +msgid "Malformed override %s line %llu #2" +msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #2" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/override.cc:191 #, c-format -msgid "Completely removed %s" -msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว" +msgid "Malformed override %s line %llu #3" +msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #3" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Can not write log (%s)" -msgstr "ไม่สามารถเขียนปูม (%s)" +msgid "Unknown compression algorithm '%s'" +msgstr "ไม่รู้จักอัลกอริทึมบีบอัด '%s'" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "ได้เมานท์ /dev/pts ไว้หรือไม่?" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "ผลลัพธ์ของการบีบอัด %s ต้องมีชุดของการบีบอัดด้วย" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "stdout เป็นเทอร์มินัลหรือไม่?" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "สร้าง FILE* ไม่สำเร็จ" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "fork ไม่สำเร็จ" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "ไม่มีการเขียนรายงาน apport เพราะถึงขีดจำกัด MaxReports แล้ว" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "โพรเซสลูกสำหรับบีบอัด" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "ข้อผิดพลาดภายใน: ไม่สามารถสร้าง %s" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" -"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเป็นสิ่งที่ตามมาจากข้อผิดพลาดก่อนหน้า" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "IO ไปยังโพรเซสย่อยหรือแฟ้มล้มเหลว" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนวณ MD5" -#: apt-pkg/deb/dpkgpm.cc:1707 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "มีปัญหาขณะลบแฟ้ม %s" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากปัญหาของระบบในเครื่อง" +"วิธีใช้: apt-internal-solver\n" +"\n" +"apt-internal-solver " +"เป็นเครื่องมือสำหรับเรียกใช้กลไกภายในปัจจุบันเสมือนเป็นกลไกการแก้ปัญหาภายนอกสำหรับโปรแกรมตระกูล " +"APT เพื่อการดีบั๊กหรืออะไรทำนองนี้\n" +"\n" +"ตัวเลือก:\n" +" -h แสดงข้อความช่วยเหลือนี้\n" +" -q แสดงผลลัพธ์แบบบันทึกลงแฟ้มได้ - ไม่ต้องแสดงความคืบหน้า\n" +" -c=? อ่านแฟ้มค่าตั้งนี้\n" +" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "พบระเบียนแพกเกจที่ไม่รู้จัก!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากปัญหาการอ่าน/เขียนของ dpkg" +"วิธีใช้: apt-sortpkgs [ตัวเลือก] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs เป็นเครื่องมืออย่างง่ายสำหรับเรียงลำดับแฟ้มรายชื่อแพกเกจ ตัวเลือก -s\n" +"ใช้สำหรับระบุชนิดของแฟ้มที่เรียง\n" +"\n" +"ตัวเลือก:\n" +" -h แสดงข้อความช่วยเหลือนี้\n" +" -s เรียงตามแฟ้มซอร์สโค้ด\n" +" -c=? อ่านแฟ้มค่าตั้งนี้\n" +" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" + +#~ 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 49a96a24e..510158ce1 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " Talaang Bersyon:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -363,7 +363,7 @@ msgstr "Hindi maaldaba ang directory ng download" 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" @@ -383,95 +383,95 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -480,7 +480,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -489,14 +489,14 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -505,7 +505,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:1358 +#: cmdline/apt-get.cc:1362 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -514,30 +514,30 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Kumokonekta sa %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -676,7 +676,7 @@ msgstr "%s ay pinakabagong bersyon na.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Naghintay, para sa %s ngunit wala nito doon" @@ -770,16 +770,16 @@ msgstr "Hindi mai-unmount ang CD-ROM sa %s, maaaring ginagamit pa ito." msgid "Disk not found." msgstr "Hindi nahanap ang Disk." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Hindi Nahanap ang Talaksan" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Bigo ang pag-stat" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Bigo ang pagtakda ng oras ng pagbago" @@ -833,7 +833,7 @@ msgstr "Bigo ang utos sa login script '%s', sabi ng server ay: %s" msgid "TYPE failed, server said: %s" msgstr "Bigo ang TYPE, sabi ng server ay: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Lumipas ang koneksyon" @@ -855,7 +855,7 @@ msgstr "May sagot na bumubo sa buffer." msgid "Protocol corruption" msgstr "Sira ang protocol" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -916,7 +916,7 @@ msgstr "Nag-timeout ang socket ng datos" msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" @@ -925,7 +925,7 @@ msgstr "Problema sa pag-hash ng talaksan" msgid "Unable to fetch file, server said '%s'" msgstr "Hindi makakuha ng talaksan, sabi ng server ay '%s'" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Nag-timeout ang socket ng datos" @@ -975,7 +975,7 @@ msgstr "Hindi maka-konekta sa %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Kumokonekta sa %s" @@ -1118,42 +1118,17 @@ msgstr "Bigo ang koneksyon" msgid "Internal error" msgstr "Internal na error" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Tumama " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Kunin: " - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "DiPansin " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Err " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Nakakuha ng %sB ng %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [May ginagawa]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Pagpalit ng Media: Ikasa ang disk na may pangalang\n" -" '%s'\n" -"sa drive '%s' at pindutin ang enter\n" +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:93 msgid "Correcting dependencies..." @@ -1183,36 +1158,210 @@ msgstr "Maaari ninyong patakbuhin ang 'apt-get -f install' upang ayusin ito." msgid "Unmet dependencies. Try using -f." msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" +#: 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 "" -"BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" +#: 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 "" -"Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" +msgstr "" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?" +#: apt-private/private-output.cc:455 +#, c-format +msgid "but %s is installed" +msgstr "ngunit ang %s ay nakaluklok" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "May mga problema at -y ay ginamit na walang --force-yes" +#: apt-private/private-output.cc:457 +#, c-format +msgid "but %s is to be installed" +msgstr "ngunit ang %s ay iluluklok" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: 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 "Failed to fetch %s %s\n" -msgstr "Bigo sa pagkuha ng %s %s\n" +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:35 +#, 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:97 +#, 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:101 +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:82 msgid "Internal error, InstallPackages was called with broken packages!" @@ -1268,8 +1417,12 @@ msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n" msgid "You don't have enough free space in %s." msgstr "Kulang kayo ng libreng puwang sa %s." -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "May mga problema at -y ay ginamit na walang --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be @@ -1472,935 +1625,691 @@ 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:129 -msgid "Listing" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" msgstr "" +"BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!" -#: apt-private/private-list.cc:159 +#: apt-private/private-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "" +"Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n" + +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko" + +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?" + +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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] "" +msgid "Failed to fetch %s %s\n" +msgstr "Bigo sa pagkuha ng %s %s\n" -#: 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!" +#: apt-private/private-sources.cc:58 +#, fuzzy, c-format +msgid "Failed to parse %s. Edit again? " +msgstr "Bigo ang pagpangalan muli ng %s tungong %s" + +#: apt-private/private-sources.cc:70 +#, c-format +msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 -#: apt-private/private-show.cc:89 -msgid "unknown" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" msgstr "" -#: apt-private/private-output.cc:265 -#, fuzzy, c-format -msgid "[installed,upgradable to: %s]" -msgstr " [Nakaluklok]" +#: apt-private/private-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "Sinusuri ang pag-upgrade... " -#: apt-private/private-output.cc:268 -#, fuzzy -msgid "[installed,local]" -msgstr " [Nakaluklok]" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "Tapos" -#: apt-private/private-output.cc:270 -msgid "[installed,auto-removable]" -msgstr "" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Tumama " -#: apt-private/private-output.cc:272 -#, fuzzy -msgid "[installed,automatic]" -msgstr " [Nakaluklok]" +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Kunin: " -#: apt-private/private-output.cc:274 -#, fuzzy -msgid "[installed]" -msgstr " [Nakaluklok]" +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "DiPansin " -#: apt-private/private-output.cc:277 +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Err " + +#: apt-private/acqprogress.cc:146 #, c-format -msgid "[upgradable from: %s]" -msgstr "" +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Nakakuha ng %sB ng %s (%sB/s)\n" -#: apt-private/private-output.cc:281 -msgid "[residual-config]" -msgstr "" +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [May ginagawa]" -#: apt-private/private-output.cc:455 +#: apt-private/acqprogress.cc:297 #, c-format -msgid "but %s is installed" -msgstr "ngunit ang %s ay nakaluklok" +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Pagpalit ng Media: Ikasa ang disk na may pangalang\n" +" '%s'\n" +"sa drive '%s' at pindutin ang enter\n" -#: apt-private/private-output.cc:457 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "but %s is to be installed" -msgstr "ngunit ang %s ay iluluklok" +msgid "Unable to read %s" +msgstr "Hindi mabasa ang %s" -#: apt-private/private-output.cc:464 -msgid "but it is not installable" -msgstr "ngunit hindi ito maaaring iluklok" +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 +#, c-format +msgid "Unable to change to %s" +msgstr "Di makalipat sa %s" -#: apt-private/private-output.cc:466 -msgid "but it is a virtual package" -msgstr "ngunit ito ay birtwal na pakete" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" -#: apt-private/private-output.cc:469 -msgid "but it is not installed" -msgstr "ngunit ito ay hindi nakaluklok" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 +#, fuzzy, c-format +msgid "Can not read mirror file '%s'" +msgstr "Hindi mabuksan ang talaksang %s" -#: apt-private/private-output.cc:469 -msgid "but it is not going to be installed" -msgstr "ngunit ito ay hindi iluluklok" +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Hindi mabuksan ang talaksang %s" -#: apt-private/private-output.cc:474 -msgid " or" -msgstr " o" +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" +msgstr "" -#: 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:" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Bigo sa paglikha ng IPC pipe sa subprocess" -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "Nagsara ng maaga ang koneksyon" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "Maling nakatakda na default!" -#: apt-private/private-output.cc:571 -msgid "The following packages have been kept back:" -msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "Pindutin ang enter upang magpatuloy." -#: apt-private/private-output.cc:592 -msgid "The following packages will be upgraded:" -msgstr "Ang susunod na mga pakete ay iu-upgrade:" +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" -#: apt-private/private-output.cc:613 -msgid "The following packages will be DOWNGRADED:" -msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:" +#: dselect/install:102 +#, fuzzy +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "May mga error na naganap habang nagbubuklat. Isasaayos ko ang" -#: apt-private/private-output.cc:633 -msgid "The following held packages will be changed:" -msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:" +#: dselect/install:103 +#, fuzzy +msgid "will be configured. This may result in duplicate errors" +msgstr "mga paketeng naluklok. Maaaring dumulot ito ng mga error na doble" -#: apt-private/private-output.cc:688 -#, c-format -msgid "%s (due to %s) " -msgstr "%s (dahil sa %s) " +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" +"o mga error na dulot ng kulang na dependensiya. Ito ay ayos lamang, yun lang" -#: apt-private/private-output.cc:696 +#: dselect/install:105 msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" -"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n" -"HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!" +"sa taas nitong kalatas ang importante. Paki-ayusin ang mga ito at patakbuhin " +"muli ang [I]luklok/Instol." -#: apt-private/private-output.cc:727 -#, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu na nai-upgrade, %lu na bagong luklok, " +#: dselect/update:30 +msgid "Merging available information" +msgstr "Pinagsasama ang magagamit na impormasyon" -#: apt-private/private-output.cc:731 -#, c-format -msgid "%lu reinstalled, " -msgstr "%lu iniluklok muli, " +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "Tinawagan ang DropNode sa naka-link pa na node" -#: apt-private/private-output.cc:733 -#, c-format -msgid "%lu downgraded, " -msgstr "%lu nai-downgrade, " +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Bigo sa paghanap ng elemento ng hash!" -#: 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-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Bigo ang pagreserba ng diversion" -#: 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" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Internal error sa AddDiversion" -#. 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]" +#: apt-inst/filelist.cc:477 +#, c-format +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Sinusubukang patungan ang diversion, %s -> %s at %s/%s" -#. 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]" +#: apt-inst/filelist.cc:506 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "Dobleng pagdagdag ng diversion %s -> %s" -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:778 -msgid "Y" -msgstr "O" +#: apt-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "Nadobleng talaksang conf %s/%s" -#. 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-inst/extract.cc:101 apt-inst/extract.cc:172 +#, c-format +msgid "The path %s is too long" +msgstr "Sobrang haba ang path na %s" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 +#: apt-inst/extract.cc:132 #, c-format -msgid "Regex compilation error - %s" -msgstr "Error sa pag-compile ng regex - %s" +msgid "Unpacking %s more than once" +msgstr "Binubuklat ang %s ng labis sa isang beses" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "Ang directory %s ay divertado" -#: apt-private/private-show.cc:156 +#: apt-inst/extract.cc:152 #, 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] "" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Ang pakete ay sumusubok na magsulat sa target na diversion %s/%s" -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" -msgstr "" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Sobrang haba ng path na diversion" -#: apt-private/private-sources.cc:58 -#, fuzzy, c-format -msgid "Failed to parse %s. Edit again? " +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 +#, c-format +msgid "Failed to stat %s" +msgstr "Bigo ang pag-stat ng %s" + +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#, c-format +msgid "Failed to rename %s to %s" msgstr "Bigo ang pagpangalan muli ng %s tungong %s" -#: apt-private/private-sources.cc:70 +#: apt-inst/extract.cc:249 #, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "" +msgid "The directory %s is being replaced by a non-directory" +msgstr "Ang directory %s ay papalitan ng hindi-directory" -#: 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-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Bigo ang paghanap ng node sa kanyang hash bucket" + +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Sobrang haba ng path" -#: apt-private/private-update.cc:90 +#: apt-inst/extract.cc:421 #, 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] "" +msgid "Overwrite package match with no version for %s" +msgstr "Patungan ng paketeng nag-match na walang bersion para sa %s" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." -msgstr "" +#: apt-inst/extract.cc:438 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "Sinusuri ang pag-upgrade... " +#: apt-inst/extract.cc:498 +#, c-format +msgid "Unable to stat %s" +msgstr "Hindi ma-stat ang %s" -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "Tapos" +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#, c-format +msgid "Failed to write file %s" +msgstr "Bigo sa pagsulat ng talaksang %s" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Unable to read %s" -msgstr "Hindi mabasa ang %s" +msgid "Failed to close file %s" +msgstr "Bigo sa pagsara ng talaksang %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "Unable to change to %s" -msgstr "Di makalipat sa %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s'" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "No mirror file '%s' found " -msgstr "" +msgid "Internal error, could not locate member %s" +msgstr "Internal error, hindi mahanap ang miyembrong %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 -msgid "Can not read mirror file '%s'" -msgstr "Hindi mabuksan ang talaksang %s" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Di maintindihang talaksang control" -#: methods/mirror.cc:315 +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Hindi tanggap na signature ng arkibo" + +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Error sa pagbasa ng header ng miyembro ng arkibo" + +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format -msgid "No entry found in mirror file '%s'" -msgstr "Hindi mabuksan ang talaksang %s" +msgid "Invalid archive member header %s" +msgstr "Hindi tanggap na header ng miyembro ng arkibo" -#: methods/mirror.cc:445 -#, c-format -msgid "[Mirror: %s]" -msgstr "" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Hindi tanggap na header ng miyembro ng arkibo" -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "Bigo sa paglikha ng IPC pipe sa subprocess" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Bitin ang arkibo. Sobrang iksi." -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" -msgstr "Nagsara ng maaga ang koneksyon" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Bigo ang pagbasa ng header ng arkibo" -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "Maling nakatakda na default!" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Bigo sa paglikha ng mga pipe" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "Pindutin ang enter upang magpatuloy." +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Bigo sa pagtakbo ng gzip " -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Sirang arkibo" -#: dselect/install:102 -#, fuzzy -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "May mga error na naganap habang nagbubuklat. Isasaayos ko ang" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Bigo ang checksum ng tar, sira ang arkibo" -#: dselect/install:103 -#, fuzzy -msgid "will be configured. This may result in duplicate errors" -msgstr "mga paketeng naluklok. Maaaring dumulot ito ng mga error na doble" +#: apt-inst/contrib/extracttar.cc:308 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s" -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" +#: apt-pkg/install-progress.cc:57 +#, c-format +msgid "Progress: [%3i%%]" msgstr "" -"o mga error na dulot ng kulang na dependensiya. Ito ay ayos lamang, yun lang" -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" msgstr "" -"sa taas nitong kalatas ang importante. Paki-ayusin ang mga ito at patakbuhin " -"muli ang [I]luklok/Instol." -#: dselect/update:30 -msgid "Merging available information" -msgstr "Pinagsasama ang magagamit na impormasyon" +#: apt-pkg/init.cc:146 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "Hindi suportado ang sistema ng paketeng '%s'" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n" -"\n" -"Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n" -"sa pagkaayos at template mula sa mga paketeng debian\n" -"\n" -"Mga opsyon:\n" -" -h Itong tulong na ito\n" -" -t Itakda ang dir na pansamantala\n" -" -c=? Basahin ang talaksang pagkaayos na ito\n" -" -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" - -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Hindi ma-stat ang %s" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete " -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Unable to write to %s" -msgstr "Hindi makapagsulat sa %s" - -#: cmdline/apt-extracttemplates.cc:300 -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 -msgid "Package extension list is too long" -msgstr "Mahaba masyado ang talaan ng extensyon ng mga pakete" +msgid "Wrote %i records.\n" +msgstr "Nagsulat ng %i na record.\n" -#: 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 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Error processing directory %s" -msgstr "Error sa pagproseso ng directory %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)" +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "Error processing contents %s" -msgstr "Error sa pagproseso ng Contents %s" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "" +"Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang " +"mismatch\n" -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" +#: apt-pkg/indexcopy.cc:515 +#, c-format +msgid "Can't find authentication record for: %s" msgstr "" -"Pag-gamit: apt-ftparchive [mga option] utos\n" -"Mga utos: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [mga grupo]\n" -" clean config\n" -"\n" -"Ang apt-ftparchive ay gumagawa ng talaksang index para sa arkibong Debian.\n" -"Suportado nito ang maraming estilo ng pagbuo mula sa awtomatikong buo\n" -"at kapalit ng dpkg-scanpackages at dpkg-scansources\n" -"\n" -"Bumubuo ang apt-ftparchive ng mga talaksang Package mula sa puno ng mga\n" -".deb. Ang talaksang Package ay naglalaman ng laman ng lahat ng control " -"field\n" -"mula sa bawat pakete pati na rin ang MD5 hash at laki ng talaksan. " -"Suportado\n" -"ang pag-gamit ng talaksang override upang pilitin ang halaga ng Priority at " -"Section.\n" -"\n" -"Bumubuo din ang apt-ftparchive ng talaksang Sources mula sa puno ng mga\n" -".dsc. Ang option na --source-override ay maaaring gamitin upang itakda\n" -"ang talaksang override ng src\n" -"\n" -"Ang mga utos na 'packages' at 'sources' ay dapat patakbuhin sa ugat ng\n" -"puno. Kailangan nakaturo ang BinaryPath sa ugat ng paghahanap na recursive\n" -"at ang talaksang override ay dapat naglalaman ng mga flag na override. Ang\n" -"pathprefix ay dinudugtong sa harap ng mga pangalan ng talaksan kung " -"mayroon.\n" -"Halimbawa ng pag-gamit mula sa arkibong Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Mga option:\n" -" -h Itong tulong na ito\n" -" --md5 Pagbuo ng MD5\n" -" -s=? Talaksang override ng source\n" -" -q Tahimik\n" -" -d=? Piliin ang optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Pagbuo ng talaksang contents\n" -" -c=? Basahin itong talaksang pagkaayos\n" -" -o=? Itakda ang isang option na pagkaayos" -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Walang mga pinili na tugma" +#: apt-pkg/indexcopy.cc:521 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Di tugmang MD5Sum" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'" +msgid "The method driver %s could not be found." +msgstr "Ang driver ng paraang %s ay hindi mahanap." -#: ftparchive/cachedb.cc:65 +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" + +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Nasira ang DB, pinalitan ng pangalan ang talaksan sa %s.old" +msgid "Method %s did not start correctly" +msgstr "Hindi umandar ng tama ang paraang %s" -#: ftparchive/cachedb.cc:83 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Luma ang DB, sinusubukang maupgrade ang %s" +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." -#: ftparchive/cachedb.cc:94 -#, fuzzy -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." msgstr "" -"Hindi tanggap ang anyo ng DB. Kung kayo ay nagsariwa mula sa nakaraang " -"bersiyon ng apt, tanggalin at likhain muli ang database." +"Hindi ma-parse o mabuksan ang talaan ng mga pakete o ng talaksang estado." -#: ftparchive/cachedb.cc:99 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Hindi mabuksan ang talaksang DB %s: %s" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang " +"ito" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 -#, c-format -msgid "Failed to stat %s" -msgstr "Bigo ang pag-stat ng %s" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Bigo ang pagbasa ng link %s" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Walang laman ang cache ng pakete" -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Walang kontrol rekord ang arkibo" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Sira ang talaksan ng cache ng pakete" -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Hindi makakuha ng cursor" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Ang talaksan ng cache ng pakete ay hindi magamit na bersyon" -#: ftparchive/writer.cc:91 -#, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: Hindi mabasa ang directory %s\n" +#: apt-pkg/pkgcache.cc:169 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "Sira ang talaksan ng cache ng pakete" -#: ftparchive/writer.cc:96 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "W: Hindi ma-stat %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "E: " +msgid "This APT does not support the versioning system '%s'" +msgstr "Ang APT na ito ay hindi nagsusuporta ng versioning system '%s'" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "W: " +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Ang cache ng pakete ay binuo para sa ibang arkitektura" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "E: Mga error ay tumutukoy sa talaksang " +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Dependensiya" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 -#, c-format -msgid "Failed to resolve %s" -msgstr "Bigo sa pag-resolba ng %s" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "PreDepends" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Bigo ang paglakad sa puno" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Mungkahi" -#: ftparchive/writer.cc:219 -#, c-format -msgid "Failed to open %s" -msgstr "Bigo ang pagbukas ng %s" - -#: ftparchive/writer.cc:278 -#, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Rekomendado" -#: ftparchive/writer.cc:286 -#, c-format -msgid "Failed to readlink %s" -msgstr "Bigo ang pagbasa ng link %s" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Tunggali" -#: ftparchive/writer.cc:290 -#, c-format -msgid "Failed to unlink %s" -msgstr "Bigo ang pag-unlink ng %s" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Pumapalit" -#: ftparchive/writer.cc:298 -#, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Bigo ang pag-link ng %s sa %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Linalaos" -#: ftparchive/writer.cc:308 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " DeLink limit na %sB tinamaan.\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Walang field ng pakete ang arkibo" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s ay walang override entry\n" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "importante" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " Tagapangalaga ng %s ay %s hindi %s\n" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "kailangan" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s ay walang override entry para sa pinagmulan\n" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "standard" -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s ay wala ring override entry na binary\n" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "optional" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Bigo ang pagreserba ng memory" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "extra" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Unable to open %s" -msgstr "Hindi mabuksan %s" +msgid "Index file type '%s' is not supported" +msgstr "Hindi suportado ang uri ng talaksang index na '%s'" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Maling anyo ng override %s linya %lu #1" +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Bigo ang pagbasa ng talaksang override %s" +#: 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)<" -#: ftparchive/override.cc:166 +#: apt-pkg/sourcelist.cc:173 #, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Maling anyo ng override %s linya %lu #1" +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" -#: ftparchive/override.cc:178 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Maling anyo ng override %s linya %lu #2" +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)<" -#: ftparchive/override.cc:191 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Maling anyo ng override %s linya %lu #3" +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)<" -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Hindi kilalang algorithmong compression '%s'" +#: 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)<" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Kailangan ng compression set ang compressed output %s" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Bigo ang paglikha ng FILE*" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Bigo ang pag-fork" - -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Anak para sa pag-Compress" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)" -#: ftparchive/multicompress.cc:232 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Error na internal, bigo ang paglikha ng %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Bigo ang IO sa subprocess/talaksan" - -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Bigo ang pagbasa habang tinutuos ang MD5" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "Problem unlinking %s" -msgstr "Problema sa pag-unlink ng %s" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Bigo ang pagpangalan muli ng %s tungong %s" - -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n" -"\n" -"Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n" -"sa pagkaayos at template mula sa mga paketeng debian\n" -"\n" -"Mga opsyon:\n" -" -h Itong tulong na ito\n" -" -t Itakda ang dir na pansamantala\n" -" -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 -msgid "Unknown package record!" -msgstr "Di kilalang record ng pakete!" - -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Pag-gamit: apt-sortpkgs [mga option] talaksan1 [talaksan2 ...]\n" -"\n" -"Ang apt-sortpkgs ay payak na kagamitan upang makapag-sort ng talaksang " -"pakete.\n" -"Ang option -s ay ginagamit upang ipaalam kung anong klaseng talaksan ito.\n" -"\n" -"Mga option:\n" -" -h Itong tulong na ito\n" -" -s Gamitin ang pag-sort ng talaksang source\n" -" -c=? Basahin ang talaksang pagkaayos na ito\n" -" -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n" +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "Failed to write file %s" -msgstr "Bigo sa pagsulat ng talaksang %s" +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "Failed to close file %s" -msgstr "Bigo sa pagsara ng talaksang %s" +msgid "Opening %s" +msgstr "Binubuksan %s" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "The path %s is too long" -msgstr "Sobrang haba ang path na %s" +msgid "Line %u too long in source list %s." +msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s." -#: apt-inst/extract.cc:132 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "Unpacking %s more than once" -msgstr "Binubuklat ang %s ng labis sa isang beses" +msgid "Malformed line %u in source list %s (type)" +msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)" -#: apt-inst/extract.cc:142 +#: apt-pkg/sourcelist.cc:375 #, c-format -msgid "The directory %s is diverted" -msgstr "Ang directory %s ay divertado" +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-inst/extract.cc:152 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Ang pakete ay sumusubok na magsulat sa target na diversion %s/%s" - -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Sobrang haba ng path na diversion" - -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Ang directory %s ay papalitan ng hindi-directory" - -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Bigo ang paghanap ng node sa kanyang hash bucket" - -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Sobrang haba ng path" - -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Patungan ng paketeng nag-match na walang bersion para sa %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" -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s" +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Hindi suportado ang uri ng talaksang index na '%s'" -#: apt-inst/extract.cc:498 +#: apt-pkg/clean.cc:64 #, c-format -msgid "Unable to stat %s" +msgid "Unable to stat %s." msgstr "Hindi ma-stat ang %s" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "Tinawagan ang DropNode sa naka-link pa na node" - -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Bigo sa paghanap ng elemento ng hash!" - -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Bigo ang pagreserba ng diversion" - -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Internal error sa AddDiversion" - -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Sinusubukang patungan ang diversion, %s -> %s at %s/%s" - -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Dobleng pagdagdag ng diversion %s -> %s" - -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Nadobleng talaksang conf %s/%s" - -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Hindi tanggap na signature ng arkibo" - -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Error sa pagbasa ng header ng miyembro ng arkibo" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "Hindi akma ang versioning system ng cache" -#: apt-inst/contrib/arfile.cc:96 +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "Hindi tanggap na header ng miyembro ng arkibo" - -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Hindi tanggap na header ng miyembro ng arkibo" - -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Bitin ang arkibo. Sobrang iksi." - -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Bigo ang pagbasa ng header ng arkibo" +msgid "Error occurred while processing %s (%s%d)" +msgstr "May naganap na error habang prinoseso ang %s (FindPkg)" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Bigo sa paglikha ng mga pipe" +#: apt-pkg/pkgcachegen.cc:257 +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-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Bigo sa pagtakbo ng gzip " +#: apt-pkg/pkgcachegen.cc:260 +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-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Sirang arkibo" +#: apt-pkg/pkgcachegen.cc:263 +#, 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-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Bigo ang checksum ng tar, sira ang arkibo" +#: apt-pkg/pkgcachegen.cc:266 +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-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s" +msgid "Package %s %s was not found while processing file dependencies" +msgstr "" +"Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya." -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s'" +msgid "Couldn't stat source package list %s" +msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "Internal error, hindi mahanap ang miyembrong %s" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Binabasa ang Listahan ng mga Pakete" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Di maintindihang talaksang control" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Kinukuha ang Talaksang Provides" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, fuzzy, c-format -msgid "List directory %spartial is missing." -msgstr "Nawawala ang directory ng talaan %spartial." +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Hindi makapagsulat sa %s" -#: apt-pkg/acquire.cc:91 -#, fuzzy, c-format -msgid "Archives directory %spartial is missing." -msgstr "Nawawala ang directory ng arkibo %spartial." +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "IO Error sa pag-imbak ng source cache" -#: apt-pkg/acquire.cc:99 -#, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "Hindi maaldaba ang directory ng talaan" +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "Hindi suportado ang uri ng talaksang index na '%s'" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "Kinukuha ang talaksang %li ng %li" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2421,35 +2330,35 @@ msgstr "Di tugmang laki" msgid "Invalid file format" msgstr "Di tanggap na operasyon %s" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, 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:1589 +#: apt-pkg/acquire-item.cc:1656 #, 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:1631 +#: apt-pkg/acquire-item.cc:1698 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:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2457,12 +2366,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2471,12 +2380,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:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2484,119 +2393,95 @@ msgstr "" "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Ang driver ng paraang %s ay hindi mahanap." +msgid "Vendor block %s contains no fingerprint" +msgstr "Block ng nagbebenta %s ay walang fingerprint" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" +msgid "List directory %spartial is missing." +msgstr "Nawawala ang directory ng talaan %spartial." -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 +#, fuzzy, c-format +msgid "Archives directory %spartial is missing." +msgstr "Nawawala ang directory ng arkibo %spartial." + +#: apt-pkg/acquire.cc:99 +#, fuzzy, c-format +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:902 #, c-format -msgid "Method %s did not start correctly" -msgstr "Hindi umandar ng tama ang paraang %s" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)" -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:904 #, 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 "Retrieving file %li of %li" +msgstr "Kinukuha ang talaksang %li ng %li" -#: apt-pkg/algorithms.cc:265 +#: 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/policy.cc:83 #, c-format msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -"Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo " -"para dito." -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot " -"ito ng mga paketeng naka-hold." - -#: apt-pkg/algorithms.cc:1088 -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/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." -msgstr "" -"Hindi ma-parse o mabuksan ang talaan ng mga pakete o ng talaksang estado." - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "" -"Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang " -"ito" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." - -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Release '%s' para sa '%s' ay hindi nahanap" - -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap" - -#: apt-pkg/cacheset.cc:603 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "Hindi mahanap ang paketeng %s" - -#: apt-pkg/cacheset.cc:609 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Hindi mahanap ang paketeng %s" - -#: apt-pkg/cacheset.cc:615 +#: apt-pkg/policy.cc:422 #, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Hindi mahanap ang paketeng %s" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header" -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "" +msgid "Did not understand pin type %s" +msgstr "Hindi naintindihan ang uri ng pin %s" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Walang prioridad (o sero) na nakatakda para sa pin" + +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +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 "" +"Ang takbo ng pag-instol na ito ay nangangailangan ng pansamantalang " +"pagtanggal ng paketeng esensyal na %s dahil sa isang Conflicts/Pre-Depends " +"loop. Madalas ay masama ito, ngunit kung nais niyo talagang gawin ito, i-" +"activate ang APT::Force-LoopBreak na option." -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +#: 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: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." +"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" @@ -2673,10 +2558,26 @@ msgstr "Sinusulat ang bagong listahan ng pagkukunan\n" msgid "Source list entries for this disc are:\n" msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Hindi ma-stat ang %s" +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo " +"para dito." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot " +"ito ng mga paketeng naka-hold." + +#: apt-pkg/algorithms.cc:1088 +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/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2705,57 +2606,67 @@ msgstr "Bigo ang pagbukas ng %s" msgid "Failed to write temporary StateFile %s" msgstr "Bigo sa pagsulat ng talaksang %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Hindi ma-parse ang talaksang pakete %s (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Release '%s' para sa '%s' ay hindi nahanap" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "Hindi mahanap ang paketeng %s" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 -#, c-format -msgid "Wrote %i records.\n" -msgstr "Nagsulat ng %i na record.\n" +#: apt-pkg/cacheset.cc:609 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "Hindi mahanap ang paketeng %s" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Hindi mahanap ang paketeng %s" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -"Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang " -"mismatch\n" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "Di tugmang MD5Sum" +#: apt-pkg/cacheset.cc:663 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" #: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format @@ -2782,319 +2693,223 @@ msgstr "Di tanggap na linya sa talaksang diversion: %s" msgid "Invalid 'Date' entry in Release file %s" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Hindi suportado ang sistema ng paketeng '%s'" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete " +msgid "%lid %lih %limin %lis" +msgstr "" -#: apt-pkg/install-progress.cc:57 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Progress: [%3i%%]" +msgid "%lih %limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 +#, c-format +msgid "%limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "%lis" msgstr "" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "Hindi mabuksan ang talaksang %s" +#: apt-pkg/contrib/strutl.cc:1258 +#, c-format +msgid "Selection %s not found" +msgstr "Piniling %s ay hindi nahanap" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:190 #, 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." +msgid "Not using locking for read only lock file %s" msgstr "" -"Ang takbo ng pag-instol na ito ay nangangailangan ng pansamantalang " -"pagtanggal ng paketeng esensyal na %s dahil sa isang Conflicts/Pre-Depends " -"loop. Madalas ay masama ito, ngunit kung nais niyo talagang gawin ito, i-" -"activate ang APT::Force-LoopBreak na option." +"Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Walang laman ang cache ng pakete" - -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Sira ang talaksan ng cache ng pakete" - -#: apt-pkg/pkgcache.cc:166 -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:169 -#, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "Sira ang talaksan ng cache ng pakete" - -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:195 #, 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:179 -msgid "The package cache was built for a different architecture" -msgstr "Ang cache ng pakete ay binuo para sa ibang arkitektura" - -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Dependensiya" - -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "PreDepends" - -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Mungkahi" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Rekomendado" - -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Tunggali" +msgid "Could not open lock file %s" +msgstr "Hindi mabuksan ang talaksang aldaba %s" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Pumapalit" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "" +"Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa " +"nfs" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Linalaos" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "hindi makuha ang aldaba %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "importante" - -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "kailangan" - -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "standard" - -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "optional" - -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "extra" - -#: apt-pkg/pkgcachegen.cc:93 -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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 -#, 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:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -"Wow, nalagpasan niyo ang bilang ng pangalan ng pakete na kaya ng APT na ito." - -#: apt-pkg/pkgcachegen.cc:260 -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:263 -#, 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:266 -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:576 +#: apt-pkg/contrib/fileutl.cc:421 #, c-format -msgid "Package %s %s was not found while processing file dependencies" +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -"Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya." -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/fileutl.cc:824 #, 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:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Binabasa ang Listahan ng mga Pakete" - -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Kinukuha ang Talaksang Provides" +msgid "Sub-process %s received a segmentation fault." +msgstr "Nakatanggap ang sub-process %s ng segmentation fault." -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "IO Error sa pag-imbak ng source cache" +#: apt-pkg/contrib/fileutl.cc:826 +#, fuzzy, c-format +msgid "Sub-process %s received signal %u." +msgstr "Nakatanggap ang sub-process %s ng segmentation fault." -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Hindi suportado ang uri ng talaksang index na '%s'" +msgid "Sub-process %s returned an error code (%u)" +msgstr "Naghudyat ang sub-process %s ng error code (%u)" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" -msgstr "" +msgid "Sub-process %s exited unexpectedly" +msgstr "Ang sub-process %s ay lumabas ng di inaasahan" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/fileutl.cc:913 #, fuzzy, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header" +msgid "Problem closing the gzip file %s" +msgstr "Problema sa pagsara ng talaksan" -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/fileutl.cc:1101 #, c-format -msgid "Did not understand pin type %s" -msgstr "Hindi naintindihan ang uri ng pin %s" - -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Walang prioridad (o sero) na nakatakda para sa pin" +msgid "Could not open file %s" +msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 #, 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)" +msgid "Could not open file descriptor %d" +msgstr "Hindi makapag-bukas ng pipe para sa %s" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Bigo ang paglikha ng subprocess IPC" + +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Bigo ang pag-exec ng taga-compress" + +#: apt-pkg/contrib/fileutl.cc:1514 #, 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)<" +msgid "read, still have %llu to read but none left" +msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, 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)" +msgid "write, still have %llu to write but couldn't" +msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/contrib/fileutl.cc:1915 #, 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)<" +msgid "Problem closing the file %s" +msgstr "Problema sa pagsara ng talaksan" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/fileutl.cc:1927 #, 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 "Problem renaming the file %s to %s" +msgstr "Problema sa pag-sync ng talaksan" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/contrib/fileutl.cc:1938 #, 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)<" +msgid "Problem unlinking the file %s" +msgstr "Problema sa pag-unlink ng talaksan" -#: 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/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Problema sa pag-sync ng talaksan" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" +msgid "%c%s... Error!" +msgstr "%c%s... Error!" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/progress.cc:150 #, 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)" +msgid "%c%s... Done" +msgstr "%c%s... Tapos" -#: 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/contrib/progress.cc:181 +msgid "..." +msgstr "" -#: 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" +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Tapos" -#: 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/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Hindi mai-mmap ang talaksang walang laman" -#: 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/contrib/mmap.cc:111 +#, fuzzy, c-format +msgid "Couldn't duplicate file descriptor %i" +msgstr "Hindi makapag-bukas ng pipe para sa %s" -#: apt-pkg/sourcelist.cc:416 +#: apt-pkg/contrib/mmap.cc:119 #, 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 "Couldn't make mmap of %llu bytes" +msgstr "Hindi makagawa ng mmap ng %lu na byte" -#: apt-pkg/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list" +#: apt-pkg/contrib/mmap.cc:146 +#, fuzzy +msgid "Unable to close mmap" +msgstr "Hindi mabuksan %s" -#: apt-pkg/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Hindi ma-parse ang talaksang pakete %s (1)" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "Hindi ma-invoke " -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Hindi ma-parse ang talaksang pakete %s (2)" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Hindi makagawa ng mmap ng %lu na byte" -#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 +#: apt-pkg/contrib/mmap.cc:322 #, fuzzy +msgid "Failed to truncate file" +msgstr "Bigo sa pagsulat ng talaksang %s" + +#: apt-pkg/contrib/mmap.cc:341 +#, c-format msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang " -"mga luma na lamang." -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Block ng nagbebenta %s ay walang fingerprint" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" + +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" #: apt-pkg/contrib/cdromutl.cc:65 #, c-format @@ -3105,54 +2920,6 @@ msgstr "Di mai-stat ang mount point %s" msgid "Failed to stat the cdrom" msgstr "Bigo sa pag-stat ng cdrom" -#: apt-pkg/contrib/cmndline.cc:121 -#, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "Opsyon sa command line %s ay di naintindihan." - -#: apt-pkg/contrib/cmndline.cc:168 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "Opsyon sa command line %s ay hindi boolean" - -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "Opsyon %s ay nangangailangan ng argumento" - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "" -"Opsyon %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng " -"=." - -#: apt-pkg/contrib/cmndline.cc:278 -#, 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:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "Opsyon '%s' ay labis ang haba" - -#: apt-pkg/contrib/cmndline.cc:341 -#, 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:391 -#, c-format -msgid "Invalid operation %s" -msgstr "Di tanggap na operasyon %s" - #: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" @@ -3210,390 +2977,618 @@ msgstr "" 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/fileutl.cc:190 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Ina-abort ang pag-instol." + +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "" -"Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s" +msgid "Command line option '%c' [from %s] is not known." +msgstr "Opsyon sa command line '%c' [mula %s] ay di kilala." -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Could not open lock file %s" -msgstr "Hindi mabuksan ang talaksang aldaba %s" +msgid "Command line option %s is not understood" +msgstr "Opsyon sa command line %s ay di naintindihan." -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "" -"Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa " -"nfs" +msgid "Command line option %s is not boolean" +msgstr "Opsyon sa command line %s ay hindi boolean" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "Could not get lock %s" -msgstr "hindi makuha ang aldaba %s" +msgid "Option %s requires an argument." +msgstr "Opsyon %s ay nangangailangan ng argumento" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "List of files can't be created as '%s' is not a directory" +msgid "Option %s: Configuration item specification must have an =." msgstr "" +"Opsyon %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng " +"=." -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Opsyon %s ay nangangailangan ng argumentong integer, hindi '%s'" -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" +msgid "Option '%s' is too long" +msgstr "Opsyon '%s' ay labis ang haba" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" +msgid "Sense %s is not understood, try true or false." +msgstr "Hindi naintindihan ang %s, subukan ang true o false." -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Nakatanggap ang sub-process %s ng segmentation fault." +msgid "Invalid operation %s" +msgstr "Di tanggap na operasyon %s" -#: apt-pkg/contrib/fileutl.cc:826 +#: apt-pkg/deb/dpkgpm.cc:110 #, fuzzy, c-format -msgid "Sub-process %s received signal %u." -msgstr "Nakatanggap ang sub-process %s ng segmentation fault." +msgid "Installing %s" +msgstr "Iniluklok ang %s" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Naghudyat ang sub-process %s ng error code (%u)" +msgid "Configuring %s" +msgstr "Isasaayos ang %s" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Ang sub-process %s ay lumabas ng di inaasahan" +msgid "Removing %s" +msgstr "Tinatanggal ang %s" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/dpkgpm.cc:113 #, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Problema sa pagsara ng talaksan" +msgid "Completely removing %s" +msgstr "Natanggal ng lubusan ang %s" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Could not open file %s" -msgstr "Hindi mabuksan ang talaksang %s" - -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 -#, fuzzy, c-format -msgid "Could not open file descriptor %d" -msgstr "Hindi makapag-bukas ng pipe para sa %s" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Bigo ang paglikha ng subprocess IPC" +msgid "Noting disappearance of %s" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Bigo ang pag-exec ng taga-compress" +#: apt-pkg/deb/dpkgpm.cc:115 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1514 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format -msgid "read, still have %llu to read but none left" -msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira" +msgid "Directory '%s' missing" +msgstr "Nawawala ang directory ng talaan %spartial." -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, fuzzy, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat" +msgid "Could not open file '%s'" +msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/contrib/fileutl.cc:1915 -#, fuzzy, c-format -msgid "Problem closing the file %s" -msgstr "Problema sa pagsara ng talaksan" +#: apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Preparing %s" +msgstr "Hinahanda ang %s" -#: apt-pkg/contrib/fileutl.cc:1927 -#, fuzzy, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Problema sa pag-sync ng talaksan" +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr "Binubuklat ang %s" -#: apt-pkg/contrib/fileutl.cc:1938 -#, fuzzy, c-format -msgid "Problem unlinking the file %s" -msgstr "Problema sa pag-unlink ng talaksan" +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing to configure %s" +msgstr "Hinahanda ang %s upang isaayos" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Problema sa pag-sync ng talaksan" +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr "Iniluklok ang %s" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Ina-abort ang pag-instol." +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "Naghahanda para sa pagtanggal ng %s" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Hindi mai-mmap ang talaksang walang laman" +#: apt-pkg/deb/dpkgpm.cc:1022 +#, c-format +msgid "Removed %s" +msgstr "Tinanggal ang %s" -#: apt-pkg/contrib/mmap.cc:111 -#, fuzzy, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Hindi makapag-bukas ng pipe para sa %s" +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Naghahanda upang tanggalin ng lubusan ang %s" -#: apt-pkg/contrib/mmap.cc:119 +#: apt-pkg/deb/dpkgpm.cc:1028 +#, c-format +msgid "Completely removed %s" +msgstr "Natanggal ng lubusan ang %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Hindi makagawa ng mmap ng %lu na byte" +msgid "Can not write log (%s)" +msgstr "Hindi makapagsulat sa %s" -#: apt-pkg/contrib/mmap.cc:146 -#, fuzzy -msgid "Unable to close mmap" -msgstr "Hindi mabuksan %s" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -#, fuzzy -msgid "Unable to synchronize mmap" -msgstr "Hindi ma-invoke " +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Hindi makagawa ng mmap ng %lu na byte" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "" -#: apt-pkg/contrib/mmap.cc:322 -#, fuzzy -msgid "Failed to truncate file" -msgstr "Bigo sa pagsulat ng talaksang %s" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "" -#: apt-pkg/contrib/mmap.cc:341 +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"Unable to lock the administration directory (%s), is another process using " +"it?" msgstr "" -#: apt-pkg/contrib/mmap.cc:446 +#: 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 "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +"dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/contrib/mmap.cc:449 +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "" + +#: cmdline/apt-extracttemplates.cc:224 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n" +"\n" +"Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n" +"sa pagkaayos at template mula sa mga paketeng debian\n" +"\n" +"Mga opsyon:\n" +" -h Itong tulong na ito\n" +" -t Itakda ang dir na pansamantala\n" +" -c=? Basahin ang talaksang pagkaayos na ito\n" +" -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" -#: apt-pkg/contrib/progress.cc:148 +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "Hindi ma-stat ang %s" + +#: cmdline/apt-extracttemplates.cc:300 +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 +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 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Error!" +msgid "Error processing directory %s" +msgstr "Error sa pagproseso ng directory %s" -#: apt-pkg/contrib/progress.cc:150 +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Tapos" +msgid "Error processing contents %s" +msgstr "Error sa pagproseso ng Contents %s" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" +"Pag-gamit: apt-ftparchive [mga option] utos\n" +"Mga utos: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [mga grupo]\n" +" clean config\n" +"\n" +"Ang apt-ftparchive ay gumagawa ng talaksang index para sa arkibong Debian.\n" +"Suportado nito ang maraming estilo ng pagbuo mula sa awtomatikong buo\n" +"at kapalit ng dpkg-scanpackages at dpkg-scansources\n" +"\n" +"Bumubuo ang apt-ftparchive ng mga talaksang Package mula sa puno ng mga\n" +".deb. Ang talaksang Package ay naglalaman ng laman ng lahat ng control " +"field\n" +"mula sa bawat pakete pati na rin ang MD5 hash at laki ng talaksan. " +"Suportado\n" +"ang pag-gamit ng talaksang override upang pilitin ang halaga ng Priority at " +"Section.\n" +"\n" +"Bumubuo din ang apt-ftparchive ng talaksang Sources mula sa puno ng mga\n" +".dsc. Ang option na --source-override ay maaaring gamitin upang itakda\n" +"ang talaksang override ng src\n" +"\n" +"Ang mga utos na 'packages' at 'sources' ay dapat patakbuhin sa ugat ng\n" +"puno. Kailangan nakaturo ang BinaryPath sa ugat ng paghahanap na recursive\n" +"at ang talaksang override ay dapat naglalaman ng mga flag na override. Ang\n" +"pathprefix ay dinudugtong sa harap ng mga pangalan ng talaksan kung " +"mayroon.\n" +"Halimbawa ng pag-gamit mula sa arkibong Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Mga option:\n" +" -h Itong tulong na ito\n" +" --md5 Pagbuo ng MD5\n" +" -s=? Talaksang override ng source\n" +" -q Tahimik\n" +" -d=? Piliin ang optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Pagbuo ng talaksang contents\n" +" -c=? Basahin itong talaksang pagkaayos\n" +" -o=? Itakda ang isang option na pagkaayos" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Tapos" +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Walang mga pinili na tugma" + +#: ftparchive/apt-ftparchive.cc:907 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Nasira ang DB, pinalitan ng pangalan ang talaksan sa %s.old" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "Luma ang DB, sinusubukang maupgrade ang %s" + +#: ftparchive/cachedb.cc:94 +#, fuzzy +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"Hindi tanggap ang anyo ng DB. Kung kayo ay nagsariwa mula sa nakaraang " +"bersiyon ng apt, tanggalin at likhain muli ang database." + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Hindi mabuksan ang talaksang DB %s: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Bigo ang pagbasa ng link %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Walang kontrol rekord ang arkibo" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Hindi makakuha ng cursor" + +#: ftparchive/writer.cc:91 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "W: Hindi mabasa ang directory %s\n" + +#: ftparchive/writer.cc:96 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "W: Hindi ma-stat %s\n" + +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "E: " + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "W: " + +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "E: Mga error ay tumutukoy sa talaksang " -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "" +msgid "Failed to resolve %s" +msgstr "Bigo sa pag-resolba ng %s" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" -msgstr "" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Bigo ang paglakad sa puno" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/writer.cc:219 #, c-format -msgid "%limin %lis" -msgstr "" +msgid "Failed to open %s" +msgstr "Bigo ang pagbukas ng %s" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:278 #, c-format -msgid "%lis" -msgstr "" +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:286 #, c-format -msgid "Selection %s not found" -msgstr "Piniling %s ay hindi nahanap" +msgid "Failed to readlink %s" +msgstr "Bigo ang pagbasa ng link %s" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:290 #, 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" +msgid "Failed to unlink %s" +msgstr "Bigo ang pag-unlink ng %s" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:298 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "" +msgid "*** Failed to link %s to %s" +msgstr "*** Bigo ang pag-link ng %s sa %s" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "" +#: ftparchive/writer.cc:308 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr " DeLink limit na %sB tinamaan.\n" -#: apt-pkg/deb/dpkgpm.cc:95 -#, fuzzy, c-format -msgid "Installing %s" -msgstr "Iniluklok ang %s" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Walang field ng pakete ang arkibo" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Configuring %s" -msgstr "Isasaayos ang %s" +msgid " %s has no override entry\n" +msgstr " %s ay walang override entry\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Removing %s" -msgstr "Tinatanggal ang %s" - -#: apt-pkg/deb/dpkgpm.cc:98 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "Natanggal ng lubusan ang %s" +msgid " %s maintainer is %s not %s\n" +msgstr " Tagapangalaga ng %s ay %s hindi %s\n" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:706 #, c-format -msgid "Noting disappearance of %s" -msgstr "" +msgid " %s has no source override entry\n" +msgstr " %s ay walang override entry para sa pinagmulan\n" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:710 #, c-format -msgid "Running post-installation trigger %s" -msgstr "" - -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 -#, fuzzy, c-format -msgid "Directory '%s' missing" -msgstr "Nawawala ang directory ng talaan %spartial." +msgid " %s has no binary override entry either\n" +msgstr " %s ay wala ring override entry na binary\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "Hindi mabuksan ang talaksang %s" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Bigo ang pagreserba ng memory" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing %s" -msgstr "Hinahanda ang %s" +msgid "Unable to open %s" +msgstr "Hindi mabuksan %s" -#: apt-pkg/deb/dpkgpm.cc:993 -#, c-format -msgid "Unpacking %s" -msgstr "Binubuklat ang %s" +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Maling anyo ng override %s linya %lu #1" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing to configure %s" -msgstr "Hinahanda ang %s upang isaayos" +msgid "Failed to read the override file %s" +msgstr "Bigo ang pagbasa ng talaksang override %s" -#: apt-pkg/deb/dpkgpm.cc:1000 -#, c-format -msgid "Installed %s" -msgstr "Iniluklok ang %s" +#: ftparchive/override.cc:166 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #1" +msgstr "Maling anyo ng override %s linya %lu #1" -#: apt-pkg/deb/dpkgpm.cc:1005 -#, c-format -msgid "Preparing for removal of %s" -msgstr "Naghahanda para sa pagtanggal ng %s" +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "Maling anyo ng override %s linya %lu #2" -#: apt-pkg/deb/dpkgpm.cc:1007 -#, c-format -msgid "Removed %s" -msgstr "Tinanggal ang %s" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "Maling anyo ng override %s linya %lu #3" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Naghahanda upang tanggalin ng lubusan ang %s" +msgid "Unknown compression algorithm '%s'" +msgstr "Hindi kilalang algorithmong compression '%s'" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:103 #, c-format -msgid "Completely removed %s" -msgstr "Natanggal ng lubusan ang %s" - -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Hindi makapagsulat sa %s" +msgid "Compressed output %s needs a compression set" +msgstr "Kailangan ng compression set ang compressed output %s" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Bigo ang paglikha ng FILE*" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Bigo ang pag-fork" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Anak para sa pag-Compress" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Error na internal, bigo ang paglikha ng %s" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "Bigo ang IO sa subprocess/talaksan" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Bigo ang pagbasa habang tinutuos ang MD5" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Problema sa pag-unlink ng %s" -#: apt-pkg/deb/dpkgpm.cc:1707 +#: cmdline/apt-internal-solver.cc:49 +#, fuzzy msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n" +"\n" +"Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n" +"sa pagkaayos at template mula sa mga paketeng debian\n" +"\n" +"Mga opsyon:\n" +" -h Itong tulong na ito\n" +" -t Itakda ang dir na pansamantala\n" +" -c=? Basahin ang talaksang pagkaayos na ito\n" +" -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" -msgstr "" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Di kilalang record ng pakete!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Pag-gamit: apt-sortpkgs [mga option] talaksan1 [talaksan2 ...]\n" +"\n" +"Ang apt-sortpkgs ay payak na kagamitan upang makapag-sort ng talaksang " +"pakete.\n" +"Ang option -s ay ginagamit upang ipaalam kung anong klaseng talaksan ito.\n" +"\n" +"Mga option:\n" +" -h Itong tulong na ito\n" +" -s Gamitin ang pag-sort ng talaksang source\n" +" -c=? Basahin ang talaksang pagkaayos na ito\n" +" -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/tr.po b/po/tr.po index fa81d682c..0c3de2a46 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2014-09-29 22:08+0200\n" "Last-Translator: Mert Dirik \n" "Language-Team: Debian l10n Turkish \n" @@ -160,7 +160,7 @@ msgid " Version table:" msgstr " Sürüm çizelgesi:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -364,7 +364,7 @@ msgstr "İndirme dizini kilitlenemiyor" 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "%s paketinin kaynak paketi bulunamadı" @@ -391,78 +391,78 @@ msgstr "" "bzr branch %s\n" "komutunu kullanın.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Zaten indirilmiş olan '%s' dosyası atlanıyor\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s içindeki boş alan miktarı belirlenemedi" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "%s üzerinde yeterli boş alan yok" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB kaynak arşivi indirilecek.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "%s kaynağını al\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Bazı arşivler alınamadı." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "İndirme işlemi tamamlandı ve sadece indirme kipinde" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Paket açma komutu '%s' başarısız.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "İnşa komutu '%s' başarısız oldu.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Alt süreç başarısız" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -471,17 +471,17 @@ 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:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s paketinin hiç inşa bağımlılığı yok.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -490,7 +490,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:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -498,12 +498,12 @@ msgid "" msgstr "" "%2$s için %1$s bağımlılığı, %3$s paketi bulunamadığı için karşılanamadı" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -512,7 +512,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:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -520,30 +520,30 @@ 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:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, 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:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "İnşa bağımlılıklarını işleme başarısız oldu" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) paketinin değişim günlüğü" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Desteklenen birimler:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -696,7 +696,7 @@ msgstr "%s zaten tutulmayacak şekilde ayarlanmış.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s için beklenildi ama o gelmedi" @@ -832,16 +832,16 @@ msgstr "%s konumundaki CD-ROM çıkarılamıyor, hâlâ kullanımda olabilir." msgid "Disk not found." msgstr "Disk bulunamadı." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Dosya bulunamadı" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Durum bilgisi okunamadı" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Değişiklik zamanı ayarlanamadı" @@ -895,7 +895,7 @@ msgstr "Oturum açma betiği komutu '%s' başarısız oldu, sunucunun iletisi: % msgid "TYPE failed, server said: %s" msgstr "TYPE başarısız, sunucunun iletisi: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Bağlantı zaman aşımına uğradı" @@ -917,7 +917,7 @@ msgstr "Bir yanıt arabelleği taşırdı." msgid "Protocol corruption" msgstr "İletişim kuralları bozulması" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -978,7 +978,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:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Dosya sağlaması yapılamadı" @@ -987,7 +987,7 @@ msgstr "Dosya sağlaması yapılamadı" msgid "Unable to fetch file, server said '%s'" msgstr "Dosya alınamıyor, sunucunun iletisi: '%s'" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Veri soketi zaman aşımına uğradı" @@ -1037,7 +1037,7 @@ msgstr "Adrese bağlanılamadı: %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Bağlanılıyor: %s" @@ -1176,42 +1176,19 @@ msgstr "Bağlantı başarısız" msgid "Internal error" msgstr "İç hata" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Bağlandı " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Alınıyor: " - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Yoksay " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Hata " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "%2$s'de %1$sB alındı (%3$sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Çalışıyor]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "Listeleme" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Ortam değişimi: Lütfen '%2$s' sürücüsüne\n" -" '%1$s'\n" -"olarak etiketlenmiş diski takın ve enter tuşuna basın\n" +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:93 msgid "Correcting dependencies..." @@ -1243,172 +1220,359 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "Karşılanmayan bağımlılıklar. -f kullanmayı deneyin." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" -msgstr "Sıralama" - -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "UYARI: Aşağıdaki paketler doğrulanamıyor!" - -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Kimlik denetimi uyarısı görmezden geliniyor.\n" - -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Bazı paketlerin kimlik denetimi yapılamadı" - -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Paketler doğrulanmadan kurulsun mu?" - -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Bazı sorunlar çıktı ve -y seçeneği, --force-yes olmadan kullanıldı" +#: 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-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:265 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "%s ağdan alınamadı. %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "İç hata, InstallPackages bozuk paketler ile çağrıldı!" +msgid "[installed,upgradable to: %s]" +msgstr "[kurulu,yükseltilebilir: %s]" -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "" -"Paketlerin kaldırılması gerekiyor ancak kaldırma işlemi devre dışı " -"bırakılmış." +#: apt-private/private-output.cc:268 +msgid "[installed,local]" +msgstr "[kurulu,yerel]" -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "İç hata, Sıralama tamamlanamadı" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "[kurulu,otomatik-kaldırılabilir]" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" -msgstr "" -"Ne kadar ilginç... Boyutlar eşleşmedi, apt@packages.debian.org adresine " -"eposta atın" +#: apt-private/private-output.cc:272 +msgid "[installed,automatic]" +msgstr "[kurulu,otomatik]" -#. 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 -#: apt-private/private-install.cc:155 -#, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "%sB/%sB arşiv dosyası indirilecek.\n" +#: apt-private/private-output.cc:274 +msgid "[installed]" +msgstr "[kurulu]" -#. 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:160 +#: apt-private/private-output.cc:277 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "%sB arşiv dosyası indirilecek.\n" +msgid "[upgradable from: %s]" +msgstr "[şundan yükseltilebilir: %s]" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Bu işlem tamamlandıktan sonra %sB ek disk alanı kullanılacak.\n" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" +msgstr "[artık-yapılandırma]" -#. 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:172 +#: apt-private/private-output.cc:455 #, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Bu işlem tamamlandıktan sonra %sB disk alanı boşalacak.\n" +msgid "but %s is installed" +msgstr "ama %s kurulu" -#: apt-private/private-install.cc:200 +#: apt-private/private-output.cc:457 #, c-format -msgid "You don't have enough free space in %s." -msgstr "%s içinde yeterli boş alanınız yok." +msgid "but %s is to be installed" +msgstr "ama %s kurulacak" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Sadece Önemsiz seçeneği ayarlandı, ama bu önemsiz bir işlem değil." +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "ama kurulabilir değil" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Evet, söylediğim şekilde yap!" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "ama o bir sanal paket" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Tehlikeli bir iş yapmak üzeresiniz.\n" -"Devam etmek için '%s' ifadesini yazınız\n" -" ?] " +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "ama kurulu değil" -#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Vazgeç." +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "ama kurulmayacak" -#: apt-private/private-install.cc:243 -msgid "Do you want to continue?" -msgstr "Devam etmek istiyor musunuz?" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " ya da" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Bazı dosyalar indirilemedi" +#: 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-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Bazı arşivler alınamıyor, apt-get update'i çalıştırmayı ya da --fix-missing " -"seçeneğini ekleyerek düzeltmeyi deneyin." +#: apt-private/private-output.cc:523 +msgid "The following NEW packages will be installed:" +msgstr "Aşağıdaki YENİ paketler kurulacak:" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing seçeneği ve ortam takası şu an için desteklenmiyor" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "Aşağıdaki paketler KALDIRILACAK:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Eksik paketler düzeltilemedi." +#: 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-install.cc:330 -msgid "Aborting install." -msgstr "Kurulum iptal ediliyor." +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "Aşağıdaki paketler yükseltilecek:" -#: apt-private/private-install.cc:366 -msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"Tüm dosyalarının üzerine yazıldığı için aşağıdaki paket\n" -"sisteminizden kayboldu:" -msgstr[1] "" -"Tüm dosyalarının üzerine yazıldığı için aşağıdaki paketler\n" -"sisteminizden kayboldu:" +#: 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-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Not: Bu eylem dpkg tarafından otomatik ve kasıtlı olarak yapılmıştır." +#: 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-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "Nesneleri silmemiz beklenemez, AutoRemover çalıştırılamıyor" +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (%s nedeniyle) " -#: apt-private/private-install.cc:499 +#: apt-private/private-output.cc:696 msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" msgstr "" -"AutoRemover yapmaması gereken bir yıkıma\n" -"sebep oldu. Lütfen apt hakkında bir hata raporu doldurun." +"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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "İç hata, InstallPackages bozuk paketler ile çağrıldı!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "" +"Paketlerin kaldırılması gerekiyor ancak kaldırma işlemi devre dışı " +"bırakılmış." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "İç hata, Sıralama tamamlanamadı" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Ne kadar ilginç... Boyutlar eşleşmedi, apt@packages.debian.org adresine " +"eposta atı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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "%sB/%sB arşiv dosyası 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 +#: apt-private/private-install.cc:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "%sB arşiv dosyası 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 +#: apt-private/private-install.cc:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Bu işlem tamamlandıktan sonra %sB ek disk alanı kullanılacak.\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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Bu işlem tamamlandıktan sonra %sB disk alanı boşalacak.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "%s içinde yeterli boş alanınız yok." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Bazı sorunlar çıktı ve -y seçeneği, --force-yes olmadan kullanıldı" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "Sadece Önemsiz seçeneği ayarlandı, ama bu önemsiz bir işlem değil." + +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Evet, söylediğim şekilde yap!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Tehlikeli bir iş yapmak üzeresiniz.\n" +"Devam etmek için '%s' ifadesini yazınız\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Vazgeç." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Devam etmek istiyor musunuz?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Bazı dosyalar indirilemedi" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Bazı arşivler alınamıyor, apt-get update'i çalıştırmayı ya da --fix-missing " +"seçeneğini ekleyerek düzeltmeyi deneyin." + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing seçeneği ve ortam takası şu an için desteklenmiyor" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Eksik paketler düzeltilemedi." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Kurulum iptal ediliyor." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"Tüm dosyalarının üzerine yazıldığı için aşağıdaki paket\n" +"sisteminizden kayboldu:" +msgstr[1] "" +"Tüm dosyalarının üzerine yazıldığı için aşağıdaki paketler\n" +"sisteminizden kayboldu:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Not: Bu eylem dpkg tarafından otomatik ve kasıtlı olarak yapılmıştır." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Nesneleri silmemiz beklenemez, AutoRemover çalıştırılamıyor" + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"AutoRemover yapmaması gereken bir yıkıma\n" +"sebep oldu. Lütfen apt hakkında bir hata raporu doldurun." + +#. #. if (Packages == 1) #. { #. c1out << std::endl; @@ -1539,940 +1703,693 @@ 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:129 -msgid "Listing" -msgstr "Listeleme" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "UYARI: Aşağıdaki paketler doğrulanamıyor!" -#: apt-private/private-list.cc:159 -#, 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-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-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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Kimlik denetimi uyarısı görmezden geliniyor.\n" -#: apt-private/private-output.cc:272 -msgid "[installed,automatic]" -msgstr "[kurulu,otomatik]" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Bazı paketlerin kimlik denetimi yapılamadı" -#: apt-private/private-output.cc:274 -msgid "[installed]" -msgstr "[kurulu]" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Paketler doğrulanmadan kurulsun mu?" -#: apt-private/private-output.cc:277 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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]" +msgid "Failed to fetch %s %s\n" +msgstr "%s ağdan alınamadı. %s\n" -#: apt-private/private-output.cc:455 +#: apt-private/private-sources.cc:58 #, c-format -msgid "but %s is installed" -msgstr "ama %s kurulu" +msgid "Failed to parse %s. Edit again? " +msgstr "%s ayrıştırılamadı. Tekrar düzenlemek ister misiniz? " -#: apt-private/private-output.cc:457 +#: apt-private/private-sources.cc:70 #, 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" +msgid "Your '%s' file changed, please run 'apt-get update'." +msgstr "'%s' dosyası değişti, lütfen 'apt-get update' komutunu çalıştırın." -#: apt-private/private-output.cc:474 -msgid " or" -msgstr " ya da" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" +msgstr "Tam Metin Arama" -#: 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-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "Yükseltme hesaplanıyor... " -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "Aşağıdaki YENİ paketler kurulacak:" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "Bitti" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "Aşağıdaki paketler KALDIRILACAK:" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Bağlandı " -#: apt-private/private-output.cc:571 -msgid "The following packages have been kept back:" -msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:" +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Alınıyor: " -#: apt-private/private-output.cc:592 -msgid "The following packages will be upgraded:" -msgstr "Aşağıdaki paketler yükseltilecek:" +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Yoksay " -#: 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/acqprogress.cc:125 +msgid "Err " +msgstr "Hata " -#: 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/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "%2$s'de %1$sB alındı (%3$sB/s)\n" -#: apt-private/private-output.cc:688 +#: apt-private/acqprogress.cc:236 #, c-format -msgid "%s (due to %s) " -msgstr "%s (%s nedeniyle) " +msgid " [Working]" +msgstr " [Çalışıyor]" -#: apt-private/private-output.cc:696 +#: apt-private/acqprogress.cc:297 +#, c-format msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" msgstr "" -"UYARI: Aşağıdaki temel paketler kaldırılacak.\n" -"Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!" +"Ortam değişimi: Lütfen '%2$s' sürücüsüne\n" +" '%1$s'\n" +"olarak etiketlenmiş diski takın ve enter tuşuna basın\n" -#: apt-private/private-output.cc:727 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, " +msgid "Unable to read %s" +msgstr "%s okunamıyor" -#: apt-private/private-output.cc:731 +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 #, c-format -msgid "%lu reinstalled, " -msgstr "%lu paket yeniden kurulacak, " +msgid "Unable to change to %s" +msgstr "%s olarak değiştirilemedi" -#: apt-private/private-output.cc:733 +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 #, c-format -msgid "%lu downgraded, " -msgstr "%lu paketin sürümü düşürülecek, " +msgid "No mirror file '%s' found " +msgstr "'%s' yansı dosyası bulunamadı " -#: apt-private/private-output.cc:735 +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 #, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n" +msgid "Can not read mirror file '%s'" +msgstr "Yansı dosyası %s okunamıyor" -#: apt-private/private-output.cc:739 +#: methods/mirror.cc:315 #, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n" +msgid "No entry found in mirror file '%s'" +msgstr "'%s' yansı dosyasında hiç girdi bulunmuyor" -#. 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]" +#: methods/mirror.cc:445 +#, c-format +msgid "[Mirror: %s]" +msgstr "[Yansı: %s]" -#. 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]" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Altsürece IPC borusu oluşturulamadı" -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:778 -msgid "Y" -msgstr "E" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "Bağlantı vaktinden önce kapandı" -#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:784 -msgid "N" -msgstr "H" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "Geçersiz öntanımlı ayar!" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Regex derleme hatası - %s" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "Devam etmek için giriş (enter) tuşuna basın." -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "Tam Metin Arama" +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Daha önceden indirilmiş .deb dosyalarını silmek istiyor musunuz?" -#: 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." +#: dselect/install:102 +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "" +"Paket açılırken bazı sorunlar çıktı. Kurulan paketler yapılandırılacak." -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" -msgstr "gerçek bir paket değil (sanal)" +#: dselect/install:103 +msgid "will be configured. This may result in duplicate errors" +msgstr "Bu durum, çift hata iletilerine ya da eksik bağımlılıkların neden" -#: apt-private/private-sources.cc:58 -#, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "%s ayrıştırılamadı. Tekrar düzenlemek ister misiniz? " +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" +"olduğu hatalara yol açabilir. Bu durum bir sorun teşkil etmez, sadece bu " +"iletinin" -#: apt-private/private-sources.cc:70 -#, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "'%s' dosyası değişti, lütfen 'apt-get update' komutunu çalıştırın." +#: dselect/install:105 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "" +"üstündeki hatalar önemlidir. Lütfen bunları onarın ve [I]nstall komutunu " +"yeniden çalıştırın" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "'update' komutu argüman almaz" +#: dselect/update:30 +msgid "Merging available information" +msgstr "Kullanılabilir bilgiler birleştiriliyor" -#: apt-private/private-update.cc:90 -#, 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-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode hâlâ bağlı olan düğüm üzerinde çağrıldı" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." -msgstr "Tüm paketler güncel." +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Sağlama elementi bulunamadı!" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "Yükseltme hesaplanıyor... " +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Yönlendirme tahsisi başarısız oldu" -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "Bitti" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "AddDiversion'da iç hata" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Unable to read %s" -msgstr "%s okunamıyor" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Bir yönlendirmenin üzerine yazılmaya çalışılıyor, %s -> %s ve %s/%s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Unable to change to %s" -msgstr "%s olarak değiştirilemedi" +msgid "Double add of diversion %s -> %s" +msgstr "Aynı dosya iki kez yönlendirilemez: %s -> %s" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 +#: apt-inst/filelist.cc:549 #, c-format -msgid "No mirror file '%s' found " -msgstr "'%s' yansı dosyası bulunamadı " +msgid "Duplicate conf file %s/%s" +msgstr "%s/%s yapılandırma dosyası zaten mevcut" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:287 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "Can not read mirror file '%s'" -msgstr "Yansı dosyası %s okunamıyor" +msgid "The path %s is too long" +msgstr "%s yolu çok uzun" -#: methods/mirror.cc:315 +#: apt-inst/extract.cc:132 #, c-format -msgid "No entry found in mirror file '%s'" -msgstr "'%s' yansı dosyasında hiç girdi bulunmuyor" +msgid "Unpacking %s more than once" +msgstr "%s paketi bir çok kez açıldı" -#: methods/mirror.cc:445 +#: apt-inst/extract.cc:142 #, c-format -msgid "[Mirror: %s]" -msgstr "[Yansı: %s]" +msgid "The directory %s is diverted" +msgstr "%s dizini yönlendirilmiş" -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "Altsürece IPC borusu oluşturulamadı" +#: apt-inst/extract.cc:152 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Bu paket yönlendirme hedefine (%s/%s) yazmayı deniyor" -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" -msgstr "Bağlantı vaktinden önce kapandı" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Yönlendirme yolu çok uzun" -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "Geçersiz öntanımlı ayar!" +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 +#, c-format +msgid "Failed to stat %s" +msgstr "%s durum bilgisi alınamadı" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "Devam etmek için giriş (enter) tuşuna basın." +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "%s, %s olarak yeniden adlandırılamadı" -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "Daha önceden indirilmiş .deb dosyalarını silmek istiyor musunuz?" +#: apt-inst/extract.cc:249 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "%s dizini dizin olmayan bir öğeyle değiştirildi" -#: dselect/install:102 -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "" -"Paket açılırken bazı sorunlar çıktı. Kurulan paketler yapılandırılacak." +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Düğüm sağlama kovasında bulunamadı" -#: dselect/install:103 -msgid "will be configured. This may result in duplicate errors" -msgstr "Bu durum, çift hata iletilerine ya da eksik bağımlılıkların neden" +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Yol çok uzun" -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "" -"olduğu hatalara yol açabilir. Bu durum bir sorun teşkil etmez, sadece bu " -"iletinin" +#: apt-inst/extract.cc:421 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "%s paketinin sürümü yok" -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" -msgstr "" -"üstündeki hatalar önemlidir. Lütfen bunları onarın ve [I]nstall komutunu " -"yeniden çalıştırın" +#: apt-inst/extract.cc:438 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "%s/%s dosyası %s paketindeki aynı adlı dosyanın üzerine yazmak istiyor" -#: dselect/update:30 -msgid "Merging available information" -msgstr "Kullanılabilir bilgiler birleştiriliyor" +#: apt-inst/extract.cc:498 +#, c-format +msgid "Unable to stat %s" +msgstr "%s durum bilgisi alınamadı" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Kullanım: apt-extracttemplates dosya1 [dosya2 ...]\n" -"\n" -"apt-extracttemplates, Debian paketlerinden ayar ve şablon bilgisini\n" -"almak için kullanılan bir araçtır\n" -"\n" -"Seçenekler:\n" -" -h Bu yardım dosyası\n" -" -t Geçici dizini ayarlar\n" -" -c=? Belirtilen ayar dosyasını kullanır\n" -" -o=? Ayar seçeneği belirtmeyi sağlar, ör -o dir::cache=/tmp\n" +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#, c-format +msgid "Failed to write file %s" +msgstr "%s dosyasına yazılamadı" -#: cmdline/apt-extracttemplates.cc:254 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Unable to mkstemp %s" -msgstr "mkstemp %s başarısız oldu" +msgid "Failed to close file %s" +msgstr "%s dosyası kapatılamadı" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "Unable to write to %s" -msgstr "%s dosyasına yazılamıyor" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Bu dosya geçerli bir DEB arşivi değil, '%s' üyesi eksik" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "debconf sürümü alınamıyor. debconf kurulu mu?" +#: apt-inst/deb/debfile.cc:132 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "İç hata, %s üyesi bulunamadı" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Paket uzantı listesi çok uzun" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Ayrıştırılamayan 'control' dosyası" -#: 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 +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Geçersiz arşiv imzası" + +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Arşiv üyesi başlığı okuma hatası" + +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid "Error processing directory %s" -msgstr "%s dizinini işlemede hata" +msgid "Invalid archive member header %s" +msgstr "Geçersiz arşiv üyesi başlığı %s" -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Kaynak uzantı listesi çok uzun" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Geçersiz arşiv üyesi başlığı" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "İçindekiler dosyasına başlık yazmada hata" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Arşiv çok kısa" -#: ftparchive/apt-ftparchive.cc:431 -#, c-format -msgid "Error processing contents %s" -msgstr "%s içeriğini işlemede hata" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Arşiv başlıkları okunamadı" -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Kullanım: apt-ftparchive [seçenekler] komut\n" -"Komutlar: packages ikilikonumu [geçersizkılmadosyası [konumöneki]]\n" -" sources kaynakkonumu [geçersizkılmadosyası [konumöneki]]\n" -" contents konum\n" -" release konum\n" -" generate yapılandırma [gruplar]\n" -" clean yapılandırma\n" -"\n" -"apt-ftparchive Debian arşivleri için indeks dosyaları üretir. \n" -"dpkg-scanpackages ve dpkg-scansources için tamamen otomatikten\n" -"işlevsel yedeklere kadar birçok üretim çeşidini destekler.\n" -"\n" -"apt-ftparchive, .deb dizinlerinden 'Package' dosyaları üretir. 'Package'\n" -"dosyası, her paketin MD5 doğrulama ve dosya büyüklüğü gibi denetim\n" -"alanlarının bilgilerini içerir. Öncelik (Priority) ve bölüm (Section)\n" -"değerlerini istenen başka değerlerle değiştirebilmek için bir geçersiz\n" -"kılma dosyası kullanılabilir.\n" -"\n" -"Benzer şekilde, apt-ftparchive, .dscs dosyalarından 'Sources' dosyaları\n" -"üretir. '--source-override' seçeneği bir src geçersiz kılma dosyası\n" -"belirtmek için kullanıabilir.\n" -"\n" -"'packages' ve 'sources' komutları dizin ağacının kökünde çalıştırıl-\n" -"malıdır. BinaryPath özyineli aramanın temeline işaret etmeli ve\n" -"geçersiz kılma dosyası geçersiz kılma bayraklarını içermelidir.\n" -"Pathprefix mevcutsa dosya adı alanlarının sonuna eklenir. Debian\n" -"arşivinden örnek kullanım şu şekildedir:\n" -"\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Seçenekler:\n" -" -h Bu yardım metni\n" -" --md5 MD5 üretimini denetle\n" -" -s=? Kaynak geçersiz kılma dosyası\n" -" -q Sessiz\n" -" -d=? Seçimlik önbellek veritabanını seç\n" -" --no-delink Bağ kurulmamış hata ayıklama kipini etkinleştir\n" -" --contents İçerik dosyası üretimini denetle\n" -" -c=? Belirtilen yapılandırma dosyası kullan\n" -" -o=? Yapılandırma seçeneği ayarla" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Hiçbir seçim eşleşmedi" - -#: ftparchive/apt-ftparchive.cc:907 -#, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "'%s' paket dosyası grubunda bazı dosyalar eksik" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Boru oluşturulamadı" -#: ftparchive/cachedb.cc:65 -#, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Veritabanı bozuk, dosya adı %s.old olarak değiştirildi" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Gzip çalıştırılamadı " -#: ftparchive/cachedb.cc:83 -#, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Veritabanı eski, %s yükseltilmeye çalışılıyor" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Bozuk arşiv" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"Veritabanı biçimi geçersiz. Eğer apt'ın eski bir sürümünden yükseltme " -"yaptıysanız, lütfen veritabanını silin ve yeniden oluşturun." +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Tar sağlama toplamı başarısız, arşiv bozulmuş" -#: ftparchive/cachedb.cc:99 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Veritabanı dosyası %s açılamadı: %s" +msgid "Unknown TAR header type %u, member %s" +msgstr "Bilinmeyen TAR başlığı türü %u, üye %s" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Failed to stat %s" -msgstr "%s durum bilgisi alınamadı" - -#: ftparchive/cachedb.cc:332 -msgid "Failed to read .dsc" -msgstr ".dsc dosyası okunamadı" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Arşivin denetim kaydı yok" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "İmleç alınamıyor" +msgid "Progress: [%3i%%]" +msgstr "Durum: [%3i%%]" -#: ftparchive/writer.cc:91 -#, c-format -msgid "W: Unable to read directory %s\n" -msgstr "U: %s dizini okunamıyor\n" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "dpkg çalıştırılıyor" -#: ftparchive/writer.cc:96 +#: apt-pkg/init.cc:146 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "U: %s durum bilgisi alınamıyor\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "H: " - -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "U: " +msgid "Packaging system '%s' is not supported" +msgstr "Paketleme sistemi '%s' desteklenmiyor" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "H: Hatalar şu dosya için geçerli: " +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Uygun bir paketleme sistemi türü bulunamıyor" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Failed to resolve %s" -msgstr "%s çözümlenemedi" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Ağaçta gezinme başarısız" +msgid "Wrote %i records.\n" +msgstr "%i kayıt yazıldı.\n" -#: ftparchive/writer.cc:219 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Failed to open %s" -msgstr "%s açılamadı" +msgid "Wrote %i records with %i missing files.\n" +msgstr "%2$i eksik dosyayla %1$i kayıt yazıldı.\n" -#: ftparchive/writer.cc:278 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "%2$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n" -#: ftparchive/writer.cc:286 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "Failed to readlink %s" -msgstr "%s readlink çağrısı başarısız oldu" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "%2$i eksik dosya ve %3$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n" -#: ftparchive/writer.cc:290 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Failed to unlink %s" -msgstr "%s bağı koparılamadı" +msgid "Can't find authentication record for: %s" +msgstr "%s için kimlik doğrulama kaydı bulunamadı" -#: ftparchive/writer.cc:298 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** %s, %s konumuna bağlanamadı" +msgid "Hash mismatch for: %s" +msgstr "Sağlama yapılamadı: %s" -#: ftparchive/writer.cc:308 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " %sB'lik bağ koparma (DeLink) sınırına ulaşıldı.\n" - -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Arşivde paket alanı yok" +msgid "The method driver %s could not be found." +msgstr "Yöntem sürücüsü %s bulunamadı." -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 +#: apt-pkg/acquire-worker.cc:118 #, c-format -msgid " %s has no override entry\n" -msgstr " %s için geçersiz kılma girdisi yok\n" +msgid "Is the package %s installed?" +msgstr "%s paketi kurulu mu?" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " %s geliştiricisi %s, %s değil\n" +msgid "Method %s did not start correctly" +msgstr "%s yöntemi düzgün şekilde başlamadı" -#: ftparchive/writer.cc:706 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid " %s has no source override entry\n" -msgstr " '%s' paketinin yerine geçecek bir kaynak paket yok\n" +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." -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " '%s' paketinin yerine geçecek bir ikili paket de yok\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ı." -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Bellek ayırma yapılamadı" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Bu sorunları gidermek için apt-get update komutunu çalıştırabilirsiniz" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "%s açılamıyor" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Kaynak listesi okunamadı." -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Hatalı geçersiz kılma %s satır %llu (%s)" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Paket önbelleği boş" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Geçersiz kılma dosyası %s okunamadı" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Paket önbelleği dosyası bozulmuş" -#: ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Hatalı geçersiz kılma %s satır %llu #1" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Paket önbelleği dosyası uyumsuz bir sürümde" -#: ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Hatalı geçersiz kılma %s satır %llu #2" +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" +msgstr "Paket önbellek dosyası bozulmuş, çok küçük" -#: ftparchive/override.cc:191 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Hatalı geçersiz kılma %s satır %llu #3" +msgid "This APT does not support the versioning system '%s'" +msgstr "Bu APT '%s' sürümleme sistemini desteklemiyor" -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Bilinmeyen sıkıştırma algoritması '%s'" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Paket önbelleği farklı bir mimarı için yapılmış" -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Sıkıştırılmış %s çıktısı bir sıkıştırma kümesine ihtiyaç duymaktadır" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Bağımlılıklar" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "DOSYA* oluşturulamadı" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "ÖnBağımlılıklar" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "fork yapılamadı" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Önerdikleri" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Çocuğu sıkıştır" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Tavsiye ettikleri" -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "İç hata, %s oluşturulamadı" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Çakışmalar" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Altsürece/dosyaya GÇ işlemi başarısız oldu" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Değiştirilenler" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "MD5 hesaplanırken okunamadı" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Eskiyenler" -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "%s bağı koparılırken sorun çıktı" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Bozdukları" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "%s, %s olarak yeniden adlandırılamadı" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Geliştirdikleri" -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Kullanım: apt-internal-solver\n" -"\n" -"apt-internal-solver mevcut dâhilî çözücüyü (hata ayıklama\n" -"gibi sebeplerle) harici çözücü gibi kullanmaya yarayan bir\n" -"arayüzdür.\n" -"\n" -"Seçenekler:\n" -" -h Bu yardım metni.\n" -" -q Günlük tutmaya uygun çıktı - İlerleme göstergesi yok\n" -" -c=? Belirtilen yapılandırma dosyası kullan\n" -" -o=? Yapılandırma seçeneği ayarla, örneğin -o dir::cache=/tmp\n" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "önemli" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Bilinmeyen paket kaydı!" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "gerekli" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Kullanım: apt-sortpkgs [seçenekler] dosya1 [dosya2 ...]\n" -"\n" -"apt-sortpkgs, paket dosyalarını sıralayan basit bir araçtır.\n" -"-s seçeneği ne tür bir dosya olduğunu göstermekte kullanılır.\n" -"\n" -"Seçenekler:\n" -" -h Bu yardım metni\n" -" -s Kaynak dosyası sıralamayı kullan\n" -" -c=? Belirtilen yapılandırma dosyasını oku\n" -" -o=? Herhangi bir yapılandırma seçeneği ayarla, örneğin -o dir::cache=/" -"tmp\n" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "standart" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" -msgstr "%s dosyasına yazılamadı" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "seçimlik" -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "%s dosyası kapatılamadı" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "ilave" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "The path %s is too long" -msgstr "%s yolu çok uzun" +msgid "Index file type '%s' is not supported" +msgstr "İndeks dosyası türü '%s' desteklenmiyor" -#: apt-inst/extract.cc:132 +#: apt-pkg/sourcelist.cc:127 #, c-format -msgid "Unpacking %s more than once" -msgstr "%s paketi bir çok kez açıldı" +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-inst/extract.cc:142 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "The directory %s is diverted" -msgstr "%s dizini yönlendirilmiş" +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-inst/extract.cc:152 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Bu paket yönlendirme hedefine (%s/%s) yazmayı deniyor" +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-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Yönlendirme yolu çok uzun" +#: 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-inst/extract.cc:249 +#: apt-pkg/sourcelist.cc:190 #, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "%s dizini dizin olmayan bir öğeyle değiştirildi" +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-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Düğüm sağlama kovasında bulunamadı" +#: 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-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Yol çok uzun" +#: 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-inst/extract.cc:421 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Overwrite package match with no version for %s" -msgstr "%s paketinin sürümü yok" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dist)" -#: apt-inst/extract.cc:438 +#: apt-pkg/sourcelist.cc:211 #, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "%s/%s dosyası %s paketindeki aynı adlı dosyanın üzerine yazmak istiyor" +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-inst/extract.cc:498 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "Unable to stat %s" -msgstr "%s durum bilgisi alınamadı" +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (mutlak dist)" -#: 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ı" - -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Sağlama elementi bulunamadı!" - -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Yönlendirme tahsisi başarısız oldu" - -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "AddDiversion'da iç hata" +#: 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-inst/filelist.cc:477 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Bir yönlendirmenin üzerine yazılmaya çalışılıyor, %s -> %s ve %s/%s" +msgid "Opening %s" +msgstr "%s Açılıyor" -#: apt-inst/filelist.cc:506 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Aynı dosya iki kez yönlendirilemez: %s -> %s" +msgid "Line %u too long in source list %s." +msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı çok uzun." -#: apt-inst/filelist.cc:549 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "%s/%s yapılandırma dosyası zaten mevcut" +msgid "Malformed line %u in source list %s (type)" +msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Geçersiz arşiv imzası" +#: 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-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Arşiv üyesi başlığı okuma hatası" +#: 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-inst/contrib/arfile.cc:96 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 #, c-format -msgid "Invalid archive member header %s" -msgstr "Geçersiz arşiv üyesi başlığı %s" +msgid "Clean of %s is not supported" +msgstr "%s temizliği desteklenmiyor" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Geçersiz arşiv üyesi başlığı" +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." +msgstr "%s için dosya bilgisi alınamadı." -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Arşiv çok kısa" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "Önbelleğin uyumsuz bir sürümleme sistemi var" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Arşiv başlıkları okunamadı" +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "%s paketi işlenirken sorunlarla karşılaşıldı (%s%d)" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Boru oluşturulamadı" +#: apt-pkg/pkgcachegen.cc:257 +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-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Gzip çalıştırılamadı " +#: apt-pkg/pkgcachegen.cc:260 +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-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Bozuk arşiv" +#: apt-pkg/pkgcachegen.cc:263 +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-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Tar sağlama toplamı başarısız, arşiv bozulmuş" +#: apt-pkg/pkgcachegen.cc:266 +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-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Bilinmeyen TAR başlığı türü %u, üye %s" +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Dosya bağımlılıkları işlenirken %s %s paketi bulunamadı" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Bu dosya geçerli bir DEB arşivi değil, '%s' üyesi eksik" +msgid "Couldn't stat source package list %s" +msgstr "Kaynak listesinin (%s) dosya bilgisi alınamadı" -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "İç hata, %s üyesi bulunamadı" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Paket listeleri okunuyor" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Ayrıştırılamayan 'control' dosyası" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Dosya Sağlananları Toplanıyor" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "List directory %spartial is missing." -msgstr "Liste dizini %spartial bulunamadı." +msgid "Unable to write to %s" +msgstr "%s dosyasına yazılamıyor" -#: apt-pkg/acquire.cc:91 -#, c-format -msgid "Archives directory %spartial is missing." -msgstr "Arşiv dizini %spartial bulunamadı." +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "Kaynak önbelleği kaydedilirken GÇ Hatası" -#: apt-pkg/acquire.cc:99 -#, c-format -msgid "Unable to lock directory %s" -msgstr "%s dizini kilitlenemiyor" +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "Çözücüye senaryo gönder" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, c-format -msgid "Clean of %s is not supported" -msgstr "%s temizliği desteklenmiyor" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "Çözücüye istek gönder" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Alınan dosya: %li / %li (%s kaldı)" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "Çözüm almak için hazırlan" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "Alınan dosya: %li / %li" +#: apt-pkg/edsp.cc:327 +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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "Harici çözücüyü çalıştır" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2491,7 +2408,7 @@ msgstr "Boyutlar eşleşmiyor" msgid "Invalid file format" msgstr "Geçersiz dosya biçimi" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2500,17 +2417,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:1589 +#: apt-pkg/acquire-item.cc:1656 #, 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:1631 +#: apt-pkg/acquire-item.cc:1698 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:1669 +#: apt-pkg/acquire-item.cc:1736 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2519,12 +2436,12 @@ msgstr "" "%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun " "güncelleştirmeleri uygulanmayacak." -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/acquire-item.cc:1758 #, 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:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2534,12 +2451,12 @@ msgstr "" "indeks dosyaları kullanılacak. GPG hatası: %s:%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "GPG hatası: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2548,129 +2465,109 @@ 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:1925 +#: apt-pkg/acquire-item.cc:1992 #, 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:1983 +#: apt-pkg/acquire-item.cc:2050 #, 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/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Yöntem sürücüsü %s bulunamadı." +msgid "Vendor block %s contains no fingerprint" +msgstr "Sağlayıcı bloğu %s parmak izi içermiyor" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Is the package %s installed?" -msgstr "%s paketi kurulu mu?" +msgid "List directory %spartial is missing." +msgstr "Liste dizini %spartial bulunamadı." -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Method %s did not start correctly" -msgstr "%s yöntemi düzgün şekilde başlamadı" +msgid "Archives directory %spartial is missing." +msgstr "Arşiv dizini %spartial bulunamadı." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 #, 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." +msgid "Unable to lock directory %s" +msgstr "%s dizini kilitlenemiyor" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"%s paketinin tekrar kurulması gerekli, ancak gereken arşiv dosyası " -"bulunamıyor." +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Alınan dosya: %li / %li (%s kaldı)" -#: apt-pkg/algorithms.cc:1086 +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Alınan dosya: %li / %li" + +#: 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/policy.cc:83 +#, c-format msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -"Hata, pkgProblemResolver::Resolve bozuk paketlere yol açtı, bu sorunun " -"nedeni tutulan paketler olabilir." +"APT::Default-Release için '%s' değeri geçersizdir, çünkü kaynaklarda böyle " +"bir sürüm yok" -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Sorunlar giderilemedi, tutulan bozuk paketleriniz var." +#: apt-pkg/policy.cc:422 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "%s tercihler dosyasında geçersiz kayıt, Paket başlığı yok" -#: 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ı." +#: apt-pkg/policy.cc:444 +#, c-format +msgid "Did not understand pin type %s" +msgstr "İğne türü %s anlaşılamadı" -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Bu sorunları gidermek için apt-get update komutunu çalıştırabilirsiniz" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "İğne için öncelik belirlenmedi (ya da sıfır)" -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Kaynak listesi okunamadı." - -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı" - -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı" - -#: apt-pkg/cacheset.cc:603 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "'%s' görevi bulunamadı" - -#: apt-pkg/cacheset.cc:609 -#, 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:615 -#, 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:626 -#, 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:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -"'%s' paketi kurulu olmadığı ve aday sürüme sahip olmadığı için her ikisi de " -"seçilemiyor" - -#: apt-pkg/cacheset.cc:647 -#, 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" +"\"%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/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, 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" +msgid "Could not configure '%s'. " +msgstr "'%s' paketi yapılandırılamadı. " -#: apt-pkg/cacheset.cc:663 +#: apt-pkg/packagemanager.cc:630 #, 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" +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 "" +"Bu kurulum, bir Çakışma/Ön-Bağımlılık döngüsü içerdiği için %s temel " +"paketinin geçici olarak kaldırılmasını gerektiriyor. Bu durum genellikle " +"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" @@ -2749,10 +2646,25 @@ msgstr "Yeni kaynak listesi yazılıyor\n" msgid "Source list entries for this disc are:\n" msgstr "Bu disk için olan kaynak listesi girdileri:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "%s için dosya bilgisi alınamadı." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"%s paketinin tekrar kurulması gerekli, ancak gereken arşiv dosyası " +"bulunamıyor." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Hata, pkgProblemResolver::Resolve bozuk paketlere yol açtı, bu sorunun " +"nedeni tutulan paketler olabilir." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Sorunlar giderilemedi, tutulan bozuk paketleriniz var." #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2780,55 +2692,69 @@ msgstr "Durum dosyası (StateFile) %s açılamadı" msgid "Failed to write temporary StateFile %s" msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "Çözücüye senaryo gönder" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Paket dosyası %s ayrıştırılamadı (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "Çözücüye istek gönder" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Paket dosyası %s ayrıştırılamadı (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "Çözüm almak için hazırlan" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı" -#: apt-pkg/edsp.cc:327 -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/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "Harici çözücüyü çalıştır" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "'%s' görevi bulunamadı" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "%i kayıt yazıldı.\n" +msgid "Couldn't find any package by regex '%s'" +msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "%2$i eksik dosyayla %1$i kayıt yazıldı.\n" +msgid "Couldn't find any package by glob '%s'" +msgstr "'%s' ifadesine eşleşen herhangi bir paket bulunamadı" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "%2$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n" +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/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "%2$i eksik dosya ve %3$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"'%s' paketi kurulu olmadığı ve aday sürüme sahip olmadığı için her ikisi de " +"seçilemiyor" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "%s için kimlik doğrulama kaydı bulunamadı" +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/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Sağlama yapılamadı: %s" +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:663 +#, 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/indexrecords.cc:78 #, c-format @@ -2855,846 +2781,918 @@ msgstr "'Release' dosyasında (%s) geçersiz 'Valid-Until' girdisi" msgid "Invalid 'Date' entry in Release file %s" msgstr "'Release' dosyasında (%s) geçersiz 'Date' girdisi" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Paketleme sistemi '%s' desteklenmiyor" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Uygun bir paketleme sistemi türü bulunamıyor" +msgid "%lid %lih %limin %lis" +msgstr "%li gün %li saat %li dk. %li sn." -#: apt-pkg/install-progress.cc:57 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Progress: [%3i%%]" -msgstr "Durum: [%3i%%]" +msgid "%lih %limin %lis" +msgstr "%li saat %li dk. %li sn." -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "dpkg çalıştırılıyor" +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 +#, c-format +msgid "%limin %lis" +msgstr "%li dk. %li sn." -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -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)" +msgid "%lis" +msgstr "%li sn." -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "Could not configure '%s'. " -msgstr "'%s' paketi yapılandırılamadı. " +msgid "Selection %s not found" +msgstr "%s seçimi bulunamadı" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:190 #, 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 "" -"Bu kurulum, bir Çakışma/Ön-Bağımlılık döngüsü içerdiği için %s temel " -"paketinin geçici olarak kaldırılmasını gerektiriyor. Bu durum genellikle " -"kötü bir durumdur, ama ille de devam etmek isterseniz, APT::Force-LoopBreak " -"seçeneğini etkinleştirin." +msgid "Not using locking for read only lock file %s" +msgstr "Kilitleme dosyası %s salt okunur olduğu için kilitleme kullanılmıyor" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Paket önbelleği boş" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "Kilit dosyası %s açılamadı" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Paket önbelleği dosyası bozulmuş" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "nfs ile bağlanmış kilit dosyası %s için kilitleme kullanılmıyor" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Paket önbelleği dosyası uyumsuz bir sürümde" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "%s kilidi alınamadı" -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" -msgstr "Paket önbellek dosyası bozulmuş, çok küçük" - -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Bu APT '%s' sürümleme sistemini desteklemiyor" +msgid "List of files can't be created as '%s' is not a directory" +msgstr "'%s' dizin olmadığı için dosya listeli oluşturulamıyor" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "Paket önbelleği farklı bir mimarı için yapılmış" +#: apt-pkg/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" +"'%2$s' dizinindeki '%1$s' normal bir dosya olmadığı için görmezden geliniyor" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Bağımlılıklar" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" +"'%2$s' dizinindeki '%1$s' dosyası uzantısı olmadığı için görmezden geliniyor" -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "ÖnBağımlılıklar" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" +"'%2$s' dizinindeki '%1$s' dosyası geçersiz bir dosya uzantısı olduğu için " +"yok sayılıyor" -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Önerdikleri" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "%s altsüreci bir bölümleme hatası aldı (segmentation fault)." -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Tavsiye ettikleri" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "%s altsüreci %u sinyali aldı." -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Çakışmalar" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "%s altsüreci bir hata kodu gönderdi (%u)" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Değiştirilenler" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "%s altsüreci beklenmeyen bir şekilde sona erdi" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Eskiyenler" +#: apt-pkg/contrib/fileutl.cc:913 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Gzip dosyası %s kapatılamadı" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Bozdukları" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "%s dosyası açılamadı" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Geliştirdikleri" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "Dosya tanımlayıcı %d açılamadı" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "önemli" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Altsüreç IPC'si oluşturulamadı" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "gerekli" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Sıkıştırma programı çalıştırılamadı " -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "standart" +#: apt-pkg/contrib/fileutl.cc:1514 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "read, %llu bayt okunması gerekli ama hiç kalmamış" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "seçimlik" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "write, yazılması gereken %llu bayt yazılamıyor" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "ilave" +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" +msgstr "%s dosyası kapatılamadı" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Önbelleğin uyumsuz bir sürümleme sistemi var" +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "%s dosyası %s olarak yeniden adlandırılamadı" -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/fileutl.cc:1938 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "%s paketi işlenirken sorunlarla karşılaşıldı (%s%d)" +msgid "Problem unlinking the file %s" +msgstr "%s dosyasından bağ kaldırma sorunu" -#: apt-pkg/pkgcachegen.cc:257 -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/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Dosya eşitlenirken sorun çıktı" -#: apt-pkg/pkgcachegen.cc:260 -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/contrib/progress.cc:148 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... Hata!" -#: apt-pkg/pkgcachegen.cc:263 -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/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Bitti" -#: apt-pkg/pkgcachegen.cc:266 -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/contrib/progress.cc:181 +msgid "..." +msgstr "..." -#: apt-pkg/pkgcachegen.cc:576 +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 #, 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ı" +msgid "%c%s... %u%%" +msgstr "%c%s... %u%%" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Boş dosya mmap yapılamıyor" + +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Kaynak listesinin (%s) dosya bilgisi alınamadı" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Dosya tanımlayıcı %i çoğaltılamadı" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Paket listeleri okunuyor" +#: apt-pkg/contrib/mmap.cc:119 +#, c-format +msgid "Couldn't make mmap of %llu bytes" +msgstr "%llu baytlık mmap yapılamaz" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Dosya Sağlananları Toplanıyor" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "mmap kapatılamıyor" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Kaynak önbelleği kaydedilirken GÇ Hatası" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "mmap eşlenemiyor" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "İndeks dosyası türü '%s' desteklenmiyor" +msgid "Couldn't make mmap of %lu bytes" +msgstr "%lu baytlık mmap yapılamaz" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Dosya kesilemedi" + +#: apt-pkg/contrib/mmap.cc:341 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"APT::Default-Release için '%s' değeri geçersizdir, çünkü kaynaklarda böyle " -"bir sürüm yok" +"Dinamik MMap yerine sığamadı. Lütfen APT::Cache-Start boyutunu artırın. " +"Kullanımdaki değer: %lu (ayrıntılı bilgi için man 5 apt.conf komutunu " +"kullanın)" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "%s tercihler dosyasında geçersiz kayıt, Paket başlığı yok" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "%lu baytlık sınıra ulaşıldığı için MMap boyutu artırılamadı." -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" +"Otomatik büyüme kullanıcı tarafından kapatıldığı için MMap boyutu " +"artırılamadı." + +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "Did not understand pin type %s" -msgstr "İğne türü %s anlaşılamadı" +msgid "Unable to stat the mount point %s" +msgstr "Bağlama noktasının (%s) durum bilgisi alınamadı" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "İğne için öncelik belirlenmedi (ya da sıfır)" +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Cdrom durum bilgisi alınamadı" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/configuration.cc:519 #, 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)" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Tanınamayan tür kısaltması: '%c'" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/contrib/configuration.cc:633 #, 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)" +msgid "Opening configuration file %s" +msgstr "Yapılandırma dosyası (%s) açılıyor" -#: apt-pkg/sourcelist.cc:217 +#: apt-pkg/contrib/configuration.cc:801 #, 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)" +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Sözdizimi hatası %s:%u: Blok ad olmadan başlıyor." -#: apt-pkg/sourcelist.cc:224 +#: apt-pkg/contrib/configuration.cc:820 #, 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)" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Sözdizimi hatası %s:%u: Kötü biçimlendirilmiş etiket" -#: apt-pkg/sourcelist.cc:335 +#: apt-pkg/contrib/configuration.cc:837 #, c-format -msgid "Opening %s" -msgstr "%s Açılıyor" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Sözdizimi hatası %s:%u: Değerden sonra ilave gereksiz" -#: apt-pkg/sourcelist.cc:371 +#: apt-pkg/contrib/configuration.cc:877 #, 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 "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/sourcelist.cc:375 +#: apt-pkg/contrib/configuration.cc:884 #, 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 "Syntax error %s:%u: Too many nested includes" +msgstr "Sözdizimi hatası %s:%u: Çok fazla yuvalanmış 'include'" -#: apt-pkg/sourcelist.cc:416 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, 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/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "'sources.list' dosyası içine bazı 'source' adresleri koymalısınız" +msgid "Syntax error %s:%u: Included from here" +msgstr "Sözdizimi hatası %s:%u: Buradan 'include' edilmiş" -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/configuration.cc:897 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Paket dosyası %s ayrıştırılamadı (1)" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Sözdizimi hatası %s:%u: Desteklenmeyen yönerge '%s'" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/configuration.cc:900 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Paket dosyası %s ayrıştırılamadı (2)" - -#: 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." +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -"Bazı indeks dosyaları indirilemedi. Bu dosyalar yok sayıldılar ya da önceki " -"sürümleri kullanıldı." +"Sözdizimi hatası %s:%u: clear yönergesi bir seçenek ağacı argümanını " +"gerektirir" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/configuration.cc:950 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Sağlayıcı bloğu %s parmak izi içermiyor" +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Sözdizimi hatası %s:%u: Dosya sonunda ilave gereksiz" -#: apt-pkg/contrib/cdromutl.cc:65 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "Bağlama noktasının (%s) durum bilgisi alınamadı" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "Cdrom durum bilgisi alınamadı" +msgid "No keyring installed in %s." +msgstr "%s dizininde kurulu bir anahtar yok." -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, 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:168 +#: apt-pkg/contrib/cmndline.cc:171 #, 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:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, 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:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "%s seçeneği: Yapılandırma öğesi tanımlaması = şeklinde değer " "içermelidir." -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, 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:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "'%s' seçeneği çok uzun" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, 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:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "Geçersiz işlem: %s" -#: apt-pkg/contrib/configuration.cc:519 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Tanınamayan tür kısaltması: '%c'" +msgid "Installing %s" +msgstr "%s kuruluyor" -#: apt-pkg/contrib/configuration.cc:633 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Opening configuration file %s" -msgstr "Yapılandırma dosyası (%s) açılıyor" +msgid "Configuring %s" +msgstr "%s yapılandırılıyor" -#: apt-pkg/contrib/configuration.cc:801 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Sözdizimi hatası %s:%u: Blok ad olmadan başlıyor." +msgid "Removing %s" +msgstr "%s kaldırılıyor" -#: apt-pkg/contrib/configuration.cc:820 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Sözdizimi hatası %s:%u: Kötü biçimlendirilmiş etiket" +msgid "Completely removing %s" +msgstr "%s tamamen kaldırılıyor" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Sözdizimi hatası %s:%u: Değerden sonra ilave gereksiz" +msgid "Noting disappearance of %s" +msgstr "%s paketinin kaybolduğu not ediliyor" -#: apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/deb/dpkgpm.cc:115 #, 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" +msgid "Running post-installation trigger %s" +msgstr "Kurulum sonrası tetikleyicisi %s çalıştırılıyor" -#: apt-pkg/contrib/configuration.cc:884 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Sözdizimi hatası %s:%u: Çok fazla yuvalanmış 'include'" +msgid "Directory '%s' missing" +msgstr "'%s' dizini bulunamadı" -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Sözdizimi hatası %s:%u: Buradan 'include' edilmiş" +msgid "Could not open file '%s'" +msgstr "'%s' dosyası açılamadı" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Sözdizimi hatası %s:%u: Desteklenmeyen yönerge '%s'" +msgid "Preparing %s" +msgstr "%s hazırlanıyor" -#: apt-pkg/contrib/configuration.cc:900 +#: apt-pkg/deb/dpkgpm.cc:1008 #, 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" +msgid "Unpacking %s" +msgstr "%s paketi açılıyor" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Sözdizimi hatası %s:%u: Dosya sonunda ilave gereksiz" +msgid "Preparing to configure %s" +msgstr "%s paketini yapılandırmaya hazırlanılıyor" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Kilitleme dosyası %s salt okunur olduğu için kilitleme kullanılmıyor" +msgid "Installed %s" +msgstr "%s kuruldu" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "Could not open lock file %s" -msgstr "Kilit dosyası %s açılamadı" +msgid "Preparing for removal of %s" +msgstr "%s paketinin kaldırılmasına hazırlanılıyor" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "nfs ile bağlanmış kilit dosyası %s için kilitleme kullanılmıyor" +msgid "Removed %s" +msgstr "%s kaldırıldı" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Could not get lock %s" -msgstr "%s kilidi alınamadı" +msgid "Preparing to completely remove %s" +msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "'%s' dizin olmadığı için dosya listeli oluşturulamıyor" +msgid "Completely removed %s" +msgstr "%s tamamen kaldırıldı" -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" -"'%2$s' dizinindeki '%1$s' normal bir dosya olmadığı için görmezden geliniyor" +msgid "Can not write log (%s)" +msgstr "Günlük dosyasına yazılamıyor (%s)" -#: apt-pkg/contrib/fileutl.cc:412 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "/dev/pts bağlı mı?" + +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "İşlem yarıda kesildi" + +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" msgstr "" -"'%2$s' dizinindeki '%1$s' dosyası uzantısı olmadığı için görmezden geliniyor" +"En fazla rapor miktarına (MaxReports) ulaşıldığı için apport raporu yazılmadı" -#: apt-pkg/contrib/fileutl.cc:421 -#, c-format +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +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:1726 msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -"'%2$s' dizinindeki '%1$s' dosyası geçersiz bir dosya uzantısı olduğu için " -"yok sayılıyor" +"Apport raporu yazılmadı çünkü hata iletisi bu durumun bir önceki hatadan " +"kaynaklanan bir hata olduğunu belirtiyor." -#: apt-pkg/contrib/fileutl.cc:824 -#, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "%s altsüreci bir bölümleme hatası aldı (segmentation fault)." +#: apt-pkg/deb/dpkgpm.cc:1732 +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/contrib/fileutl.cc:826 -#, c-format -msgid "Sub-process %s received signal %u." -msgstr "%s altsüreci %u sinyali aldı." - -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "%s altsüreci bir hata kodu gönderdi (%u)" +#: apt-pkg/deb/dpkgpm.cc:1739 +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/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 -#, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "%s altsüreci beklenmeyen bir şekilde sona erdi" +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +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/contrib/fileutl.cc:913 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Gzip dosyası %s kapatılamadı" +#: apt-pkg/deb/dpkgpm.cc:1774 +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/contrib/fileutl.cc:1101 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "Could not open file %s" -msgstr "%s dosyası açılamadı" +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/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/deb/debsystem.cc:94 #, c-format -msgid "Could not open file descriptor %d" -msgstr "Dosya tanımlayıcı %d açılamadı" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Altsüreç IPC'si oluşturulamadı" - -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Sıkıştırma programı çalıştırılamadı " +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?" -#: apt-pkg/contrib/fileutl.cc:1514 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 #, c-format -msgid "read, still have %llu to read but none left" -msgstr "read, %llu bayt okunması gerekli ama hiç kalmamış" +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/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "write, yazılması gereken %llu bayt yazılamıyor" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "Kilitlenmemiş" -#: apt-pkg/contrib/fileutl.cc:1915 -#, c-format -msgid "Problem closing the file %s" -msgstr "%s dosyası kapatılamadı" +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Kullanım: apt-extracttemplates dosya1 [dosya2 ...]\n" +"\n" +"apt-extracttemplates, Debian paketlerinden ayar ve şablon bilgisini\n" +"almak için kullanılan bir araçtır\n" +"\n" +"Seçenekler:\n" +" -h Bu yardım dosyası\n" +" -t Geçici dizini ayarlar\n" +" -c=? Belirtilen ayar dosyasını kullanır\n" +" -o=? Ayar seçeneği belirtmeyi sağlar, ör -o dir::cache=/tmp\n" -#: apt-pkg/contrib/fileutl.cc:1927 +#: cmdline/apt-extracttemplates.cc:254 #, c-format -msgid "Problem renaming the file %s to %s" -msgstr "%s dosyası %s olarak yeniden adlandırılamadı" +msgid "Unable to mkstemp %s" +msgstr "mkstemp %s başarısız oldu" -#: apt-pkg/contrib/fileutl.cc:1938 -#, c-format -msgid "Problem unlinking the file %s" -msgstr "%s dosyasından bağ kaldırma sorunu" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "debconf sürümü alınamıyor. debconf kurulu mu?" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Dosya eşitlenirken sorun çıktı" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "Paket uzantı listesi çok uzun" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: 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 #, c-format -msgid "No keyring installed in %s." -msgstr "%s dizininde kurulu bir anahtar yok." +msgid "Error processing directory %s" +msgstr "%s dizinini işlemede hata" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Boş dosya mmap yapılamıyor" +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Kaynak uzantı listesi çok uzun" -#: apt-pkg/contrib/mmap.cc:111 -#, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Dosya tanımlayıcı %i çoğaltılamadı" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "İçindekiler dosyasına başlık yazmada hata" -#: apt-pkg/contrib/mmap.cc:119 +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "%llu baytlık mmap yapılamaz" +msgid "Error processing contents %s" +msgstr "%s içeriğini işlemede hata" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "mmap kapatılamıyor" +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Kullanım: apt-ftparchive [seçenekler] komut\n" +"Komutlar: packages ikilikonumu [geçersizkılmadosyası [konumöneki]]\n" +" sources kaynakkonumu [geçersizkılmadosyası [konumöneki]]\n" +" contents konum\n" +" release konum\n" +" generate yapılandırma [gruplar]\n" +" clean yapılandırma\n" +"\n" +"apt-ftparchive Debian arşivleri için indeks dosyaları üretir. \n" +"dpkg-scanpackages ve dpkg-scansources için tamamen otomatikten\n" +"işlevsel yedeklere kadar birçok üretim çeşidini destekler.\n" +"\n" +"apt-ftparchive, .deb dizinlerinden 'Package' dosyaları üretir. 'Package'\n" +"dosyası, her paketin MD5 doğrulama ve dosya büyüklüğü gibi denetim\n" +"alanlarının bilgilerini içerir. Öncelik (Priority) ve bölüm (Section)\n" +"değerlerini istenen başka değerlerle değiştirebilmek için bir geçersiz\n" +"kılma dosyası kullanılabilir.\n" +"\n" +"Benzer şekilde, apt-ftparchive, .dscs dosyalarından 'Sources' dosyaları\n" +"üretir. '--source-override' seçeneği bir src geçersiz kılma dosyası\n" +"belirtmek için kullanıabilir.\n" +"\n" +"'packages' ve 'sources' komutları dizin ağacının kökünde çalıştırıl-\n" +"malıdır. BinaryPath özyineli aramanın temeline işaret etmeli ve\n" +"geçersiz kılma dosyası geçersiz kılma bayraklarını içermelidir.\n" +"Pathprefix mevcutsa dosya adı alanlarının sonuna eklenir. Debian\n" +"arşivinden örnek kullanım şu şekildedir:\n" +"\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Seçenekler:\n" +" -h Bu yardım metni\n" +" --md5 MD5 üretimini denetle\n" +" -s=? Kaynak geçersiz kılma dosyası\n" +" -q Sessiz\n" +" -d=? Seçimlik önbellek veritabanını seç\n" +" --no-delink Bağ kurulmamış hata ayıklama kipini etkinleştir\n" +" --contents İçerik dosyası üretimini denetle\n" +" -c=? Belirtilen yapılandırma dosyası kullan\n" +" -o=? Yapılandırma seçeneği ayarla" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "mmap eşlenemiyor" +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Hiçbir seçim eşleşmedi" -#: apt-pkg/contrib/mmap.cc:290 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "%lu baytlık mmap yapılamaz" - -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Dosya kesilemedi" +msgid "Some files are missing in the package file group `%s'" +msgstr "'%s' paket dosyası grubunda bazı dosyalar eksik" -#: apt-pkg/contrib/mmap.cc:341 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "" -"Dinamik MMap yerine sığamadı. Lütfen APT::Cache-Start boyutunu artırın. " -"Kullanımdaki değer: %lu (ayrıntılı bilgi için man 5 apt.conf komutunu " -"kullanın)" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Veritabanı bozuk, dosya adı %s.old olarak değiştirildi" -#: apt-pkg/contrib/mmap.cc:446 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "%lu baytlık sınıra ulaşıldığı için MMap boyutu artırılamadı." +msgid "DB is old, attempting to upgrade %s" +msgstr "Veritabanı eski, %s yükseltilmeye çalışılıyor" -#: apt-pkg/contrib/mmap.cc:449 +#: ftparchive/cachedb.cc:94 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" -"Otomatik büyüme kullanıcı tarafından kapatıldığı için MMap boyutu " -"artırılamadı." +"Veritabanı biçimi geçersiz. Eğer apt'ın eski bir sürümünden yükseltme " +"yaptıysanız, lütfen veritabanını silin ve yeniden oluşturun." -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Hata!" +msgid "Unable to open DB file %s: %s" +msgstr "Veritabanı dosyası %s açılamadı: %s" -#: apt-pkg/contrib/progress.cc:150 -#, c-format -msgid "%c%s... Done" -msgstr "%c%s... Bitti" +#: ftparchive/cachedb.cc:332 +msgid "Failed to read .dsc" +msgstr ".dsc dosyası okunamadı" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "..." +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Arşivin denetim kaydı yok" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "İmleç alınamıyor" + +#: ftparchive/writer.cc:91 #, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... %u%%" +msgid "W: Unable to read directory %s\n" +msgstr "U: %s dizini okunamıyor\n" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/writer.cc:96 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%li gün %li saat %li dk. %li sn." +msgid "W: Unable to stat %s\n" +msgstr "U: %s durum bilgisi alınamıyor\n" + +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "H: " + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "U: " -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" -msgstr "%li saat %li dk. %li sn." +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "H: Hatalar şu dosya için geçerli: " -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%limin %lis" -msgstr "%li dk. %li sn." +msgid "Failed to resolve %s" +msgstr "%s çözümlenemedi" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 -#, c-format -msgid "%lis" -msgstr "%li sn." +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Ağaçta gezinme başarısız" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:219 #, c-format -msgid "Selection %s not found" -msgstr "%s seçimi bulunamadı" +msgid "Failed to open %s" +msgstr "%s açılamadı" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:278 #, 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 " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:286 #, 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 "Failed to readlink %s" +msgstr "%s readlink çağrısı başarısız oldu" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:290 #, 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 "Failed to unlink %s" +msgstr "%s bağı koparılamadı" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:298 #, c-format -msgid "Installing %s" -msgstr "%s kuruluyor" +msgid "*** Failed to link %s to %s" +msgstr "*** %s, %s konumuna bağlanamadı" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:308 #, c-format -msgid "Configuring %s" -msgstr "%s yapılandırılıyor" +msgid " DeLink limit of %sB hit.\n" +msgstr " %sB'lik bağ koparma (DeLink) sınırına ulaşıldı.\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 -#, c-format -msgid "Removing %s" -msgstr "%s kaldırılıyor" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Arşivde paket alanı yok" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Completely removing %s" -msgstr "%s tamamen kaldırılıyor" +msgid " %s has no override entry\n" +msgstr " %s için geçersiz kılma girdisi yok\n" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Noting disappearance of %s" -msgstr "%s paketinin kaybolduğu not ediliyor" +msgid " %s maintainer is %s not %s\n" +msgstr " %s geliştiricisi %s, %s değil\n" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:706 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Kurulum sonrası tetikleyicisi %s çalıştırılıyor" +msgid " %s has no source override entry\n" +msgstr " '%s' paketinin yerine geçecek bir kaynak paket yok\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:710 #, c-format -msgid "Directory '%s' missing" -msgstr "'%s' dizini bulunamadı" +msgid " %s has no binary override entry either\n" +msgstr " '%s' paketinin yerine geçecek bir ikili paket de yok\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, c-format -msgid "Could not open file '%s'" -msgstr "'%s' dosyası açılamadı" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Bellek ayırma yapılamadı" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing %s" -msgstr "%s hazırlanıyor" +msgid "Unable to open %s" +msgstr "%s açılamıyor" -#: apt-pkg/deb/dpkgpm.cc:993 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 #, c-format -msgid "Unpacking %s" -msgstr "%s paketi açılıyor" +msgid "Malformed override %s line %llu (%s)" +msgstr "Hatalı geçersiz kılma %s satır %llu (%s)" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing to configure %s" -msgstr "%s paketini yapılandırmaya hazırlanılıyor" +msgid "Failed to read the override file %s" +msgstr "Geçersiz kılma dosyası %s okunamadı" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/override.cc:166 #, c-format -msgid "Installed %s" -msgstr "%s kuruldu" +msgid "Malformed override %s line %llu #1" +msgstr "Hatalı geçersiz kılma %s satır %llu #1" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:178 #, c-format -msgid "Preparing for removal of %s" -msgstr "%s paketinin kaldırılmasına hazırlanılıyor" +msgid "Malformed override %s line %llu #2" +msgstr "Hatalı geçersiz kılma %s satır %llu #2" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:191 #, c-format -msgid "Removed %s" -msgstr "%s kaldırıldı" +msgid "Malformed override %s line %llu #3" +msgstr "Hatalı geçersiz kılma %s satır %llu #3" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Preparing to completely remove %s" -msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor" +msgid "Unknown compression algorithm '%s'" +msgstr "Bilinmeyen sıkıştırma algoritması '%s'" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:103 #, c-format -msgid "Completely removed %s" -msgstr "%s tamamen kaldırıldı" +msgid "Compressed output %s needs a compression set" +msgstr "Sıkıştırılmış %s çıktısı bir sıkıştırma kümesine ihtiyaç duymaktadır" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, c-format -msgid "Can not write log (%s)" -msgstr "Günlük dosyasına yazılamıyor (%s)" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "DOSYA* oluşturulamadı" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "/dev/pts bağlı mı?" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "fork yapılamadı" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "stdout bir uçbirim mi?" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Çocuğu sıkıştır" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "İşlem yarıda kesildi" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "İç hata, %s oluşturulamadı" -#: apt-pkg/deb/dpkgpm.cc:1687 -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ı" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "Altsürece/dosyaya GÇ işlemi başarısız oldu" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "bağımlılık sorunları - yapılandırılmamış durumda bırakılıyor" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "MD5 hesaplanırken okunamadı" -#: apt-pkg/deb/dpkgpm.cc:1694 -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." +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "%s bağı koparılırken sorun çıktı" -#: apt-pkg/deb/dpkgpm.cc:1700 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates a disk full " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı" +"Kullanım: apt-internal-solver\n" +"\n" +"apt-internal-solver mevcut dâhilî çözücüyü (hata ayıklama\n" +"gibi sebeplerle) harici çözücü gibi kullanmaya yarayan bir\n" +"arayüzdür.\n" +"\n" +"Seçenekler:\n" +" -h Bu yardım metni.\n" +" -q Günlük tutmaya uygun çıktı - İlerleme göstergesi yok\n" +" -c=? Belirtilen yapılandırma dosyası kullan\n" +" -o=? Yapılandırma seçeneği ayarla, örneğin -o dir::cache=/tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1707 -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ı" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Bilinmeyen paket kaydı!" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Hata iletisi yerel bir sistem hatasına işaret ettiği için apport raporu " -"yazılamadı" +"Kullanım: apt-sortpkgs [seçenekler] dosya1 [dosya2 ...]\n" +"\n" +"apt-sortpkgs, paket dosyalarını sıralayan basit bir araçtır.\n" +"-s seçeneği ne tür bir dosya olduğunu göstermekte kullanılır.\n" +"\n" +"Seçenekler:\n" +" -h Bu yardım metni\n" +" -s Kaynak dosyası sıralamayı kullan\n" +" -c=? Belirtilen yapılandırma dosyasını oku\n" +" -o=? Herhangi bir yapılandırma seçeneği ayarla, örneğin -o dir::cache=/" +"tmp\n" -#: apt-pkg/deb/dpkgpm.cc:1742 -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 "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 4f7b34a37..b63e6d039 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2012-09-25 20:19+0300\n" "Last-Translator: A. Bondarenko \n" "Language-Team: Українська \n" @@ -165,7 +165,7 @@ msgid " Version table:" msgstr " Таблиця версій:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -363,7 +363,7 @@ msgstr "" "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні " "тексти" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Неможливо знайти пакунок з вихідними текстами для %s" @@ -388,81 +388,81 @@ msgstr "" "bzr branch %s\n" "щоб отримати найновіші (потенційно не випущені) оновлення до пакунку.\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаємо вже завантажений файл '%s'\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не вдалося визначити кількість вільного місця в %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостатньо місця в %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Завантаження вихідних текстів %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Деякі архіви не вдалося завантажити." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Завантаження завершено в режимі \"тільки завантаження\"" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускається розпакування вихідних текстів, тому що вже розпаковано в %s\n" -#: cmdline/apt-get.cc:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда розпакування '%s' завершилася невдало.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда побудови '%s' закінчилася невдало.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Породжений процес завершився невдало" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для перевірки залежностей для побудови необхідно вказати як мінімум один " "пакунок" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -471,17 +471,17 @@ msgstr "" "Відсутня інформація про архітектуру для %s. Дивись apt.conf(5) APT::" "Архітектури для налащтування" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Неможливо одержати інформацію про залежності для побудови %s" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "%s не має залежностей для побудови.\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -490,7 +490,7 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо %s не є дозволеним на " "'%s' пакунках" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -498,14 +498,14 @@ msgid "" msgstr "" "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не вдалося задовольнити залежність типу %s для %s: Встановлений пакунок %s " "новіше, аніж треба" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -514,7 +514,7 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо версія пакунку-" "кандидата %s не задовольняє умови по версіям" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -523,30 +523,30 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо немає пакунку-" "кандидата %s потрібної версії" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Залежності для побудови %s не можуть бути задоволені." -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Обробка залежностей для побудови закінчилася невдало" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Журнал змін для %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Підтримувані модулі:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -694,7 +694,7 @@ msgstr "%s вже був незафіксований.\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Очікував на %s, але його там не було" @@ -809,17 +809,17 @@ msgstr "" msgid "Disk not found." msgstr "Диск не знайдено." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Файл не знайдено" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 #, fuzzy msgid "Failed to stat" msgstr "Не вдалося одержати атрибути (stat)" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Не вдалося встановити час модифікації" @@ -873,7 +873,7 @@ msgstr "Команда '%s' у скрипті логіна не вдалася, msgid "TYPE failed, server said: %s" msgstr "TYPE невдало, сервер мовив: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Час з'єднання вичерпався" @@ -895,7 +895,7 @@ msgstr "Відповідь переповнила буфер." msgid "Protocol corruption" msgstr "Спотворений протокол" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -956,7 +956,7 @@ msgstr "Час з'єднання з сокетом даних вичерпавс msgid "Unable to accept connection" msgstr "Неможливо прийняти з'єднання" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Проблема хешування файла" @@ -965,7 +965,7 @@ msgstr "Проблема хешування файла" msgid "Unable to fetch file, server said '%s'" msgstr "Неможливо завантажити файл, сервер мовив: '%s'" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Час з'єднання з сокетом (socket) з даними вичерпався" @@ -1015,7 +1015,7 @@ msgstr "Неможливо під'єднатися до %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "З'єднання з %s" @@ -1156,42 +1156,18 @@ msgstr "З'єднання не вдалося" msgid "Internal error" msgstr "Внутрішня помилка" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "В кеші " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Отр:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Ігн " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Пом " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Отримано %sB за %sB (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Йде робота]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Зміна носія: вставте диск з міткою\n" -" '%s'\n" -"у пристрій '%s' і натисніть Enter\n" +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:93 msgid "Correcting dependencies..." @@ -1222,175 +1198,361 @@ msgstr "" msgid "Unmet dependencies. Try using -f." msgstr "Незадоволені залежності. Спробуйте використати -f." -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!" - -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Автентифікаційне попередження не прийнято до уваги.\n" - -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Деякі пакунки неможливо автентифікувати" - -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Встановити ці пакунки без перевірки?" - -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Виявлено проблеми, а опція -y була використана без --force-yes" +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Встановлено]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 -#, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Не вдалося завантажити %s %s\n" +#: apt-private/private-output.cc:268 +#, fuzzy +msgid "[installed,local]" +msgstr " [Встановлено]" -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" msgstr "" -"Внутрішня помилка, InstallPackages була викликана з непрацездатними " -"пакунками!" - -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "Необхідно видалити пакунки, але видалення заборонене." - -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Внутрішня помилка, Ordering не завершилася" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" -msgstr "Дивно... Розбіжність розмірів, напишіть на apt@packages.debian.org" +#: apt-private/private-output.cc:272 +#, fuzzy +msgid "[installed,automatic]" +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 -#: apt-private/private-install.cc:155 -#, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "Необхідно завантажити %sB/%sB архівів.\n" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +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 -#: apt-private/private-install.cc:160 +#: apt-private/private-output.cc:277 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "Необхідно завантажити %sB архівів.\n" +msgid "[upgradable from: %s]" +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 -#: apt-private/private-install.cc:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" msgstr "" -"Після цієї операції об'єм зайнятого дискового простору зросте на %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 -#: apt-private/private-install.cc:172 +#: apt-private/private-output.cc:455 #, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "" -"Після цієї операції об'єм зайнятого дискового простору зменшиться на %sB.\n" +msgid "but %s is installed" +msgstr "але %s вже встановлений" -#: apt-private/private-install.cc:200 +#: apt-private/private-output.cc:457 #, c-format -msgid "You don't have enough free space in %s." -msgstr "Недостатньо вільного місця в %s." +msgid "but %s is to be installed" +msgstr "але %s буде встановлений" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "" -"Вказано виконання тільки тривіальних операцій, але це не тривіальна операція." +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "але він не може бути встановлений" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Так, робити, як я скажу!" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "але це віртуальний пакунок" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Те, що ви хочете зробити, може мати небажані наслідки.\n" -"Щоб продовжити, введіть фразу: '%s'\n" -" ?] " +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "але він не встановлений" -#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Перервано." +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "але він не буде встановлений" -#: apt-private/private-install.cc:243 -msgid "Do you want to continue?" -msgstr "Бажаєте продовжити?" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " чи" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Деякі файли не вдалося завантажити" +#: apt-private/private-output.cc:488 apt-private/private-output.cc:500 +msgid "The following packages have unmet dependencies:" +msgstr "Пакунки, що мають незадоволені залежності:" -#: apt-private/private-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Неможливо завантажити деякі архіви, імовірно треба виконати apt-get update " -"або спробувати повторити запуск з ключем --fix-missing?" +#: apt-private/private-output.cc:523 +msgid "The following NEW packages will be installed:" +msgstr "НОВІ пакунки, які будуть встановлені:" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing і зміна носія в даний момент не підтримується" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "Пакунки, які будуть ВИДАЛЕНІ:" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Неможливо виправити втрачені пакунки." +#: apt-private/private-output.cc:571 +msgid "The following packages have been kept back:" +msgstr "Пакунки, які залишені в незмінному стані:" -#: apt-private/private-install.cc:330 -msgid "Aborting install." -msgstr "Переривається встановлення." +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "Пакунки, які будуть ОНОВЛЕНІ:" -#: apt-private/private-install.cc:366 -msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"Вказаний пакунок зник з вашої системи, так як\n" -"усі файли були перезаписані іншими пакунками:" -msgstr[1] "" -"Вказані пакунки зникли з вашої системи, так як\n" -"усі файли були перезаписані іншими пакунками:" -msgstr[2] "" -"Вказані пакунки зникли з вашої системи, так як\n" -"усі файли були перезаписані іншими пакунками:" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" +msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:" -#: apt-private/private-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Увага: це зроблено автоматично і умисно dpkg'ем." +#: apt-private/private-output.cc:633 +msgid "The following held packages will be changed:" +msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:" -#: apt-private/private-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "Нам не дозволено видаляти, неможливо запустити AutoRemover" +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (внаслідок %s) " -#: apt-private/private-install.cc:499 +#: apt-private/private-output.cc:696 msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" msgstr "" -"Хм, виглядає так, що AutoRemover помилково знищив щось потрібне.\n" -"Будь-ласка відправте багрепорт щодо apt." - +"УВАГА: Наступні важливі пакунки будуть вилучені.\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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "" +"Внутрішня помилка, InstallPackages була викликана з непрацездатними " +"пакунками!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "Необхідно видалити пакунки, але видалення заборонене." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Внутрішня помилка, Ordering не завершилася" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "Дивно... Розбіжність розмірів, напишіть на 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of 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 +#: apt-private/private-install.cc:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Необхідно завантажити %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 +#: apt-private/private-install.cc:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "" +"Після цієї операції об'єм зайнятого дискового простору зросте на %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 +#: apt-private/private-install.cc:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "" +"Після цієї операції об'єм зайнятого дискового простору зменшиться на %sB.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Недостатньо вільного місця в %s." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Виявлено проблеми, а опція -y була використана без --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "" +"Вказано виконання тільки тривіальних операцій, але це не тривіальна операція." + +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Так, робити, як я скажу!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Те, що ви хочете зробити, може мати небажані наслідки.\n" +"Щоб продовжити, введіть фразу: '%s'\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Перервано." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Бажаєте продовжити?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Деякі файли не вдалося завантажити" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Неможливо завантажити деякі архіви, імовірно треба виконати apt-get update " +"або спробувати повторити запуск з ключем --fix-missing?" + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing і зміна носія в даний момент не підтримується" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Неможливо виправити втрачені пакунки." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Переривається встановлення." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"Вказаний пакунок зник з вашої системи, так як\n" +"усі файли були перезаписані іншими пакунками:" +msgstr[1] "" +"Вказані пакунки зникли з вашої системи, так як\n" +"усі файли були перезаписані іншими пакунками:" +msgstr[2] "" +"Вказані пакунки зникли з вашої системи, так як\n" +"усі файли були перезаписані іншими пакунками:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Увага: це зроблено автоматично і умисно dpkg'ем." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Нам не дозволено видаляти, неможливо запустити AutoRemover" + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"Хм, виглядає так, що AutoRemover помилково знищив щось потрібне.\n" +"Будь-ласка відправте багрепорт щодо apt." + #. #. if (Packages == 1) #. { @@ -1524,951 +1686,693 @@ msgstr "" msgid "Package '%s' is not installed, so not removed\n" msgstr "Пакунок '%s' не встановлений, тому не видалений\n" -#: apt-private/private-list.cc:129 -msgid "Listing" -msgstr "" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!" -#: apt-private/private-list.cc:159 -#, 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-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-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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Автентифікаційне попередження не прийнято до уваги.\n" -#: apt-private/private-output.cc:268 -#, fuzzy -msgid "[installed,local]" -msgstr " [Встановлено]" +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Деякі пакунки неможливо автентифікувати" -#: apt-private/private-output.cc:270 -msgid "[installed,auto-removable]" -msgstr "" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Встановити ці пакунки без перевірки?" -#: apt-private/private-output.cc:272 -#, fuzzy -msgid "[installed,automatic]" -msgstr " [Встановлено]" +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "Не вдалося завантажити %s %s\n" -#: apt-private/private-output.cc:274 -#, fuzzy -msgid "[installed]" -msgstr " [Встановлено]" +#: apt-private/private-sources.cc:58 +#, fuzzy, c-format +msgid "Failed to parse %s. Edit again? " +msgstr "Не вдалося перейменувати %s на %s" -#: apt-private/private-output.cc:277 +#: apt-private/private-sources.cc:70 #, c-format -msgid "[upgradable from: %s]" +msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-output.cc:281 -msgid "[residual-config]" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" 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-upgrade.cc:25 +msgid "Calculating upgrade... " +msgstr "Обчислення оновлень... " -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "НОВІ пакунки, які будуть встановлені:" +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "Виконано" -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "Пакунки, які будуть ВИДАЛЕНІ:" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "В кеші " -#: apt-private/private-output.cc:571 -msgid "The following packages have been kept back:" -msgstr "Пакунки, які залишені в незмінному стані:" +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Отр:" -#: apt-private/private-output.cc:592 -msgid "The following packages will be upgraded:" -msgstr "Пакунки, які будуть ОНОВЛЕНІ:" +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Ігн " -#: apt-private/private-output.cc:613 -msgid "The following packages will be DOWNGRADED:" -msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:" +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Пом " -#: apt-private/private-output.cc:633 -msgid "The following held packages will be changed:" -msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:" +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Отримано %sB за %sB (%sB/s)\n" -#: apt-private/private-output.cc:688 +#: apt-private/acqprogress.cc:236 #, c-format -msgid "%s (due to %s) " -msgstr "%s (внаслідок %s) " +msgid " [Working]" +msgstr " [Йде робота]" -#: apt-private/private-output.cc:696 +#: apt-private/acqprogress.cc:297 +#, c-format msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" msgstr "" -"УВАГА: Наступні важливі пакунки будуть вилучені.\n" -"НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!" +"Зміна носія: вставте диск з міткою\n" +" '%s'\n" +"у пристрій '%s' і натисніть Enter\n" -#: apt-private/private-output.cc:727 +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "оновлено %lu, встановлено %lu нових, " +msgid "Unable to read %s" +msgstr "Неможливо прочитати %s" -#: apt-private/private-output.cc:731 +#: 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 #, c-format -msgid "%lu reinstalled, " -msgstr "%lu перевстановлено, " +msgid "Unable to change to %s" +msgstr "Неможливо змінити на %s" -#: apt-private/private-output.cc:733 +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 #, c-format -msgid "%lu downgraded, " -msgstr "%lu замінено на старіші версії, " +msgid "No mirror file '%s' found " +msgstr "Не знайдено файла дзеркала '%s' " -#: apt-private/private-output.cc:735 +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 #, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu відмічено для видалення і %lu не оновлено.\n" +msgid "Can not read mirror file '%s'" +msgstr "Неможливо прочитати файл дзеркала '%s'" -#: apt-private/private-output.cc:739 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Неможливо прочитати файл дзеркала '%s'" + +#: methods/mirror.cc:445 #, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "не встановлено(видалено) до кінця %lu пакунків.\n" +msgid "[Mirror: %s]" +msgstr "[Дзеркало: %s]" -#. 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 "" +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Не вдалося створити IPC канал для підпроцесу" -#. 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 "" +#: methods/rsh.cc:346 +msgid "Connection closed prematurely" +msgstr "З'єднання завершено передчасно" -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:778 -msgid "Y" -msgstr "" +#: dselect/install:33 +msgid "Bad default setting!" +msgstr "Неправильне значення за умовчанням!" -#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:784 -msgid "N" -msgstr "" +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 +msgid "Press enter to continue." +msgstr "Для продовження натисніть Enter." -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Помилка компіляції регулярного виразу - %s" +#: dselect/install:92 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Чи хочете ви видалити всі раніше завантажені .deb файли?" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" +#: dselect/install:102 +msgid "Some errors occurred while unpacking. Packages that were installed" 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] "" +#: dselect/install:103 +msgid "will be configured. This may result in duplicate errors" +msgstr "будуть налаштовані. Це може призвести до повторення помилок" -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" +#: dselect/install:104 +msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" +"або виникнення нових через незадоволені залежності. Це нормально,тільки " +"помилки" -#: apt-private/private-sources.cc:58 -#, fuzzy, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "Не вдалося перейменувати %s на %s" - -#: apt-private/private-sources.cc:70 -#, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." +#: dselect/install:105 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" +"зазначені вище цього повідомлення є важливими. Будь-ласка, виправте їх і " +"виконайте установку '[I]nstall' ще раз" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Команді update не потрібні аргументи" +#: dselect/update:30 +msgid "Merging available information" +msgstr "Об'єднання доступної інформації" -#: apt-private/private-update.cc:90 -#, 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-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "DropNode було викликано для вузла, що ще використовувався" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." -msgstr "" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Не вдалося знайти елемент хеша!" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "Обчислення оновлень... " +#: apt-inst/filelist.cc:459 +#, fuzzy +msgid "Failed to allocate diversion" +msgstr "Не вдалося створити diversion" -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "Виконано" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Внутрішня помилка в AddDiversion" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 -#, c-format -msgid "Unable to read %s" -msgstr "Неможливо прочитати %s" +#: apt-inst/filelist.cc:477 +#, fuzzy, c-format +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Спроба перезапису diversion, %s -> %s і %s/%s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/filelist.cc:506 +#, fuzzy, c-format +msgid "Double add of diversion %s -> %s" +msgstr "Подвійне додавання diversion %s -> %s" + +#: apt-inst/filelist.cc:549 #, c-format -msgid "Unable to change to %s" -msgstr "Неможливо змінити на %s" +msgid "Duplicate conf file %s/%s" +msgstr "Копія конфігураційного файлу %s/%s" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "No mirror file '%s' found " -msgstr "Не знайдено файла дзеркала '%s' " +msgid "The path %s is too long" +msgstr "Шлях %s занадто довгий" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:287 +#: apt-inst/extract.cc:132 #, c-format -msgid "Can not read mirror file '%s'" -msgstr "Неможливо прочитати файл дзеркала '%s'" +msgid "Unpacking %s more than once" +msgstr "Розпакування %s більш ніж один раз" -#: methods/mirror.cc:315 +#: apt-inst/extract.cc:142 #, fuzzy, c-format -msgid "No entry found in mirror file '%s'" -msgstr "Неможливо прочитати файл дзеркала '%s'" +msgid "The directory %s is diverted" +msgstr "Директорія %s є відхиленою (diverted)" -#: methods/mirror.cc:445 +#: apt-inst/extract.cc:152 #, c-format -msgid "[Mirror: %s]" -msgstr "[Дзеркало: %s]" - -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "Не вдалося створити IPC канал для підпроцесу" - -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" -msgstr "З'єднання завершено передчасно" - -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "Неправильне значення за умовчанням!" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Пакунок пробує записати у ціль з diversion %s/%s" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "Для продовження натисніть Enter." +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +#, fuzzy +msgid "The diversion path is too long" +msgstr "Шлях 'diversion' є занадто довгим" -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "Чи хочете ви видалити всі раніше завантажені .deb файли?" +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 +#, c-format +msgid "Failed to stat %s" +msgstr "Не вдалося одержати атрибути %s" -#: dselect/install:102 -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "" -"Під час розпакування виникли якісь помилки. Пакунки, які були встановлені" +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "Не вдалося перейменувати %s на %s" -#: dselect/install:103 -msgid "will be configured. This may result in duplicate errors" -msgstr "будуть налаштовані. Це може призвести до повторення помилок" +#: apt-inst/extract.cc:249 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "Директорія %s замінюється не директорією" -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "" -"або виникнення нових через незадоволені залежності. Це нормально,тільки " -"помилки" +#: apt-inst/extract.cc:289 +#, fuzzy +msgid "Failed to locate node in its hash bucket" +msgstr "Не вдалося знайти вузол у його наборі хешів" -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" -msgstr "" -"зазначені вище цього повідомлення є важливими. Будь-ласка, виправте їх і " -"виконайте установку '[I]nstall' ще раз" +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Шлях занадто довгий" -#: dselect/update:30 -msgid "Merging available information" -msgstr "Об'єднання доступної інформації" +#: apt-inst/extract.cc:421 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "Перезаписати відповідність пакунка без версії для %s" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Використання: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates витягує з пакунків Debian конфігураційні скрипти\n" -"і файли-шаблони\n" -"\n" -"Опції:\n" -" -h Цей текст\n" -" -t Встановити директорію для тимчасових файлів\n" -" -c=? Читати зазначений конфігураційний файл\n" -" -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n" +#: apt-inst/extract.cc:438 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Файл %s/%s перезаписує інший файл в пакунку %s" -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" +#: apt-inst/extract.cc:498 +#, c-format +msgid "Unable to stat %s" msgstr "Неможливо прочитати атрибути %s" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Unable to write to %s" -msgstr "Неможливо записати в %s" +msgid "Failed to write file %s" +msgstr "Не вдалося записати файл %s" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Неможливо визначити версію debconf. Він встановлений?" +#: apt-inst/dirstream.cc:105 +#, c-format +msgid "Failed to close file %s" +msgstr "Не вдалося закрити файл %s" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Список розширень, припустимих для пакунків, занадто довгий" +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Невірний DEB архів, відсутній член '%s'" -#: 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 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "Error processing directory %s" -msgstr "Помилка обробки директорії %s" +msgid "Internal error, could not locate member %s" +msgstr "Внутрішня помилка, не можу знайти складову частину %s" -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "" -"Список розширень, припустимих для пакунків з вихідними текстами, занадто " -"довгий" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Контрольний файл не можливо обробити" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Помилка запису заголовка в повний перелік вмісту пакунків (Contents)" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Невірний підпис архіву" -#: ftparchive/apt-ftparchive.cc:431 -#, c-format -msgid "Error processing contents %s" -msgstr "Помилка обробки повного переліку вмісту пакунків (Contents) %s" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Неможливо прочитати заголовок 'member' в архіві" -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Використання: apt-ftparchive [параметри] команда\n" -"Команди: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive генерує індексні файли архівів Debian. Він підтримує\n" -"безліч стилів генерації: від повністю автоматичного до функціональної " -"заміни\n" -"програм dpkg-scanpackages і dpkg-scansources\n" -"\n" -"apt-ftparchive генерує файли Package (переліки пакунків) для дерева\n" -"тек, що містять файли .deb. Файл Package містить у собі керуючі\n" -"поля кожного пакунка, а також хеш MD5 і розмір файлу. Значення керуючих\n" -"полів \"пріоритет\" (Priority) і \"секція\" (Section) можуть бути змінені з\n" -"допомогою файлу override.\n" -"\n" -"Крім того, apt-ftparchive може генерувати файли Sources з дерева\n" -"тек, що містять файли .dsc. Для вказівки файлу override у цьому \n" -"режимі можна використати параметр --source-override.\n" -"\n" -"Команди 'packages' і 'sources' треба виконувати, перебуваючи в кореневій " -"теці\n" -"дерева, що ви хочете обробити. BinaryPath повинен вказувати на місце,\n" -"з якого починається рекурсивний обхід, а файл перепризначень (override)\n" -"повинен містити запис про перепризначення керуючих полів. Якщо був " -"зазначений\n" -"Pathprefix, то його значення додається до керуючих полів, що містять\n" -"імена файлів. Приклад використання для архіву Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Параметри:\n" -" -h Цей текст\n" -" --md5 Керування генерацією MD5-хешів\n" -" -s=? Вказати файл перепризначень (override) для пакунків з вихідними " -"текстами\n" -" -q Не виводити повідомлення в процесі роботи\n" -" -d=? Вказати кешуючу базу даних (не обов'язково)\n" -" --no-delink Включити режим налагодження процесу видалення файлів\n" -" --contents Керування генерацією повного переліку вмісту пакунків\n" -" (файлу Contents)\n" -" -c=? Використати зазначений конфігураційний файл\n" -" -o=? Вказати довільний параметр конфігурації" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "Збігів не виявлено" - -#: ftparchive/apt-ftparchive.cc:907 -#, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "У групі пакунків '%s' відсутні деякі файли" - -#: ftparchive/cachedb.cc:65 -#, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "БД була пошкоджена, файл перейменований на %s.old" +#: apt-inst/contrib/arfile.cc:96 +#, fuzzy, c-format +msgid "Invalid archive member header %s" +msgstr "Невірний заголовок 'member' %s в архіві" -#: ftparchive/cachedb.cc:83 -#, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "БД застаріла, намагаюсь оновити %s" +#: apt-inst/contrib/arfile.cc:108 +#, fuzzy +msgid "Invalid archive member header" +msgstr "Невірний заголовок 'member' в архіві" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"Невірний формат БД. Якщо ви оновилися зі старої версії apt, будь-ласка " -"видаліть і наново створіть базу-даних." +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Архів занадто малий" -#: ftparchive/cachedb.cc:99 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Не вдалося відкрити файл БД %s: %s" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Не вдалося прочитати заголовки в архіві" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 -#, c-format -msgid "Failed to stat %s" -msgstr "Не вдалося одержати атрибути %s" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Не вдалося створити канали (pipes)" -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Не вдалося прочитати посилання (readlink) %s" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Не вдалося виконати gzip " -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "В архіві немає запису 'control'" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Пошкоджений архів" -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Неможливо одержати курсор" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Контрольна сума tar архіва невірна, архів пошкоджений" -#: ftparchive/writer.cc:91 +#: apt-inst/contrib/extracttar.cc:308 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "У: Не вдалося прочитати директорію %s\n" +msgid "Unknown TAR header type %u, member %s" +msgstr "Невідомий тип заголовку TAR - %u, член %s" -#: ftparchive/writer.cc:96 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "У: Неможливо прочитати атрибути %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "П: " - -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "У: " +msgid "Progress: [%3i%%]" +msgstr "" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "П: Помилки відносяться до файлу " +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "Виконується dpkg" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-pkg/init.cc:146 #, c-format -msgid "Failed to resolve %s" -msgstr "Не вдалося визначити %s" +msgid "Packaging system '%s' is not supported" +msgstr "Система пакування '%s' не підтримується" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Не вдалося зробити обхід дерева" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Неможливо визначити тип необхідної системи пакування" -#: ftparchive/writer.cc:219 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Failed to open %s" -msgstr "Не вдалося відкрити %s" +msgid "Wrote %i records.\n" +msgstr "Записано %i записів.\n" -#: ftparchive/writer.cc:278 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid " DeLink %s [%s]\n" -msgstr "DeLink %s [%s]\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Записано %i записів з %i відсутніми файлами.\n" -#: ftparchive/writer.cc:286 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "Failed to readlink %s" -msgstr "Не вдалося прочитати посилання (readlink) %s" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Записано %i записів з %i невідповідними файлам\n" -#: ftparchive/writer.cc:290 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "Failed to unlink %s" -msgstr "Не вдалося видалити посилання (unlink) %s" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n" -#: ftparchive/writer.cc:298 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Не вдалося створити посилання %s на %s" +msgid "Can't find authentication record for: %s" +msgstr "Неможливо знайти аутентифікаційний запис для: %s" -#: ftparchive/writer.cc:308 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Перевищено ліміт в %sB в DeLink.\n" +msgid "Hash mismatch for: %s" +msgstr "Невідповідність хешу для: %s" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Архів не мав поля 'package'" +#: apt-pkg/acquire-worker.cc:116 +#, c-format +msgid "The method driver %s could not be found." +msgstr "Драйвер для метода %s не знайдено." -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 +#: apt-pkg/acquire-worker.cc:118 #, fuzzy, c-format -msgid " %s has no override entry\n" -msgstr " Відсутній запис про перепризначення (override) для %s\n" +msgid "Is the package %s installed?" +msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " пакунок %s супроводжується %s, а не %s\n" +msgid "Method %s did not start correctly" +msgstr "Метод %s стартував некоректно" -#: ftparchive/writer.cc:706 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " Відсутній запис про перепризначення вихідних текстів для %s\n" +#: apt-pkg/acquire-worker.cc:455 +#, c-format +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "" +"Будь-ласка, вставте диск з поміткою: '%s' в привід '%s' і натисніть Enter." -#: ftparchive/writer.cc:710 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " Крім того, відсутній запис про бінарне перепризначення для %s\n" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "Не можу обробити чи відкрити перелік пакунків чи статусний файл." -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Не вдалося виділити пам'ять" - -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Не вдалося відкрити %s" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Для виправлення цих помилок Ви можете виконати apt-get update" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Неможливо прочитати перелік вихідних кодів." -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Не вдалося прочитати файл перепризначень (override) %s" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Кеш пакунків пустий" -#: ftparchive/override.cc:166 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Файл кешу пакунків пошкоджений" -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #2" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "Файл кешу пакунків має несумісну версію" -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #3" +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" +msgstr "Файл кешу пакунків пошкоджений, занадто малий" -#: ftparchive/multicompress.cc:73 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Невідомий алгоритм стиснення '%s'" +msgid "This APT does not support the versioning system '%s'" +msgstr "Цей APT не підтримує систему призначення версій '%s'" -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Для отримання стиснутого виводу %s необхідно ввімкнути стиснення" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Кеш пакунків був побудований для іншої архітектури" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Не вдалося створити FILE*" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Залежності (Depends)" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Не вдалося породити процес (fork)" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Пре-Залежності (PreDepends)" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Процес-нащадок, що виконує пакування" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Пропонує (Suggests)" -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "Внутрішня помилка, не вдалося створити %s" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Рекомендує (Recommends)" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Помилка уведення/виводу в підпроцес/файл" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Конфлікти (Conflicts)" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Помилка зчитування під час обчислення MD5" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Заміняє (Replaces)" -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "Не вдалося видалити %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Застарілі (Obsoletes)" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "Не вдалося перейменувати %s на %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Ламає (Breaks)" -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Використання: apt-internal-solver\n" -"\n" -"apt-internal-solver це інтерфейс для використання поточного\n" -"внутрішнього розв'язувача (як зовнішнього) для АРТ програм\n" -"для дебагу чи інших цілей\n" -"\n" -"Опції:\n" -" -h Цей текст допомоги.\n" -" -q Виводити повідомлення, придатні для запису у файл журналу.\n" -" Не виводити індикатор прогресу\n" -" -c=? Читати зазначений конфігураційний файл\n" -" -o=? Вказати умовну опцію, наприклад, -o dir::cache=/tmp\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Покращує (Enhances)" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Невідомий запис про пакунок!" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "важливі (important)" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Використання: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs - простий інструмент для сортування переліків пакунків. Опція -" -"s\n" -"використається, щоб вказати тип списку.\n" -"\n" -"Опції:\n" -" -h цей текст\n" -" -s сортувати список файлів з вихідними текстами\n" -" -c=? читати зазначений файл конфігурації\n" -" -o=? встановити довільну опцію, наприклад, -o dir::cache=/tmp\n" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "необхідні (required)" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" -msgstr "Не вдалося записати файл %s" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "стандартні (standard)" -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "Не вдалося закрити файл %s" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "необов'язкові (optional)" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "Шлях %s занадто довгий" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "додаткові (extra)" -#: apt-inst/extract.cc:132 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Unpacking %s more than once" -msgstr "Розпакування %s більш ніж один раз" +msgid "Index file type '%s' is not supported" +msgstr "Тип '%s' індексного файлу не підтримується" -#: apt-inst/extract.cc:142 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format -msgid "The directory %s is diverted" -msgstr "Директорія %s є відхиленою (diverted)" +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)" -#: apt-inst/extract.cc:152 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Пакунок пробує записати у ціль з diversion %s/%s" - -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -#, fuzzy -msgid "The diversion path is too long" -msgstr "Шлях 'diversion' є занадто довгим" +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "Спотворений рядок %lu у переліку джерел %s (нечитабельний [параметр])" -#: apt-inst/extract.cc:249 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Директорія %s замінюється не директорією" +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "" +"Спотворений рядок %lu у переліку джерел %s ([параметр] занадто короткий)" -#: apt-inst/extract.cc:289 -#, fuzzy -msgid "Failed to locate node in its hash bucket" -msgstr "Не вдалося знайти вузол у його наборі хешів" +#: 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-inst/extract.cc:293 -msgid "The path is too long" -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-inst/extract.cc:421 +#: apt-pkg/sourcelist.cc:193 #, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Перезаписати відповідність пакунка без версії для %s" +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgstr "" +"Спотворений рядок %lu у переліку джерел %s ([%s] ключ %s не має значення)" -#: apt-inst/extract.cc:438 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Файл %s/%s перезаписує інший файл в пакунку %s" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Спотворений рядок %lu у переліку джерел %s (проблема з URI)" -#: apt-inst/extract.cc:498 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Unable to stat %s" -msgstr "Неможливо прочитати атрибути %s" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Спотворений рядок %lu у переліку джерел %s (dist)" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "DropNode було викликано для вузла, що ще використовувався" - -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Не вдалося знайти елемент хеша!" +#: apt-pkg/sourcelist.cc:211 +#, c-format +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)" -#: apt-inst/filelist.cc:459 -#, fuzzy -msgid "Failed to allocate diversion" -msgstr "Не вдалося створити diversion" +#: apt-pkg/sourcelist.cc:217 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "Спотворений рядок %lu у переліку джерел %s (absolute dist)" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Внутрішня помилка в AddDiversion" +#: apt-pkg/sourcelist.cc:224 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "Спотворений рядок %lu у переліку джерел %s (dist parse)" -#: apt-inst/filelist.cc:477 -#, fuzzy, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Спроба перезапису diversion, %s -> %s і %s/%s" +#: apt-pkg/sourcelist.cc:335 +#, c-format +msgid "Opening %s" +msgstr "Відкриття %s" -#: apt-inst/filelist.cc:506 -#, fuzzy, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Подвійне додавання diversion %s -> %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-inst/filelist.cc:549 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Копія конфігураційного файлу %s/%s" +msgid "Malformed line %u in source list %s (type)" +msgstr "Спотворений рядок %u у переліку джерел %s (тип)" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Невірний підпис архіву" +#: 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-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Неможливо прочитати заголовок 'member' в архіві" +#: 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-inst/contrib/arfile.cc:96 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 #, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "Невірний заголовок 'member' %s в архіві" +msgid "Clean of %s is not supported" +msgstr "Тип '%s' індексного файлу не підтримується" -#: apt-inst/contrib/arfile.cc:108 -#, fuzzy -msgid "Invalid archive member header" -msgstr "Невірний заголовок 'member' в архіві" +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." +msgstr "Неможливо прочитати атрибути %s." -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Архів занадто малий" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "Кеш має несумісну систему призначення версій" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Виникла помилка під час обробки %s (%s%d)" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Не вдалося створити канали (pipes)" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "Ого! Ви перевищили кількість імен пакунків, які APT може обробити." -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Не вдалося виконати gzip " +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "Ого! Ви перевищили кількість версій, які APT може обробити." -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Пошкоджений архів" +#: apt-pkg/pkgcachegen.cc:263 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Ого! Ви перевищили кількість описів, які APT може обробити." -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Контрольна сума tar архіва невірна, архів пошкоджений" +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "Ого! Ви перевищили кількість залежностей, які APT може обробити." -#: apt-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Невідомий тип заголовку TAR - %u, член %s" +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Пакунок %s %s не був знайдений під час обробки залежностей" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Невірний DEB архів, відсутній член '%s'" +msgid "Couldn't stat source package list %s" +msgstr "Не вдалося прочитати атрибути переліку вихідних текстів %s" -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "Внутрішня помилка, не можу знайти складову частину %s" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Зчитування переліків пакунків" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Контрольний файл не можливо обробити" +#: apt-pkg/pkgcachegen.cc:1316 +#, fuzzy +msgid "Collecting File Provides" +msgstr "Збирання інформації про 'File Provides'" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "List directory %spartial is missing." -msgstr "Відсутня директорія зі списками: %spartial" +msgid "Unable to write to %s" +msgstr "Неможливо записати в %s" -#: apt-pkg/acquire.cc:91 -#, c-format -msgid "Archives directory %spartial is missing." -msgstr "Відсутня директорія для архівів: %spartial" +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "Помилка IO під час збереження кешу вихідних текстів" -#: apt-pkg/acquire.cc:99 -#, c-format -msgid "Unable to lock directory %s" -msgstr "Неможливо заблокувати директорію %s" +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +#, fuzzy +msgid "Send scenario to solver" +msgstr "Відправити сценарій розв'язувачу" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "Тип '%s' індексного файлу не підтримується" +#: apt-pkg/edsp.cc:241 +#, fuzzy +msgid "Send request to solver" +msgstr "Відправити запит розв'язувачу" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Завантажується файл %li з %li (залишилось %s)" +#: apt-pkg/edsp.cc:320 +#, fuzzy +msgid "Prepare for receiving solution" +msgstr "Пригодуватися до отримання розв'язку" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "Завантажується файл %li з %li" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" +"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про " +"помилку" + +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +#, fuzzy +msgid "Execute external solver" +msgstr "Виконати зовнішній розв'язувач" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2488,7 +2392,7 @@ msgstr "Невідповідність розміру" msgid "Invalid file format" msgstr "Невірна дія %s" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2497,16 +2401,16 @@ msgstr "" "Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у " "sources.list, або пошкоджений файл)" -#: apt-pkg/acquire-item.cc:1589 +#: apt-pkg/acquire-item.cc:1656 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі" -#: apt-pkg/acquire-item.cc:1631 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2515,12 +2419,12 @@ msgstr "" "Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього " "репозиторія не будуть застосовані." -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2530,12 +2434,12 @@ msgstr "" "попередні індексні файли будуть використані. Помилка GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "Помилка GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2544,132 +2448,110 @@ msgstr "" "Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно " "власноруч виправити цей пакунок. (через відсутність 'arch')" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "Драйвер для метода %s не знайдено." +msgid "Vendor block %s contains no fingerprint" +msgstr "Блок постачальника %s не містить відбитку (fingerprint)" -#: apt-pkg/acquire-worker.cc:118 -#, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n" +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#, c-format +msgid "List directory %spartial is missing." +msgstr "Відсутня директорія зі списками: %spartial" -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Method %s did not start correctly" -msgstr "Метод %s стартував некоректно" +msgid "Archives directory %spartial is missing." +msgstr "Відсутня директорія для архівів: %spartial" -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 #, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"Будь-ласка, вставте диск з поміткою: '%s' в привід '%s' і натисніть Enter." +msgid "Unable to lock directory %s" +msgstr "Неможливо заблокувати директорію %s" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"Пакунок %s повинен бути перевстановленим, але я не можу знайти його архів." +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Завантажується файл %li з %li (залишилось %s)" -#: apt-pkg/algorithms.cc:1086 +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Завантажується файл %li з %li" + +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "Додайте деякі посилання (URI) на вихідні тексти у ваш sources.list" + +#: apt-pkg/policy.cc:83 +#, c-format msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -"Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути " -"пов'язано з зафіксованими пакунками." +"Невірне значення '%s' для APT::Default-Release, так як такий випуск не є " +"доступним у вихідних кодах" -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки." - -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." -msgstr "Не можу обробити чи відкрити перелік пакунків чи статусний файл." - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Для виправлення цих помилок Ви можете виконати apt-get update" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Неможливо прочитати перелік вихідних кодів." - -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Випуск '%s' для '%s' не знайдено" - -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Версія '%s' для '%s' не знайдена" - -#: apt-pkg/cacheset.cc:603 +#: apt-pkg/policy.cc:422 #, c-format -msgid "Couldn't find task '%s'" -msgstr "Неможливо знайти завдання '%s'" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Невірний запис у файлі налаштувань %s, відсутній заголовок Package" -#: apt-pkg/cacheset.cc:609 +#: apt-pkg/policy.cc:444 #, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'" - -#: apt-pkg/cacheset.cc:615 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'" +msgid "Did not understand pin type %s" +msgstr "Не зрозумів тип %s для фіксатора пакунків (pin)" -#: apt-pkg/cacheset.cc:626 -#, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "Неможливо вибирати версії пакунку '%s', так як він є чисто віртуальним" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Не встановлено пріоритету (або стоїть 0) для фіксатора пакунків (pin)" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" -"Неможливо вибрати встановлений пакунок, або версію-кандидат пакунку '%s', " -"так як вони відсутні" - -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -"Неможливо вибрати найновішу версію пакунку '%s', так як він є чисто " -"віртуальним" +"Неможливо прямо налаштувати конфігурацію на '%s'. Будь-ласка, дивіться man 5 " +"apt.conf, нижче APT::Immediate-Configure для деталей. (%d)" -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "Неможливо вибрати версію пакунку %s, так як він не має кандидатів" +msgid "Could not configure '%s'. " +msgstr "Неможливо налаштувати '%s'." -#: apt-pkg/cacheset.cc:663 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select installed version from package %s as it is not installed" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -"Неможливо вибрати встановлену версію пакунку %s, так як такий пакунок не " -"встановлено" +"Для виконання даного встановлення потрібне тимчасове видалення важливого " +"пакунку %s через петлеві конфлікти/пре-залежності (Pre-Depends loop). Це " +"погано, але якщо Ви дійсно бажаєте зробити це, активуйте параметр 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" @@ -2748,10 +2630,24 @@ msgstr "Записується новий перелік вихідних тек msgid "Source list entries for this disc are:\n" msgstr "Перелік вихідних текстів для цього диска:\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Неможливо прочитати атрибути %s." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Пакунок %s повинен бути перевстановленим, але я не можу знайти його архів." + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути " +"пов'язано з зафіксованими пакунками." + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки." #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2779,61 +2675,73 @@ msgstr "Не вдалося відкрити StateFile %s" msgid "Failed to write temporary StateFile %s" msgstr "Не вдалося записати до тимчасового StateFile файла %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -#, fuzzy -msgid "Send scenario to solver" -msgstr "Відправити сценарій розв'язувачу" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Неможливо проаналізувати файл пакунку %s (1)" -#: apt-pkg/edsp.cc:241 -#, fuzzy -msgid "Send request to solver" -msgstr "Відправити запит розв'язувачу" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Неможливо проаналізувати файл пакунку %s (2)" -#: apt-pkg/edsp.cc:320 -#, fuzzy -msgid "Prepare for receiving solution" -msgstr "Пригодуватися до отримання розв'язку" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Випуск '%s' для '%s' не знайдено" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" -"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про " -"помилку" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Версія '%s' для '%s' не знайдена" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -#, fuzzy -msgid "Execute external solver" -msgstr "Виконати зовнішній розв'язувач" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Неможливо знайти завдання '%s'" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "Записано %i записів.\n" +msgid "Couldn't find any package by regex '%s'" +msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Записано %i записів з %i відсутніми файлами.\n" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "Неможливо вибирати версії пакунку '%s', так як він є чисто віртуальним" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Записано %i записів з %i невідповідними файлам\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" +"Неможливо вибрати встановлений пакунок, або версію-кандидат пакунку '%s', " +"так як вони відсутні" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "" +"Неможливо вибрати найновішу версію пакунку '%s', так як він є чисто " +"віртуальним" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "Неможливо знайти аутентифікаційний запис для: %s" +msgid "Can't select candidate version from package %s as it has no candidate" +msgstr "Неможливо вибрати версію пакунку %s, так як він не має кандидатів" -#: apt-pkg/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:663 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Невідповідність хешу для: %s" +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" +"Неможливо вибрати встановлену версію пакунку %s, так як такий пакунок не " +"встановлено" #: apt-pkg/indexrecords.cc:78 #, c-format @@ -2860,321 +2768,227 @@ msgstr "Невірний запис 'Valid-Until' у 'Release' файлі %s" msgid "Invalid 'Date' entry in Release file %s" msgstr "Невірний запис 'Date' у 'Release' файлі %s" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Система пакування '%s' не підтримується" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Неможливо визначити тип необхідної системи пакування" +msgid "%lid %lih %limin %lis" +msgstr "%liд %liг %liхв %liс" -#: apt-pkg/install-progress.cc:57 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Progress: [%3i%%]" -msgstr "" +msgid "%lih %limin %lis" +msgstr "%liг %liхв %liс" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "Виконується dpkg" +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 +#, c-format +msgid "%limin %lis" +msgstr "%liхв %liс" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" -"Неможливо прямо налаштувати конфігурацію на '%s'. Будь-ласка, дивіться man 5 " -"apt.conf, нижче APT::Immediate-Configure для деталей. (%d)" +msgid "%lis" +msgstr "%liс" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "Could not configure '%s'. " -msgstr "Неможливо налаштувати '%s'." +msgid "Selection %s not found" +msgstr "Вибір %s не знайдено" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:190 #, 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." +msgid "Not using locking for read only lock file %s" msgstr "" -"Для виконання даного встановлення потрібне тимчасове видалення важливого " -"пакунку %s через петлеві конфлікти/пре-залежності (Pre-Depends loop). Це " -"погано, але якщо Ви дійсно бажаєте зробити це, активуйте параметр APT::Force-" -"LoopBreak." +"Блокування не використовується, так як файл блокування %s доступний тільки " +"для зчитування" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Кеш пакунків пустий" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "Неможливо відкрити 'lock' файл %s" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Файл кешу пакунків пошкоджений" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "" +"Блокування не використовується, так як файл блокування %s знаходиться на " +"файловій системі nfs" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Файл кешу пакунків має несумісну версію" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Неможливо отримати замок %s" -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" -msgstr "Файл кешу пакунків пошкоджений, занадто малий" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "Неможливо створити перелік файлів, так як '%s' не є директорією" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:394 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Цей APT не підтримує систему призначення версій '%s'" +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "Ігнорується '%s' у директорії '%s', так як не є звичайним файлом" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "Кеш пакунків був побудований для іншої архітектури" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "Ігнорується файл '%s' у директорії '%s', так як він не має розширення" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Залежності (Depends)" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" +"Ігнорується файл '%s' у директорії '%s', так як він має невірне розширення" -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Пре-Залежності (PreDepends)" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Підпроцес %s отримав 'segmentation fault' (фатальна помилка)." -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Пропонує (Suggests)" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "Підпроцес %s отримав сигнал %u." -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Рекомендує (Recommends)" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Підпроцес %s повернув код помилки (%u)" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Конфлікти (Conflicts)" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Підпроцес %s раптово завершився" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Заміняє (Replaces)" +#: apt-pkg/contrib/fileutl.cc:913 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Проблема з закриттям gzip файла %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Застарілі (Obsoletes)" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Неможливо відкрити файл %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Ламає (Breaks)" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "Неможливо відкрити файловий дескриптор %d" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Покращує (Enhances)" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Не вдалося створити IPC з породженим процесом" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "важливі (important)" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Не вдалося виконати компресор " -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "необхідні (required)" +#: apt-pkg/contrib/fileutl.cc:1514 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "зчитування, повинен зчитати ще %llu байт, але нічого більше нема" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "стандартні (standard)" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "записування, повинен був записати ще %llu байт, але не вдалося" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "необов'язкові (optional)" +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" +msgstr "Проблема з закриттям файла %s" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "додаткові (extra)" +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Проблема з перейменуванням файла %s на %s" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Кеш має несумісну систему призначення версій" +#: apt-pkg/contrib/fileutl.cc:1938 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "Проблема з роз'єднанням файла %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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Проблема з синхронізацією файла" + +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Виникла помилка під час обробки %s (%s%d)" +msgid "%c%s... Error!" +msgstr "%c%s... Помилка!" -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "Ого! Ви перевищили кількість імен пакунків, які APT може обробити." +#: apt-pkg/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Виконано" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Ого! Ви перевищили кількість версій, які APT може обробити." +#: apt-pkg/contrib/progress.cc:181 +msgid "..." +msgstr "" -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "Ого! Ви перевищили кількість описів, які APT може обробити." +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Виконано" -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "Ого! Ви перевищили кількість залежностей, які APT може обробити." +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Неможливо відобразити в пам'яті (mmap) пустий файл" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/mmap.cc:111 #, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "Пакунок %s %s не був знайдений під час обробки залежностей" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Неможливо створити копію файлового дескриптора %i" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/mmap.cc:119 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "Не вдалося прочитати атрибути переліку вихідних текстів %s" - -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Зчитування переліків пакунків" +msgid "Couldn't make mmap of %llu bytes" +msgstr "Неможливо зробити mmap для %llu байт" -#: apt-pkg/pkgcachegen.cc:1316 -#, fuzzy -msgid "Collecting File Provides" -msgstr "Збирання інформації про 'File Provides'" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Не вдалося закрити mmap" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Помилка IO під час збереження кешу вихідних текстів" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Не вдалося синхронізувати mmap" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/mmap.cc:290 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Тип '%s' індексного файлу не підтримується" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Неможливо відобразити в пам'яті %lu байт" -#: apt-pkg/policy.cc:83 -#, c-format +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Не вдалося обрізати файл" + +#: apt-pkg/contrib/mmap.cc:341 +#, fuzzy, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"Невірне значення '%s' для APT::Default-Release, так як такий випуск не є " -"доступним у вихідних кодах" +"Динамічний MMap використав усе місце. Будь-ласка, збільшіть розмір APT::" +"Cache-Start. Поточне значення: %lu. (man 5 apt.conf)" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Невірний запис у файлі налаштувань %s, відсутній заголовок Package" - -#: apt-pkg/policy.cc:444 -#, c-format -msgid "Did not understand pin type %s" -msgstr "Не зрозумів тип %s для фіксатора пакунків (pin)" - -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Не встановлено пріоритету (або стоїть 0) для фіксатора пакунків (pin)" - -#: 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)" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." 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: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/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "Додайте деякі посилання (URI) на вихідні тексти у ваш sources.list" - -#: apt-pkg/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Неможливо проаналізувати файл пакунку %s (1)" - -#: apt-pkg/tagfile.cc:237 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Неможливо проаналізувати файл пакунку %s (2)" +"Неможливо збільшити розмір MMap, так як обмеження в %lu байт вже досягнуто." -#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 +#: apt-pkg/contrib/mmap.cc:449 msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." +"Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" -"Деякі індексні файли не вдалося завантажити. Вони були зігноровані, або " -"замість них були використані старіші версії." - -#: apt-pkg/vendorlist.cc:85 -#, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Блок постачальника %s не містить відбитку (fingerprint)" +"Неможливо збільшити розмір MMap, так як автоматичне збільшення вимкнено " +"користувачем." #: apt-pkg/contrib/cdromutl.cc:65 #, c-format @@ -3185,53 +2999,6 @@ msgstr "Неможливо прочитати атрибути точки мон msgid "Failed to stat the cdrom" msgstr "Не вдалося прочитати атрибути cdrom" -#: apt-pkg/contrib/cmndline.cc:121 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "Невідомий параметр командного рядка '%c' [з %s]." - -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "Незрозумілий параметр %s командного рядка" - -#: apt-pkg/contrib/cmndline.cc:168 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "Параметр %s командного рядка не є логічного типу 'boolean'" - -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "Параметр %s потребує аргумента." - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "" -"Опція %s: Специфікація вимагає, щоб рядки у конфігурації мали вираз =." - -#: apt-pkg/contrib/cmndline.cc:278 -#, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "Параметр %s потребує цілочислений аргумент, але не '%s'" - -#: apt-pkg/contrib/cmndline.cc:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "Параметр '%s' є занадто довгим" - -#: apt-pkg/contrib/cmndline.cc:341 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "Незрозумілий вираз %s, спробуйте true чи false." - -#: apt-pkg/contrib/cmndline.cc:391 -#, c-format -msgid "Invalid operation %s" -msgstr "Невірна дія %s" - #: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" @@ -3291,411 +3058,639 @@ msgstr "" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтаксична помилка %s:%u: Зайве сміття в кінці файла" -#: apt-pkg/contrib/fileutl.cc:190 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "" -"Блокування не використовується, так як файл блокування %s доступний тільки " -"для зчитування" +msgid "No keyring installed in %s." +msgstr "Не встановлено 'keyring' у %s." -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Could not open lock file %s" -msgstr "Неможливо відкрити 'lock' файл %s" +msgid "Command line option '%c' [from %s] is not known." +msgstr "Невідомий параметр командного рядка '%c' [з %s]." -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "" -"Блокування не використовується, так як файл блокування %s знаходиться на " -"файловій системі nfs" +msgid "Command line option %s is not understood" +msgstr "Незрозумілий параметр %s командного рядка" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Could not get lock %s" -msgstr "Неможливо отримати замок %s" +msgid "Command line option %s is not boolean" +msgstr "Параметр %s командного рядка не є логічного типу 'boolean'" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "Неможливо створити перелік файлів, так як '%s' не є директорією" +msgid "Option %s requires an argument." +msgstr "Параметр %s потребує аргумента." -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "Ігнорується '%s' у директорії '%s', так як не є звичайним файлом" +msgid "Option %s: Configuration item specification must have an =." +msgstr "" +"Опція %s: Специфікація вимагає, щоб рядки у конфігурації мали вираз =." -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "Ігнорується файл '%s' у директорії '%s', так як він не має розширення" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Параметр %s потребує цілочислений аргумент, але не '%s'" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" -"Ігнорується файл '%s' у директорії '%s', так як він має невірне розширення" +msgid "Option '%s' is too long" +msgstr "Параметр '%s' є занадто довгим" -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Підпроцес %s отримав 'segmentation fault' (фатальна помилка)." +msgid "Sense %s is not understood, try true or false." +msgstr "Незрозумілий вираз %s, спробуйте true чи false." -#: apt-pkg/contrib/fileutl.cc:826 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s received signal %u." -msgstr "Підпроцес %s отримав сигнал %u." +msgid "Invalid operation %s" +msgstr "Невірна дія %s" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Підпроцес %s повернув код помилки (%u)" +msgid "Installing %s" +msgstr "Встановлюється %s" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Підпроцес %s раптово завершився" +msgid "Configuring %s" +msgstr "Налаштовується %s" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Problem closing the gzip file %s" -msgstr "Проблема з закриттям gzip файла %s" +msgid "Removing %s" +msgstr "Видаляється %s" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Could not open file %s" -msgstr "Неможливо відкрити файл %s" +msgid "Completely removing %s" +msgstr "Повністю видаляється %s" -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Could not open file descriptor %d" -msgstr "Неможливо відкрити файловий дескриптор %d" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Не вдалося створити IPC з породженим процесом" - -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Не вдалося виконати компресор " +msgid "Noting disappearance of %s" +msgstr "Взято до відома зникнення %s" -#: apt-pkg/contrib/fileutl.cc:1514 +#: apt-pkg/deb/dpkgpm.cc:115 #, c-format -msgid "read, still have %llu to read but none left" -msgstr "зчитування, повинен зчитати ще %llu байт, але нічого більше нема" +msgid "Running post-installation trigger %s" +msgstr "Виконується післяустановочний ініціатор %s" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "записування, повинен був записати ще %llu байт, але не вдалося" +msgid "Directory '%s' missing" +msgstr "Директорія '%s' відсутня" -#: apt-pkg/contrib/fileutl.cc:1915 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, c-format -msgid "Problem closing the file %s" -msgstr "Проблема з закриттям файла %s" +msgid "Could not open file '%s'" +msgstr "Неможливо відкрити файл '%s'" -#: apt-pkg/contrib/fileutl.cc:1927 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Проблема з перейменуванням файла %s на %s" +msgid "Preparing %s" +msgstr "Підготовка %s" -#: apt-pkg/contrib/fileutl.cc:1938 +#: apt-pkg/deb/dpkgpm.cc:1008 #, c-format -msgid "Problem unlinking the file %s" -msgstr "Проблема з роз'єднанням файла %s" +msgid "Unpacking %s" +msgstr "Розпакування %s" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Проблема з синхронізацією файла" +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing to configure %s" +msgstr "Підготовка до конфігурації %s" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "No keyring installed in %s." -msgstr "Не встановлено 'keyring' у %s." +msgid "Installed %s" +msgstr "Встановлено %s" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Неможливо відобразити в пам'яті (mmap) пустий файл" +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "Підготовка до видалення %s" -#: apt-pkg/contrib/mmap.cc:111 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Неможливо створити копію файлового дескриптора %i" +msgid "Removed %s" +msgstr "Видалено %s" -#: apt-pkg/contrib/mmap.cc:119 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Неможливо зробити mmap для %llu байт" +msgid "Preparing to completely remove %s" +msgstr "Підготовка до повного видалення %s" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Не вдалося закрити mmap" +#: apt-pkg/deb/dpkgpm.cc:1028 +#, c-format +msgid "Completely removed %s" +msgstr "Повністю видалено %s" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Не вдалося синхронізувати mmap" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Неможливо записати в %s" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Неможливо відобразити в пам'яті %lu байт" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Не вдалося обрізати файл" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "Операцію було перервано до того, як вона мала завершитися" -#: apt-pkg/contrib/mmap.cc:341 -#, fuzzy, c-format +#: apt-pkg/deb/dpkgpm.cc:1719 +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:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "проблеми з залежностями - залишено неналаштованим" + +#: apt-pkg/deb/dpkgpm.cc:1726 msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -"Динамічний MMap використав усе місце. Будь-ласка, збільшіть розмір APT::" -"Cache-Start. Поточне значення: %lu. (man 5 apt.conf)" +"Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, " +"що ця помилка є наслідком попередньої невдачі." -#: apt-pkg/contrib/mmap.cc:446 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1732 msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +"No apport report written because the error message indicates a disk full " +"error" msgstr "" -"Неможливо збільшити розмір MMap, так як обмеження в %lu байт вже досягнуто." +"Звіт apport не був записаний, тому що повідомлення про помилку вказує на " +"відсутність вільного місця на диску" -#: apt-pkg/contrib/mmap.cc:449 +#: apt-pkg/deb/dpkgpm.cc:1739 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"No apport report written because the error message indicates a out of memory " +"error" msgstr "" -"Неможливо збільшити розмір MMap, так як автоматичне збільшення вимкнено " -"користувачем." +"Звіт apport не був записаний, тому що повідомлення про помилку вказує на " +"відсутність вільного місця у пам'яті" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +#, fuzzy +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" +"Звіт apport не був записаний, тому що повідомлення про помилку вказує на " +"відсутність вільного місця на диску" + +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "%c%s... Error!" -msgstr "%c%s... Помилка!" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" +"Неможливо заблокувати адміністративну директорію (%s), може її використовує " +"інший процес?" -#: apt-pkg/contrib/progress.cc:150 +#: apt-pkg/deb/debsystem.cc:94 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Виконано" +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Неможливо заблокувати адміністративну директорію (%s), ви root?" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +#. 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' аби виправити " +"проблему. " -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "Не заблоковано" + +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Використання: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates витягує з пакунків Debian конфігураційні скрипти\n" +"і файли-шаблони\n" +"\n" +"Опції:\n" +" -h Цей текст\n" +" -t Встановити директорію для тимчасових файлів\n" +" -c=? Читати зазначений конфігураційний файл\n" +" -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:254 #, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Виконано" +msgid "Unable to mkstemp %s" +msgstr "Неможливо прочитати атрибути %s" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "%liд %liг %liхв %liс" +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Неможливо визначити версію debconf. Він встановлений?" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +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 #, c-format -msgid "%lih %limin %lis" -msgstr "%liг %liхв %liс" +msgid "Error processing directory %s" +msgstr "Помилка обробки директорії %s" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "" +"Список розширень, припустимих для пакунків з вихідними текстами, занадто " +"довгий" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Помилка запису заголовка в повний перелік вмісту пакунків (Contents)" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "%limin %lis" -msgstr "%liхв %liс" +msgid "Error processing contents %s" +msgstr "Помилка обробки повного переліку вмісту пакунків (Contents) %s" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Використання: apt-ftparchive [параметри] команда\n" +"Команди: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive генерує індексні файли архівів Debian. Він підтримує\n" +"безліч стилів генерації: від повністю автоматичного до функціональної " +"заміни\n" +"програм dpkg-scanpackages і dpkg-scansources\n" +"\n" +"apt-ftparchive генерує файли Package (переліки пакунків) для дерева\n" +"тек, що містять файли .deb. Файл Package містить у собі керуючі\n" +"поля кожного пакунка, а також хеш MD5 і розмір файлу. Значення керуючих\n" +"полів \"пріоритет\" (Priority) і \"секція\" (Section) можуть бути змінені з\n" +"допомогою файлу override.\n" +"\n" +"Крім того, apt-ftparchive може генерувати файли Sources з дерева\n" +"тек, що містять файли .dsc. Для вказівки файлу override у цьому \n" +"режимі можна використати параметр --source-override.\n" +"\n" +"Команди 'packages' і 'sources' треба виконувати, перебуваючи в кореневій " +"теці\n" +"дерева, що ви хочете обробити. BinaryPath повинен вказувати на місце,\n" +"з якого починається рекурсивний обхід, а файл перепризначень (override)\n" +"повинен містити запис про перепризначення керуючих полів. Якщо був " +"зазначений\n" +"Pathprefix, то його значення додається до керуючих полів, що містять\n" +"імена файлів. Приклад використання для архіву Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Параметри:\n" +" -h Цей текст\n" +" --md5 Керування генерацією MD5-хешів\n" +" -s=? Вказати файл перепризначень (override) для пакунків з вихідними " +"текстами\n" +" -q Не виводити повідомлення в процесі роботи\n" +" -d=? Вказати кешуючу базу даних (не обов'язково)\n" +" --no-delink Включити режим налагодження процесу видалення файлів\n" +" --contents Керування генерацією повного переліку вмісту пакунків\n" +" (файлу Contents)\n" +" -c=? Використати зазначений конфігураційний файл\n" +" -o=? Вказати довільний параметр конфігурації" + +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Збігів не виявлено" + +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "%lis" -msgstr "%liс" +msgid "Some files are missing in the package file group `%s'" +msgstr "У групі пакунків '%s' відсутні деякі файли" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "Selection %s not found" -msgstr "Вибір %s не знайдено" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "БД була пошкоджена, файл перейменований на %s.old" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/cachedb.cc:83 #, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "БД застаріла, намагаюсь оновити %s" + +#: ftparchive/cachedb.cc:94 msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" -"Неможливо заблокувати адміністративну директорію (%s), може її використовує " -"інший процес?" +"Невірний формат БД. Якщо ви оновилися зі старої версії apt, будь-ласка " +"видаліть і наново створіть базу-даних." + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Не вдалося відкрити файл БД %s: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Не вдалося прочитати посилання (readlink) %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "В архіві немає запису 'control'" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Неможливо одержати курсор" + +#: ftparchive/writer.cc:91 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "У: Не вдалося прочитати директорію %s\n" + +#: ftparchive/writer.cc:96 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "У: Неможливо прочитати атрибути %s\n" + +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "П: " -#: apt-pkg/deb/debsystem.cc:94 -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Неможливо заблокувати адміністративну директорію (%s), ви root?" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "У: " -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "П: Помилки відносяться до файлу " + +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "" -"dpkg було перервано, ви повинні вручну запустити '%s' аби виправити " -"проблему. " +msgid "Failed to resolve %s" +msgstr "Не вдалося визначити %s" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "Не заблоковано" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Не вдалося зробити обхід дерева" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:219 #, c-format -msgid "Installing %s" -msgstr "Встановлюється %s" +msgid "Failed to open %s" +msgstr "Не вдалося відкрити %s" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:278 #, c-format -msgid "Configuring %s" -msgstr "Налаштовується %s" +msgid " DeLink %s [%s]\n" +msgstr "DeLink %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:286 #, c-format -msgid "Removing %s" -msgstr "Видаляється %s" +msgid "Failed to readlink %s" +msgstr "Не вдалося прочитати посилання (readlink) %s" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:290 #, c-format -msgid "Completely removing %s" -msgstr "Повністю видаляється %s" +msgid "Failed to unlink %s" +msgstr "Не вдалося видалити посилання (unlink) %s" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:298 #, c-format -msgid "Noting disappearance of %s" -msgstr "Взято до відома зникнення %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Не вдалося створити посилання %s на %s" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:308 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Виконується післяустановочний ініціатор %s" +msgid " DeLink limit of %sB hit.\n" +msgstr " Перевищено ліміт в %sB в DeLink.\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 -#, c-format -msgid "Directory '%s' missing" -msgstr "Директорія '%s' відсутня" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Архів не мав поля 'package'" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, c-format -msgid "Could not open file '%s'" -msgstr "Неможливо відкрити файл '%s'" +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 +#, fuzzy, c-format +msgid " %s has no override entry\n" +msgstr " Відсутній запис про перепризначення (override) для %s\n" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Preparing %s" -msgstr "Підготовка %s" +msgid " %s maintainer is %s not %s\n" +msgstr " пакунок %s супроводжується %s, а не %s\n" -#: apt-pkg/deb/dpkgpm.cc:993 -#, c-format -msgid "Unpacking %s" -msgstr "Розпакування %s" +#: ftparchive/writer.cc:706 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " Відсутній запис про перепризначення вихідних текстів для %s\n" -#: apt-pkg/deb/dpkgpm.cc:998 -#, c-format -msgid "Preparing to configure %s" -msgstr "Підготовка до конфігурації %s" +#: ftparchive/writer.cc:710 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " Крім того, відсутній запис про бінарне перепризначення для %s\n" -#: apt-pkg/deb/dpkgpm.cc:1000 -#, c-format -msgid "Installed %s" -msgstr "Встановлено %s" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Не вдалося виділити пам'ять" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing for removal of %s" -msgstr "Підготовка до видалення %s" +msgid "Unable to open %s" +msgstr "Не вдалося відкрити %s" -#: apt-pkg/deb/dpkgpm.cc:1007 -#, c-format -msgid "Removed %s" -msgstr "Видалено %s" +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Підготовка до повного видалення %s" +msgid "Failed to read the override file %s" +msgstr "Не вдалося прочитати файл перепризначень (override) %s" -#: apt-pkg/deb/dpkgpm.cc:1013 -#, c-format -msgid "Completely removed %s" -msgstr "Повністю видалено %s" +#: ftparchive/override.cc:166 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #1" +msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1" + +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #2" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/override.cc:191 #, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Неможливо записати в %s" +msgid "Malformed override %s line %llu #3" +msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #3" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/multicompress.cc:73 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Невідомий алгоритм стиснення '%s'" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Для отримання стиснутого виводу %s необхідно ввімкнути стиснення" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "Операцію було перервано до того, як вона мала завершитися" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Не вдалося створити FILE*" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" -"Звіт apport не був записаний, тому що параметр MaxReports вже досягнув " -"максимальної величини" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Не вдалося породити процес (fork)" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "проблеми з залежностями - залишено неналаштованим" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Процес-нащадок, що виконує пакування" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" -"Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, " -"що ця помилка є наслідком попередньої невдачі." +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Внутрішня помилка, не вдалося створити %s" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" -"Звіт apport не був записаний, тому що повідомлення про помилку вказує на " -"відсутність вільного місця на диску" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "Помилка уведення/виводу в підпроцес/файл" -#: apt-pkg/deb/dpkgpm.cc:1707 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" -"Звіт apport не був записаний, тому що повідомлення про помилку вказує на " -"відсутність вільного місця у пам'яті" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Помилка зчитування під час обчислення MD5" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 -#, fuzzy +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Не вдалося видалити %s" + +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Звіт apport не був записаний, тому що повідомлення про помилку вказує на " -"відсутність вільного місця на диску" +"Використання: apt-internal-solver\n" +"\n" +"apt-internal-solver це інтерфейс для використання поточного\n" +"внутрішнього розв'язувача (як зовнішнього) для АРТ програм\n" +"для дебагу чи інших цілей\n" +"\n" +"Опції:\n" +" -h Цей текст допомоги.\n" +" -q Виводити повідомлення, придатні для запису у файл журналу.\n" +" Не виводити індикатор прогресу\n" +" -c=? Читати зазначений конфігураційний файл\n" +" -o=? Вказати умовну опцію, наприклад, -o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Невідомий запис про пакунок!" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Звіт apport не був записаний, тому що повідомлення про помилку вказує на " -"помилку В/В (I/O) у dpkg" +"Використання: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs - простий інструмент для сортування переліків пакунків. Опція -" +"s\n" +"використається, щоб вказати тип списку.\n" +"\n" +"Опції:\n" +" -h цей текст\n" +" -s сортувати список файлів з вихідними текстами\n" +" -c=? читати зазначений файл конфігурації\n" +" -o=? встановити довільну опцію, наприклад, -o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/vi.po b/po/vi.po index 71dcfa553..416a9631d 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2014-09-12 13:48+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -162,7 +162,7 @@ msgid " Version table:" msgstr " Bảng phiên bản:" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -369,7 +369,7 @@ msgstr "Không thể khoá thư mục tải về" 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:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Không tìm thấy gói nguồn cho %s" @@ -395,79 +395,79 @@ 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:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Đang bỏ qua tập tin đã được tải về “%s”\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "Không thể tìm được chỗ trống trong %s" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "Không đủ chỗ trống trên %s" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, 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:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "Lấy mã nguồn %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Gặp lỗi khi lấy một số kho." -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 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:950 +#: cmdline/apt-get.cc:954 #, 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:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Lệnh giải nén “%s” bị lỗi.\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, 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:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Lệnh biên dịch “%s” bị lỗi.\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Tiến trình con bị lỗi" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 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:1055 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" @@ -476,17 +476,17 @@ 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:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, 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:1102 +#: cmdline/apt-get.cc:1106 #, 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:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -495,7 +495,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:1290 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -503,14 +503,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:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -519,7 +519,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:1358 +#: cmdline/apt-get.cc:1362 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -528,30 +528,30 @@ 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:1381 +#: cmdline/apt-get.cc:1385 #, 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:1396 +#: cmdline/apt-get.cc:1400 #, 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:1401 +#: cmdline/apt-get.cc:1405 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" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "Changelog cho %s (%s)" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "Hỗ trợ các mô-đun:" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -708,7 +708,7 @@ 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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Cần %s nhưng mà không thấy nó ở đây" @@ -847,16 +847,16 @@ msgstr "Không thể bỏ gắn đĩa CD-ROM trong %s. Có lẽ nó vẫn đang msgid "Disk not found." msgstr "Không tìm thấy đĩa." -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Không tìm thấy tập tin" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Gặp lỗi khi lấy thống kê" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Gặp lỗi khi đặt giờ sửa đổi" @@ -910,7 +910,7 @@ msgstr "Văn lệnh đăng nhập “%s” đã thất bại: máy chủ nói: % msgid "TYPE failed, server said: %s" msgstr "Lệnh TYPE (kiểu) đã thất bại: máy chủ nói: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Thời hạn kết nối" @@ -932,7 +932,7 @@ msgstr "Một trả lời đã tràn bộ đệm." msgid "Protocol corruption" msgstr "Giao thức bị hỏng" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -993,7 +993,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:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Gặp vấn đề băm tập tin" @@ -1002,7 +1002,7 @@ msgstr "Gặp vấn đề băm tập tin" msgid "Unable to fetch file, server said '%s'" msgstr "Không thể lấy tập tin: máy phục vụ nói “%s”" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Ổ cắm dữ liệu đã quá giờ" @@ -1052,7 +1052,7 @@ msgstr "Không thể kết nối đến %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Đang kết nối đến %s" @@ -1197,42 +1197,16 @@ msgstr "Kết nối bị lỗi" msgid "Internal error" msgstr "Gặp lỗi nội bộ" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Tìm thấy " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Lấy:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Bỏq " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Lỗi " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Đã lấy về %sB mất %s (%sB/g).\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [Đang hoạt động]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "Đang liệt kê" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Chuyển đổi thiết bị lưu trữ: vui lòng đưa đĩa có nhãn\n" -" “%s”\n" -"vào ổ “%s” rồi bấm nút Enter\n" +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:93 msgid "Correcting dependencies..." @@ -1262,175 +1236,355 @@ msgstr "Bạn có thể chạy lệnh “apt-get -f install” để sửa nhữ 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-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" -msgstr "Đang sắp xếp" - -#: apt-private/private-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "CẢNH BÁO: Không thể xác thực những gói sau đây!" - -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "Cảnh báo xác thực bị đè.\n" - -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "Một số gói không thể được xác thực" - -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "Cài đặt những gói này mà không cần thẩm tra?" - -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "Có lỗi và đã dùng tùy chọn “-y” mà không có “--force-yes”" +#: 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-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:265 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Gặp lỗi khi lấy về %s %s\n" - -#: apt-private/private-install.cc:82 -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!" +msgid "[installed,upgradable to: %s]" +msgstr "[đã cài, có thể nâng cấp thành: %s]" -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "" -"Cần phải gỡ bỏ một số gói, nhưng mà tính năng Gỡ bỏ (Remove) đã bị tắt." +#: apt-private/private-output.cc:268 +msgid "[installed,local]" +msgstr "[đã cài đặt,nội bộ]" -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "Gặp lỗi nội bộ: Tiến trình Sắp xếp chưa xong" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "[đã cài,có thể tự động gỡ bỏ]" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" -msgstr "" -"Lạ nhỉ... Kích cỡ không khớp nhau. Hãy gửi thư cho " +#: apt-private/private-output.cc:272 +msgid "[installed,automatic]" +msgstr "[đã cài đặt,tự động]" -#. 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 -#: apt-private/private-install.cc:155 -#, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "Cần phải lấy %sB/%sB từ kho chứa.\n" +#: apt-private/private-output.cc:274 +msgid "[installed]" +msgstr "[đã cài đặt]" -#. 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:160 +#: apt-private/private-output.cc:277 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "Cần phải lấy %sB từ kho chứa.\n" +msgid "[upgradable from: %s]" +msgstr "[có thể nâng cấp từ: %s]" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ bị chiếm dụng.\n" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" +msgstr "[residual-config]" -#. 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:172 +#: apt-private/private-output.cc:455 #, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ được giải phóng.\n" +msgid "but %s is installed" +msgstr "nhưng mà %s đã được cài đặt" -#: apt-private/private-install.cc:200 +#: apt-private/private-output.cc:457 #, c-format -msgid "You don't have enough free space in %s." -msgstr "Bạn không có đủ dung lượng đĩa còn trống trong %s." +msgid "but %s is to be installed" +msgstr "nhưng mà %s sẽ được cài đặt" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "" -"Đã đưa ra “Chỉ không đáng kể” (Trivial Only) nhưng mà thao tác này là đáng " -"kể." +#: 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" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "Có, làm đi!" +#: 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-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Bạn sắp làm việc mà nó có thể gây hư hại cho hệ thống.\n" -"Nếu vẫn muốn tiếp tục thì hãy gõ cụm từ “%s”\n" -"?] " +#: 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-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Hủy bỏ." +#: 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-install.cc:243 -msgid "Do you want to continue?" -msgstr "Bạn có muốn tiếp tục không?" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " hay" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Một số tập tin không tải về được" +#: 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-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Không thể lấy một số kho, có lẽ hãy chạy lệnh “apt-get update” (apt lấy cập " -"nhật)\n" -"hay dùng tùy chọn “--fix-missing” (sửa thiếu sót) không?" +#: 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-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "" -"Chưa hỗ trợ tùy chọn “--fix-missing” (sửa khi thiếu) và trao đổi phương tiện." +#: 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-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "Không thể sửa những gói còn thiếu." +#: 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-install.cc:330 -msgid "Aborting install." -msgstr "Đang hủy bỏ tiến trình cài đặt." +#: 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-install.cc:366 -msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -"Những gói theo đây không còn nằm trên hệ thống này vì mọi tập tin đều bị gói " -"khác ghi đè:" +#: 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-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "Ghi chú: Thay đổi này được tự động thực hiện bởi dpkg." +#: 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-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động" +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (bởi vì %s) " -#: apt-private/private-install.cc:499 +#: apt-private/private-output.cc:696 msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" msgstr "" -"Ừm, có vẻ là Bộ Gỡ bỏ Tự động đã hủy cái gì, một trường hợp thực sự không " -"nên xảy ra. Hãy thông báo lỗi về apt." +"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ì!" -#. -#. if (Packages == 1) -#. { -#. c1out << std::endl; -#. c1out << +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +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!" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "" +"Cần phải gỡ bỏ một số gói, nhưng mà tính năng Gỡ bỏ (Remove) đã bị tắt." + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "Gặp lỗi nội bộ: Tiến trình Sắp xếp chưa xong" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Lạ nhỉ... Kích cỡ không khớp nhau. Hãy gửi thư cho " + +#. 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Cần phải lấy %sB/%sB từ kho chứa.\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:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Cần phải lấy %sB từ kho chứa.\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:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ bị chiếm dụng.\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:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ được giải phóng.\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Bạn không có đủ dung lượng đĩa còn trống trong %s." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "Có lỗi và đã dùng tùy chọn “-y” mà không có “--force-yes”" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "" +"Đã đưa ra “Chỉ không đáng kể” (Trivial Only) nhưng mà thao tác này là đáng " +"kể." + +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "Có, làm đi!" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Bạn sắp làm việc mà nó có thể gây hư hại cho hệ thống.\n" +"Nếu vẫn muốn tiếp tục thì hãy gõ cụm từ “%s”\n" +"?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "Hủy bỏ." + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "Bạn có muốn tiếp tục không?" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "Một số tập tin không tải về được" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Không thể lấy một số kho, có lẽ hãy chạy lệnh “apt-get update” (apt lấy cập " +"nhật)\n" +"hay dùng tùy chọn “--fix-missing” (sửa thiếu sót) không?" + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "" +"Chưa hỗ trợ tùy chọn “--fix-missing” (sửa khi thiếu) và trao đổi phương tiện." + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "Không thể sửa những gói còn thiếu." + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "Đang hủy bỏ tiến trình cài đặt." + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +"Những gói theo đây không còn nằm trên hệ thống này vì mọi tập tin đều bị gói " +"khác ghi đè:" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "Ghi chú: Thay đổi này được tự động thực hiện bởi dpkg." + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động" + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"Ừm, có vẻ là Bộ Gỡ bỏ Tự động đã hủy cái gì, một trường hợp thực sự không " +"nên xảy ra. Hãy thông báo lỗi về apt." + +#. +#. if (Packages == 1) +#. { +#. c1out << std::endl; +#. c1out << #. _("Since you only requested a single operation it is extremely likely that\n" #. "the package is simply not installable and a bug report against\n" #. "that package should be filed.") << std::endl; @@ -1547,205 +1701,26 @@ 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:129 -msgid "Listing" -msgstr "Đang liệt kê" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "CẢNH BÁO: Không thể xác thực những gói sau đây!" -#: apt-private/private-list.cc:159 -#, 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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "Cảnh báo xác thực bị đè.\n" -#: 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-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:35 -#, 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-download.cc:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +msgstr "Một số gói không thể được xác thực" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "Tìm kiếm toàn văn" +#: apt-private/private-download.cc:50 +msgid "Install these packages without verification?" +msgstr "Cài đặt những gói này mà không cần thẩm tra?" -#: apt-private/private-show.cc:156 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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)" +msgid "Failed to fetch %s %s\n" +msgstr "Gặp lỗi khi lấy về %s %s\n" #: apt-private/private-sources.cc:58 #, c-format @@ -1757,21 +1732,9 @@ msgstr "Gặp lỗi khi phân tích %s. Sửa lại chứ? " msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "Tập tin “%s” của bạn đã thay đổi, hãy chạy lệnh “apt-get update”." -#: 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:90 -#, 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:94 -msgid "All packages are up to date." -msgstr "Mọi gói đã được cập nhật." +#: apt-private/private-search.cc:69 +msgid "Full Text Search" +msgstr "Tìm kiếm toàn văn" #: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " @@ -1781,20 +1744,57 @@ msgstr "Đang tính toán nâng cấp... " msgid "Done" msgstr "Xong" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Tìm thấy " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "Lấy:" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "Bỏq " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "Lỗi " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Đã lấy về %sB mất %s (%sB/g).\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [Đang hoạt động]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Chuyển đổi thiết bị lưu trữ: vui lòng đưa đĩa có nhãn\n" +" “%s”\n" +"vào ổ “%s” rồi bấm nút Enter\n" + #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, 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:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1828,7 +1828,7 @@ msgstr "[Bản sao: %s]" msgid "Failed to create IPC pipe to subprocess" msgstr "Gặp lỗi khi tạo ống IPC đến tiến trình con" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "Kết nối bị đóng bất ngờ" @@ -1868,624 +1868,522 @@ msgstr "" msgid "Merging available information" msgstr "Đang hòa trộn các thông tin sẵn có..." -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Cách dùng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n" -"\n" -"[extract: rút trích;\n" -"templates: mẫu]\n" -"\n" -"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n" -"\tvà biểu mẫu đều từ gói Debian\n" -"\n" -"Tùy chọn:\n" -" -h Trợ giúp này\n" -" -t Đặt thư mục tạm thời\n" -" [t: viết tắt cho từ “temporary”: tạm thời]\n" -" -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:254 -#, c-format -msgid "Unable to mkstemp %s" -msgstr "Không thể tạo tập tin tạm (hàm mkstemp) %s" +#: 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" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "Không thể ghi vào %s" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Gặp lỗi khi định vị phần tử băm!" -#: cmdline/apt-extracttemplates.cc:300 -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?" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Gặp lỗi khi định vị trệch đi" -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Danh sách mở rộng gói quá dài" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đ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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "Gặp lỗi khi xử lý thư mục %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Danh sách mở rộng nguồn quá dài" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "Gặp lỗi khi xử lý nội dung %s" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Cách dùng: apt-ftparchive [tùy_chọn...] lệnh\n" -"\n" -"[ftparchive: FTP archive: kho FTP]\n" -"\n" -"Lệnh: packages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n" -" sources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n" -" contents path\n" -" release path\n" -" generate config [các_nhóm]\n" -" clean config\n" -"\n" -"(packages: những gói;\n" -"binarypath: đường dẫn nhị phân;\n" -"sources: những nguồn;\n" -"srcpath: đường dẫn nguồn;\n" -"contents path: đường dẫn nội dung;\n" -"release path: đường dẫn bản đã phát hành;\n" -"generate config [groups]: tạo ra cấu hình [các nhóm];\n" -"clean config: cấu hình toàn mới)\n" -"\n" -"apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n" -"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động hoàn toàn\n" -"đến cách thay thế hàm cho dpkg-scanpackages (dpkg-quét_gói)\n" -"và dpkg-scansources (dpkg-quét_nguồn).\n" -"\n" -"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n" -"Tập tin gói chứa nội dung các trường điều khiển từ mỗi gói,\n" -"cùng với băm MD5 và kích cỡ tập tin.\n" -"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n" -"\n" -"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n" -"Có thể sử dụng tùy chọn “--source-override” (đè nguồn)\n" -"để ghi rõ tập tin đè nguồn\n" -"\n" -"Lệnh “packages” (gói) và “sources” (nguồn) nên chạy tại gốc cây.\n" -"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ " -"quy,\n" -"và tập tin đè nên chứa những cờ đè.\n" -"Pathprefix (tiền tố đường dẫn) được phụ thêm vào\n" -"những trường tên tập tin nếu có.\n" -"Cách sử dụng thí dụ từ kho Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Tùy chọn:\n" -" -h _Trợ giúp_ này\n" -" --md5 Điều khiển cách tạo ra MD5\n" -" -s=? Tập tin đè nguồn\n" -" -q _Im lặng_ (không xuất chi tiết)\n" -" -d=? Chọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n" -" --no-delink Mở chế độ gỡ lỗi _bỏ liên kết_\n" -" --contents Điều khiển cách tạo ra tập tin _nội dung_\n" -" -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 -msgid "No selections matched" -msgstr "Không có cái được chọn khớp được" +msgid "Double add of diversion %s -> %s" +msgstr "Sự trệch đi được thêm hai lần %s → %s" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, 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”." +msgid "Duplicate conf file %s/%s" +msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tập tin thành %s.old (old: cũ)." +msgid "The path %s is too long" +msgstr "Đường dẫn %s quá dài" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Cơ sở dữ liệu đã cũ, nên đang cố nâng cấp lên thành %s" +msgid "Unpacking %s more than once" +msgstr "Đang giải nén %s nhiều lần" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " -"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu." +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "Thư mục %s bị trệch hướng" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s." +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Đường dẫn trệch đi quá dài" + +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "Việc lấy thông tin thống kê cho %s bị lỗi" -#: ftparchive/cachedb.cc:332 -msgid "Failed to read .dsc" -msgstr "Gặp lỗi khi đọc .dsc" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "Kho không có mục ghi điều khiển" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "Không thể lấy con trỏ" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "CB: Không thể đọc thư mục %s\n" +msgid "Failed to rename %s to %s" +msgstr "Việc đổi tên %s thành %s bị lỗi" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "CB: Không thể lấy thông tin thống kê %s\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "L: " +msgid "The directory %s is being replaced by a non-directory" +msgstr "Thư mục %s đang được thay thế do một cái không phải là thư mục" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "CB: " +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Gặp lỗi định vị điểm nút trong hộp băm nó bị lỗi" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "LỖI: có lỗi áp dụng vào tập tin " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Đường dẫn quá dài" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "Gặp lỗi khi phân giải %s" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "Việc di chuyển qua cây bị lỗi" +msgid "Overwrite package match with no version for %s" +msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to open %s" -msgstr "Gặp lỗi khi mở %s" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s" -#: ftparchive/writer.cc:278 +#: apt-inst/extract.cc:498 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " Bỏ liên kết %s [%s]\n" +msgid "Unable to stat %s" +msgstr "Không thể lấy thông tin thống kê %s" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Failed to readlink %s" -msgstr "Gặp lỗi khi đọc liên kết %s" +msgid "Failed to write file %s" +msgstr "Việc ghi tập tin %s gặp lỗi" -#: ftparchive/writer.cc:290 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to unlink %s" -msgstr "Việc bỏ liên kết %s bị lỗi" +msgid "Failed to close file %s" +msgstr "Việc đóng tập tin %s gặp lỗi" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Gặp lỗi khi liên kết %s đến %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành viên “%s”" -#: ftparchive/writer.cc:308 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Hết hạn bỏ liên kết của %sB.\n" +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" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Kho không có trường gói" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "Tập tin điều khiển không có khả năng phân tách" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Chữ ký kho không hợp lệ" + +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Gặp lỗi khi đọc phần đầu thành viên kho" + +#: apt-inst/contrib/arfile.cc:96 #, c-format -msgid " %s has no override entry\n" -msgstr " %s không có mục ghi đè (override)\n" +msgid "Invalid archive member header %s" +msgstr "Phần đầu thành viên kho lưu không hợp lệ %s" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Phần đầu thành viên kho không hợp lê" + +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Kho quá ngắn" + +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Việc đọc phần đầu kho bị lỗi" + +#: apt-inst/contrib/extracttar.cc:124 +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:151 +msgid "Failed to exec gzip " +msgstr "Việc thực hiện gzip bị lỗi " + +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Kho bị hỏng." + +#: apt-inst/contrib/extracttar.cc:203 +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:308 #, 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" +msgid "Unknown TAR header type %u, member %s" +msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s" -#: ftparchive/writer.cc:706 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid " %s has no source override entry\n" -msgstr " %s không có mục ghi đè (override) nguồn\n" +msgid "Progress: [%3i%%]" +msgstr "Diễn biến: [%3i%%]" -#: ftparchive/writer.cc:710 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "Đang chạy dpkg" + +#: apt-pkg/init.cc:146 #, 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" +msgid "Packaging system '%s' is not supported" +msgstr "Không hỗ trợ hệ thống đóng gói “%s”" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Unable to open %s" -msgstr "Không thể mở %s" +msgid "Wrote %i records.\n" +msgstr "Đã ghi %i bản ghi.\n" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "Sai “override” %s dòng %llu (%s)" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Đã ghi %i bản ghi với %i tập tin còn thiếu.\n" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "Failed to read the override file %s" -msgstr "Việc đọc tập tin đè %s bị lỗi" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Đã ghi %i bản ghi với %i tập tin không khớp với nhau\n" -#: ftparchive/override.cc:166 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Sai override %s dòng %llu #1" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "" +"Đã ghi %i bản ghi với %i tập tin còn thiếu và %i tập tin không khớp với " +"nhau\n" -#: ftparchive/override.cc:178 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Sai override %s dòng %llu #2" +msgid "Can't find authentication record for: %s" +msgstr "Không tìm thấy bản ghi xác thực cho: %s" -#: ftparchive/override.cc:191 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Sai override %s dòng %llu #3" +msgid "Hash mismatch for: %s" +msgstr "Sai khớp chuỗi duy nhất cho: %s" -#: ftparchive/multicompress.cc:73 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Không biết thuật toán nén “%s”" +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." -#: ftparchive/multicompress.cc:103 +#: apt-pkg/acquire-worker.cc:118 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Dữ liệu xuất đã nén %s cần một bộ nén" +msgid "Is the package %s installed?" +msgstr "Gói “%s” đã được cài đặt chưa?" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Việc tạo TẬP_TIN* bị lỗi" +#: apt-pkg/acquire-worker.cc:169 +#, c-format +msgid "Method %s did not start correctly" +msgstr "Phương thức %s đã không khởi chạy đúng đắn." -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Gặp lỗi khi rẽ nhánh tiến trình" +#: apt-pkg/acquire-worker.cc:455 +#, 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." -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "Nén con" +#: 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." -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"Bạn nên lấy cơ sở dữ liệu mới bằng lệnh “apt-get update” để sửa các vấn đề " +"này" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Không thể đọc danh sách nguồn." -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Gặp lỗi khi đọc trong khi tính MD5" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "Bộ nhớ tạm gói trống" -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "Gặp lỗi khi bỏ liên kết %s" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "Tập tin nhớ tạm gói bị hỏng" + +#: apt-pkg/pkgcache.cc:166 +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:169 +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ỏ" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Việc đổi tên %s thành %s bị lỗi" +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”" -#: cmdline/apt-internal-solver.cc:49 -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Cách dùng: apt-internal-solver\n" -"\n" -"apt-internal-solver là một giao diện để dùng cho bộ phân giải nội bộ\n" -"hiện tại giống như bộ phân giải bên ngoài dành cho họ chương trình APT\n" -"để phục vụ cho việc gỡ lỗi hay tương tự thế\n" -"\n" -"Tùy chọn:\n" -" -h Trợ giúp này.\n" -" -q Làm việc ở chế độ im lặng - không hiển thị tiến triển công việc\n" -" -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" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "Bộ nhớ tạm gói được biên dịch cho một kiến trúc khác" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Không hiểu bản ghi gói!" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "Phụ thuộc" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Cách dùng: apt-sortpkgs [tùy_chọn...] tập_tin1 [tập_tin2 ...]\n" -"\n" -"[sortpkgs: sort packages: sắp xếp các gói]\n" -"\n" -"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n" -"Tùy chọn “-s” dùng để ngầm chỉ kiểu tập tin là gì.\n" -"\n" -"Tùy chọn:\n" -" -h Trợ giúp_ này\n" -" -s Sắp xếp những tập tin _nguồn_\n" -" -c=? Đọc tập tin cấu hình này\n" -" -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "Phụ thuộc sẵn" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" -msgstr "Việc ghi tập tin %s gặp lỗi" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "Đề nghị" -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "Việc đóng tập tin %s gặp lỗi" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "Khuyến khích" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "Đường dẫn %s quá dài" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "Xung đột" -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" -msgstr "Đang giải nén %s nhiều lần" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "Thay thế" -#: apt-inst/extract.cc:142 -#, c-format -msgid "The directory %s is diverted" -msgstr "Thư mục %s bị trệch hướng" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "Cũ" -#: apt-inst/extract.cc:152 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "Làm hỏng" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Đường dẫn trệch đi quá dài" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "Tăng cường" -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "Thư mục %s đang được thay thế do một cái không phải là thư mục" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "quan trọng" -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Gặp lỗi định vị điểm nút trong hộp băm nó bị lỗi" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "yêu cầu" -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Đường dẫn quá dài" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "chuẩn" -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "tùy chọn" -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "bổ sung" -#: apt-inst/extract.cc:498 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Unable to stat %s" -msgstr "Không thể lấy thông tin thống kê %s" - -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết" - -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Gặp lỗi khi định vị phần tử băm!" - -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Gặp lỗi khi định vị trệch đi" - -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)" +msgid "Index file type '%s' is not supported" +msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”" -#: apt-inst/filelist.cc:477 +#: apt-pkg/sourcelist.cc:127 #, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s" +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-inst/filelist.cc:506 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Sự trệch đi được thêm hai lần %s → %s" +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-inst/filelist.cc:549 +#: apt-pkg/sourcelist.cc:173 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s" - -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Chữ ký kho không hợp lệ" - -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Gặp lỗi khi đọc phần đầu thành viên kho" +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-inst/contrib/arfile.cc:96 +#: apt-pkg/sourcelist.cc:184 #, c-format -msgid "Invalid archive member header %s" -msgstr "Phần đầu thành viên kho lưu không hợp lệ %s" - -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Phần đầu thành viên kho không hợp lê" - -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Kho quá ngắn" - -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Việc đọc phần đầu kho bị lỗi" +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-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Gặp lỗi khi tạo các đường ống dẫn lệnh" +#: 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-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Việc thực hiện gzip bị lỗi " +#: 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-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Kho bị hỏng." +#: 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-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Gặp lỗi khi tổng kiểm “tar”, kho bị hỏ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-inst/contrib/extracttar.cc:308 +#: apt-pkg/sourcelist.cc:211 #, 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" +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-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành viên “%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-inst/deb/debfile.cc:132 +#: apt-pkg/sourcelist.cc:224 #, c-format -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" +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-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "Tập tin điều khiển không có khả năng phân tách" +#: apt-pkg/sourcelist.cc:335 +#, c-format +msgid "Opening %s" +msgstr "Đang mở %s" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "List directory %spartial is missing." -msgstr "Thiếu thư mục danh sách %spartial." +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/acquire.cc:91 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "Archives directory %spartial is missing." -msgstr "Thiếu thư mục kho lưu %spartial." +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/acquire.cc:99 +#: apt-pkg/sourcelist.cc:375 #, c-format -msgid "Unable to lock directory %s" -msgstr "Không thể khoá thư mục %s" +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/acquire.cc:490 apt-pkg/clean.cc:39 +#: 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:490 #, c-format msgid "Clean of %s is not supported" msgstr "Không hỗ trợ việc xóa %s" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 +#: apt-pkg/clean.cc:64 #, 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)" +msgid "Unable to stat %s." +msgstr "Không thể lấy trạng thái về %s." -#: apt-pkg/acquire.cc:904 +#: apt-pkg/pkgcachegen.cc:93 +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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, c-format -msgid "Retrieving file %li of %li" -msgstr "Đang tải tập tin %li trong tổng số %li" +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:257 +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:260 +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:263 +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:266 +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:576 +#, 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:1211 +#, 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:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "Đang đọc các danh sách gói" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "Đang tập hợp các Nhà cung cấp Tập tin" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Không thể ghi vào %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +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:241 +msgid "Send request to solver" +msgstr "Gửi yêu cầu đến bộ phân giải" + +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "Chuẩn bị để lấy cách giải quyết" + +#: apt-pkg/edsp.cc:327 +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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "Thi hành bộ phân giải từ bên ngoài" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2504,7 +2402,7 @@ msgstr "Kích cỡ không khớp nhau" msgid "Invalid file format" msgstr "Định dạng tập tập tin không hợp lệ" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2513,16 +2411,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:1589 +#: apt-pkg/acquire-item.cc:1656 #, 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:1631 +#: apt-pkg/acquire-item.cc:1698 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:1669 +#: apt-pkg/acquire-item.cc:1736 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " @@ -2531,12 +2429,12 @@ 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, 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:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2547,12 +2445,12 @@ msgstr "" "Lỗi GPG: %s: %s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "Lỗi GPG: %s: %s" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2561,12 +2459,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:1925 +#: apt-pkg/acquire-item.cc:1992 #, 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:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2574,118 +2472,100 @@ msgstr "" "Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " "tin:) cho gói %s." -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, 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 "Vendor block %s contains no fingerprint" +msgstr "Khối nhà bán %s không chứa vân tay" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, c-format -msgid "Is the package %s installed?" -msgstr "Gói “%s” đã được cài đặt chưa?" +msgid "List directory %spartial is missing." +msgstr "Thiếu thư mục danh sách %spartial." -#: apt-pkg/acquire-worker.cc:169 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Method %s did not start correctly" -msgstr "Phương thức %s đã không khởi chạy đúng đắn." +msgid "Archives directory %spartial is missing." +msgstr "Thiếu thư mục kho lưu %spartial." -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 #, 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 "Unable to lock directory %s" +msgstr "Không thể khoá thư mục %s" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó." - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -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:1088 -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/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." - -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "" -"Bạn nên lấy cơ sở dữ liệu mới bằng lệnh “apt-get update” để sửa các vấn đề " -"này" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Không thể đọc danh sách nguồn." +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/cacheset.cc:489 +#: apt-pkg/acquire.cc:904 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Không tìm thấy bản phát hành “%s” cho “%s”" +msgid "Retrieving file %li of %li" +msgstr "Đang tải tập tin %li trong tổng số %li" -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Không tìm thấy phiên bản “%s” cho “%s”" +#: 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/cacheset.cc:603 +#: apt-pkg/policy.cc:83 #, c-format -msgid "Couldn't find task '%s'" -msgstr "Không tìm thấy tác vụ “%s”" +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" +msgstr "" +"Giá trị “%s” không hợp lệ cho APT::Default-Release như vậy bản phát hành " +"không sẵn có trong mã nguồn" -#: apt-pkg/cacheset.cc:609 +#: apt-pkg/policy.cc:422 #, 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”" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "" +"Gặp mục ghi sai trong tập tin tùy thích %s: không có dòng đầu Package (Gói)." -#: apt-pkg/cacheset.cc:615 +#: apt-pkg/policy.cc:444 #, 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”" +msgid "Did not understand pin type %s" +msgstr "Không hiểu kiểu ghim %s" -#: apt-pkg/cacheset.cc:626 -#, 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/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" 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/cacheset.cc:647 -#, 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" +"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/cacheset.cc:655 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, 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ử" +msgid "Could not configure '%s'. " +msgstr "Không thể cấu hình “%s”. " -#: apt-pkg/cacheset.cc:663 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select installed version from package %s as it is not installed" +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 "" -"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" +"Việc chạy tiến trình cài đặt này sẽ cần thiết gỡ bỏ tạm gói chủ yếu %s, do " +"vòng lặp Xung đột/Phụ thuộc trước. Trường hợp này thường xấu, nhưng mà nếu " +"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" @@ -2763,18 +2643,31 @@ msgstr "Đang ghi danh sách nguồn mới\n" 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" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Không thể lấy trạng thái về %s." - -#: 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/depcache.cc:139 -msgid "Candidate versions" -msgstr "Phiên bản ứng cử" +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:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +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:1088 +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/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/depcache.cc:139 +msgid "Candidate versions" +msgstr "Phiên bản ứng cử" #: apt-pkg/depcache.cc:168 msgid "Dependency generation" @@ -2794,57 +2687,71 @@ msgstr "Lỗi mở tập tin tình trạng StateFile %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/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/tagfile.cc:140 +#, 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/edsp.cc:241 -msgid "Send request to solver" -msgstr "Gửi yêu cầu đến bộ phân giải" +#: apt-pkg/tagfile.cc:237 +#, 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/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "Chuẩn bị để lấy cách giải quyết" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Không tìm thấy bản phát hành “%s” cho “%s”" -#: apt-pkg/edsp.cc:327 -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/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Không tìm thấy phiên bản “%s” cho “%s”" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "Thi hành bộ phân giải từ bên ngoài" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "Không tìm thấy tác vụ “%s”" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:609 #, c-format -msgid "Wrote %i records.\n" -msgstr "Đã ghi %i bản ghi.\n" +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/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Đã ghi %i bản ghi với %i tập tin còn thiếu.\n" +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/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Đã ghi %i bản ghi với %i tập tin không khớp với nhau\n" +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/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" -"Đã ghi %i bản ghi với %i tập tin còn thiếu và %i tập tin không khớp với " -"nhau\n" +"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/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "Không tìm thấy bản ghi xác thực cho: %s" +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/indexcopy.cc:521 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Sai khớp chuỗi duy nhất cho: %s" +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:663 +#, 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/indexrecords.cc:78 #, c-format @@ -2874,842 +2781,933 @@ 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/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Không hỗ trợ hệ thống đóng gói “%s”" +msgid "%lid %lih %limin %lis" +msgstr "%li ngày %li giờ %li phút %li giây" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" +msgstr "%li giờ %li phút %li giây" -#: apt-pkg/install-progress.cc:57 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Progress: [%3i%%]" -msgstr "Diễn biến: [%3i%%]" +msgid "%limin %lis" +msgstr "%li phút %li giây" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "Đang chạy dpkg" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 +#, c-format +msgid "%lis" +msgstr "%li giây" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -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)" +msgid "Selection %s not found" +msgstr "Không tìm thấy vùng chọn %s" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "Could not configure '%s'. " -msgstr "Không thể cấu hình “%s”. " +msgid "Not using locking for read only lock file %s" +msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:195 #, 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 "" -"Việc chạy tiến trình cài đặt này sẽ cần thiết gỡ bỏ tạm gói chủ yếu %s, do " -"vòng lặp Xung đột/Phụ thuộc trước. Trường hợp này thường xấu, nhưng mà nếu " -"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)." +msgid "Could not open lock file %s" +msgstr "Không thể mở tập tin khóa %s" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Bộ nhớ tạm gói trống" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Tập tin nhớ tạm gói bị hỏng" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "Không thể lấy khóa %s" -#: apt-pkg/pkgcache.cc:166 -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/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" +"Liệt kê các tập tin không thể được tạo ra vì “%s” không phải là một thư mục" -#: apt-pkg/pkgcache.cc:169 -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/contrib/fileutl.cc:394 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "Bỏ qua “%s” trong thư mục “%s'vì nó không phải là tập tin bình thường" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:412 #, 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”" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" +"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó không có phần đuôi mở rộng" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "Bộ nhớ tạm gói được biên dịch cho một kiến trúc khác" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" +"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó có phần đuôi mở rộng không hợp " +"lệ" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Phụ thuộc" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Tiến trình con %s đã nhận một lỗi phân đoạn." -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "Phụ thuộc sẵn" +#: apt-pkg/contrib/fileutl.cc:826 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "Tiến trình con %s đã nhận tín hiệu %u." -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Đề nghị" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Tiến trình con %s đã trả về một mã lỗi (%u)" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Khuyến khích" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Tiến trình con %s đã thoát bất thường" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Xung đột" +#: apt-pkg/contrib/fileutl.cc:913 +#, c-format +msgid "Problem closing the gzip file %s" +msgstr "Gặp vấn đề khi đóng tập tin gzip %s" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Thay thế" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "Không thể mở tập tin %s" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Cũ" +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#, c-format +msgid "Could not open file descriptor %d" +msgstr "Không thể mở bộ mô tả tập tin %d" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "Làm hỏng" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "Việc tạo tiến trình con IPC bị lỗi" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "Tăng cường" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "Gặp lỗi khi thực hiện nén " -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "quan trọng" +#: apt-pkg/contrib/fileutl.cc:1514 +#, c-format +msgid "read, still have %llu to read but none left" +msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "yêu cầu" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "ghi, còn cần ghi %llu nhưng mà không thể" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "chuẩn" +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" +msgstr "Gặp vấn đề khi đóng tập tin %s" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "tùy chọn" +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Gặp vấn đề khi đổi tên tập tin %s thành %s" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "bổ sung" +#: apt-pkg/contrib/fileutl.cc:1938 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Bộ nhớ tạm có hệ thống điều khiển phiên bản không tương thích" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "Gặp vấn đề khi đồng bộ hóa tập tin" -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Có lỗi phát sinh khi xử lý %s (%s%d)" +msgid "%c%s... Error!" +msgstr "%c%s... Lỗi!" -#: apt-pkg/pkgcachegen.cc:257 -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/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Xong" -#: apt-pkg/pkgcachegen.cc:260 -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/contrib/progress.cc:181 +msgid "..." +msgstr "..." -#: apt-pkg/pkgcachegen.cc:263 -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ý." +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... %u%%" -#: apt-pkg/pkgcachegen.cc:266 -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/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" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/contrib/mmap.cc:111 #, 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" +msgid "Couldn't duplicate file descriptor %i" +msgstr "Không thể nhân đôi bộ mô tả tập tin %i" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/contrib/mmap.cc:119 #, 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:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "Đang đọc các danh sách gói" +msgid "Couldn't make mmap of %llu bytes" +msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %llu byte" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Đang tập hợp các Nhà cung cấp Tập tin" +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "Không thể đóng mmap (ánh xạ bộ nhớ)" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "Không thể động bộ hoá mmap (ánh xạ bộ nhớ)" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/mmap.cc:290 #, 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 "Couldn't make mmap of %lu bytes" +msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %lu byte" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "Gặp lỗi khi cắt ngắn tập tin" + +#: apt-pkg/contrib/mmap.cc:341 #, c-format msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -"Giá trị “%s” không hợp lệ cho APT::Default-Release như vậy bản phát hành " -"không sẵn có trong mã nguồn" +"Dynamic MMap (ánh xạ bộ nhớ động) đã vượt quá kích thước tối đa cho phép.\n" +"Hãy tăng kích cỡ của “APT::Cache-Start” (giới hạn vùng nhớ tạm Apt).\n" +"Giá trị hiện thời là: %lu. (man 5 apt.conf)" -#: apt-pkg/policy.cc:422 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì đã tới giới hạn %lu byte." + +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" -"Gặp mục ghi sai trong tập tin tùy thích %s: không có dòng đầu Package (Gói)." +"Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì chức năng tự động tăng bị người " +"dùng tắt đi." -#: apt-pkg/policy.cc:444 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "Did not understand pin type %s" -msgstr "Không hiểu kiểu ghim %s" +msgid "Unable to stat the mount point %s" +msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" +#: apt-pkg/contrib/cdromutl.cc:246 +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/sourcelist.cc:127 +#: apt-pkg/contrib/configuration.cc:519 #, 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)" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Không chấp nhận kiểu viết tắt: “%c”" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/configuration.cc:633 #, 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)" +msgid "Opening configuration file %s" +msgstr "Đang mở tập tin cấu hình %s..." -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/contrib/configuration.cc:801 #, 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)" +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/sourcelist.cc:184 +#: apt-pkg/contrib/configuration.cc:820 #, 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)" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Gặp lỗi cú pháp %s:%u: Sai dạng thẻ" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/contrib/configuration.cc:837 #, 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)" +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/sourcelist.cc:193 +#: apt-pkg/contrib/configuration.cc:877 #, 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ị)" +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/sourcelist.cc:206 +#: apt-pkg/contrib/configuration.cc:884 #, 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)" +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/sourcelist.cc:208 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, 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)" +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/sourcelist.cc:211 +#: apt-pkg/contrib/configuration.cc:897 #, 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)" +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/sourcelist.cc:217 +#: apt-pkg/contrib/configuration.cc:900 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" 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)" +"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/sourcelist.cc:224 +#: apt-pkg/contrib/configuration.cc:950 #, 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)" +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/sourcelist.cc:335 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Opening %s" -msgstr "Đang mở %s" +msgid "No keyring installed in %s." +msgstr "Không có vòng khoá nào được cài đặt vào %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/srcrecords.cc:52 -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/tagfile.cc:140 -#, 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:237 -#, 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/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/vendorlist.cc:85 -#, 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/contrib/cdromutl.cc:65 -#, c-format -msgid "Unable to stat the mount point %s" -msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" - -#: apt-pkg/contrib/cdromutl.cc:246 -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/cmndline.cc:121 +#: apt-pkg/contrib/cmndline.cc:124 #, 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:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, 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:168 +#: apt-pkg/contrib/cmndline.cc:171 #, 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:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, 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:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Tùy chọn %s: Đặc tả mục cấu hình phải có một “=”." -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/cmndline.cc:281 #, 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:309 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format msgid "Option '%s' is too long" msgstr "Tùy chọn “%s” quá dài" -#: apt-pkg/contrib/cmndline.cc:341 +#: apt-pkg/contrib/cmndline.cc:344 #, 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:391 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format msgid "Invalid operation %s" msgstr "Thao tác “%s” không hợp lệ" -#: apt-pkg/contrib/configuration.cc:519 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Không chấp nhận kiểu viết tắt: “%c”" +msgid "Installing %s" +msgstr "Đang cài đặt %s" -#: apt-pkg/contrib/configuration.cc:633 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Opening configuration file %s" -msgstr "Đang mở tập tin cấu hình %s..." +msgid "Configuring %s" +msgstr "Đang cấu hình %s" -#: apt-pkg/contrib/configuration.cc:801 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, 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." +msgid "Removing %s" +msgstr "Đang gỡ bỏ %s" -#: apt-pkg/contrib/configuration.cc:820 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Gặp lỗi cú pháp %s:%u: Sai dạng thẻ" +msgid "Completely removing %s" +msgstr "Đang gỡ bỏ hoàn toàn %s" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/deb/dpkgpm.cc:114 #, 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ị" +msgid "Noting disappearance of %s" +msgstr "Đang ghi chép sự biến mất của %s" -#: apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/deb/dpkgpm.cc:115 #, 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" +msgid "Running post-installation trigger %s" +msgstr "Đang chạy bẫy sau-cài-đặt %s" -#: apt-pkg/contrib/configuration.cc:884 +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 #, 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" +msgid "Directory '%s' missing" +msgstr "Thiếu thư mục “%s”" -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, 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" +msgid "Could not open file '%s'" +msgstr "Không thể mở tập tin “%s”" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/deb/dpkgpm.cc:1007 #, 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”" +msgid "Preparing %s" +msgstr "Đang chuẩn bị %s" -#: apt-pkg/contrib/configuration.cc:900 +#: apt-pkg/deb/dpkgpm.cc:1008 #, 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ố" +msgid "Unpacking %s" +msgstr "Đang mở gói %s" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/deb/dpkgpm.cc:1013 #, 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" +msgid "Preparing to configure %s" +msgstr "Đang chuẩn bị cấu hình %s" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" +msgid "Installed %s" +msgstr "Đã cài đặt %s" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/deb/dpkgpm.cc:1020 #, c-format -msgid "Could not open lock file %s" -msgstr "Không thể mở tập tin khóa %s" +msgid "Preparing for removal of %s" +msgstr "Đang chuẩn bị gỡ bỏ %s" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" +msgid "Removed %s" +msgstr "Đã gỡ bỏ %s" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1027 #, c-format -msgid "Could not get lock %s" -msgstr "Không thể lấy khóa %s" +msgid "Preparing to completely remove %s" +msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "" -"Liệt kê các tập tin không thể được tạo ra vì “%s” không phải là một thư mục" +msgid "Completely removed %s" +msgstr "Gỡ bỏ hoàn toàn %s" -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "Bỏ qua “%s” trong thư mục “%s'vì nó không phải là tập tin bình thường" +msgid "Can not write log (%s)" +msgstr "Không thể ghi nhật ký (%s)" -#: apt-pkg/contrib/fileutl.cc:412 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "/dev/pts đã gắn chưa?" + +#: apt-pkg/deb/dpkgpm.cc:1657 +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:1719 +msgid "No apport report written because MaxReports is reached already" msgstr "" -"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó không có phần đuôi mở rộng" +"Không ghi báo cáo apport, vì đã chạm giới hạn số các báo cáo (MaxReports)" -#: apt-pkg/contrib/fileutl.cc:421 -#, c-format +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +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:1726 msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." msgstr "" -"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó có phần đuôi mở rộng không hợp " -"lệ" - -#: apt-pkg/contrib/fileutl.cc:824 -#, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Tiến trình con %s đã nhận một lỗi phân đoạn." +"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/contrib/fileutl.cc:826 -#, c-format -msgid "Sub-process %s received signal %u." -msgstr "Tiến trình con %s đã nhận tín hiệu %u." +#: apt-pkg/deb/dpkgpm.cc:1732 +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/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Tiến trình con %s đã trả về một mã lỗi (%u)" +#: apt-pkg/deb/dpkgpm.cc:1739 +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/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 -#, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Tiến trình con %s đã thoát bất thường" +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +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/contrib/fileutl.cc:913 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "Gặp vấn đề khi đóng tập tin gzip %s" +#: apt-pkg/deb/dpkgpm.cc:1774 +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/contrib/fileutl.cc:1101 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "Could not open file %s" -msgstr "Không thể mở tập tin %s" +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/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/deb/debsystem.cc:94 #, c-format -msgid "Could not open file descriptor %d" -msgstr "Không thể mở bộ mô tả tập tin %d" - -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "Việc tạo tiến trình con IPC bị lỗi" - -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "Gặp lỗi khi thực hiện nén " +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?" -#: apt-pkg/contrib/fileutl.cc:1514 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 #, c-format -msgid "read, still have %llu to read but none left" -msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả" +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/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "ghi, còn cần ghi %llu nhưng mà không thể" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "Chưa được khoá" -#: apt-pkg/contrib/fileutl.cc:1915 -#, c-format -msgid "Problem closing the file %s" -msgstr "Gặp vấn đề khi đóng tập tin %s" +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Cách dùng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n" +"\n" +"[extract: rút trích;\n" +"templates: mẫu]\n" +"\n" +"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n" +"\tvà biểu mẫu đều từ gói Debian\n" +"\n" +"Tùy chọn:\n" +" -h Trợ giúp này\n" +" -t Đặt thư mục tạm thời\n" +" [t: viết tắt cho từ “temporary”: tạm thời]\n" +" -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" -#: apt-pkg/contrib/fileutl.cc:1927 +#: cmdline/apt-extracttemplates.cc:254 #, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Gặp vấn đề khi đổi tên tập tin %s thành %s" +msgid "Unable to mkstemp %s" +msgstr "Không thể tạo tập tin tạm (hàm mkstemp) %s" -#: apt-pkg/contrib/fileutl.cc:1938 -#, c-format -msgid "Problem unlinking the file %s" -msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s" +#: cmdline/apt-extracttemplates.cc:300 +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?" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "Gặp vấn đề khi đồng bộ hóa tập tin" +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "Danh sách mở rộng gói quá dài" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: 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 #, c-format -msgid "No keyring installed in %s." -msgstr "Không có vòng khoá nào được cài đặt vào %s." +msgid "Error processing directory %s" +msgstr "Gặp lỗi khi xử lý thư mục %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" +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Danh sách mở rộng nguồn quá dài" -#: apt-pkg/contrib/mmap.cc:111 -#, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Không thể nhân đôi bộ mô tả tập tin %i" +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung" -#: apt-pkg/contrib/mmap.cc:119 +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %llu byte" +msgid "Error processing contents %s" +msgstr "Gặp lỗi khi xử lý nội dung %s" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "Không thể đóng mmap (ánh xạ bộ nhớ)" +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Cách dùng: apt-ftparchive [tùy_chọn...] lệnh\n" +"\n" +"[ftparchive: FTP archive: kho FTP]\n" +"\n" +"Lệnh: packages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n" +" sources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n" +" contents path\n" +" release path\n" +" generate config [các_nhóm]\n" +" clean config\n" +"\n" +"(packages: những gói;\n" +"binarypath: đường dẫn nhị phân;\n" +"sources: những nguồn;\n" +"srcpath: đường dẫn nguồn;\n" +"contents path: đường dẫn nội dung;\n" +"release path: đường dẫn bản đã phát hành;\n" +"generate config [groups]: tạo ra cấu hình [các nhóm];\n" +"clean config: cấu hình toàn mới)\n" +"\n" +"apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n" +"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động hoàn toàn\n" +"đến cách thay thế hàm cho dpkg-scanpackages (dpkg-quét_gói)\n" +"và dpkg-scansources (dpkg-quét_nguồn).\n" +"\n" +"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n" +"Tập tin gói chứa nội dung các trường điều khiển từ mỗi gói,\n" +"cùng với băm MD5 và kích cỡ tập tin.\n" +"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n" +"\n" +"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n" +"Có thể sử dụng tùy chọn “--source-override” (đè nguồn)\n" +"để ghi rõ tập tin đè nguồn\n" +"\n" +"Lệnh “packages” (gói) và “sources” (nguồn) nên chạy tại gốc cây.\n" +"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ " +"quy,\n" +"và tập tin đè nên chứa những cờ đè.\n" +"Pathprefix (tiền tố đường dẫn) được phụ thêm vào\n" +"những trường tên tập tin nếu có.\n" +"Cách sử dụng thí dụ từ kho Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Tùy chọn:\n" +" -h _Trợ giúp_ này\n" +" --md5 Điều khiển cách tạo ra MD5\n" +" -s=? Tập tin đè nguồn\n" +" -q _Im lặng_ (không xuất chi tiết)\n" +" -d=? Chọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n" +" --no-delink Mở chế độ gỡ lỗi _bỏ liên kết_\n" +" --contents Điều khiển cách tạo ra tập tin _nội dung_\n" +" -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”" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "Không thể động bộ hoá mmap (ánh xạ bộ nhớ)" +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "Không có cái được chọn khớp được" -#: apt-pkg/contrib/mmap.cc:290 +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Không thể tạo mmap (ánh xạ bộ nhớ) kích cỡ %lu byte" - -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "Gặp lỗi khi cắt ngắn tập tin" +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”." -#: apt-pkg/contrib/mmap.cc:341 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "" -"Dynamic MMap (ánh xạ bộ nhớ động) đã vượt quá kích thước tối đa cho phép.\n" -"Hãy tăng kích cỡ của “APT::Cache-Start” (giới hạn vùng nhớ tạm Apt).\n" -"Giá trị hiện thời là: %lu. (man 5 apt.conf)" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tập tin thành %s.old (old: cũ)." -#: apt-pkg/contrib/mmap.cc:446 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì đã tới giới hạn %lu byte." +msgid "DB is old, attempting to upgrade %s" +msgstr "Cơ sở dữ liệu đã cũ, nên đang cố nâng cấp lên thành %s" -#: apt-pkg/contrib/mmap.cc:449 +#: ftparchive/cachedb.cc:94 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" -"Không thể tăng kích cỡ của ánh xạ bộ nhớ, vì chức năng tự động tăng bị người " -"dùng tắt đi." +"Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " +"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu." -#: apt-pkg/contrib/progress.cc:148 +#: ftparchive/cachedb.cc:99 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Lỗi!" +msgid "Unable to open DB file %s: %s" +msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s." -#: apt-pkg/contrib/progress.cc:150 -#, c-format -msgid "%c%s... Done" -msgstr "%c%s... Xong" +#: ftparchive/cachedb.cc:332 +msgid "Failed to read .dsc" +msgstr "Gặp lỗi khi đọc .dsc" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "..." +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Kho không có mục ghi điều khiển" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Không thể lấy con trỏ" + +#: ftparchive/writer.cc:91 #, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... %u%%" +msgid "W: Unable to read directory %s\n" +msgstr "CB: Không thể đọc thư mục %s\n" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/writer.cc:96 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%li ngày %li giờ %li phút %li giây" +msgid "W: Unable to stat %s\n" +msgstr "CB: Không thể lấy thông tin thống kê %s\n" + +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "L: " + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "CB: " -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lih %limin %lis" -msgstr "%li giờ %li phút %li giây" +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "LỖI: có lỗi áp dụng vào tập tin " -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "%limin %lis" -msgstr "%li phút %li giây" +msgid "Failed to resolve %s" +msgstr "Gặp lỗi khi phân giải %s" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 -#, c-format -msgid "%lis" -msgstr "%li giây" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Việc di chuyển qua cây bị lỗi" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:219 #, c-format -msgid "Selection %s not found" -msgstr "Không tìm thấy vùng chọn %s" +msgid "Failed to open %s" +msgstr "Gặp lỗi khi mở %s" -#: apt-pkg/deb/debsystem.cc:91 +#: ftparchive/writer.cc:278 #, 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 " DeLink %s [%s]\n" +msgstr " Bỏ liên kết %s [%s]\n" -#: apt-pkg/deb/debsystem.cc:94 +#: ftparchive/writer.cc:286 #, 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 "Failed to readlink %s" +msgstr "Gặp lỗi khi đọc liên kết %s" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:290 #, 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 "Failed to unlink %s" +msgstr "Việc bỏ liên kết %s bị lỗi" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:298 #, c-format -msgid "Installing %s" -msgstr "Đang cài đặt %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Gặp lỗi khi liên kết %s đến %s" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:308 #, c-format -msgid "Configuring %s" -msgstr "Đang cấu hình %s" +msgid " DeLink limit of %sB hit.\n" +msgstr " Hết hạn bỏ liên kết của %sB.\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 -#, c-format -msgid "Removing %s" -msgstr "Đang gỡ bỏ %s" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Kho không có trường gói" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Completely removing %s" -msgstr "Đang gỡ bỏ hoàn toàn %s" +msgid " %s has no override entry\n" +msgstr " %s không có mục ghi đè (override)\n" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Noting disappearance of %s" -msgstr "Đang ghi chép sự biến mất của %s" +msgid " %s maintainer is %s not %s\n" +msgstr " người bảo trì %s là %s không phải %s\n" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:706 #, c-format -msgid "Running post-installation trigger %s" -msgstr "Đang chạy bẫy sau-cài-đặt %s" +msgid " %s has no source override entry\n" +msgstr " %s không có mục ghi đè (override) nguồn\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:710 #, c-format -msgid "Directory '%s' missing" -msgstr "Thiếu thư mục “%s”" +msgid " %s has no binary override entry either\n" +msgstr " %s cũng không có mục ghi đè (override) nhị phân\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, c-format -msgid "Could not open file '%s'" -msgstr "Không thể mở tập tin “%s”" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing %s" -msgstr "Đang chuẩn bị %s" +msgid "Unable to open %s" +msgstr "Không thể mở %s" -#: apt-pkg/deb/dpkgpm.cc:993 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 #, c-format -msgid "Unpacking %s" -msgstr "Đang mở gói %s" +msgid "Malformed override %s line %llu (%s)" +msgstr "Sai “override” %s dòng %llu (%s)" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing to configure %s" -msgstr "Đang chuẩn bị cấu hình %s" +msgid "Failed to read the override file %s" +msgstr "Việc đọc tập tin đè %s bị lỗi" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/override.cc:166 #, c-format -msgid "Installed %s" -msgstr "Đã cài đặt %s" +msgid "Malformed override %s line %llu #1" +msgstr "Sai override %s dòng %llu #1" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:178 #, c-format -msgid "Preparing for removal of %s" -msgstr "Đang chuẩn bị gỡ bỏ %s" +msgid "Malformed override %s line %llu #2" +msgstr "Sai override %s dòng %llu #2" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:191 #, c-format -msgid "Removed %s" -msgstr "Đã gỡ bỏ %s" +msgid "Malformed override %s line %llu #3" +msgstr "Sai override %s dòng %llu #3" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s" +msgid "Unknown compression algorithm '%s'" +msgstr "Không biết thuật toán nén “%s”" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/multicompress.cc:103 #, c-format -msgid "Completely removed %s" -msgstr "Gỡ bỏ hoàn toàn %s" +msgid "Compressed output %s needs a compression set" +msgstr "Dữ liệu xuất đã nén %s cần một bộ nén" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 -#, c-format -msgid "Can not write log (%s)" -msgstr "Không thể ghi nhật ký (%s)" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Việc tạo TẬP_TIN* bị lỗi" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "/dev/pts đã gắn chưa?" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Gặp lỗi khi rẽ nhánh tiến trình" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "Đầu ra là thiết bị cuối?" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "Nén con" -#: apt-pkg/deb/dpkgpm.cc:1625 -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" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s" -#: apt-pkg/deb/dpkgpm.cc:1687 -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)" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -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" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Gặp lỗi khi đọc trong khi tính MD5" -#: apt-pkg/deb/dpkgpm.cc:1694 -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 đó." +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "Gặp lỗi khi bỏ liên kết %s" -#: apt-pkg/deb/dpkgpm.cc:1700 +#: cmdline/apt-internal-solver.cc:49 msgid "" -"No apport report written because the error message indicates a disk full " -"error" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" 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”" +"Cách dùng: apt-internal-solver\n" +"\n" +"apt-internal-solver là một giao diện để dùng cho bộ phân giải nội bộ\n" +"hiện tại giống như bộ phân giải bên ngoài dành cho họ chương trình APT\n" +"để phục vụ cho việc gỡ lỗi hay tương tự thế\n" +"\n" +"Tùy chọn:\n" +" -h Trợ giúp này.\n" +" -q Làm việc ở chế độ im lặng - không hiển thị tiến triển công việc\n" +" -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" -#: apt-pkg/deb/dpkgpm.cc:1707 -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ớ”" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Không hiểu bản ghi gói!" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"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ộ" +"Cách dùng: apt-sortpkgs [tùy_chọn...] tập_tin1 [tập_tin2 ...]\n" +"\n" +"[sortpkgs: sort packages: sắp xếp các gói]\n" +"\n" +"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n" +"Tùy chọn “-s” dùng để ngầm chỉ kiểu tập tin là gì.\n" +"\n" +"Tùy chọn:\n" +" -h Trợ giúp_ này\n" +" -s Sắp xếp những tập tin _nguồn_\n" +" -c=? Đọc tập tin cấu hình này\n" +" -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n" -#: apt-pkg/deb/dpkgpm.cc:1742 -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 "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 a019e8e39..566735eb7 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2010-08-26 14:42+0800\n" "Last-Translator: Zhou Mo \n" "Language-Team: Chinese (simplified) \n" @@ -158,7 +158,7 @@ msgid " Version table:" msgstr " 版本列表：" #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 @@ -341,8 +341,7 @@ msgstr "%s 被设置为手动安装。\n" msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." -msgstr "" -"该命令已废弃。请用‘apt-mark auto’或‘apt-mark manual’替代。" +msgstr "该命令已废弃。请用‘apt-mark auto’或‘apt-mark manual’替代。" #: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 msgid "Internal error, problem resolver broke stuff" @@ -356,7 +355,7 @@ msgstr "无法锁定下载目录" msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" @@ -381,156 +380,155 @@ msgstr "" "bzr branch %s\n" "获得该软件包的最近更新(可能尚未正式发布)。\n" -#: cmdline/apt-get.cc:843 +#: cmdline/apt-get.cc:839 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载的文件“%s”\n" -#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872 +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 #: apt-private/private-install.cc:187 apt-private/private-install.cc:190 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的可用空间" -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:886 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的可用空间" #. 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:891 +#: cmdline/apt-get.cc:895 #, 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:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:902 +#: cmdline/apt-get.cc:906 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:920 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" -#: cmdline/apt-get.cc:950 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "忽略已经被解包到 %s 目录的源代码包\n" -#: cmdline/apt-get.cc:963 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:964 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:992 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1059 #, 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" +"找不到关于 %s 的有效体系结构信息。请参见 apt.conf(5) APT::Architectures for " +"setup" -#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系信息" -#: cmdline/apt-get.cc:1102 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:1272 +#: cmdline/apt-get.cc:1276 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" -msgstr "由于 %3$s 不被软件包 %4$s 所允许，因此不能满足 %2$s 所要求的 %1$s 依赖关系" +msgstr "" +"由于 %3$s 不被软件包 %4$s 所允许，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:1290 +#: cmdline/apt-get.cc:1294 #, 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:1313 +#: cmdline/apt-get.cc:1317 #, 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:1352 +#: cmdline/apt-get.cc:1356 #, 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:1358 +#: cmdline/apt-get.cc:1362 #, 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:1381 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:1396 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:1401 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, c-format msgid "Changelog for %s (%s)" msgstr "%s (%s) 的 Changelog" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1596 msgid "Supported modules:" msgstr "支持的模块：" -#: cmdline/apt-get.cc:1633 +#: cmdline/apt-get.cc:1637 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -653,7 +651,6 @@ msgstr "" "\n" " This APT helper has Super Meep Powers.\n" - #: cmdline/apt-mark.cc:68 #, c-format msgid "%s can not be marked as it is not installed.\n" @@ -681,7 +678,7 @@ msgstr "%s 已经设置为不保留。\n" #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1272 +#: apt-pkg/deb/dpkgpm.cc:1304 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待子进程 %s 的退出，但是它并不存在" @@ -750,7 +747,6 @@ msgstr "" " -o=? 任意设置一个配置项，比如 -o dir::cache=/tmp\n" "更多细节请参见 the apt-mark(8) 和 apt.conf(5) 的 man 手册。" - #: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" @@ -816,16 +812,16 @@ msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。" msgid "Disk not found." msgstr "找不到盘片。" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "无法找到该文件" -#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "无法读取状态" -#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" @@ -878,7 +874,7 @@ msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s" msgid "TYPE failed, server said: %s" msgstr "TYPE 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240 +#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "连接超时" @@ -900,7 +896,7 @@ msgstr "回应超出了缓存区大小。" msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872 +#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 #: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 #: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 #: apt-pkg/contrib/fileutl.cc:1639 @@ -961,7 +957,7 @@ msgstr "数据套接字连接超时" msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:316 +#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "把文件加入哈希表时出错" @@ -970,7 +966,7 @@ msgstr "把文件加入哈希表时出错" msgid "Unable to fetch file, server said '%s'" msgstr "无法获取文件，服务器响应信息为“%s”" -#: methods/ftp.cc:905 methods/rsh.cc:335 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "数据套接字超时" @@ -1020,7 +1016,7 @@ msgstr "无法连接上 %s:%s (%s)。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "正在连接 %s" @@ -1157,42 +1153,16 @@ msgstr "连接失败" msgid "Internal error" msgstr "内部错误" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "命中 " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "获取：" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "忽略 " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "错误 " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "下载 %sB，耗时 %s (%sB/s)\n" - -#: apt-private/acqprogress.cc:236 -#, c-format -msgid " [Working]" -msgstr " [执行中]" +#: apt-private/private-list.cc:129 +msgid "Listing" +msgstr "正在列表" -#: apt-private/acqprogress.cc:297 +#: apt-private/private-list.cc:159 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"更换介质：请把标有\n" -"“%s”\n" -"的盘片插入驱动器“%s”再按回车键\n" +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:93 msgid "Correcting dependencies..." @@ -1222,159 +1192,338 @@ msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。 msgid "Unmet dependencies. Try using -f." msgstr "不能满足依赖关系。不妨试一下 -f 选项。" -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" -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-download.cc:36 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "【警告】：下列软件包不能通过验证！" +#: apt-private/private-output.cc:265 +#, c-format +msgid "[installed,upgradable to: %s]" +msgstr "[已安装，可升级至：%s]" -#: apt-private/private-download.cc:40 -msgid "Authentication warning overridden.\n" -msgstr "忽略了认证警告。\n" +#: apt-private/private-output.cc:268 +msgid "[installed,local]" +msgstr "[已安装，本地]" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 -msgid "Some packages could not be authenticated" -msgstr "有些软件包不能通过验证" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" +msgstr "[已安装，可自动卸载]" -#: apt-private/private-download.cc:50 -msgid "Install these packages without verification?" -msgstr "不经验证就安装这些软件包吗？" +#: apt-private/private-output.cc:272 +msgid "[installed,automatic]" +msgstr "[已安装，自动]" -#: apt-private/private-download.cc:59 apt-private/private-install.cc:210 -msgid "There are problems and -y was used without --force-yes" -msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes" +#: apt-private/private-output.cc:274 +msgid "[installed]" +msgstr "[已安装]" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:277 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "无法下载 %s %s\n" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！" - -#: apt-private/private-install.cc:91 -msgid "Packages need to be removed but remove is disabled." -msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。" - -#: apt-private/private-install.cc:110 -msgid "Internal error, Ordering didn't finish" -msgstr "内部错误，Ordering 未能完成" +msgid "[upgradable from: %s]" +msgstr "[可从该版本升级：%s]" -#: apt-private/private-install.cc:148 -msgid "How odd... The sizes didn't match, email apt@packages.debian.org" -msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" +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 -#: apt-private/private-install.cc:155 +#: apt-private/private-output.cc:455 #, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "需要下载 %sB/%sB 的软件包。\n" +msgid "but %s is installed" +msgstr "但是 %s 已经安装" -#. 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:160 +#: apt-private/private-output.cc:457 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "需要下载 %sB 的软件包。\n" +msgid "but %s is to be installed" +msgstr "但是 %s 正要被安装" -#. 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:167 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +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 -#: apt-private/private-install.cc:172 -#, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "解压缩后将会空出 %sB 的空间。\n" +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "但是它是虚拟软件包" -#: apt-private/private-install.cc:200 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "您在 %s 上没有足够的可用空间。" +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "但是它还没有被安装" -#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。" +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "但是它将不会被安装" -#. 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) -#: apt-private/private-install.cc:220 -msgid "Yes, do as I say!" -msgstr "是，按我说的做！" +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " 或" -#: apt-private/private-install.cc:222 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"您的操作会导致潜在的危害。\n" -"若还想继续的话，就输入下面的短句“%s”\n" -" ?] " +#: apt-private/private-output.cc:488 apt-private/private-output.cc:500 +msgid "The following packages have unmet dependencies:" +msgstr "下列软件包有未满足的依赖关系：" -#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "中止执行。" +#: apt-private/private-output.cc:523 +msgid "The following NEW packages will be installed:" +msgstr "下列【新】软件包将被安装：" -#: apt-private/private-install.cc:243 -msgid "Do you want to continue?" -msgstr "您希望继续执行吗？" +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "下列软件包将被【卸载】：" -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "有一些文件无法下载" +#: apt-private/private-output.cc:571 +msgid "The following packages have been kept back:" +msgstr "下列软件包的版本将保持不变：" -#: apt-private/private-install.cc:320 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项" -"再试试？" +#: apt-private/private-output.cc:592 +msgid "The following packages will be upgraded:" +msgstr "下列软件包将被升级：" -#: apt-private/private-install.cc:324 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "目前还不支持 --fix-missing 和介质交换" +#: apt-private/private-output.cc:613 +msgid "The following packages will be DOWNGRADED:" +msgstr "下列软件包将被【降级】：" -#: apt-private/private-install.cc:329 -msgid "Unable to correct missing packages." -msgstr "无法更正缺少的软件包。" +#: apt-private/private-output.cc:633 +msgid "The following held packages will be changed:" +msgstr "下列被要求保持版本不变的软件包将被改变：" -#: apt-private/private-install.cc:330 -msgid "Aborting install." -msgstr "中止安装。" +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (是由于 %s) " -#: apt-private/private-install.cc:366 +#: apt-private/private-output.cc:696 msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失：" +"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-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "注意：这是自动被 dpkg 有意完成的。" +#: apt-private/private-output.cc:727 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，" -#: apt-private/private-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "我们不应该进行删除，无法启动自动删除器" +#: apt-private/private-output.cc:731 +#, c-format +msgid "%lu reinstalled, " +msgstr "重新安装了 %lu 个软件包，" -#: apt-private/private-install.cc:499 -msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." -msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。" +#: 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:35 +#, 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:97 +#, 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:101 +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:82 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！" + +#: apt-private/private-install.cc:91 +msgid "Packages need to be removed but remove is disabled." +msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。" + +#: apt-private/private-install.cc:110 +msgid "Internal error, Ordering didn't finish" +msgstr "内部错误，Ordering 未能完成" + +#: apt-private/private-install.cc:148 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "怪了……文件大小不符，请发信给 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 +#: apt-private/private-install.cc:155 +#, c-format +msgid "Need to get %sB/%sB of 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 +#: apt-private/private-install.cc:160 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "需要下载 %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 +#: apt-private/private-install.cc:167 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "解压缩后会消耗掉 %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 +#: apt-private/private-install.cc:172 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "解压缩后将会空出 %sB 的空间。\n" + +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "您在 %s 上没有足够的可用空间。" + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 +msgid "There are problems and -y was used without --force-yes" +msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes" + +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。" + +#. 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) +#: apt-private/private-install.cc:220 +msgid "Yes, do as I say!" +msgstr "是，按我说的做！" + +#: apt-private/private-install.cc:222 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"您的操作会导致潜在的危害。\n" +"若还想继续的话，就输入下面的短句“%s”\n" +" ?] " + +#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 +msgid "Abort." +msgstr "中止执行。" + +#: apt-private/private-install.cc:243 +msgid "Do you want to continue?" +msgstr "您希望继续执行吗？" + +#: apt-private/private-install.cc:313 +msgid "Some files failed to download" +msgstr "有一些文件无法下载" + +#: apt-private/private-install.cc:320 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项" +"再试试？" + +#: apt-private/private-install.cc:324 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "目前还不支持 --fix-missing 和介质交换" + +#: apt-private/private-install.cc:329 +msgid "Unable to correct missing packages." +msgstr "无法更正缺少的软件包。" + +#: apt-private/private-install.cc:330 +msgid "Aborting install." +msgstr "中止安装。" + +#: apt-private/private-install.cc:366 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失：" + +#: apt-private/private-install.cc:370 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "注意：这是自动被 dpkg 有意完成的。" + +#: apt-private/private-install.cc:391 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "我们不应该进行删除，无法启动自动删除器" + +#: apt-private/private-install.cc:499 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。" #. #. if (Packages == 1) @@ -1494,205 +1643,26 @@ msgstr "软件包 %s 还未安装，因而不会被卸载。您的意思是 ‘% msgid "Package '%s' is not installed, so not removed\n" msgstr "软件包 %s 还未安装，因而不会被卸载\n" -#: apt-private/private-list.cc:129 -msgid "Listing" -msgstr "正在列表" +#: apt-private/private-download.cc:36 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "【警告】：下列软件包不能通过验证！" -#: apt-private/private-list.cc:159 -#, 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-download.cc:40 +msgid "Authentication warning overridden.\n" +msgstr "忽略了认证警告。\n" -#: 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:45 apt-private/private-download.cc:52 +msgid "Some packages could not be authenticated" +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-download.cc:50 +msgid "Install these packages without verification?" +msgstr "不经验证就安装这些软件包吗？" -#: apt-private/private-output.cc:265 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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 "" - -#. 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:35 -#, c-format -msgid "Regex compilation error - %s" -msgstr "编译正则表达式时出错 - %s" - -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -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 "不是一个实包(虚包)" +msgid "Failed to fetch %s %s\n" +msgstr "无法下载 %s %s\n" #: apt-private/private-sources.cc:58 #, c-format @@ -1704,21 +1674,9 @@ msgstr "解析 %s 失败。请重新编辑之后再试。" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "您的 %s 文件有过改动，请执行 ‘apt-get update’。" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr " update 命令不需要参数" - -#: apt-private/private-update.cc:90 -#, 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:94 -msgid "All packages are up to date." -msgstr "所有软件包均为最新。" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" +msgstr "全文搜索" #: apt-private/private-upgrade.cc:25 msgid "Calculating upgrade... " @@ -1728,20 +1686,57 @@ msgstr "正在对升级进行计算... " msgid "Done" msgstr "完成" +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "命中 " + +#: apt-private/acqprogress.cc:90 +msgid "Get:" +msgstr "获取：" + +#: apt-private/acqprogress.cc:121 +msgid "Ign " +msgstr "忽略 " + +#: apt-private/acqprogress.cc:125 +msgid "Err " +msgstr "错误 " + +#: apt-private/acqprogress.cc:146 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "下载 %sB，耗时 %s (%sB/s)\n" + +#: apt-private/acqprogress.cc:236 +#, c-format +msgid " [Working]" +msgstr " [执行中]" + +#: apt-private/acqprogress.cc:297 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"更换介质：请把标有\n" +"“%s”\n" +"的盘片插入驱动器“%s”再按回车键\n" + #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format msgid "Unable to read %s" msgstr "无法读取 %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 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:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1775,7 +1770,7 @@ msgstr "[镜像：%s]" msgid "Failed to create IPC pipe to subprocess" msgstr "无法为子进程创建 IPC 管道" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "连接被永久关闭" @@ -1813,512 +1808,128 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们， msgid "Merging available information" msgstr "正在合并可用信息" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n" -"\n" -"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n" -"信息的工具\n" -"\n" -"选项：\n" -" -h 本帮助文本\n" -" -t 设置 temp 目录\n" -" -c=? 读指定的配置文件\n" -" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "把 DropNode 用在了仍在链表中的节点上" -#: cmdline/apt-extracttemplates.cc:254 -#, c-format -msgid "Unable to mkstemp %s" -msgstr "无法建立临时文件(mkstemp) %s " +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "无法定位哈希表元素！" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 -#, c-format -msgid "Unable to write to %s" -msgstr "无法写入 %s" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "无法分配转移项" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？" - -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "软件包的扩展列表太长" +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "内部错误，出现在 AddDiversion" -#: 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 +#: apt-inst/filelist.cc:477 #, c-format -msgid "Error processing directory %s" -msgstr "处理目录 %s 时出错" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "源扩展列表太长" - -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "将头写入到目录文件时出错" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-inst/filelist.cc:506 #, c-format -msgid "Error processing contents %s" -msgstr "处理目录 %s 时出错" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"用法： apt-ftparchive [选项] 命令\n" -"命令： packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n" -" sources 源代码包搜索路径 [overridefile [路径前缀]]\n" -" contents 搜索路径\n" -" release 搜索路径\n" -" generate 配置文件 [groups]\n" -" clean 配置文件\n" -"\n" -"apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n" -"多种生成索引的方式，从全自动的索引生成到在功能上取代 dpkg-scanpackages \n" -"和 dpkg-scansources，都能游刃有余\n" -"\n" -"apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n" -"Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n" -"还有软件包的所有控制字段的内容。该软件同时支持 override 文件，\n" -"通过它可以强制指定软件包的优先级及其所属的软件类别。\n" -"\n" -"与上面类似，apt-ftparchive 也能由 .dsc 的文件树生成 Source 文件。\n" -"可以通过使用 --source-override 选项来指定一个 override 文件\n" -"\n" -"使用“packages”和“source”命令时，必须在文件树的根部执行本程序。\n" -"二进制包的搜索路径一定要是递归搜索的底层，而且 override 文件里\n" -"应该注明 override 的标志。若指定了路径前缀，那么它会被加到文件名前面。\n" -"下面有个来自 Debian 文档的例子：\n" -" apt-ftparchive packages dists/potato/main/binary-i386 > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"选项:\n" -" -h 本帮助文档\n" -" --md5 使之生成 MD5 校验和\n" -" -s=? 源代码包 override 文件\n" -" -q 输出精简信息\n" -" -d=? 指定可选的缓存数据库\n" -" -d=? 使用另一个可选的缓存数据库\n" -" --no-delink 开启delink的调试模式\n" -" --contents 使之生成控制内容文件\n" -" -c=? 读取指定配置文件\n" -" -o=? 设置任意指定的配置选项" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "没有任何选定项是匹配的" +msgid "Double add of diversion %s -> %s" +msgstr "添加了两个转移项 %s-> %s" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:549 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "软件包文件组“%s”中缺少一些文件" +msgid "Duplicate conf file %s/%s" +msgstr "重复的配置文件 %s/%s" -#: ftparchive/cachedb.cc:65 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old" +msgid "The path %s is too long" +msgstr "路径名 %s 太长" -#: ftparchive/cachedb.cc:83 +#: apt-inst/extract.cc:132 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "数据库已过期，现尝试进行升级 %s" +msgid "Unpacking %s more than once" +msgstr "%s 被解包了不只一次" -#: ftparchive/cachedb.cc:94 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" -"数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。" +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "目录 %s 已被转移" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:152 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "无法打开数据库文件 %s：%s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "该软件包正尝试写入转移对象 %s/%s" + +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "该转移路径太长" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format msgid "Failed to stat %s" msgstr "无法获得 %s 的状态" -#: ftparchive/cachedb.cc:332 -msgid "Failed to read .dsc" -msgstr "读取 .dsc 文件失败" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "归档文件没有包含控制字段" - -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "无法获得游标" - -#: ftparchive/writer.cc:91 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "警告：无法读取目录 %s\n" +msgid "Failed to rename %s to %s" +msgstr "无法将 %s 重命名为 %s" -#: ftparchive/writer.cc:96 +#: apt-inst/extract.cc:249 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "警告：无法获得 %s 的状态\n" - -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "错误：" +msgid "The directory %s is being replaced by a non-directory" +msgstr "目录 %s 要被一个非目录的文件替换" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "警告：" +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "无法在其散列桶中分配节点" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "错误：处理文件时出错 " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "路径名太长" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to resolve %s" -msgstr "无法解析 %s" - -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "无法遍历目录树" +msgid "Overwrite package match with no version for %s" +msgstr "用来覆盖的软件包不属于 %s 的任何版本" -#: ftparchive/writer.cc:219 +#: apt-inst/extract.cc:438 #, c-format -msgid "Failed to open %s" -msgstr "无法打开 %s" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" -#: ftparchive/writer.cc:278 +#: apt-inst/extract.cc:498 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgid "Unable to stat %s" +msgstr "无法读取 %s 的状态" -#: ftparchive/writer.cc:286 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "Failed to readlink %s" -msgstr "无法读取符号链接 %s" +msgid "Failed to write file %s" +msgstr "无法写入文件 %s" -#: ftparchive/writer.cc:290 +#: apt-inst/dirstream.cc:105 #, c-format -msgid "Failed to unlink %s" -msgstr "无法使用 unlink 删除 %s" +msgid "Failed to close file %s" +msgstr "无法关闭文件 %s" -#: ftparchive/writer.cc:298 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** 无法将 %s 链接到 %s" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”" -#: ftparchive/writer.cc:308 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " 达到了 DeLink 的上限 %sB。\n" +msgid "Internal error, could not locate member %s" +msgstr "内部错误，无法定位包内文件 %s" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "归档文件没有包含 package 字段" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "不能解析的主控文件" -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s 中没有 override 项\n" - -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " %s 的维护者 %s 并非 %s\n" - -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s 没有源代码的 override 项\n" - -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s 中没有二进制文件的 override 项\n" - -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - 分配内存失败" - -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "无法打开 %s" - -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "override 文件 %s 第 %llu (%s) 行的格式有误" - -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "无法读取 override 文件 %s" - -#: ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" -msgstr "override 文件 %s 第 %llu 行的格式有误 #1" - -#: ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %llu #2" -msgstr "override 文件 %s 第 %llu 行的格式有误 #2" - -#: ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %llu #3" -msgstr "override 文件 %s 第 %llu 行的格式有误 #3" - -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "未知的压缩算法“%s”" - -#: ftparchive/multicompress.cc:103 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合" - -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "无法创建 FILE*" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "无法 fork" - -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "压缩子进程" - -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "内部错误，无法创建 %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "无法对子进程或文件进行读写" - -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "在计算 MD5 校验和时无法读取数据" - -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "在使用 unlink 删除 %s 时出错" - -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "无法将 %s 重命名为 %s" - -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n" -"\n" -"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n" -"信息的工具\n" -"\n" -"选项：\n" -" -h 本帮助文本\n" -" -t 设置 temp 目录\n" -" -c=? 读指定的配置文件\n" -" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "未知的软件包记录！" - -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n" -"\n" -"apt-sortpkgs 是对软件包索引文件内容进行排序的简单工具。-s 选项\n" -"是用来指出后面参数所示文件是哪种文件。\n" -"\n" -"选项：\n" -" -h 本帮助文档\n" -" -s 根据源文件排序\n" -" -c=? 读取指定配置文件\n" -" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" - -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, c-format -msgid "Failed to write file %s" -msgstr "无法写入文件 %s" - -#: apt-inst/dirstream.cc:105 -#, c-format -msgid "Failed to close file %s" -msgstr "无法关闭文件 %s" - -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "路径名 %s 太长" - -#: apt-inst/extract.cc:132 -#, c-format -msgid "Unpacking %s more than once" -msgstr "%s 被解包了不只一次" - -#: apt-inst/extract.cc:142 -#, c-format -msgid "The directory %s is diverted" -msgstr "目录 %s 已被转移" - -#: apt-inst/extract.cc:152 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "该软件包正尝试写入转移对象 %s/%s" - -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "该转移路径太长" - -#: apt-inst/extract.cc:249 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "目录 %s 要被一个非目录的文件替换" - -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "无法在其散列桶中分配节点" - -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "路径名太长" - -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "用来覆盖的软件包不属于 %s 的任何版本" - -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" - -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "无法读取 %s 的状态" - -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "把 DropNode 用在了仍在链表中的节点上" - -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "无法定位哈希表元素！" - -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "无法分配转移项" - -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "内部错误，出现在 AddDiversion" - -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s" - -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "添加了两个转移项 %s-> %s" - -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "重复的配置文件 %s/%s" - -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "无效的归档签名" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "无效的归档签名" #: apt-inst/contrib/arfile.cc:84 msgid "Error reading archive member header" @@ -2362,135 +1973,53 @@ msgstr "Tar 的校验和不符，文件已损坏" msgid "Unknown TAR header type %u, member %s" msgstr "未知的 TAR 数据头类型 %u，成员 %s" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”" +msgid "Progress: [%3i%%]" +msgstr "进度：[%3i%%]" -#: apt-inst/deb/debfile.cc:132 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "内部错误，无法定位包内文件 %s" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +msgstr "正在运行 dpkg" -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "不能解析的主控文件" - -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, c-format -msgid "List directory %spartial is missing." -msgstr "软件包列表的目录 %spartial 缺失。" - -#: apt-pkg/acquire.cc:91 -#, c-format -msgid "Archives directory %spartial is missing." -msgstr "仓库目录 %spartial 确实。" - -#: apt-pkg/acquire.cc:99 -#, c-format -msgid "Unable to lock directory %s" -msgstr "无法对目录 %s 加锁" - -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "%s 的 clean 不被支持" - -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)" - -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "正在下载第 %li 个文件，共 %li 个" - -#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "无法重命名文件，%s (%s -> %s)。" - -#: apt-pkg/acquire-item.cc:163 -msgid "Hash Sum mismatch" -msgstr "Hash 校验和不符" - -#: apt-pkg/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "大小不符" - -#: apt-pkg/acquire-item.cc:173 -msgid "Invalid file format" -msgstr "无效的文件格式 %s" - -#: apt-pkg/acquire-item.cc:1573 -#, 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:1589 +#: apt-pkg/init.cc:146 #, c-format -msgid "Unable to find hash sum for '%s' in Release file" -msgstr "在 Release 文件中找不到 %s 的哈希值" - -#: apt-pkg/acquire-item.cc:1631 -msgid "There is no public key available for the following key IDs:\n" -msgstr "以下 ID 的密钥没有可用的公钥：\n" +msgid "Packaging system '%s' is not supported" +msgstr "不支持“%s”打包系统" -#: apt-pkg/acquire-item.cc:1669 -#, 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/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "无法确定适合的打包系统类型" -#: apt-pkg/acquire-item.cc:1691 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "冲突的发行版：%s (期望 %s 但得到 %s)" +msgid "Wrote %i records.\n" +msgstr "已写入 %i 条记录。\n" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "" -"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" -msgstr "" -"校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n" -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "GPG error: %s: %s" -msgstr "GPG 错误：%s: %s" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, 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 软件包的文件。在这种情况下可能需要您手动修正这个软件" -"包。(缘于架构缺失)" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/indexcopy.cc:515 #, c-format -msgid "Can't find a source to download version '%s' of '%s'" -msgstr "没有源可以用来下载 %s 版本的 %s" +msgid "Can't find authentication record for: %s" +msgstr "无法找到认证记录：%s" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/indexcopy.cc:521 #, c-format -msgid "" -"The package index files are corrupted. No Filename: field for package %s." -msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" +msgid "Hash mismatch for: %s" +msgstr "Hash 校验和不符：%s" #: apt-pkg/acquire-worker.cc:116 #, c-format @@ -2512,26 +2041,6 @@ msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。" -#: apt-pkg/algorithms.cc:265 -#, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。" - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的" -"缘故。" - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "" -"无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" -"系。" - #: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "无法解析或打开软件包的列表或是状态文件。" @@ -2544,170 +2053,244 @@ msgstr "您可能需要运行 apt-get update 来解决这些问题" msgid "The list of sources could not be read." msgstr "无法读取源列表。" -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "未找到“%2$s”的“%1$s”发布版本" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "软件包缓存区是空的" -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "未找到“%2$s”的“%1$s”版本" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "软件包缓存文件损坏了" -#: apt-pkg/cacheset.cc:603 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "无法找到任务 %s" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "软件包缓存区文件的版本不兼容" -#: apt-pkg/cacheset.cc:609 -#, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "无法按照正则表达式 %s 找到任何软件包" +#: apt-pkg/pkgcache.cc:169 +msgid "The package cache file is corrupted, it is too small" +msgstr "软件包缓存文件损坏，它太小了" -#: apt-pkg/cacheset.cc:615 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "无法按照 glob ‘%s’ 找到任何软件包" +msgid "This APT does not support the versioning system '%s'" +msgstr "本程序目前不支持“%s”版本系统" -#: apt-pkg/cacheset.cc:626 -#, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "无法从完全虚拟的软件包 %s 中选择版本" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "软件包缓存区是为其它架构的硬件构建的" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 -#, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "依赖" -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "预依赖" -#: apt-pkg/cacheset.cc:655 -#, c-format -msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "因为软件包 %s 没有候选版本，无法进行选择" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "建议" -#: apt-pkg/cacheset.cc:663 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" -msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "推荐" -#: 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/pkgcache.cc:322 +msgid "Conflicts" +msgstr "冲突" -#: apt-pkg/cdrom.cc:571 -msgid "Unmounting CD-ROM...\n" -msgstr "正在卸载 CD-ROM...\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "替换" -#: apt-pkg/cdrom.cc:586 -#, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "现把 %s 作为了 CD-ROM 的挂载点\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "废弃" -#: apt-pkg/cdrom.cc:599 -msgid "Waiting for disc...\n" -msgstr "等待插入盘片……\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "破坏" -#: apt-pkg/cdrom.cc:609 -msgid "Mounting CD-ROM...\n" -msgstr "正在挂载 CD-ROM 文件系统……\n" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "增强" -#: apt-pkg/cdrom.cc:620 -msgid "Identifying... " -msgstr "正在鉴别... " +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "重要" -#: apt-pkg/cdrom.cc:662 -#, c-format -msgid "Stored label: %s\n" -msgstr "已归档文件的标签：%s\n" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "必需" -#: apt-pkg/cdrom.cc:680 -msgid "Scanning disc for index files...\n" -msgstr "正在盘片中查找索引文件...\n" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "标准" -#: apt-pkg/cdrom.cc:734 -#, c-format -msgid "" -"Found %zu package indexes, %zu source indexes, %zu translation indexes and " -"%zu signatures\n" -msgstr "" -"找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签" -"名\n" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "可选" -#: apt-pkg/cdrom.cc:744 -msgid "" -"Unable to locate any package files, perhaps this is not a Debian Disc or the " -"wrong architecture?" -msgstr "" -"无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构" -"架。" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "额外" -#: apt-pkg/cdrom.cc:771 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Found label '%s'\n" -msgstr "找到标签 '%s'\n" +msgid "Index file type '%s' is not supported" +msgstr "不支持索引文件类型“%s”" -#: apt-pkg/cdrom.cc:800 -msgid "That is not a valid name, try again.\n" -msgstr "这不是一个有效的名字，请重试。\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/cdrom.cc:817 +#: apt-pkg/sourcelist.cc:170 #, c-format -msgid "" -"This disc is called: \n" -"'%s'\n" -msgstr "" -"这张盘片现在的名字是：\n" -"“%s”\n" +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)" -#: apt-pkg/cdrom.cc:819 -msgid "Copying package lists..." -msgstr "正在复制软件包列表……" +#: 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/cdrom.cc:863 -msgid "Writing new source list\n" -msgstr "正在写入新的源列表\n" +#: 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/cdrom.cc:874 -msgid "Source list entries for this disc are:\n" -msgstr "对应于该盘片的软件源设置项是：\n" +#: 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/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 行有错误(独立发行版)" + +#: 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:490 +#, fuzzy, 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/depcache.cc:138 apt-pkg/depcache.cc:167 -msgid "Building dependency tree" -msgstr "正在分析软件包的依赖关系树" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "软件包暂存区使用的是不兼容的版本控制系统" -#: apt-pkg/depcache.cc:139 -msgid "Candidate versions" -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:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "处理 %s (%s%d) 时出错" -#: apt-pkg/depcache.cc:168 -msgid "Dependency generation" -msgstr "生成依赖关系" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "哇，软件包数量超出了本 APT 的处理能力。" -#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 -msgid "Reading state information" -msgstr "正在读取状态信息" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "哇，软件包版本数量超出了本 APT 的处理能力。" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/pkgcachegen.cc:263 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "哇，软件包说明数量超出了本 APT 的处理能力。" + +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "哇，依赖关系数量超出了本 APT 的处理能力。" + +#: apt-pkg/pkgcachegen.cc:576 #, 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:1211 #, 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:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "正在读取软件包列表" + +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "正在收集文件所提供的软件包" + +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "无法写入 %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "无法读取或写入软件源缓存" #: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 msgid "Send scenario to solver" @@ -2729,78 +2312,144 @@ msgstr "外部solver出错，错误信息不恰当" msgid "Execute external solver" msgstr "执行外部solver" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format -msgid "Wrote %i records.\n" -msgstr "已写入 %i 条记录。\n" +msgid "rename failed, %s (%s -> %s)." +msgstr "无法重命名文件，%s (%s -> %s)。" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 -#, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n" +#: apt-pkg/acquire-item.cc:163 +msgid "Hash Sum mismatch" +msgstr "Hash 校验和不符" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/acquire-item.cc:168 +msgid "Size mismatch" +msgstr "大小不符" + +#: apt-pkg/acquire-item.cc:173 +msgid "Invalid file format" +msgstr "无效的文件格式 %s" + +#: apt-pkg/acquire-item.cc:1640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n" +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +msgstr "" +"在 Release 文件中找不到期望的条目 %s（sources.list条目有误，或者文件有误）" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/acquire-item.cc:1656 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n" +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "在 Release 文件中找不到 %s 的哈希值" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/acquire-item.cc:1698 +msgid "There is no public key available for the following key IDs:\n" +msgstr "以下 ID 的密钥没有可用的公钥：\n" + +#: apt-pkg/acquire-item.cc:1736 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "无法找到认证记录：%s" +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/indexcopy.cc:521 +#: apt-pkg/acquire-item.cc:1758 #, c-format -msgid "Hash mismatch for: %s" -msgstr "Hash 校验和不符：%s" +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "冲突的发行版：%s (期望 %s 但得到 %s)" -#: apt-pkg/indexrecords.cc:78 +#: apt-pkg/acquire-item.cc:1788 #, c-format -msgid "Unable to parse Release file %s" -msgstr "无法解析软件包仓库 Release 文件 %s" +msgid "" +"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" +msgstr "" +"校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n" -#: apt-pkg/indexrecords.cc:86 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format -msgid "No sections in Release file %s" -msgstr "软件包仓库 Release 文件 %s 内无组件章节信息" +msgid "GPG error: %s: %s" +msgstr "GPG 错误：%s: %s" -#: apt-pkg/indexrecords.cc:117 +#: apt-pkg/acquire-item.cc:1926 #, c-format -msgid "No Hash entry in Release file %s" -msgstr "软件包仓库 Release 文件 %s 内无哈希条目" +msgid "" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package. (due to missing arch)" +msgstr "" +"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" +"包。(缘于架构缺失)" -#: apt-pkg/indexrecords.cc:130 +#: apt-pkg/acquire-item.cc:1992 #, c-format -msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效" +msgid "Can't find a source to download version '%s' of '%s'" +msgstr "没有源可以用来下载 %s 版本的 %s" -#: apt-pkg/indexrecords.cc:149 +#: apt-pkg/acquire-item.cc:2050 #, c-format -msgid "Invalid 'Date' entry in Release file %s" -msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效" +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/init.cc:146 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "不支持“%s”打包系统" +msgid "Vendor block %s contains no fingerprint" +msgstr "软件提供者数据块内 %s 没有包含指纹信息" -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "无法确定适合的打包系统类型" +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#, c-format +msgid "List directory %spartial is missing." +msgstr "软件包列表的目录 %spartial 缺失。" -#: apt-pkg/install-progress.cc:57 +#: apt-pkg/acquire.cc:91 #, c-format -msgid "Progress: [%3i%%]" -msgstr "进度：[%3i%%]" +msgid "Archives directory %spartial is missing." +msgstr "仓库目录 %spartial 确实。" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "正在运行 dpkg" +#: apt-pkg/acquire.cc:99 +#, c-format +msgid "Unable to lock directory %s" +msgstr "无法对目录 %s 加锁" + +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 +#, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)" + +#: apt-pkg/acquire.cc:904 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "正在下载第 %li 个文件，共 %li 个" + +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI" + +#: 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 +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头" + +#: apt-pkg/policy.cc:444 +#, c-format +msgid "Did not understand pin type %s" +msgstr "无法识别锁定的类型 %s" + +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "没有为版本锁定指定优先级(或为零)" #: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format @@ -2827,328 +2476,444 @@ msgstr "" "少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::" "Force-LoopBreak 选项。" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -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/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "软件包缓存文件损坏了" +#: apt-pkg/cdrom.cc:571 +msgid "Unmounting CD-ROM...\n" +msgstr "正在卸载 CD-ROM...\n" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "软件包缓存区文件的版本不兼容" +#: apt-pkg/cdrom.cc:586 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "现把 %s 作为了 CD-ROM 的挂载点\n" -#: apt-pkg/pkgcache.cc:169 -msgid "The package cache file is corrupted, it is too small" -msgstr "软件包缓存文件损坏，它太小了" +#: apt-pkg/cdrom.cc:599 +msgid "Waiting for disc...\n" +msgstr "等待插入盘片……\n" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/cdrom.cc:609 +msgid "Mounting CD-ROM...\n" +msgstr "正在挂载 CD-ROM 文件系统……\n" + +#: apt-pkg/cdrom.cc:620 +msgid "Identifying... " +msgstr "正在鉴别... " + +#: apt-pkg/cdrom.cc:662 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "本程序目前不支持“%s”版本系统" +msgid "Stored label: %s\n" +msgstr "已归档文件的标签：%s\n" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "软件包缓存区是为其它架构的硬件构建的" +#: apt-pkg/cdrom.cc:680 +msgid "Scanning disc for index files...\n" +msgstr "正在盘片中查找索引文件...\n" -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "依赖" +#: apt-pkg/cdrom.cc:734 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" +msgstr "" +"找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签" +"名\n" -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "预依赖" +#: apt-pkg/cdrom.cc:744 +msgid "" +"Unable to locate any package files, perhaps this is not a Debian Disc or the " +"wrong architecture?" +msgstr "" +"无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构" +"架。" -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "建议" +#: apt-pkg/cdrom.cc:771 +#, c-format +msgid "Found label '%s'\n" +msgstr "找到标签 '%s'\n" -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "推荐" +#: apt-pkg/cdrom.cc:800 +msgid "That is not a valid name, try again.\n" +msgstr "这不是一个有效的名字，请重试。\n" -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "冲突" +#: apt-pkg/cdrom.cc:817 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"这张盘片现在的名字是：\n" +"“%s”\n" -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "替换" +#: apt-pkg/cdrom.cc:819 +msgid "Copying package lists..." +msgstr "正在复制软件包列表……" -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "废弃" +#: apt-pkg/cdrom.cc:863 +msgid "Writing new source list\n" +msgstr "正在写入新的源列表\n" -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "破坏" +#: apt-pkg/cdrom.cc:874 +msgid "Source list entries for this disc are:\n" +msgstr "对应于该盘片的软件源设置项是：\n" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "增强" +#: apt-pkg/algorithms.cc:265 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "重要" +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的" +"缘故。" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "必需" +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "" +"无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" +"系。" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "标准" +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 +msgid "Building dependency tree" +msgstr "正在分析软件包的依赖关系树" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "可选" +#: apt-pkg/depcache.cc:139 +msgid "Candidate versions" +msgstr "候选版本" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "额外" +#: apt-pkg/depcache.cc:168 +msgid "Dependency generation" +msgstr "生成依赖关系" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "软件包暂存区使用的是不兼容的版本控制系统" +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 +msgid "Reading state information" +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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/depcache.cc:250 #, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "处理 %s (%s%d) 时出错" +msgid "Failed to open StateFile %s" +msgstr "无法打开状态文件 %s" -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "哇，软件包数量超出了本 APT 的处理能力。" - -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "哇，软件包版本数量超出了本 APT 的处理能力。" +#: apt-pkg/depcache.cc:256 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "无法写入临时状态文件 %s" -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "哇，软件包说明数量超出了本 APT 的处理能力。" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "无法解析软件包文件 %s (1)" -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "哇，依赖关系数量超出了本 APT 的处理能力。" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "无法解析软件包文件 %s (2)" -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/cacheset.cc:489 #, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "当处理文件依赖关系时，无法找到软件包 %s %s" +msgid "Release '%s' for '%s' was not found" +msgstr "未找到“%2$s”的“%1$s”发布版本" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/cacheset.cc:492 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "无法获取源软件包列表 %s 的状态" +msgid "Version '%s' for '%s' was not found" +msgstr "未找到“%2$s”的“%1$s”版本" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "正在读取软件包列表" +#: apt-pkg/cacheset.cc:603 +#, c-format +msgid "Couldn't find task '%s'" +msgstr "无法找到任务 %s" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "正在收集文件所提供的软件包" +#: apt-pkg/cacheset.cc:609 +#, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "无法按照正则表达式 %s 找到任何软件包" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "无法读取或写入软件源缓存" +#: apt-pkg/cacheset.cc:615 +#, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "无法按照 glob ‘%s’ 找到任何软件包" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "不支持索引文件类型“%s”" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "无法从完全虚拟的软件包 %s 中选择版本" -#: apt-pkg/policy.cc:83 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, 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 是无效的，" -"因为在源里找不到这样的发行" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择" -#: apt-pkg/policy.cc:422 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头" +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版" -#: apt-pkg/policy.cc:444 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Did not understand pin type %s" -msgstr "无法识别锁定的类型 %s" - -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "没有为版本锁定指定优先级(或为零)" +msgid "Can't select candidate version from package %s as it has no candidate" +msgstr "因为软件包 %s 没有候选版本，无法进行选择" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/cacheset.cc:663 #, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "安装源配置文件“%2$s”第 %1$u 节有错误(URI 解析)" +msgid "Can't select installed version from package %s as it is not installed" +msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/indexrecords.cc:78 #, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)" +msgid "Unable to parse Release file %s" +msgstr "无法解析软件包仓库 Release 文件 %s" -#: apt-pkg/sourcelist.cc:173 +#: apt-pkg/indexrecords.cc:86 #, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)" +msgid "No sections in Release file %s" +msgstr "软件包仓库 Release 文件 %s 内无组件章节信息" -#: apt-pkg/sourcelist.cc:184 +#: apt-pkg/indexrecords.cc:117 #, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)" +msgid "No Hash entry in Release file %s" +msgstr "软件包仓库 Release 文件 %s 内无哈希条目" -#: apt-pkg/sourcelist.cc:190 +#: apt-pkg/indexrecords.cc:130 #, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)" +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/indexrecords.cc:149 #, 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 没有值)" +msgid "Invalid 'Date' entry in Release file %s" +msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效" -#: apt-pkg/sourcelist.cc:206 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)" +msgid "%lid %lih %limin %lis" +msgstr "%li天 %li小时 %li分 %li秒" -#: apt-pkg/sourcelist.cc:208 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)" +msgid "%lih %limin %lis" +msgstr "%li小时 %li分 %li秒" -#: apt-pkg/sourcelist.cc:211 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" +msgid "%limin %lis" +msgstr "%li分 %li秒" -#: apt-pkg/sourcelist.cc:217 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)" +msgid "%lis" +msgstr "%li秒" -#: apt-pkg/sourcelist.cc:224 +#: apt-pkg/contrib/strutl.cc:1258 #, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)" +msgid "Selection %s not found" +msgstr "找不到您选则的 %s" -#: apt-pkg/sourcelist.cc:335 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "Opening %s" -msgstr "正在打开 %s" +msgid "Not using locking for read only lock file %s" +msgstr "由于文件系统为只读，因而无法使用文件锁 %s" -#: apt-pkg/sourcelist.cc:371 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)" +msgid "Could not open lock file %s" +msgstr "无法打开锁文件 %s" -#: apt-pkg/sourcelist.cc:375 +#: apt-pkg/contrib/fileutl.cc:218 #, c-format -msgid "Type '%s' is not known on line %u in source list %s" -msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" +msgid "Not using locking for nfs mounted lock file %s" +msgstr "无法在 nfs 文件系统上使用文件锁 %s" -#: apt-pkg/sourcelist.cc:416 +#: apt-pkg/contrib/fileutl.cc:223 #, c-format -msgid "Type '%s' is not known on stanza %u in source list %s" -msgstr "无法识别在源列表 %3$s 里，第 %2$u 节中的软件包类别“%1$s”" - -#: apt-pkg/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI" +msgid "Could not get lock %s" +msgstr "无法获得锁 %s" -#: apt-pkg/tagfile.cc:140 +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 #, c-format -msgid "Unable to parse package file %s (1)" -msgstr "无法解析软件包文件 %s (1)" +msgid "List of files can't be created as '%s' is not a directory" +msgstr "无法创建文件列表，因为‘%s’不是一个目录" -#: apt-pkg/tagfile.cc:237 +#: apt-pkg/contrib/fileutl.cc:394 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "无法解析软件包文件 %s (2)" - -#: 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 "" -"部分索引文件下载失败。如果忽略它们，那将转而使用旧的索引文件。" +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "忽略‘%s’(于目录‘%s’)，鉴于它不是一个常规文件" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/contrib/fileutl.cc:412 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "软件提供者数据块内 %s 没有包含指纹信息" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "忽略‘%s’(于目录‘%s’)，鉴于它没有文件扩展名" -#: apt-pkg/contrib/cdromutl.cc:65 +#: apt-pkg/contrib/fileutl.cc:421 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "无法读取文件系统挂载点 %s 的状态" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "无法读取盘片的状态" +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "忽略‘%s’(于目录‘%s’)，鉴于它的文件扩展名无效" -#: apt-pkg/contrib/cmndline.cc:121 +#: apt-pkg/contrib/fileutl.cc:824 #, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "未知的命令行选项“%c” [来自 %s]" +msgid "Sub-process %s received a segmentation fault." +msgstr "子进程 %s 发生了段错误" -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 +#: apt-pkg/contrib/fileutl.cc:826 #, c-format -msgid "Command line option %s is not understood" -msgstr "无法识别命令行选项 %s" +msgid "Sub-process %s received signal %u." +msgstr "子进程 %s 收到信号 %u。" -#: apt-pkg/contrib/cmndline.cc:168 +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 #, c-format -msgid "Command line option %s is not boolean" -msgstr "命令行选项 %s 不是布尔值" +msgid "Sub-process %s returned an error code (%u)" +msgstr "子进程 %s 返回了一个错误号 (%u)" -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 #, c-format -msgid "Option %s requires an argument." -msgstr "选项 %s 要求有一个参数" +msgid "Sub-process %s exited unexpectedly" +msgstr "子进程 %s 异常退出" -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 +#: apt-pkg/contrib/fileutl.cc:913 #, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定" +msgid "Problem closing the gzip file %s" +msgstr "关闭 gzip %s 文件出错" -#: apt-pkg/contrib/cmndline.cc:278 +#: apt-pkg/contrib/fileutl.cc:1101 #, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”" +msgid "Could not open file %s" +msgstr "无法打开文件 %s" -#: apt-pkg/contrib/cmndline.cc:309 +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 #, c-format -msgid "Option '%s' is too long" -msgstr "选项“%s”太长" +msgid "Could not open file descriptor %d" +msgstr "无法打开文件描述符 %d" -#: apt-pkg/contrib/cmndline.cc:341 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "不能识别参数 %s，请用 true 或 false" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "无法创建子进程的 IPC 管道" + +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "无法执行压缩程序" -#: apt-pkg/contrib/cmndline.cc:391 +#: apt-pkg/contrib/fileutl.cc:1514 #, c-format -msgid "Invalid operation %s" -msgstr "无效的操作 %s" +msgid "read, still have %llu to read but none left" +msgstr "还剩 %llu 字节没有读出，但已没有可读信息" + +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "还剩 %llu 字节没有写入，但无法写入操作" + +#: apt-pkg/contrib/fileutl.cc:1915 +#, c-format +msgid "Problem closing the file %s" +msgstr "关闭文件 %s 出错" + +#: apt-pkg/contrib/fileutl.cc:1927 +#, c-format +msgid "Problem renaming the file %s to %s" +msgstr "重命名文件 %s 为 %s 出错" + +#: apt-pkg/contrib/fileutl.cc:1938 +#, c-format +msgid "Problem unlinking the file %s" +msgstr "用 unlink 删除文件 %s 出错" + +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "同步文件出错" + +#: apt-pkg/contrib/progress.cc:148 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... 有错误！" + +#: apt-pkg/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... 完成" + +#: apt-pkg/contrib/progress.cc:181 +msgid "..." +msgstr "..." + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... %u%%" + +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "无法 mmap 一个空文件" + +#: apt-pkg/contrib/mmap.cc:111 +#, c-format +msgid "Couldn't duplicate file descriptor %i" +msgstr "无法为复制文件描述符 %i" + +#: apt-pkg/contrib/mmap.cc:119 +#, c-format +msgid "Couldn't make mmap of %llu bytes" +msgstr "无法 mmap %llu 字节的数据" + +#: apt-pkg/contrib/mmap.cc:146 +msgid "Unable to close mmap" +msgstr "无法关闭 mmap" + +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +msgid "Unable to synchronize mmap" +msgstr "无法同步 mmap " + +#: apt-pkg/contrib/mmap.cc:290 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "无法 mmap %lu 字节的数据" + +#: apt-pkg/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "无法截断文件" + +#: apt-pkg/contrib/mmap.cc:341 +#, c-format +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" +"动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值：%lu。(man 5 " +"apt.conf)" + +#: apt-pkg/contrib/mmap.cc:446 +#, c-format +msgid "" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。" + +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。" + +#: apt-pkg/contrib/cdromutl.cc:65 +#, c-format +msgid "Unable to stat the mount point %s" +msgstr "无法读取文件系统挂载点 %s 的状态" + +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "无法读取盘片的状态" #: apt-pkg/contrib/configuration.cc:519 #, c-format @@ -3205,389 +2970,610 @@ msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据" -#: apt-pkg/contrib/fileutl.cc:190 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "由于文件系统为只读，因而无法使用文件锁 %s" +msgid "No keyring installed in %s." +msgstr "%s 中没有安装密钥环。" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Could not open lock file %s" -msgstr "无法打开锁文件 %s" +msgid "Command line option '%c' [from %s] is not known." +msgstr "未知的命令行选项“%c” [来自 %s]" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "无法在 nfs 文件系统上使用文件锁 %s" +msgid "Command line option %s is not understood" +msgstr "无法识别命令行选项 %s" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Could not get lock %s" -msgstr "无法获得锁 %s" +msgid "Command line option %s is not boolean" +msgstr "命令行选项 %s 不是布尔值" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "无法创建文件列表，因为‘%s’不是一个目录" +msgid "Option %s requires an argument." +msgstr "选项 %s 要求有一个参数" -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "忽略‘%s’(于目录‘%s’)，鉴于它不是一个常规文件" +msgid "Option %s: Configuration item specification must have an =." +msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定" -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "忽略‘%s’(于目录‘%s’)，鉴于它没有文件扩展名" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" -"忽略‘%s’(于目录‘%s’)，鉴于它的文件扩展名无效" +msgid "Option '%s' is too long" +msgstr "选项“%s”太长" -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "子进程 %s 发生了段错误" +msgid "Sense %s is not understood, try true or false." +msgstr "不能识别参数 %s，请用 true 或 false" -#: apt-pkg/contrib/fileutl.cc:826 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s received signal %u." -msgstr "子进程 %s 收到信号 %u。" +msgid "Invalid operation %s" +msgstr "无效的操作 %s" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/deb/dpkgpm.cc:110 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "子进程 %s 返回了一个错误号 (%u)" +msgid "Installing %s" +msgstr "正在安装 %s" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "子进程 %s 异常退出" +msgid "Configuring %s" +msgstr "正在配置 %s" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Problem closing the gzip file %s" -msgstr "关闭 gzip %s 文件出错" +msgid "Removing %s" +msgstr "正在删除 %s" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/dpkgpm.cc:113 #, c-format -msgid "Could not open file %s" -msgstr "无法打开文件 %s" +msgid "Completely removing %s" +msgstr "完全删除 %s" -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Could not open file descriptor %d" -msgstr "无法打开文件描述符 %d" +msgid "Noting disappearance of %s" +msgstr "注意到 %s 已经消失" -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "无法创建子进程的 IPC 管道" +#: apt-pkg/deb/dpkgpm.cc:115 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "执行安装后执行的触发器 %s" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "无法执行压缩程序" +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 +#, c-format +msgid "Directory '%s' missing" +msgstr "目录 %s 缺失" -#: apt-pkg/contrib/fileutl.cc:1514 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, c-format -msgid "read, still have %llu to read but none left" -msgstr "还剩 %llu 字节没有读出，但已没有可读信息" +msgid "Could not open file '%s'" +msgstr "无法打开文件 %s" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#: apt-pkg/deb/dpkgpm.cc:1007 #, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "还剩 %llu 字节没有写入，但无法写入操作" +msgid "Preparing %s" +msgstr "正在准备 %s" -#: apt-pkg/contrib/fileutl.cc:1915 +#: apt-pkg/deb/dpkgpm.cc:1008 #, c-format -msgid "Problem closing the file %s" -msgstr "关闭文件 %s 出错" +msgid "Unpacking %s" +msgstr "正在解压缩 %s" -#: apt-pkg/contrib/fileutl.cc:1927 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format -msgid "Problem renaming the file %s to %s" -msgstr "重命名文件 %s 为 %s 出错" +msgid "Preparing to configure %s" +msgstr "正在准备配置 %s" -#: apt-pkg/contrib/fileutl.cc:1938 +#: apt-pkg/deb/dpkgpm.cc:1015 #, c-format -msgid "Problem unlinking the file %s" -msgstr "用 unlink 删除文件 %s 出错" +msgid "Installed %s" +msgstr "已安装 %s" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "同步文件出错" +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "正在准备 %s 的删除操作" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: apt-pkg/deb/dpkgpm.cc:1022 #, c-format -msgid "No keyring installed in %s." -msgstr "%s 中没有安装密钥环。" +msgid "Removed %s" +msgstr "已删除 %s" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "无法 mmap 一个空文件" +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "正在准备完全删除 %s" -#: apt-pkg/contrib/mmap.cc:111 +#: apt-pkg/deb/dpkgpm.cc:1028 #, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "无法为复制文件描述符 %i" +msgid "Completely removed %s" +msgstr "完全删除了 %s" -#: apt-pkg/contrib/mmap.cc:119 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "无法 mmap %llu 字节的数据" +msgid "Can not write log (%s)" +msgstr "无法写入日志 (%s)" -#: apt-pkg/contrib/mmap.cc:146 -msgid "Unable to close mmap" -msgstr "无法关闭 mmap" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "/dev/pts 挂载了吗？" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -msgid "Unable to synchronize mmap" -msgstr "无法同步 mmap " +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "操作在完成之前被打断" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "无法 mmap %lu 字节的数据" +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "无法截断文件" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "依赖问题 - 保持未配置" -#: apt-pkg/contrib/mmap.cc:341 +#: apt-pkg/deb/dpkgpm.cc:1726 +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:1732 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。" + +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。" + +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "错误信息显示本地系统有一些问题，因此没有写入 apport 报告" + +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "" -"动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值：%lu。(man 5 " -"apt.conf)" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？" -#: apt-pkg/contrib/mmap.cc:446 +#: 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 "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgstr "dpkg 被中断，您必须手工运行 ‘%s’ 解决此问题。" -#: apt-pkg/contrib/mmap.cc:449 +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "未锁定" + +#: cmdline/apt-extracttemplates.cc:224 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." -msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n" +"\n" +"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n" +"信息的工具\n" +"\n" +"选项：\n" +" -h 本帮助文本\n" +" -t 设置 temp 目录\n" +" -c=? 读指定的配置文件\n" +" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" -#: apt-pkg/contrib/progress.cc:148 +#: cmdline/apt-extracttemplates.cc:254 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... 有错误！" +msgid "Unable to mkstemp %s" +msgstr "无法建立临时文件(mkstemp) %s " -#: apt-pkg/contrib/progress.cc:150 +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？" + +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +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 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... 完成" +msgid "Error processing directory %s" +msgstr "处理目录 %s 时出错" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "..." +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "源扩展列表太长" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "将头写入到目录文件时出错" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... %u%%" +msgid "Error processing contents %s" +msgstr "处理目录 %s 时出错" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"用法： apt-ftparchive [选项] 命令\n" +"命令： packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n" +" sources 源代码包搜索路径 [overridefile [路径前缀]]\n" +" contents 搜索路径\n" +" release 搜索路径\n" +" generate 配置文件 [groups]\n" +" clean 配置文件\n" +"\n" +"apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n" +"多种生成索引的方式，从全自动的索引生成到在功能上取代 dpkg-scanpackages \n" +"和 dpkg-scansources，都能游刃有余\n" +"\n" +"apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n" +"Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n" +"还有软件包的所有控制字段的内容。该软件同时支持 override 文件，\n" +"通过它可以强制指定软件包的优先级及其所属的软件类别。\n" +"\n" +"与上面类似，apt-ftparchive 也能由 .dsc 的文件树生成 Source 文件。\n" +"可以通过使用 --source-override 选项来指定一个 override 文件\n" +"\n" +"使用“packages”和“source”命令时，必须在文件树的根部执行本程序。\n" +"二进制包的搜索路径一定要是递归搜索的底层，而且 override 文件里\n" +"应该注明 override 的标志。若指定了路径前缀，那么它会被加到文件名前面。\n" +"下面有个来自 Debian 文档的例子：\n" +" apt-ftparchive packages dists/potato/main/binary-i386 > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"选项:\n" +" -h 本帮助文档\n" +" --md5 使之生成 MD5 校验和\n" +" -s=? 源代码包 override 文件\n" +" -q 输出精简信息\n" +" -d=? 指定可选的缓存数据库\n" +" -d=? 使用另一个可选的缓存数据库\n" +" --no-delink 开启delink的调试模式\n" +" --contents 使之生成控制内容文件\n" +" -c=? 读取指定配置文件\n" +" -o=? 设置任意指定的配置选项" + +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "没有任何选定项是匹配的" + +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "%li天 %li小时 %li分 %li秒" +msgid "Some files are missing in the package file group `%s'" +msgstr "软件包文件组“%s”中缺少一些文件" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "%lih %limin %lis" -msgstr "%li小时 %li分 %li秒" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "数据库已过期，现尝试进行升级 %s" + +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" +"数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。" + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "无法打开数据库文件 %s：%s" + +#: ftparchive/cachedb.cc:332 +msgid "Failed to read .dsc" +msgstr "读取 .dsc 文件失败" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "归档文件没有包含控制字段" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 -#, c-format -msgid "%limin %lis" -msgstr "%li分 %li秒" +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "无法获得游标" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:91 #, c-format -msgid "%lis" -msgstr "%li秒" +msgid "W: Unable to read directory %s\n" +msgstr "警告：无法读取目录 %s\n" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:96 #, c-format -msgid "Selection %s not found" -msgstr "找不到您选则的 %s" +msgid "W: Unable to stat %s\n" +msgstr "警告：无法获得 %s 的状态\n" -#: apt-pkg/deb/debsystem.cc:91 -#, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "错误：" -#: apt-pkg/deb/debsystem.cc:94 -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "警告：" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "错误：处理文件时出错 " + +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "dpkg 被中断，您必须手工运行 ‘%s’ 解决此问题。" +msgid "Failed to resolve %s" +msgstr "无法解析 %s" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "未锁定" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "无法遍历目录树" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:219 #, c-format -msgid "Installing %s" -msgstr "正在安装 %s" +msgid "Failed to open %s" +msgstr "无法打开 %s" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:278 #, c-format -msgid "Configuring %s" -msgstr "正在配置 %s" +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:286 #, c-format -msgid "Removing %s" -msgstr "正在删除 %s" +msgid "Failed to readlink %s" +msgstr "无法读取符号链接 %s" -#: apt-pkg/deb/dpkgpm.cc:98 +#: ftparchive/writer.cc:290 #, c-format -msgid "Completely removing %s" -msgstr "完全删除 %s" +msgid "Failed to unlink %s" +msgstr "无法使用 unlink 删除 %s" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:298 #, c-format -msgid "Noting disappearance of %s" -msgstr "注意到 %s 已经消失" +msgid "*** Failed to link %s to %s" +msgstr "*** 无法将 %s 链接到 %s" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:308 #, c-format -msgid "Running post-installation trigger %s" -msgstr "执行安装后执行的触发器 %s" +msgid " DeLink limit of %sB hit.\n" +msgstr " 达到了 DeLink 的上限 %sB。\n" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "归档文件没有包含 package 字段" + +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Directory '%s' missing" -msgstr "目录 %s 缺失" +msgid " %s has no override entry\n" +msgstr " %s 中没有 override 项\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Could not open file '%s'" -msgstr "无法打开文件 %s" +msgid " %s maintainer is %s not %s\n" +msgstr " %s 的维护者 %s 并非 %s\n" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing %s" -msgstr "正在准备 %s" +msgid " %s has no source override entry\n" +msgstr " %s 没有源代码的 override 项\n" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:710 #, c-format -msgid "Unpacking %s" -msgstr "正在解压缩 %s" +msgid " %s has no binary override entry either\n" +msgstr " %s 中没有二进制文件的 override 项\n" + +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - 分配内存失败" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Preparing to configure %s" -msgstr "正在准备配置 %s" +msgid "Unable to open %s" +msgstr "无法打开 %s" -#: apt-pkg/deb/dpkgpm.cc:1000 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 #, c-format -msgid "Installed %s" -msgstr "已安装 %s" +msgid "Malformed override %s line %llu (%s)" +msgstr "override 文件 %s 第 %llu (%s) 行的格式有误" -#: apt-pkg/deb/dpkgpm.cc:1005 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Preparing for removal of %s" -msgstr "正在准备 %s 的删除操作" +msgid "Failed to read the override file %s" +msgstr "无法读取 override 文件 %s" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:166 #, c-format -msgid "Removed %s" -msgstr "已删除 %s" +msgid "Malformed override %s line %llu #1" +msgstr "override 文件 %s 第 %llu 行的格式有误 #1" -#: apt-pkg/deb/dpkgpm.cc:1012 +#: ftparchive/override.cc:178 #, c-format -msgid "Preparing to completely remove %s" -msgstr "正在准备完全删除 %s" +msgid "Malformed override %s line %llu #2" +msgstr "override 文件 %s 第 %llu 行的格式有误 #2" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/override.cc:191 #, c-format -msgid "Completely removed %s" -msgstr "完全删除了 %s" +msgid "Malformed override %s line %llu #3" +msgstr "override 文件 %s 第 %llu 行的格式有误 #3" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/multicompress.cc:73 #, c-format -msgid "Can not write log (%s)" -msgstr "无法写入日志 (%s)" +msgid "Unknown compression algorithm '%s'" +msgstr "未知的压缩算法“%s”" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "/dev/pts 挂载了吗？" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "stdout 是终端吗？" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "无法创建 FILE*" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "操作在完成之前被打断" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "无法 fork" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "压缩子进程" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "依赖问题 - 保持未配置" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "内部错误，无法创建 %s" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。" +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "无法对子进程或文件进行读写" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。" +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "在计算 MD5 校验和时无法读取数据" -#: apt-pkg/deb/dpkgpm.cc:1707 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。" +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "在使用 unlink 删除 %s 时出错" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-internal-solver.cc:49 +#, fuzzy msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"错误信息显示本地系统有一些问题，因此没有写入 apport 报告" +"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n" +"\n" +"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n" +"信息的工具\n" +"\n" +"选项：\n" +" -h 本帮助文本\n" +" -t 设置 temp 目录\n" +" -c=? 读指定的配置文件\n" +" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "未知的软件包记录！" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。" +"用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n" +"\n" +"apt-sortpkgs 是对软件包索引文件内容进行排序的简单工具。-s 选项\n" +"是用来指出后面参数所示文件是哪种文件。\n" +"\n" +"选项：\n" +" -h 本帮助文档\n" +" -s 根据源文件排序\n" +" -c=? 读取指定配置文件\n" +" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" + +#~ msgid "Is stdout a terminal?" +#~ msgstr "stdout 是终端吗？" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" diff --git a/po/zh_TW.po b/po/zh_TW.po index 59a8dcac7..48e352971 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 \n" -"POT-Creation-Date: 2014-09-09 20:35+0200\n" +"POT-Creation-Date: 2014-12-03 14:47+0100\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5] %s and %s/%s" +msgstr "試圖改寫抽換資訊，%s -> %s 和 %s/%s" -#. 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 "" +#: apt-inst/filelist.cc:506 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "重複加入抽換資訊 %s -> %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-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "重複的設定檔 %s/%s" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "Regex compilation error - %s" -msgstr "編譯正規表示式時發生錯誤 - %s" +msgid "The path %s is too long" +msgstr "路徑 %s 過長" -#: apt-private/private-search.cc:69 -msgid "Full Text Search" -msgstr "" +#: apt-inst/extract.cc:132 +#, c-format +msgid "Unpacking %s more than once" +msgstr "解開 %s 超過一次" -#: apt-private/private-show.cc:156 +#: apt-inst/extract.cc:142 #, 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] "" +msgid "The directory %s is diverted" +msgstr "路徑 %s 已被抽換" -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" -msgstr "" +#: apt-inst/extract.cc:152 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "此套件試圖寫至抽換後的目標 %s/%s" -#: apt-private/private-sources.cc:58 -#, fuzzy, c-format -msgid "Failed to parse %s. Edit again? " -msgstr "無法將 %s 更名為 %s" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "要進行抽換的路徑過長" -#: apt-private/private-sources.cc:70 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format -msgid "Your '%s' file changed, please run 'apt-get update'." -msgstr "" +msgid "Failed to stat %s" +msgstr "無法取得 %s 的狀態" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "update 指令不需任何參數" +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "無法將 %s 更名為 %s" -#: apt-private/private-update.cc:90 +#: apt-inst/extract.cc:249 #, 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] "" +msgid "The directory %s is being replaced by a non-directory" +msgstr "目錄 %s 已經被非目錄的檔案所取代" -#: apt-private/private-update.cc:94 -msgid "All packages are up to date." -msgstr "" +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "在雜湊表中找不到節點" -#: apt-private/private-upgrade.cc:25 -msgid "Calculating upgrade... " -msgstr "籌備升級中... " +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "路徑過長" -#: apt-private/private-upgrade.cc:28 -msgid "Done" -msgstr "完成" +#: apt-inst/extract.cc:421 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "以無版本的 %s 覆寫原始套件" -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:494 -#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:368 -#: apt-pkg/contrib/fileutl.cc:481 +#: apt-inst/extract.cc:438 #, c-format -msgid "Unable to read %s" -msgstr "無法讀取 %s" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "檔案 %s/%s 覆寫了套件 %s 中的相同檔案" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:500 -#: apt-pkg/acquire.cc:525 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 -#: apt-pkg/contrib/cdromutl.cc:235 +#: apt-inst/extract.cc:498 #, c-format -msgid "Unable to change to %s" -msgstr "無法切換至 %s" +msgid "Unable to stat %s" +msgstr "無法取得 %s 的狀態" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:280 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, c-format -msgid "No mirror file '%s' found " -msgstr "" +msgid "Failed to write file %s" +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 -msgid "Can not read mirror file '%s'" -msgstr "無法開啟檔案 %s" +#: apt-inst/dirstream.cc:105 +#, c-format +msgid "Failed to close file %s" +msgstr "關閉檔案 %s 失敗" -#: methods/mirror.cc:315 -#, fuzzy, c-format -msgid "No entry found in mirror file '%s'" -msgstr "無法開啟檔案 %s" +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "這是個不正確的 DEB 套件檔，沒有 '%s' 成員" -#: methods/mirror.cc:445 +#: apt-inst/deb/debfile.cc:132 #, c-format -msgid "[Mirror: %s]" -msgstr "" +msgid "Internal error, could not locate member %s" +msgstr "內部錯誤，找不找到成員 %s" -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 -msgid "Failed to create IPC pipe to subprocess" -msgstr "無法和子程序建立 IPC 管線" +#: apt-inst/deb/debfile.cc:227 +msgid "Unparsable control file" +msgstr "無法分析的 control 檔" -#: methods/rsh.cc:343 -msgid "Connection closed prematurely" -msgstr "連線突然終止" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "無效的套件庫簽章" -#: dselect/install:33 -msgid "Bad default setting!" -msgstr "錯誤的預設設定！" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "讀取套件檔的成員標頭訊息時發生錯誤" -#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 -#: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." -msgstr "請按 [Enter] 鍵以繼續進行。" +#: apt-inst/contrib/arfile.cc:96 +#, fuzzy, c-format +msgid "Invalid archive member header %s" +msgstr "無效的套件檔成員標頭" -#: dselect/install:92 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "您想移除所有先前下載的 .deb 檔嗎？" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "無效的套件檔成員標頭" -#: dselect/install:102 -#, fuzzy -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "在解開套件時發生錯誤。我要準備設定" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "套件檔過短" -#: dselect/install:103 -#, fuzzy -msgid "will be configured. This may result in duplicate errors" -msgstr "套件已安裝過。這會造成重複錯誤" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "讀取套件檔標頭失敗" -#: dselect/install:104 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "或是因為沒有相依關係而造成錯誤。那麼這個錯誤是無關緊要的" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "無法建立管線" -#: dselect/install:105 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" -msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "無法執行 gzip" -#: dselect/update:30 -msgid "Merging available information" -msgstr "整合現有的資料" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "損毀的套件檔" -#: cmdline/apt-extracttemplates.cc:224 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"用法：apt-extracttemplates 檔案1 [檔案2 ...]\n" -"\n" -"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n" -"的工具\n" -"\n" -"選項\n" -" -h 本幫助訊息。\n" -" -t 指定暫存目錄\n" -" -c=? 讀取指定的設定檔\n" -" -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" +#: apt-inst/contrib/extracttar.cc:203 +msgid "Tar checksum failed, archive corrupted" +msgstr "Tar checksum 失敗，套件檔已損毀" -#: cmdline/apt-extracttemplates.cc:254 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "無法取得 %s 的狀態" +#: apt-inst/contrib/extracttar.cc:308 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "未知的 TAR 標頭類型 %u，成員 %s" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: apt-pkg/install-progress.cc:57 #, c-format -msgid "Unable to write to %s" -msgstr "無法寫入 %s" +msgid "Progress: [%3i%%]" +msgstr "" -#: cmdline/apt-extracttemplates.cc:300 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "無法取得 debconf 版本。是否有安裝 debconf？" - -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "套件延伸列表過長" +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +msgid "Running dpkg" +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 +#: apt-pkg/init.cc:146 #, c-format -msgid "Error processing directory %s" -msgstr "處理目錄 %s 時發生錯誤" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "原始碼的延伸列表太長" +msgid "Packaging system '%s' is not supported" +msgstr "不支援的套件包裝系統 '%s'" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "寫入標頭資訊到內容檔時發生錯誤" +#: apt-pkg/init.cc:162 +msgid "Unable to determine a suitable packaging system type" +msgstr "無法確認合適的套件包裝系統類型" -#: ftparchive/apt-ftparchive.cc:431 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 #, c-format -msgid "Error processing contents %s" -msgstr "處理內容 %s 時發生錯誤" - -#: ftparchive/apt-ftparchive.cc:626 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"用法：apt-ftparchive [選項] 指令\n" -"指令：packages 二進制檔搜索路徑 [重新定義檔 [路徑前綴]]\n" -" sources 原始碼搜索路徑 [重新定義檔 [路徑前綴]]\n" -" contents 搜索路徑\n" -" release 搜索路徑\n" -" generate 設定檔 [群組]\n" -" clean 設定檔\n" -"\n" -"apt-ftparchive 可用來替 Debian 套件庫建立索引檔。它支援了從全\n" -"自動化到足以替代 dpkg-scanpackages 及 dpkg-scansources 所提供\n" -"的所有功能等等各式各樣建立索引的方式。apt-ftparchive 會根據 .deb 檔案樹建立 " -"Package 檔。Package 檔\n" -"裡不僅包含了每個套件的 control 資料的內容，還包含了 MD5 檢驗\n" -"碼和檔案大小。它還支援了重新定義檔，可用來強制指定優先等級及\n" -"其所屬的類別。\n" -"\n" -"而同樣的，apt-ftparchive 也能根據 .dsc 檔案樹生成 Source 檔。\n" -"可用 --source-override 選項來指定一個 src 重新定義檔。\n" -"\n" -"應當在檔案樹的根目錄下執行 'packages' 和 'source' 指令。\n" -"二進制檔的搜索路徑必須指向遞迴搜索的底層，且在重新定義檔裡必\n" -"須包含 override 旗標。若指定了路徑前綴時，則會被附加到檔案名\n" -"稱這個欄位裡。以 Debian 套件庫為例:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"選項：\n" -" -h 本幫助說明\n" -" --md5 控制如何產生 MD5 檢驗碼\n" -" -s=? 原始碼的重新定義檔\n" -" -q 安靜模式\n" -" -d=? 指定搭配的快取資料庫\n" -" --no-delink 啟用 DeLinking 模式\n" -" --contents 產生控制內容檔\n" -" -c=? 讀取指定的設定檔\n" -" -o=? 指定任意的設定選項" - -#: ftparchive/apt-ftparchive.cc:822 -msgid "No selections matched" -msgstr "找不到符合的選項" +msgid "Wrote %i records.\n" +msgstr "寫入 %i 筆紀錄。\n" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "套件檔案組 `%s' 少了部份檔案" +msgid "Wrote %i records with %i missing files.\n" +msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了。\n" -#: ftparchive/cachedb.cc:65 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB 已損毀，檔案被更名為 %s.old" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案不符\n" -#: ftparchive/cachedb.cc:83 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "DB 過舊，嘗試升級 %s" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了，有 %i 個檔案不符\n" -#: ftparchive/cachedb.cc:94 -#, fuzzy -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +#: apt-pkg/indexcopy.cc:515 +#, c-format +msgid "Can't find authentication record for: %s" msgstr "" -"資料庫格式不正確。如果您是由舊版的 apt 升級上來的，請移除並重新建立資料庫。" -#: ftparchive/cachedb.cc:99 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "無法開啟 DB 檔 %s: %s" +#: apt-pkg/indexcopy.cc:521 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Hash Sum 不符" -#: ftparchive/cachedb.cc:182 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-pkg/acquire-worker.cc:116 #, c-format -msgid "Failed to stat %s" -msgstr "無法取得 %s 的狀態" - -#: ftparchive/cachedb.cc:332 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "無法讀取連結 %s" - -#: ftparchive/cachedb.cc:365 -msgid "Archive has no control record" -msgstr "套件檔沒有 control 記錄" +msgid "The method driver %s could not be found." +msgstr "找不到安裝方式的驅動程式 %s。" -#: ftparchive/cachedb.cc:594 -msgid "Unable to get a cursor" -msgstr "無法取得遊標" +#: apt-pkg/acquire-worker.cc:118 +#, fuzzy, c-format +msgid "Is the package %s installed?" +msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n" -#: ftparchive/writer.cc:91 +#: apt-pkg/acquire-worker.cc:169 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "警告：無法讀取目錄 %s\n" +msgid "Method %s did not start correctly" +msgstr "安裝方式 %s 沒有正確啟動" -#: ftparchive/writer.cc:96 +#: apt-pkg/acquire-worker.cc:455 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "警告：無法取得 %s 狀態\n" +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。" -#: ftparchive/writer.cc:152 -msgid "E: " -msgstr "錯誤：" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "無法分析或開啟套件清單或狀況檔。" -#: ftparchive/writer.cc:154 -msgid "W: " -msgstr "警告：" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "您也許得執行 apt-get update 以修正這些問題" -#: ftparchive/writer.cc:161 -msgid "E: Errors apply to file " -msgstr "錯誤：套用到檔案時發生錯誤" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "無法讀取來源列表。" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 -#, c-format -msgid "Failed to resolve %s" -msgstr "無法解析 %s" +#: apt-pkg/pkgcache.cc:155 +msgid "Empty package cache" +msgstr "清空套件快取" -#: ftparchive/writer.cc:192 -msgid "Tree walking failed" -msgstr "無法走訪目錄樹" +#: apt-pkg/pkgcache.cc:161 +msgid "The package cache file is corrupted" +msgstr "套件快取檔損壞" -#: ftparchive/writer.cc:219 -#, c-format -msgid "Failed to open %s" -msgstr "無法開啟 %s" +#: apt-pkg/pkgcache.cc:166 +msgid "The package cache file is an incompatible version" +msgstr "套件快取檔版本不符" -#: ftparchive/writer.cc:278 -#, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +#: apt-pkg/pkgcache.cc:169 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "套件快取檔損壞" -#: ftparchive/writer.cc:286 +#: apt-pkg/pkgcache.cc:174 #, c-format -msgid "Failed to readlink %s" -msgstr "無法讀取連結 %s" +msgid "This APT does not support the versioning system '%s'" +msgstr "本 APT 不支援 '%s' 版本系統" -#: ftparchive/writer.cc:290 -#, c-format -msgid "Failed to unlink %s" -msgstr "無法移除連結 %s" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" +msgstr "這個套件快取是用於另一種平台的" -#: ftparchive/writer.cc:298 -#, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** 無法將 %s 連結到 %s" +#: apt-pkg/pkgcache.cc:321 +msgid "Depends" +msgstr "相依關係" -#: ftparchive/writer.cc:308 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " 達到了 DeLink 的上限 %sB。\n" +#: apt-pkg/pkgcache.cc:321 +msgid "PreDepends" +msgstr "預先相依關係" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "套件檔裡沒有套件資訊" - -#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 -#, c-format -msgid " %s has no override entry\n" -msgstr " %s 沒有重新定義項目\n" +#: apt-pkg/pkgcache.cc:321 +msgid "Suggests" +msgstr "建議" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " %s 的維護者是 %s，而非 %s\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Recommends" +msgstr "推薦" -#: ftparchive/writer.cc:706 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s 沒有原始碼重新定義項目\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Conflicts" +msgstr "衝突" -#: ftparchive/writer.cc:710 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s 也沒有二元碼重新定義項目\n" +#: apt-pkg/pkgcache.cc:322 +msgid "Replaces" +msgstr "取代" -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - 無法配置記憶體" +#: apt-pkg/pkgcache.cc:323 +msgid "Obsoletes" +msgstr "廢棄" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "無法開啟 %s" +#: apt-pkg/pkgcache.cc:323 +msgid "Breaks" +msgstr "毀損" -#. skip spaces -#. find end of word -#: ftparchive/override.cc:68 -#, fuzzy, c-format -msgid "Malformed override %s line %llu (%s)" -msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1" +#: apt-pkg/pkgcache.cc:323 +msgid "Enhances" +msgstr "" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "無法讀取重新定義檔 %s" +#: apt-pkg/pkgcache.cc:334 +msgid "important" +msgstr "重要" -#: ftparchive/override.cc:166 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1" +#: apt-pkg/pkgcache.cc:334 +msgid "required" +msgstr "必要" -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #2" +#: apt-pkg/pkgcache.cc:334 +msgid "standard" +msgstr "標準" -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #3" +#: apt-pkg/pkgcache.cc:335 +msgid "optional" +msgstr "次要" -#: ftparchive/multicompress.cc:73 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "未知的壓縮演算法 '%s'" +#: apt-pkg/pkgcache.cc:335 +msgid "extra" +msgstr "額外" -#: ftparchive/multicompress.cc:103 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "要壓縮輸出 %s 需搭配壓縮動作" +msgid "Index file type '%s' is not supported" +msgstr "不被支援的索引檔類型 '%s'" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "無法建立 FILE*" +#: apt-pkg/sourcelist.cc:127 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "fork 時失敗" +#: apt-pkg/sourcelist.cc:170 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: ftparchive/multicompress.cc:209 -msgid "Compress child" -msgstr "壓縮子程序" +#: apt-pkg/sourcelist.cc:173 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）" -#: ftparchive/multicompress.cc:232 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "內部錯誤，無法建立 %s" +#: 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 行的格式錯誤（發行版分析）" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "和子程序/檔案 IO 失敗" +#: 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 行的格式錯誤（發行版分析）" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "在計算 MD5 時無法讀取到資料" +#: 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 行的格式錯誤（發行版分析）" -#: ftparchive/multicompress.cc:359 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Problem unlinking %s" -msgstr "在取消 %s 的連結時發生問題" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Failed to rename %s to %s" -msgstr "無法將 %s 更名為 %s" - -#: cmdline/apt-internal-solver.cc:49 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"用法：apt-extracttemplates 檔案1 [檔案2 ...]\n" -"\n" -"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n" -"的工具\n" -"\n" -"選項\n" -" -h 本幫助訊息。\n" -" -t 指定暫存目錄\n" -" -c=? 讀取指定的設定檔\n" -" -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "未知的套件記錄！" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）" -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"用法：apt-sortpkgs [選項] 檔案1 [檔案2 ...]\n" -"\n" -"apt-sortpkgs 是用來排序套件檔的簡單工具。-s 選項是用來指定它的檔案類型。\n" -"\n" -"選項：\n" -" -h 本幫助訊息。\n" -" -s 根據原始檔排序\n" -" -c=? 讀取指定的設定檔\n" -" -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" +#: apt-pkg/sourcelist.cc:211 +#, c-format +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#: apt-pkg/sourcelist.cc:217 #, c-format -msgid "Failed to write file %s" -msgstr "寫入檔案 %s 失敗" +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（絕對發行版）" -#: apt-inst/dirstream.cc:105 +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "Failed to close file %s" -msgstr "關閉檔案 %s 失敗" +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "The path %s is too long" -msgstr "路徑 %s 過長" +msgid "Opening %s" +msgstr "正在開啟 %s" -#: apt-inst/extract.cc:132 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "Unpacking %s more than once" -msgstr "解開 %s 超過一次" +msgid "Line %u too long in source list %s." +msgstr "來源列表 %2$s 中的第 %1$u 行太長。" -#: apt-inst/extract.cc:142 +#: apt-pkg/sourcelist.cc:371 #, c-format -msgid "The directory %s is diverted" -msgstr "路徑 %s 已被抽換" +msgid "Malformed line %u in source list %s (type)" +msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）" -#: apt-inst/extract.cc:152 +#: apt-pkg/sourcelist.cc:375 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "此套件試圖寫至抽換後的目標 %s/%s" +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "要進行抽換的路徑過長" +#: 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-inst/extract.cc:249 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "不被支援的索引檔類型 '%s'" + +#: apt-pkg/clean.cc:64 #, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "目錄 %s 已經被非目錄的檔案所取代" +msgid "Unable to stat %s." +msgstr "無法取得 %s 的狀態。" -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "在雜湊表中找不到節點" - -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "路徑過長" - -#: apt-inst/extract.cc:421 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "以無版本的 %s 覆寫原始套件" - -#: apt-inst/extract.cc:438 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "檔案 %s/%s 覆寫了套件 %s 中的相同檔案" - -#: apt-inst/extract.cc:498 -#, c-format -msgid "Unable to stat %s" -msgstr "無法取得 %s 的狀態" +#: apt-pkg/pkgcachegen.cc:93 +msgid "Cache has an incompatible versioning system" +msgstr "快取使用的是不相容的版本系統" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "DropNode 在還有連結結點時被呼叫" +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 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:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "在處理 %s 時發生錯誤 (FindPkg)" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "找不到雜湊元件！" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "哇呀，您已經超過這個 APT 所能處理的套件名稱數量了。" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "在配置抽換資訊時失敗" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "哇呀，您已經超過這個 APT 所能處理的版本數量了。" -#: apt-inst/filelist.cc:464 -msgid "Internal error in AddDiversion" -msgstr "在 AddDiversion 發生了內部錯誤" +#: apt-pkg/pkgcachegen.cc:263 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "哇呀，您已經超過這個 APT 所能處理的說明數量了。" -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "試圖改寫抽換資訊，%s -> %s 和 %s/%s" +#: apt-pkg/pkgcachegen.cc:266 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "哇呀，您已經超過這個 APT 所能處理的相依關係數量了。" -#: apt-inst/filelist.cc:506 +#: apt-pkg/pkgcachegen.cc:576 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "重複加入抽換資訊 %s -> %s" +msgid "Package %s %s was not found while processing file dependencies" +msgstr "在計算檔案相依性時找不到套件 %s %s" -#: apt-inst/filelist.cc:549 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "重複的設定檔 %s/%s" - -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "無效的套件庫簽章" - -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "讀取套件檔的成員標頭訊息時發生錯誤" - -#: apt-inst/contrib/arfile.cc:96 -#, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "無效的套件檔成員標頭" - -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "無效的套件檔成員標頭" - -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "套件檔過短" - -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "讀取套件檔標頭失敗" - -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "無法建立管線" - -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "無法執行 gzip" - -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "損毀的套件檔" - -#: apt-inst/contrib/extracttar.cc:203 -msgid "Tar checksum failed, archive corrupted" -msgstr "Tar checksum 失敗，套件檔已損毀" +msgid "Couldn't stat source package list %s" +msgstr "無法取得來源套件列表 %s 的狀態" -#: apt-inst/contrib/extracttar.cc:308 -#, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "未知的 TAR 標頭類型 %u，成員 %s" +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +msgid "Reading package lists" +msgstr "正在讀取套件清單" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 -#, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "這是個不正確的 DEB 套件檔，沒有 '%s' 成員" +#: apt-pkg/pkgcachegen.cc:1316 +msgid "Collecting File Provides" +msgstr "正在收集檔案提供者" -#: apt-inst/deb/debfile.cc:132 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "內部錯誤，找不找到成員 %s" - -#: apt-inst/deb/debfile.cc:227 -msgid "Unparsable control file" -msgstr "無法分析的 control 檔" +msgid "Unable to write to %s" +msgstr "無法寫入 %s" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 -#, fuzzy, c-format -msgid "List directory %spartial is missing." -msgstr "找不到清單目錄 %spartial。" +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 +msgid "IO Error saving source cache" +msgstr "在儲存來源快取時 IO 錯誤" -#: apt-pkg/acquire.cc:91 -#, fuzzy, c-format -msgid "Archives directory %spartial is missing." -msgstr "找不到套件檔目錄 %spartial。" +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "" -#: apt-pkg/acquire.cc:99 -#, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "無法鎖定列表目錄" +#: apt-pkg/edsp.cc:241 +msgid "Send request to solver" +msgstr "" -#: apt-pkg/acquire.cc:490 apt-pkg/clean.cc:39 -#, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "不被支援的索引檔類型 '%s'" +#: apt-pkg/edsp.cc:320 +msgid "Prepare for receiving solution" +msgstr "" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:902 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "正在取得檔案 %li/%li（還有 %s）" +#: apt-pkg/edsp.cc:327 +msgid "External solver failed without a proper error message" +msgstr "" -#: apt-pkg/acquire.cc:904 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "正在取得檔案 %li/%li" +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 +msgid "Execute external solver" +msgstr "" #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format @@ -2376,35 +2286,35 @@ msgstr "大小不符" msgid "Invalid file format" msgstr "無效的操作 %s" -#: apt-pkg/acquire-item.cc:1573 +#: apt-pkg/acquire-item.cc:1640 #, 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:1589 +#: apt-pkg/acquire-item.cc:1656 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "無法辨別 Release 檔 %s" -#: apt-pkg/acquire-item.cc:1631 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "無法取得以下的密鑰 ID 的公鑰：\n" -#: apt-pkg/acquire-item.cc:1669 +#: apt-pkg/acquire-item.cc:1736 #, 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:1691 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）" -#: apt-pkg/acquire-item.cc:1721 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -2412,12 +2322,12 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736 +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2426,123 +2336,102 @@ msgstr "" "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平" "台）" -#: apt-pkg/acquire-item.cc:1925 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:1983 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。" -#: apt-pkg/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "The method driver %s could not be found." -msgstr "找不到安裝方式的驅動程式 %s。" +msgid "Vendor block %s contains no fingerprint" +msgstr "提供者區塊 %s 沒有包含指紋碼" -#: apt-pkg/acquire-worker.cc:118 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, fuzzy, c-format -msgid "Is the package %s installed?" -msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n" +msgid "List directory %spartial is missing." +msgstr "找不到清單目錄 %spartial。" -#: apt-pkg/acquire-worker.cc:169 -#, c-format -msgid "Method %s did not start correctly" -msgstr "安裝方式 %s 沒有正確啟動" +#: apt-pkg/acquire.cc:91 +#, fuzzy, c-format +msgid "Archives directory %spartial is missing." +msgstr "找不到套件檔目錄 %spartial。" -#: apt-pkg/acquire-worker.cc:455 +#: apt-pkg/acquire.cc:99 +#, fuzzy, c-format +msgid "Unable to lock directory %s" +msgstr "無法鎖定列表目錄" + +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:902 #, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "正在取得檔案 %li/%li（還有 %s）" -#: apt-pkg/algorithms.cc:265 +#: apt-pkg/acquire.cc:904 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "套件 %s 需要重新安裝，但找不到它的套件檔。" +msgid "Retrieving file %li of %li" +msgstr "正在取得檔案 %li/%li" -#: apt-pkg/algorithms.cc:1086 +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "在 sources.list 中必須包含一些 'source' URI" + +#: apt-pkg/policy.cc:83 +#, c-format msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -"錯誤，pkgProblemResolver::Resolve 的建立中斷了，這可能肇因於保留 (hold) 套" -"件。" -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." -msgstr "無法修正問題，您保留 (hold) 了損毀的套件。" +#: apt-pkg/policy.cc:422 +#, fuzzy, c-format +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "個人設定檔中有些不正確資料，沒有以 Package 開頭" -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." -msgstr "無法分析或開啟套件清單或狀況檔。" +#: apt-pkg/policy.cc:444 +#, c-format +msgid "Did not understand pin type %s" +msgstr "無法分析鎖定類型 %s" -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "您也許得執行 apt-get update 以修正這些問題" - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "無法讀取來源列表。" - -#: apt-pkg/cacheset.cc:489 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "找不到 '%2$s' 的 '%1$s' 發行版" - -#: apt-pkg/cacheset.cc:492 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "找不到 '%s' 版的 '%s'" - -#: apt-pkg/cacheset.cc:603 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "無法找到主題 %s" - -#: apt-pkg/cacheset.cc:609 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "無法找到套件 %s" - -#: apt-pkg/cacheset.cc:615 -#, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "無法找到套件 %s" - -#: apt-pkg/cacheset.cc:626 -#, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "" +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "銷定並沒有優先順序之分（或零）" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" - -#: apt-pkg/cacheset.cc:647 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/cacheset.cc:655 -#, c-format -msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "" +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "無法開啟檔案 %s" -#: apt-pkg/cacheset.cc:663 +#: apt-pkg/packagemanager.cc:630 #, c-format -msgid "Can't select installed version from package %s as it is not installed" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" +"此安裝因衝突或預先相依關係，需暫時刪除 %s 這個基本套件。這通常不是好主意，但" +"若您執意進行，請設定 APT::Force-LoopBreak 選項。" -#: apt-pkg/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" @@ -2617,10 +2506,23 @@ msgstr "正在寫入新的來源列表\n" msgid "Source list entries for this disc are:\n" msgstr "該碟片的來源列表項目為：\n" -#: apt-pkg/clean.cc:64 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "無法取得 %s 的狀態。" +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "套件 %s 需要重新安裝，但找不到它的套件檔。" + +#: apt-pkg/algorithms.cc:1086 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"錯誤，pkgProblemResolver::Resolve 的建立中斷了，這可能肇因於保留 (hold) 套" +"件。" + +#: apt-pkg/algorithms.cc:1088 +msgid "Unable to correct problems, you have held broken packages." +msgstr "無法修正問題，您保留 (hold) 了損毀的套件。" #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 msgid "Building dependency tree" @@ -2648,55 +2550,67 @@ msgstr "無法開啟 StateFile %s" msgid "Failed to write temporary StateFile %s" msgstr "無法寫入暫存的 StateFile %s" -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" +#: apt-pkg/tagfile.cc:140 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "無法辨識套件檔 %s (1)" -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/tagfile.cc:237 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "無法辨識套件檔 %s (2)" -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-pkg/cacheset.cc:489 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "找不到 '%2$s' 的 '%1$s' 發行版" -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:492 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "找不到 '%s' 版的 '%s'" -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/cacheset.cc:603 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "無法找到主題 %s" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 -#, c-format -msgid "Wrote %i records.\n" -msgstr "寫入 %i 筆紀錄。\n" +#: apt-pkg/cacheset.cc:609 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "無法找到套件 %s" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:615 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "無法找到套件 %s" + +#: apt-pkg/cacheset.cc:626 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了。\n" +msgid "Can't select versions from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案不符\n" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了，有 %i 個檔案不符\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Can't find authentication record for: %s" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "Hash Sum 不符" +#: apt-pkg/cacheset.cc:663 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" #: apt-pkg/indexrecords.cc:78 #, c-format @@ -2723,312 +2637,221 @@ msgstr "在 Release 檔 %s 裡沒有 Hash 項目" msgid "Invalid 'Date' entry in Release file %s" msgstr "在 Release 檔 %s 裡沒有 Hash 項目" -#: apt-pkg/init.cc:146 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "不支援的套件包裝系統 '%s'" - -#: apt-pkg/init.cc:162 -msgid "Unable to determine a suitable packaging system type" -msgstr "無法確認合適的套件包裝系統類型" +msgid "%lid %lih %limin %lis" +msgstr "" -#: apt-pkg/install-progress.cc:57 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Progress: [%3i%%]" +msgid "%lih %limin %lis" msgstr "" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 +#, c-format +msgid "%limin %lis" msgstr "" -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" +msgid "%lis" msgstr "" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "無法開啟檔案 %s" +#: apt-pkg/contrib/strutl.cc:1258 +#, c-format +msgid "Selection %s not found" +msgstr "選項 %s 找不到" -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" -"此安裝因衝突或預先相依關係，需暫時刪除 %s 這個基本套件。這通常不是好主意，但" -"若您執意進行，請設定 APT::Force-LoopBreak 選項。" +msgid "Not using locking for read only lock file %s" +msgstr "不在唯讀檔案 %s 上使用檔案鎖定" -#: apt-pkg/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "清空套件快取" +#: apt-pkg/contrib/fileutl.cc:195 +#, c-format +msgid "Could not open lock file %s" +msgstr "無法開啟鎖定檔 %s" -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "套件快取檔損壞" +#: apt-pkg/contrib/fileutl.cc:218 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "不在以 nfs 掛載的檔案 %s 上使用檔案鎖定" -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "套件快取檔版本不符" +#: apt-pkg/contrib/fileutl.cc:223 +#, c-format +msgid "Could not get lock %s" +msgstr "無法將 %s 鎖定" -#: apt-pkg/pkgcache.cc:169 -#, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "套件快取檔損壞" +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#, c-format +msgid "List of files can't be created as '%s' is not a directory" +msgstr "" -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/contrib/fileutl.cc:394 #, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "本 APT 不支援 '%s' 版本系統" +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "這個套件快取是用於另一種平台的" - -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "相依關係" - -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "預先相依關係" - -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "建議" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "推薦" - -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "衝突" - -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "取代" - -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "廢棄" - -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "毀損" +#: apt-pkg/contrib/fileutl.cc:412 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" +#: apt-pkg/contrib/fileutl.cc:421 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "重要" +#: apt-pkg/contrib/fileutl.cc:824 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "子程序 %s 收到一個記憶體錯誤。" -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "必要" +#: apt-pkg/contrib/fileutl.cc:826 +#, fuzzy, c-format +msgid "Sub-process %s received signal %u." +msgstr "子程序 %s 收到一個記憶體錯誤。" -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "標準" +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "子程序 %s 傳回錯誤碼 (%u)" -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "次要" +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "子程序 %s 不預期得結束" -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "額外" +#: apt-pkg/contrib/fileutl.cc:913 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "在關閉檔案時發生問題" -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "快取使用的是不相容的版本系統" +#: apt-pkg/contrib/fileutl.cc:1101 +#, c-format +msgid "Could not open file %s" +msgstr "無法開啟檔案 %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:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 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:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 #, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "在處理 %s 時發生錯誤 (FindPkg)" - -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "哇呀，您已經超過這個 APT 所能處理的套件名稱數量了。" +msgid "Could not open file descriptor %d" +msgstr "無法開啟管線給 %s 使用" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "哇呀，您已經超過這個 APT 所能處理的版本數量了。" +#: apt-pkg/contrib/fileutl.cc:1315 +msgid "Failed to create subprocess IPC" +msgstr "無法建立子程序 IPC" -#: apt-pkg/pkgcachegen.cc:263 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "哇呀，您已經超過這個 APT 所能處理的說明數量了。" +#: apt-pkg/contrib/fileutl.cc:1373 +msgid "Failed to exec compressor " +msgstr "無法執行壓縮程式" -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "哇呀，您已經超過這個 APT 所能處理的相依關係數量了。" +#: apt-pkg/contrib/fileutl.cc:1514 +#, fuzzy, c-format +msgid "read, still have %llu to read but none left" +msgstr "讀取，仍有 %lu 未讀但已無空間" -#: apt-pkg/pkgcachegen.cc:576 -#, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "在計算檔案相依性時找不到套件 %s %s" +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 +#, fuzzy, c-format +msgid "write, still have %llu to write but couldn't" +msgstr "寫入，仍有 %lu 待寫入但已沒辨法" -#: apt-pkg/pkgcachegen.cc:1211 -#, c-format -msgid "Couldn't stat source package list %s" -msgstr "無法取得來源套件列表 %s 的狀態" +#: apt-pkg/contrib/fileutl.cc:1915 +#, fuzzy, c-format +msgid "Problem closing the file %s" +msgstr "在關閉檔案時發生問題" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 -msgid "Reading package lists" -msgstr "正在讀取套件清單" +#: apt-pkg/contrib/fileutl.cc:1927 +#, fuzzy, c-format +msgid "Problem renaming the file %s to %s" +msgstr "在同步檔案時發生問題" -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "正在收集檔案提供者" +#: apt-pkg/contrib/fileutl.cc:1938 +#, fuzzy, c-format +msgid "Problem unlinking the file %s" +msgstr "在刪除檔案時發生問題" -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "在儲存來源快取時 IO 錯誤" +#: apt-pkg/contrib/fileutl.cc:1951 +msgid "Problem syncing the file" +msgstr "在同步檔案時發生問題" -#: apt-pkg/pkgrecords.cc:38 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "不被支援的索引檔類型 '%s'" +msgid "%c%s... Error!" +msgstr "%c%s... 錯誤！" -#: apt-pkg/policy.cc:83 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +msgid "%c%s... Done" +msgstr "%c%s... 完成" + +#: apt-pkg/contrib/progress.cc:181 +msgid "..." msgstr "" -#: apt-pkg/policy.cc:422 +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "個人設定檔中有些不正確資料，沒有以 Package 開頭" - -#: apt-pkg/policy.cc:444 -#, c-format -msgid "Did not understand pin type %s" -msgstr "無法分析鎖定類型 %s" +msgid "%c%s... %u%%" +msgstr "%c%s... 完成" -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "銷定並沒有優先順序之分（或零）" +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "不能 mmap 空白檔案" -#: apt-pkg/sourcelist.cc:127 +#: apt-pkg/contrib/mmap.cc:111 #, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）" +msgid "Couldn't duplicate file descriptor %i" +msgstr "無法開啟管線給 %s 使用" -#: apt-pkg/sourcelist.cc:170 +#: apt-pkg/contrib/mmap.cc:119 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" +msgid "Couldn't make mmap of %llu bytes" +msgstr "無法 mmap 到 %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/contrib/mmap.cc:146 +#, fuzzy +msgid "Unable to close mmap" +msgstr "無法開啟 %s" -#: 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/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "無法 invoke " -#: 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/contrib/mmap.cc:290 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "無法 mmap 到 %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/contrib/mmap.cc:322 +msgid "Failed to truncate file" +msgstr "無法截短檔案" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/contrib/mmap.cc:341 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)" +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" +"動態 MMap 已用完所有空間。請增加 APT::Cache-Start 的大小。目前大小為：%lu。" +"(man 5 apt.conf)" -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/contrib/mmap.cc:446 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）" - -#: 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 行的格式錯誤（絕對發行版）" - -#: 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: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/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "在 sources.list 中必須包含一些 'source' URI" - -#: apt-pkg/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "無法辨識套件檔 %s (1)" - -#: apt-pkg/tagfile.cc:237 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "無法辨識套件檔 %s (2)" - -#: 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 "有一些索引檔不能下載，它們可能被略過了，或是替而使用原有的索引檔。" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" -#: apt-pkg/vendorlist.cc:85 -#, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "提供者區塊 %s 沒有包含指紋碼" +#: apt-pkg/contrib/mmap.cc:449 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." +msgstr "" #: apt-pkg/contrib/cdromutl.cc:65 #, c-format @@ -3039,52 +2862,6 @@ msgstr "無法取得掛載點 %s 的狀態" msgid "Failed to stat the cdrom" msgstr "無法取得 CD-ROM 的狀態" -#: apt-pkg/contrib/cmndline.cc:121 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "未知的命令列選項 '%c' [來自 %s]。" - -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "無法理解的命令列選項 %s" - -#: apt-pkg/contrib/cmndline.cc:168 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "命令列選項 %s 不是 boolean 值" - -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "需替選項 %s 指定參數。" - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "選項 %s：在指定設定項目時應該有 =。" - -#: apt-pkg/contrib/cmndline.cc:278 -#, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "選項 %s 的參數應該是數字，而不是 '%s'" - -#: apt-pkg/contrib/cmndline.cc:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "選項 %s 太長" - -#: apt-pkg/contrib/cmndline.cc:341 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "偵測器 %s 無法理解，試試 true 或 false。" - -#: apt-pkg/contrib/cmndline.cc:391 -#, c-format -msgid "Invalid operation %s" -msgstr "無效的操作 %s" - #: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" @@ -3140,388 +2917,606 @@ msgstr "語法錯誤 %s:%u：指令只能於最高層級執行" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "語法錯誤 %s:%u：在檔案結尾有多餘的垃圾" -#: apt-pkg/contrib/fileutl.cc:190 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "放棄安裝。" + +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "不在唯讀檔案 %s 上使用檔案鎖定" +msgid "Command line option '%c' [from %s] is not known." +msgstr "未知的命令列選項 '%c' [來自 %s]。" -#: apt-pkg/contrib/fileutl.cc:195 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Could not open lock file %s" -msgstr "無法開啟鎖定檔 %s" +msgid "Command line option %s is not understood" +msgstr "無法理解的命令列選項 %s" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/cmndline.cc:171 #, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "不在以 nfs 掛載的檔案 %s 上使用檔案鎖定" +msgid "Command line option %s is not boolean" +msgstr "命令列選項 %s 不是 boolean 值" -#: apt-pkg/contrib/fileutl.cc:223 +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 #, c-format -msgid "Could not get lock %s" -msgstr "無法將 %s 鎖定" +msgid "Option %s requires an argument." +msgstr "需替選項 %s 指定參數。" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "" +msgid "Option %s: Configuration item specification must have an =." +msgstr "選項 %s：在指定設定項目時應該有 =。" -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "選項 %s 的參數應該是數字，而不是 '%s'" -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" +msgid "Option '%s' is too long" +msgstr "選項 %s 太長" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" +msgid "Sense %s is not understood, try true or false." +msgstr "偵測器 %s 無法理解，試試 true 或 false。" -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "子程序 %s 收到一個記憶體錯誤。" +msgid "Invalid operation %s" +msgstr "無效的操作 %s" -#: apt-pkg/contrib/fileutl.cc:826 -#, fuzzy, c-format -msgid "Sub-process %s received signal %u." -msgstr "子程序 %s 收到一個記憶體錯誤。" +#: apt-pkg/deb/dpkgpm.cc:110 +#, c-format +msgid "Installing %s" +msgstr "正在安裝 %s" -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "子程序 %s 傳回錯誤碼 (%u)" +msgid "Configuring %s" +msgstr "正在設定 %s" -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "子程序 %s 不預期得結束" +msgid "Removing %s" +msgstr "正在移除 %s" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/deb/dpkgpm.cc:113 #, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "在關閉檔案時發生問題" +msgid "Completely removing %s" +msgstr "已完整移除 %s" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format -msgid "Could not open file %s" -msgstr "無法開啟檔案 %s" - -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 -#, fuzzy, c-format -msgid "Could not open file descriptor %d" -msgstr "無法開啟管線給 %s 使用" +msgid "Noting disappearance of %s" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1315 -msgid "Failed to create subprocess IPC" -msgstr "無法建立子程序 IPC" +#: apt-pkg/deb/dpkgpm.cc:115 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "正在執行安裝後套件後續處理程式 %s" -#: apt-pkg/contrib/fileutl.cc:1373 -msgid "Failed to exec compressor " -msgstr "無法執行壓縮程式" +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:845 +#, c-format +msgid "Directory '%s' missing" +msgstr "找不到 '%s' 目錄" -#: apt-pkg/contrib/fileutl.cc:1514 +#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882 #, fuzzy, c-format -msgid "read, still have %llu to read but none left" -msgstr "讀取，仍有 %lu 未讀但已無空間" +msgid "Could not open file '%s'" +msgstr "無法開啟檔案 %s" -#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 -#, fuzzy, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "寫入，仍有 %lu 待寫入但已沒辨法" +#: apt-pkg/deb/dpkgpm.cc:1007 +#, c-format +msgid "Preparing %s" +msgstr "正在準備 %s" -#: apt-pkg/contrib/fileutl.cc:1915 -#, fuzzy, c-format -msgid "Problem closing the file %s" -msgstr "在關閉檔案時發生問題" +#: apt-pkg/deb/dpkgpm.cc:1008 +#, c-format +msgid "Unpacking %s" +msgstr "正在解開 %s" -#: apt-pkg/contrib/fileutl.cc:1927 -#, fuzzy, c-format -msgid "Problem renaming the file %s to %s" -msgstr "在同步檔案時發生問題" +#: apt-pkg/deb/dpkgpm.cc:1013 +#, c-format +msgid "Preparing to configure %s" +msgstr "正在準備設定 %s" -#: apt-pkg/contrib/fileutl.cc:1938 -#, fuzzy, c-format -msgid "Problem unlinking the file %s" -msgstr "在刪除檔案時發生問題" +#: apt-pkg/deb/dpkgpm.cc:1015 +#, c-format +msgid "Installed %s" +msgstr "已安裝 %s" -#: apt-pkg/contrib/fileutl.cc:1951 -msgid "Problem syncing the file" -msgstr "在同步檔案時發生問題" +#: apt-pkg/deb/dpkgpm.cc:1020 +#, c-format +msgid "Preparing for removal of %s" +msgstr "正在準備移除 %s" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "放棄安裝。" +#: apt-pkg/deb/dpkgpm.cc:1022 +#, c-format +msgid "Removed %s" +msgstr "已移除 %s" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "不能 mmap 空白檔案" +#: apt-pkg/deb/dpkgpm.cc:1027 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "正在準備完整移除 %s" -#: apt-pkg/contrib/mmap.cc:111 +#: apt-pkg/deb/dpkgpm.cc:1028 +#, c-format +msgid "Completely removed %s" +msgstr "已完整移除 %s" + +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, fuzzy, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "無法開啟管線給 %s 使用" +msgid "Can not write log (%s)" +msgstr "無法寫入 %s" -#: apt-pkg/contrib/mmap.cc:119 -#, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "無法 mmap 到 %lu 位元組" +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 +msgid "Is /dev/pts mounted?" +msgstr "" -#: apt-pkg/contrib/mmap.cc:146 -#, fuzzy -msgid "Unable to close mmap" -msgstr "無法開啟 %s" +#: apt-pkg/deb/dpkgpm.cc:1657 +msgid "Operation was interrupted before it could finish" +msgstr "" -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 -#, fuzzy -msgid "Unable to synchronize mmap" -msgstr "無法 invoke " +#: apt-pkg/deb/dpkgpm.cc:1719 +msgid "No apport report written because MaxReports is reached already" +msgstr "" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "無法 mmap 到 %lu 位元組" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1724 +msgid "dependency problems - leaving unconfigured" +msgstr "" -#: apt-pkg/contrib/mmap.cc:322 -msgid "Failed to truncate file" -msgstr "無法截短檔案" +#: apt-pkg/deb/dpkgpm.cc:1726 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" -#: apt-pkg/contrib/mmap.cc:341 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1732 msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"No apport report written because the error message indicates a disk full " +"error" msgstr "" -"動態 MMap 已用完所有空間。請增加 APT::Cache-Start 的大小。目前大小為：%lu。" -"(man 5 apt.conf)" -#: apt-pkg/contrib/mmap.cc:446 -#, c-format +#: apt-pkg/deb/dpkgpm.cc:1739 msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +"No apport report written because the error message indicates a out of memory " +"error" msgstr "" -#: apt-pkg/contrib/mmap.cc:449 +#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752 msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"No apport report written because the error message indicates an issue on the " +"local system" msgstr "" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/deb/dpkgpm.cc:1774 +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 "%c%s... Error!" -msgstr "%c%s... 錯誤！" +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" -#: apt-pkg/contrib/progress.cc:150 +#: 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 "%c%s... Done" -msgstr "%c%s... 完成" +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgstr "" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" msgstr "" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: cmdline/apt-extracttemplates.cc:224 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"用法：apt-extracttemplates 檔案1 [檔案2 ...]\n" +"\n" +"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n" +"的工具\n" +"\n" +"選項\n" +" -h 本幫助訊息。\n" +" -t 指定暫存目錄\n" +" -c=? 讀取指定的設定檔\n" +" -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:254 #, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... 完成" +msgid "Unable to mkstemp %s" +msgstr "無法取得 %s 的狀態" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "無法取得 debconf 版本。是否有安裝 debconf？" + +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +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 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "" +msgid "Error processing directory %s" +msgstr "處理目錄 %s 時發生錯誤" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "原始碼的延伸列表太長" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "寫入標頭資訊到內容檔時發生錯誤" + +#: ftparchive/apt-ftparchive.cc:431 #, c-format -msgid "%lih %limin %lis" +msgid "Error processing contents %s" +msgstr "處理內容 %s 時發生錯誤" + +#: ftparchive/apt-ftparchive.cc:626 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" +"用法：apt-ftparchive [選項] 指令\n" +"指令：packages 二進制檔搜索路徑 [重新定義檔 [路徑前綴]]\n" +" sources 原始碼搜索路徑 [重新定義檔 [路徑前綴]]\n" +" contents 搜索路徑\n" +" release 搜索路徑\n" +" generate 設定檔 [群組]\n" +" clean 設定檔\n" +"\n" +"apt-ftparchive 可用來替 Debian 套件庫建立索引檔。它支援了從全\n" +"自動化到足以替代 dpkg-scanpackages 及 dpkg-scansources 所提供\n" +"的所有功能等等各式各樣建立索引的方式。apt-ftparchive 會根據 .deb 檔案樹建立 " +"Package 檔。Package 檔\n" +"裡不僅包含了每個套件的 control 資料的內容，還包含了 MD5 檢驗\n" +"碼和檔案大小。它還支援了重新定義檔，可用來強制指定優先等級及\n" +"其所屬的類別。\n" +"\n" +"而同樣的，apt-ftparchive 也能根據 .dsc 檔案樹生成 Source 檔。\n" +"可用 --source-override 選項來指定一個 src 重新定義檔。\n" +"\n" +"應當在檔案樹的根目錄下執行 'packages' 和 'source' 指令。\n" +"二進制檔的搜索路徑必須指向遞迴搜索的底層，且在重新定義檔裡必\n" +"須包含 override 旗標。若指定了路徑前綴時，則會被附加到檔案名\n" +"稱這個欄位裡。以 Debian 套件庫為例:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"選項：\n" +" -h 本幫助說明\n" +" --md5 控制如何產生 MD5 檢驗碼\n" +" -s=? 原始碼的重新定義檔\n" +" -q 安靜模式\n" +" -d=? 指定搭配的快取資料庫\n" +" --no-delink 啟用 DeLinking 模式\n" +" --contents 產生控制內容檔\n" +" -c=? 讀取指定的設定檔\n" +" -o=? 指定任意的設定選項" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: ftparchive/apt-ftparchive.cc:822 +msgid "No selections matched" +msgstr "找不到符合的選項" + +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "%limin %lis" +msgid "Some files are missing in the package file group `%s'" +msgstr "套件檔案組 `%s' 少了部份檔案" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB 已損毀，檔案被更名為 %s.old" + +#: ftparchive/cachedb.cc:83 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "DB 過舊，嘗試升級 %s" + +#: ftparchive/cachedb.cc:94 +#, fuzzy +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." msgstr "" +"資料庫格式不正確。如果您是由舊版的 apt 升級上來的，請移除並重新建立資料庫。" + +#: ftparchive/cachedb.cc:99 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "無法開啟 DB 檔 %s: %s" + +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "無法讀取連結 %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "套件檔沒有 control 記錄" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "無法取得遊標" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: ftparchive/writer.cc:91 #, c-format -msgid "%lis" -msgstr "" +msgid "W: Unable to read directory %s\n" +msgstr "警告：無法讀取目錄 %s\n" -#: apt-pkg/contrib/strutl.cc:1258 +#: ftparchive/writer.cc:96 #, c-format -msgid "Selection %s not found" -msgstr "選項 %s 找不到" +msgid "W: Unable to stat %s\n" +msgstr "警告：無法取得 %s 狀態\n" -#: apt-pkg/deb/debsystem.cc:91 -#, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "錯誤：" -#: apt-pkg/deb/debsystem.cc:94 -#, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "無法鎖定列表目錄" +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "警告：" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "錯誤：套用到檔案時發生錯誤" + +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "" +msgid "Failed to resolve %s" +msgstr "無法解析 %s" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "無法走訪目錄樹" -#: apt-pkg/deb/dpkgpm.cc:95 +#: ftparchive/writer.cc:219 #, c-format -msgid "Installing %s" -msgstr "正在安裝 %s" +msgid "Failed to open %s" +msgstr "無法開啟 %s" -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:999 +#: ftparchive/writer.cc:278 #, c-format -msgid "Configuring %s" -msgstr "正在設定 %s" +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1006 +#: ftparchive/writer.cc:286 #, c-format -msgid "Removing %s" -msgstr "正在移除 %s" - -#: apt-pkg/deb/dpkgpm.cc:98 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "已完整移除 %s" +msgid "Failed to readlink %s" +msgstr "無法讀取連結 %s" -#: apt-pkg/deb/dpkgpm.cc:99 +#: ftparchive/writer.cc:290 #, c-format -msgid "Noting disappearance of %s" -msgstr "" +msgid "Failed to unlink %s" +msgstr "無法移除連結 %s" -#: apt-pkg/deb/dpkgpm.cc:100 +#: ftparchive/writer.cc:298 #, c-format -msgid "Running post-installation trigger %s" -msgstr "正在執行安裝後套件後續處理程式 %s" +msgid "*** Failed to link %s to %s" +msgstr "*** 無法將 %s 連結到 %s" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:830 +#: ftparchive/writer.cc:308 #, c-format -msgid "Directory '%s' missing" -msgstr "找不到 '%s' 目錄" +msgid " DeLink limit of %sB hit.\n" +msgstr " 達到了 DeLink 的上限 %sB。\n" -#: apt-pkg/deb/dpkgpm.cc:845 apt-pkg/deb/dpkgpm.cc:867 -#, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "無法開啟檔案 %s" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "套件檔裡沒有套件資訊" -#: apt-pkg/deb/dpkgpm.cc:992 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:692 #, c-format -msgid "Preparing %s" -msgstr "正在準備 %s" +msgid " %s has no override entry\n" +msgstr " %s 沒有重新定義項目\n" -#: apt-pkg/deb/dpkgpm.cc:993 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:848 #, c-format -msgid "Unpacking %s" -msgstr "正在解開 %s" +msgid " %s maintainer is %s not %s\n" +msgstr " %s 的維護者是 %s，而非 %s\n" -#: apt-pkg/deb/dpkgpm.cc:998 +#: ftparchive/writer.cc:706 #, c-format -msgid "Preparing to configure %s" -msgstr "正在準備設定 %s" +msgid " %s has no source override entry\n" +msgstr " %s 沒有原始碼重新定義項目\n" -#: apt-pkg/deb/dpkgpm.cc:1000 +#: ftparchive/writer.cc:710 #, c-format -msgid "Installed %s" -msgstr "已安裝 %s" +msgid " %s has no binary override entry either\n" +msgstr " %s 也沒有二元碼重新定義項目\n" -#: apt-pkg/deb/dpkgpm.cc:1005 -#, c-format -msgid "Preparing for removal of %s" -msgstr "正在準備移除 %s" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - 無法配置記憶體" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format -msgid "Removed %s" -msgstr "已移除 %s" +msgid "Unable to open %s" +msgstr "無法開啟 %s" -#: apt-pkg/deb/dpkgpm.cc:1012 -#, c-format -msgid "Preparing to completely remove %s" -msgstr "正在準備完整移除 %s" +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1" -#: apt-pkg/deb/dpkgpm.cc:1013 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Completely removed %s" -msgstr "已完整移除 %s" +msgid "Failed to read the override file %s" +msgstr "無法讀取重新定義檔 %s" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1124 -#: apt-pkg/deb/dpkgpm.cc:1150 +#: ftparchive/override.cc:166 #, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "無法寫入 %s" +msgid "Malformed override %s line %llu #1" +msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1" -#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1150 -msgid "Is /dev/pts mounted?" -msgstr "" +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #2" -#: apt-pkg/deb/dpkgpm.cc:1124 -msgid "Is stdout a terminal?" -msgstr "" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #3" -#: apt-pkg/deb/dpkgpm.cc:1625 -msgid "Operation was interrupted before it could finish" -msgstr "" +#: ftparchive/multicompress.cc:73 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "未知的壓縮演算法 '%s'" -#: apt-pkg/deb/dpkgpm.cc:1687 -msgid "No apport report written because MaxReports is reached already" -msgstr "" +#: ftparchive/multicompress.cc:103 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "要壓縮輸出 %s 需搭配壓縮動作" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1692 -msgid "dependency problems - leaving unconfigured" -msgstr "" +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "無法建立 FILE*" -#: apt-pkg/deb/dpkgpm.cc:1694 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "fork 時失敗" -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" +#: ftparchive/multicompress.cc:209 +msgid "Compress child" +msgstr "壓縮子程序" -#: apt-pkg/deb/dpkgpm.cc:1707 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" +#: ftparchive/multicompress.cc:232 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "內部錯誤，無法建立 %s" + +#: ftparchive/multicompress.cc:305 +msgid "IO to subprocess/file failed" +msgstr "和子程序/檔案 IO 失敗" + +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "在計算 MD5 時無法讀取到資料" + +#: ftparchive/multicompress.cc:359 +#, c-format +msgid "Problem unlinking %s" +msgstr "在取消 %s 的連結時發生問題" -#: apt-pkg/deb/dpkgpm.cc:1714 apt-pkg/deb/dpkgpm.cc:1720 +#: cmdline/apt-internal-solver.cc:49 +#, fuzzy msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"用法：apt-extracttemplates 檔案1 [檔案2 ...]\n" +"\n" +"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n" +"的工具\n" +"\n" +"選項\n" +" -h 本幫助訊息。\n" +" -t 指定暫存目錄\n" +" -c=? 讀取指定的設定檔\n" +" -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "未知的套件記錄！" -#: apt-pkg/deb/dpkgpm.cc:1742 +#: cmdline/apt-sortpkgs.cc:153 msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"用法：apt-sortpkgs [選項] 檔案1 [檔案2 ...]\n" +"\n" +"apt-sortpkgs 是用來排序套件檔的簡單工具。-s 選項是用來指定它的檔案類型。\n" +"\n" +"選項：\n" +" -h 本幫助訊息。\n" +" -s 根據原始檔排序\n" +" -c=? 讀取指定的設定檔\n" +" -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" -- cgit v1.2.3-70-g09d2 From 4e6a7e260eb713318b1b5019a72073050242ac3c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 25 Nov 2014 10:50:58 +0100 Subject: properly handle already reinstall pkgs in ordering The bugreport itself describes the case of the ordering code detecting a loop where none is present, but the testcase finds also cases in which there is actually a loop and we fail to realize it. --reinstall can be considered an interactive command through and it usually doesn't encounter such "hard" problems (= looping essentials), so this is less serious than it sounds at first. Closes: 770291 --- apt-pkg/packagemanager.cc | 46 +++++++++++--- test/integration/test-bug-770291-reinstall | 98 ++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 10 deletions(-) create mode 100755 test/integration/test-bug-770291-reinstall diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index ba48c53cc..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) diff --git a/test/integration/test-bug-770291-reinstall b/test/integration/test-bug-770291-reinstall new file mode 100755 index 000000000..ea1f57ede --- /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 + +testequal '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 + +testequal '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 + +testequal '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 + +testequal '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 -- cgit v1.2.3-70-g09d2 From 016bea8214e1826b289025f03890f70a5805db87 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 25 Nov 2014 12:10:15 +0100 Subject: correct architecture detection for 'rc' packages for purge We were already considering these cases, but the code was flawed, so that packages changing architectures are incorrectly handled and hence the wrong architecture is used to call dpkg with, so that dpkg says the package isn't installed (which it isn't for the requested architecture). Closes: 770898 --- apt-pkg/deb/dpkgpm.cc | 16 ++---- test/integration/framework | 24 ++++++--- .../test-ubuntu-bug-761175-remove-purge | 62 ++++++++++++++-------- 3 files changed, 63 insertions(+), 39 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 593875071..3fbda0552 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -201,18 +201,10 @@ 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; } /*}}}*/ diff --git a/test/integration/framework b/test/integration/framework index ff059f59e..298f4c9b2 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -635,12 +635,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 @@ -1489,3 +1485,19 @@ aptautotest_aptget_update() { done } aptautotest_apt_update() { aptautotest_aptget_update "$@"; } + +testaptautotestnodpkgwarning() { + local TESTCALL="$1" + while [ -n "$2" ]; do + if [ "$2" = '-s' ]; then return; fi + 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/test-ubuntu-bug-761175-remove-purge b/test/integration/test-ubuntu-bug-761175-remove-purge index 14648e9b8..0b5a91246 100755 --- a/test/integration/test-ubuntu-bug-761175-remove-purge +++ b/test/integration/test-ubuntu-bug-761175-remove-purge @@ -4,33 +4,53 @@ 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... + testequal "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 + testequal "dpkg-query: 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' -- cgit v1.2.3-70-g09d2 From ecb777ddb4d13bb7a18bbf2ebb8e2c810dcaeb72 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 18 Nov 2014 19:53:56 +0100 Subject: always run 'dpkg --configure -a' at the end of our dpkg callings dpkg checks now for dependencies before running triggers, so that packages can now end up in trigger states (especially those we are not touching at all with our calls) after apt is done running. The solution to this is trivial: Just tell dpkg to configure everything after we have (supposely) configured everything already. In the worst case this means dpkg will have to run a bunch of triggers, usually it will just do nothing though. The code to make this happen was already available, so we just flip a config option here to cause it to be run. This way we can keep pretending that triggers are an implementation detail of dpkg. --triggers-only would supposely work as well, but --configure is more robust in regards to future changes to dpkg and something we will hopefully make use of in future versions anyway (as it was planed at the time this and related options were implemented). Closes: 769609 --- apt-pkg/deb/dpkgpm.cc | 9 ++- test/integration/framework | 25 ++++--- test/integration/test-apt-progress-fd | 67 ++++++++++--------- test/integration/test-apt-progress-fd-deb822 | 18 +++-- test/integration/test-apt-progress-fd-error | 2 +- ...est-bug-769609-triggers-still-pending-after-run | 78 ++++++++++++++++++++++ .../test-no-fds-leaked-to-maintainer-scripts | 6 +- 7 files changed, 149 insertions(+), 56 deletions(-) create mode 100755 test/integration/test-bug-769609-triggers-still-pending-after-run diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 3fbda0552..79120f6f5 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1039,6 +1039,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) @@ -1266,9 +1272,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 diff --git a/test/integration/framework b/test/integration/framework index 298f4c9b2..930ab9367 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -1237,10 +1237,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 @@ -1249,16 +1252,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() { diff --git a/test/integration/test-apt-progress-fd b/test/integration/test-apt-progress-fd index af022f582..90e6ef7e4 100755 --- a/test/integration/test-apt-progress-fd +++ b/test/integration/test-apt-progress-fd @@ -19,13 +19,14 @@ testequal "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" cat apt-progress.log # upgrade exec 3> apt-progress.log @@ -34,13 +35,14 @@ testequal "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" cat apt-progress.log # reinstall exec 3> apt-progress.log @@ -49,22 +51,24 @@ testequal "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" cat apt-progress.log # and remove exec 3> apt-progress.log testsuccess aptget remove testing -y -o APT::Status-Fd=3 testequal "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" cat apt-progress.log # install non-native and ensure we get proper progress info exec 3> apt-progress.log @@ -75,12 +79,13 @@ testequal "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" cat apt-progress.log 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..badc985e4 100755 --- a/test/integration/test-apt-progress-fd-deb822 +++ b/test/integration/test-apt-progress-fd-deb822 @@ -27,37 +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) + +Status: progress +Percent: 83.3333 +Message: Running dpkg " cat 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-bug-769609-triggers-still-pending-after-run b/test/integration/test-bug-769609-triggers-still-pending-after-run new file mode 100755 index 000000000..0588b793f --- /dev/null +++ b/test/integration/test-bug-769609-triggers-still-pending-after-run @@ -0,0 +1,78 @@ +#!/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 < ${BUILDDIR}/debian/triggers + buildpackage "$BUILDDIR" 'unstable' 'main' 'native' + rm -rf "$BUILDDIR" + buildsimplenativepackage "trigdepends-$TYPE" 'all' '1.0' 'unstable' +} + +# FIXME: implement test with activate-style triggers +#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-no-fds-leaked-to-maintainer-scripts b/test/integration/test-no-fds-leaked-to-maintainer-scripts index 428db46ef..cde987bd6 100755 --- a/test/integration/test-no-fds-leaked-to-maintainer-scripts +++ b/test/integration/test-no-fds-leaked-to-maintainer-scripts @@ -48,7 +48,8 @@ startup packages configure configure $PKGNAME 1.0 status unpacked $PKGNAME 1.0 status half-configured $PKGNAME 1.0 -status installed $PKGNAME 1.0" cut -f 3- -d' ' rootdir/var/log/dpkg.log +status installed $PKGNAME 1.0 +startup packages configure" cut -f 3- -d' ' rootdir/var/log/dpkg.log rm -f rootdir/var/log/dpkg.log rootdir/var/log/apt/term.log testsuccess aptget purge -y fdleaks -qq @@ -76,4 +77,5 @@ 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 " cut -f 3- -d' ' rootdir/var/log/dpkg.log +status not-installed $PKGNAME +startup packages configure" cut -f 3- -d' ' rootdir/var/log/dpkg.log -- cgit v1.2.3-70-g09d2 From ed793a19ec00b83254029509bc516e3ba911c75a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 29 Nov 2014 17:59:52 +0100 Subject: dispose http(s) 416 error page as non-content MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Real webservers (like apache) actually send an error page with a 416 response, but our client didn't expect it leaving the page on the socket to be parsed as response for the next request (http) or as file content (https), which isn't what we want at all… Symptom is a "Bad header line" as html usually doesn't parse that well to an http-header. This manifests itself e.g. if we have a complete file (or larger) in partial/ which isn't discarded by If-Range as the server doesn't support it (or it is just newer, think: mirror rotation). It is a sort-of regression of 78c72d0ce22e00b194251445aae306df357d5c1a, which removed the filesize - 1 trick, but this had its own problems… To properly test this our webserver gains the ability to reply with transfer-encoding: chunked as most real webservers will use it to send the dynamically generated error pages. Closes: 768797 --- cmdline/apt-helper.cc | 31 +++-- methods/http.cc | 2 + methods/https.cc | 15 ++- methods/server.cc | 26 ++-- methods/server.h | 5 +- test/integration/framework | 4 +- test/integration/test-partial-file-support | 62 ++++++++- test/interactive-helper/aptwebserver.cc | 193 ++++++++++++++++++----------- 8 files changed, 233 insertions(+), 105 deletions(-) diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc index 1b832f165..a05ae90a2 100644 --- a/cmdline/apt-helper.cc +++ b/cmdline/apt-helper.cc @@ -51,22 +51,33 @@ static bool DoDownloadFile(CommandLine &CmdL) AcqTextStatus Stat(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 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::const_iterator f = targetfiles.begin(); f != targetfiles.end(); ++f) + if (FileExists(*f) == false) + return _error->Error(_("Download Failed")); + return true; } diff --git a/methods/http.cc b/methods/http.cc index a5de13511..ad1347d36 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -444,6 +444,8 @@ bool HttpServerState::RunData(FileFd * const File) loss of the connection means we are done */ if (Encoding == Closes) In.Limit(-1); + else if (JunkSize != 0) + In.Limit(JunkSize); else In.Limit(Size - StartPos); diff --git a/methods/https.cc b/methods/https.cc index 366148e19..23b3a10d4 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -69,6 +69,9 @@ HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp) { me->Server->Result = 200; me->Server->StartPos = me->Server->Size; + // 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->Server->JunkSize = std::numeric_limits::max(); } else me->Server->StartPos = 0; @@ -86,19 +89,25 @@ 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) + if(me->File->Write(buffer, buffer_size) != true) return false; if(me->Queue->MaximumSize > 0 && me->File->Tell() > me->Queue->MaximumSize) { me->SetFailReason("MaximumSizeExceeded"); - return _error->Error("Writing more data than expected (%llu > %llu)", + _error->Error("Writing more data than expected (%llu > %llu)", me->TotalWritten, me->Queue->MaximumSize); + return 0; } - return size*nmemb; + return buffer_size; } int diff --git a/methods/server.cc b/methods/server.cc index c4689ff12..9b3d39cf2 100644 --- a/methods/server.cc +++ b/methods/server.cc @@ -55,6 +55,7 @@ ServerState::RunHeadersResult ServerState::RunHeaders(FileFd * const File, Minor = 0; Result = 0; Size = 0; + JunkSize = 0; StartPos = 0; Encoding = Closes; HaveContent = false; @@ -163,14 +164,14 @@ 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 * SizePtr = &Size; + if (Result == 416) + SizePtr = &JunkSize; - Size = strtoull(Val.c_str(), NULL, 10); - if (Size >= std::numeric_limits::max()) + *SizePtr = strtoull(Val.c_str(), NULL, 10); + if (*SizePtr >= std::numeric_limits::max()) return _error->Errno("HeaderLine", _("The HTTP server sent an invalid Content-Length header")); - else if (Size == 0) + else if (*SizePtr == 0) HaveContent = false; return true; } @@ -187,10 +188,7 @@ bool ServerState::HeaderLine(string Line) // §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; - } + ; // we got the expected filesize which is all we wanted else if (sscanf(Val.c_str(),"bytes %llu-%*u/%llu",&StartPos,&Size) != 2) return _error->Error(_("The HTTP server sent an invalid Content-Range header")); if ((unsigned long long)StartPos > Size) @@ -308,9 +306,15 @@ ServerMethod::DealWithHeaders(FetchResult &Res) if ((unsigned long long)SBuf.st_size == Server->Size) { // the file is completely downloaded, but was not moved + 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->Size; Server->Result = 200; - Server->HaveContent = false; } else if (unlink(Queue->DestFile.c_str()) == 0) { diff --git a/methods/server.h b/methods/server.h index 7d5198478..b974ec89a 100644 --- a/methods/server.h +++ b/methods/server.h @@ -34,7 +34,8 @@ struct ServerState char Code[360]; // These are some statistics from the last parsed header lines - unsigned long long Size; + unsigned long long Size; // size of the usable content (aka: the file) + unsigned long long JunkSize; // size of junk content (aka: server error pages) unsigned long long StartPos; time_t Date; bool HaveContent; @@ -73,7 +74,7 @@ struct ServerState RunHeadersResult RunHeaders(FileFd * const File, const std::string &Uri); 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'; Size = 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; diff --git a/test/integration/framework b/test/integration/framework index 930ab9367..f7f69f5d5 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -1119,8 +1119,8 @@ 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 \ + local PROTO="${1%%:*}" + apthelper -o Debug::Acquire::${PROTO}=1 -o Debug::pkgAcquire::Worker=1 \ download-file "$1" "$2" 2>&1 || true # only if the file exists the download was successful if [ -r "$2" ]; then diff --git a/test/integration/test-partial-file-support b/test/integration/test-partial-file-support index 98b2f242a..b6b305d25 100755 --- a/test/integration/test-partial-file-support +++ b/test/integration/test-partial-file-support @@ -24,13 +24,25 @@ testdownloadfile() { 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,41 @@ 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" + + 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 +104,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 +126,18 @@ testrun() { testwebserverlaststatuscode '200' "$DOWNLOADLOG" } +msgmsg 'http: Test with Content-Length' +webserverconfig 'aptwebserver::chunked-transfer-encoding' 'false' +testrun 'http://localhost:8080' +msgmsg 'http: Test with Transfer-Encoding: chunked' +webserverconfig 'aptwebserver::chunked-transfer-encoding' 'true' testrun 'http://localhost:8080' changetohttpswebserver +msgmsg 'https: Test with Content-Length' +webserverconfig 'aptwebserver::chunked-transfer-encoding' 'false' +testrun 'https://localhost:4433' +msgmsg 'https: Test with Transfer-Encoding: chunked' +webserverconfig 'aptwebserver::chunked-transfer-encoding' 'true' testrun 'https://localhost:4433' diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc index 00004a524..ca6f88c58 100644 --- a/test/interactive-helper/aptwebserver.cc +++ b/test/interactive-helper/aptwebserver.cc @@ -19,6 +19,8 @@ #include #include #include + +#include #include #include #include @@ -79,12 +81,21 @@ static char const * httpcodeToStr(int const httpcode) /*{{{*/ return NULL; } /*}}}*/ +static bool chunkedTransferEncoding(std::list 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 &headers, FileFd &data)/*{{{*/ { - std::ostringstream contentlength; - contentlength << "Content-Length: " << data.FileSize(); - headers.push_back(contentlength.str()); - + if (chunkedTransferEncoding(headers) == false) + { + 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); @@ -92,9 +103,12 @@ static void addFileHeaders(std::list &headers, FileFd &data)/*{{{*/ /*}}}*/ static void addDataHeaders(std::list &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 &headers)/*{{{*/ @@ -114,6 +128,9 @@ static bool sendHead(int const client, int const httpcode, std::list>> RESPONSE to " << client << " >>>" << std::endl; bool Success = true; for (std::list::const_iterator h = headers.begin(); @@ -130,25 +147,55 @@ static bool sendHead(int const client, int const httpcode, std::list 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 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 +204,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 headers = std::list()) + bool const content, std::string const &error, std::list &headers) { std::string response(""); response.append(httpcodeToStr(httpcode)).append(""); response.append("

").append(httpcodeToStr(httpcode)).append("

"); if (httpcode != 200) - { - if (error.empty() == false) - response.append("

Error: ").append(error).append("

"); - response.append("This error is a result of the request: 
");
-   }
+      response.append("
Error: ");
+   else
+      response.append("
Success: ");
+   if (error.empty() == false)
+      response.append(error);
+   else
+      response.append(httpcodeToStr(httpcode));
+   if (httpcode != 200)
+      response.append("
This error is a result of the request: 
");
    else
-   {
-      if (error.empty() == false)
-	 response.append("
Success: ").append(error).append("
");
       response.append("The successfully executed operation was requested by: 
");
-   }
    response.append(request).append("
");
+   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 &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 +272,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 +314,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 &headers)
 {
-   std::list 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 +361,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 ¶ms, bool &sendContent,
-		    bool &closeConnection)
+		    bool &closeConnection, std::list &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 +383,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 +395,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 +410,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 +421,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 +433,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 +446,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 +461,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 +472,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 +485,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 headers;
 	    headers.push_back("WWW-Authenticate: Basic");
 	    sendError(client, 401, request, sendContent, "Unsupported Authentication Scheme", headers);
 	    return false;
@@ -463,7 +513,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 headers;
+      sendError(client, 400, request, sendContent, "Filename contains illegal character (sequence)", headers);
       return false;
    }
 
@@ -499,7 +550,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 parts)/*{{{*/
+static bool handleOnTheFlyReconfiguration(int const client, std::string const &request,/*{{{*/
+      std::vector parts, std::list &headers)
 {
    size_t const pcount = parts.size();
    for (size_t i = 0; i < pcount; ++i)
@@ -507,40 +559,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 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 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;
 }
 									/*}}}*/
@@ -549,18 +599,22 @@ static void * handleClient(void * voidclient)				/*{{{*/
    int client = *((int*)(voidclient));
    std::clog << "ACCEPT client " << client << std::endl;
    std::vector messages;
-   while (ReadMessages(client, messages))
+   bool closeConnection = false;
+   std::list headers;
+   while (closeConnection == false && ReadMessages(client, messages))
    {
-      bool closeConnection = false;
+      // if we announced a closing, do the close
+      if (std::find(headers.begin(), headers.end(), std::string("Connection: close")) != headers.end())
+	 break;
+      headers.clear();
       for (std::vector::const_iterator m = messages.begin();
 	    m != messages.end() && closeConnection == false; ++m) {
 	 std::clog << ">>> REQUEST from " << client << " >>>" << std::endl << *m
 	    << std::endl << "<<<<<<<<<<<<<<<<" << std::endl;
-	 std::list 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 +623,7 @@ static void * handleClient(void * voidclient)				/*{{{*/
 	    std::vector parts = VectorizeString(filename, '/');
 	    if (parts[0] == "_config")
 	    {
-	       handleOnTheFlyReconfiguration(client, *m, parts);
+	       handleOnTheFlyReconfiguration(client, *m, parts, headers);
 	       continue;
 	    }
 	 }
@@ -601,7 +655,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 +674,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)
@@ -676,17 +730,16 @@ static void * handleClient(void * voidclient)				/*{{{*/
 			headers.push_back(contentrange.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;
+			sendError(client, 416, *m, sendContent, "", headers);
+			break;
 		     }
 		  }
 	       }
@@ -695,22 +748,20 @@ 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)
-	 break;
    }
    close(client);
    std::clog << "CLOSE client " << client << std::endl;
-- 
cgit v1.2.3-70-g09d2


From c6bc9735cf1486d40d85bba90cfc3aaa6537a9c0 Mon Sep 17 00:00:00 2001
From: David Kalnischkies 
Date: Wed, 10 Dec 2014 22:26:59 +0100
Subject: do not make PTY slave the controlling terminal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If we have no controlling terminal opening a terminal will make this
terminal our controller, which is a serious problem if this happens to
be the pseudo terminal we created to run dpkg in as we will close this
terminal at the end hanging ourself up in the process…

The offending open is the one we do to have at least one slave fd open
all the time, but for good measure, we apply the flag also to the slave
fd opening in the child process as we set the controlling terminal
explicitely here.

This is a regression from 150bdc9ca5d656f9fba94d37c5f4f183b02bd746 with
the slight twist that this usecase was silently broken before in that it
wasn't logging the output in term.log (as a pseudo terminal wasn't
created).

Closes: 772641
---
 apt-pkg/deb/dpkgpm.cc                              |  4 +-
 .../test-no-fds-leaked-to-maintainer-scripts       | 60 +++++++++++++---------
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 79120f6f5..8a8214c19 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1127,7 +1127,7 @@ void pkgDPkgPM::StartPtyMagic()
 	       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);
+	    d->protect_slave_from_dying = open(d->slave, O_RDWR | O_CLOEXEC | O_NOCTTY);
 	 }
       }
    }
@@ -1159,7 +1159,7 @@ void pkgDPkgPM::SetupSlavePtyMagic()
    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?"));
    else if (ioctl(slaveFd, TIOCSCTTY, 0) < 0)
diff --git a/test/integration/test-no-fds-leaked-to-maintainer-scripts b/test/integration/test-no-fds-leaked-to-maintainer-scripts
index cde987bd6..a7d556b87 100755
--- a/test/integration/test-no-fds-leaked-to-maintainer-scripts
+++ b/test/integration/test-no-fds-leaked-to-maintainer-scripts
@@ -26,20 +26,25 @@ setupaptarchive
 
 rm -f rootdir/var/log/dpkg.log rootdir/var/log/apt/term.log
 testsuccess aptget install -y fdleaks -qq < /dev/null
-msgtest 'Check if fds were not' 'leaked'
-if [ "$(grep 'root root' rootdir/tmp/testsuccess.output | wc -l)" = '8' ]; then
-	msgpass
-else
-	echo
-	cat rootdir/tmp/testsuccess.output
-	msgfail
-fi
 
-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)"
+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
+	testequal "startup archives unpack
 install $PKGNAME  1.0
 status half-installed $PKGNAME 1.0
 status unpacked $PKGNAME 1.0
@@ -50,22 +55,19 @@ 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
-msgtest 'Check if fds were not' 'leaked'
-if [ "$(grep 'root root' rootdir/tmp/testsuccess.output | wc -l)" = '12' ]; then
-	msgpass
-else
-	echo
-	cat rootdir/tmp/testsuccess.output
-	msgfail
-fi
-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)"
+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
+	testequal "startup packages purge
 status installed $PKGNAME 1.0
 remove $PKGNAME 1.0 
 status half-configured $PKGNAME 1.0
@@ -79,3 +81,13 @@ status config-files $PKGNAME 1.0
 status config-files $PKGNAME 1.0
 status not-installed $PKGNAME 
 startup packages configure" cut -f 3- -d' ' rootdir/var/log/dpkg.log
+}
+checkpurge
+
+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
-- 
cgit v1.2.3-70-g09d2


From 6393a493035d7b1e0000bbc7b74bc5b31b32eacd Mon Sep 17 00:00:00 2001
From: Jean-Pierre Giraud 
Date: Mon, 22 Dec 2014 12:30:32 +0100
Subject: French manpages translation update

Closes: 771967
---
 doc/po/fr.po | 577 ++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 373 insertions(+), 204 deletions(-)

diff --git a/doc/po/fr.po b/doc/po/fr.po
index f94f0e07a..0a8103852 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 , 2009, 2010, 2011, 2012, 2013.
+# Jean-Pierre Giraud , 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team \n"
 "POT-Creation-Date: 2014-08-28 00:20+0000\n"
-"PO-Revision-Date: 2014-07-04 01:28+0200\n"
-"Last-Translator: Christian Perrier \n"
+"PO-Revision-Date: 2014-11-15 17:26+0100\n"
+"Last-Translator: Jean-Pierre Giraud \n"
 "Language-Team: French \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
@@ -51,7 +52,8 @@ msgid ""
 msgstr ""
 "\n"
-"\t\tPage qualité\n"
+"\t\tPage qualité"
+"\n"
 "\t\n"
 "\">\n"
 
@@ -73,7 +75,8 @@ msgstr ""
 "\n"
 "Bogues\n"
-"   Page des bogues d'APT. \n"
+"   Page des bogues d'APT<"
+"/ulink>. \n"
 "   Si vous souhaitez signaler un bogue à propos d'APT, veuillez lire\n"
 "   /usr/share/doc/debian/bug-reporting.txt ou utiliser\n"
 "   la commande &reportbug;.\n"
@@ -88,7 +91,8 @@ msgid ""
 "\n"
 "Author\n"
-"   APT was written by the APT team apt@packages.debian.org.\n"
+"   APT was written by the APT team apt@packages.debian.org<"
+"/email>.\n"
 "   \n"
 " \n"
 "\">\n"
@@ -96,7 +100,8 @@ msgstr ""
 "\n"
 "Author\n"
-"   APT a été écrit par l'équipe de développement APT apt@packages.debian.org.\n"
+"   APT a été écrit par l'équipe de développement APT "
+"apt@packages.debian.org.\n"
 "   \n"
 " \n"
 "\">\n"
@@ -152,10 +157,12 @@ msgid ""
 "     \n"
 "      \n"
 "      \n"
-"     Configuration File; Specify a configuration file to use. \n"
+"     Configuration File; Specify a configuration file to use. "
+"\n"
 "     The program will read the default configuration file and then this \n"
 "     configuration file. If configuration settings need to be set before the\n"
-"     default configuration files are parsed specify a file with the APT_CONFIG\n"
+"     default configuration files are parsed specify a file with the "
+"APT_CONFIG\n"
 "     environment variable. See &apt-conf; for syntax information.\n"
 "     \n"
 "     \n"
@@ -164,10 +171,15 @@ msgstr ""
 "     \n"
 "      \n"
 "      \n"
-"     Fichier de configuration ; indique le fichier de configuration à utiliser. \n"
-"     Le programme lira le fichier de configuration par défaut puis le fichier indiqué ici. \n"
-"     Si les réglages de configuration doivent être établis avant l'analyse des fichiers\n"
-"     de configuration par défaut, un fichier peut être indiqué avec la variable d'environnement APT_CONFIG.     Veuillez consulter &apt-conf; pour des informations sur la syntaxe d'utilisation.     \n"
+"     Fichier de configuration ; indique le fichier de "
+"configuration à utiliser. \n"
+"     Le programme lira le fichier de configuration par défaut puis le fichier "
+"indiqué ici. \n"
+"     Si les réglages de configuration doivent être établis avant l'analyse "
+"des fichiers\n"
+"     de configuration par défaut, un fichier peut être indiqué avec la "
+"variable d'environnement APT_CONFIG.     Veuillez consulter "
+"&apt-conf; pour des informations sur la syntaxe d'utilisation.     \n"
 "     \n"
 "     \n"
 "     \n"
@@ -192,8 +204,10 @@ msgstr ""
 "      \n"
 "      \n"
 "     Définir une option de configuration ; permet de régler\n"
-"      une option de configuration donnée. La syntaxe est .\n"
-"       et  peuvent être utilisées plusieurs fois\n"
+"      une option de configuration donnée. La syntaxe est .\n"
+"       et  peuvent être utilisées "
+"plusieurs fois\n"
 "      pour définir des options différentes.\n"
 "     \n"
 "     \n"
@@ -207,7 +221,8 @@ msgid ""
 "\n"
 "All command line options may be set using the configuration file, the\n"
+"   All command line options may be set using the configuration file, "
+"the\n"
 "   descriptions indicate the configuration option to set. For boolean\n"
 "   options you can override the config file by using something like \n"
 "   ,, \n"
@@ -218,9 +233,12 @@ msgstr ""
 "\n"
 "Toutes les options de la ligne de commande peuvent être définies dans le fichier de configuration, \n"
-"   les descriptions indiquant l'option de configuration concernée. Pour les options\n"
-"   booléennes, vous pouvez inverser les réglages du fichiers de configuration avec \n"
+"   Toutes les options de la ligne de commande peuvent être définies "
+"dans le fichier de configuration, \n"
+"   les descriptions indiquant l'option de configuration concernée. Pour les "
+"options\n"
+"   booléennes, vous pouvez inverser les réglages du fichiers de configuration "
+"avec \n"
 "   ,, \n"
 "   et d'autres variantes analogues.\n"
 "   \n"
@@ -233,13 +251,15 @@ msgid ""
 "/etc/apt/apt.conf\n"
 "     APT configuration file.\n"
-"     Configuration Item: Dir::Etc::Main.\n"
+"     Configuration Item: Dir::Etc::Main."
+"\n"
 "     \n"
 msgstr ""
 "/etc/apt/apt.conf\n"
 "     Fichier de configuration d'APT.\n"
-"     Élément de configuration : Dir::Etc::Main.\n"
+"     Élément de configuration : Dir::Etc::Main.<"
+"/listitem>\n"
 "     \n"
 
 #. type: Plain text
@@ -248,13 +268,15 @@ msgstr ""
 msgid ""
 "     /etc/apt/apt.conf.d/\n"
 "     APT configuration file fragments.\n"
-"     Configuration Item: Dir::Etc::Parts.\n"
+"     Configuration Item: Dir::Etc::Parts."
+"\n"
 "     \n"
 "\">\n"
 msgstr ""
 "     /etc/apt/apt.conf.d/\n"
 "     Fragments du fichier de configuration d'APT.\n"
-"     Élément de configuration : Dir::Etc::Parts.\n"
+"     Élément de configuration : Dir::Etc::Parts.<"
+"/listitem>\n"
 "     \n"
 "\">\n"
 
@@ -265,28 +287,34 @@ msgid ""
 "&cachedir;/archives/\n"
 "     Storage area for retrieved package files.\n"
-"     Configuration Item: Dir::Cache::Archives.\n"
+"     Configuration Item: Dir::Cache::Archives.<"
+"/listitem>\n"
 "     \n"
 msgstr ""
 "&cachedir;/archives/\n"
 "     Zone de stockage des fichiers récupérés.\n"
-"     Élément de configuration : Dir::Cache::Archives.\n"
+"     Élément de configuration : Dir::Cache::Archives.<"
+"/para>\n"
 "     \n"
 
 #. type: Plain text
 #: apt.ent:109
 #, no-wrap
 msgid ""
-"     &cachedir;/archives/partial/\n"
+"     &cachedir;/archives/partial/<"
+"/term>\n"
 "     Storage area for package files in transit.\n"
-"     Configuration Item: Dir::Cache::Archives (partial will be implicitly appended)\n"
+"     Configuration Item: Dir::Cache::Archives ("
+"partial will be implicitly appended)\n"
 "     \n"
 "\">\n"
 msgstr ""
-"     &cachedir;/archives/partial/\n"
+"     &cachedir;/archives/partial/<"
+"/term>\n"
 "     Zone de stockage pour les paquets en transit.\n"
-"     Élément de configuration : Dir::Cache::Archives (partial sera implicitement ajouté). \n"
+"     Élément de configuration : Dir::Cache::Archives (<"
+"filename>partial sera implicitement ajouté). \n"
 "     \n"
 "\">\n"
 
@@ -301,14 +329,18 @@ msgid ""
 "     i.e. a preference to get certain packages\n"
 "     from a separate source\n"
 "     or from a different version of a distribution.\n"
-"     Configuration Item: Dir::Etc::Preferences.\n"
+"     Configuration Item: Dir::Etc::Preferences.<"
+"/listitem>\n"
 "     \n"
 msgstr ""
 "/etc/apt/preferences\n"
 "     Fichier des préférences.\n"
-"     C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente.\n"
-"     Élément de configuration : Dir::Etc::Preferences.\n"
+"     C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) "
+"c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une "
+"distribution différente.\n"
+"     Élément de configuration : Dir::Etc::Preferences.<"
+"/para>\n"
 "     \n"
 
 #. type: Plain text
@@ -317,13 +349,15 @@ msgstr ""
 msgid ""
 "     /etc/apt/preferences.d/\n"
 "     File fragments for the version preferences.\n"
-"     Configuration Item: Dir::Etc::PreferencesParts.\n"
+"     Configuration Item: Dir::Etc::PreferencesParts."
+"\n"
 "     \n"
 "\">\n"
 msgstr ""
 "     /etc/apt/preferences.d/\n"
 "     Fragments de fichiers pour la préférence des versions.\n"
-"     Élément de configuration : Dir::Etc::PreferencesParts.\n"
+"     Élément de configuration : Dir::Etc::PreferencesParts"
+".\n"
 "     \n"
 "\">\n"
 
@@ -334,28 +368,35 @@ msgid ""
 "/etc/apt/sources.list\n"
 "     Locations to fetch packages from.\n"
-"     Configuration Item: Dir::Etc::SourceList.\n"
+"     Configuration Item: Dir::Etc::SourceList.<"
+"/listitem>\n"
 "     \n"
 msgstr ""
 "/etc/apt/sources.list\n"
 "     Emplacement pour la récupération des paquets.\n"
-"     Élément de configuration : Dir::Etc::SourceList.\n"
+"     Élément de configuration : Dir::Etc::SourceList.<"
+"/para>\n"
 "     \n"
 
 #. type: Plain text
 #: apt.ent:137
 #, no-wrap
 msgid ""
-"     /etc/apt/sources.list.d/\n"
+"     /etc/apt/sources.list.d/"
+"\n"
 "     File fragments for locations to fetch packages from.\n"
-"     Configuration Item: Dir::Etc::SourceParts.\n"
+"     Configuration Item: Dir::Etc::SourceParts.<"
+"/listitem>\n"
 "     \n"
 "\">\n"
 msgstr ""
-"     /etc/apt/sources.list.d/\n"
-"     Fragments de fichiers définissant les emplacements de récupération de paquets.\n"
-"     Élément de configuration : Dir::Etc::SourceParts.\n"
+"     /etc/apt/sources.list.d/"
+"\n"
+"     Fragments de fichiers définissant les emplacements de "
+"récupération de paquets.\n"
+"     Élément de configuration : Dir::Etc::SourceParts.<"
+"/para>\n"
 "     \n"
 "\">\n"
 
@@ -365,30 +406,38 @@ msgstr ""
 msgid ""
 "&statedir;/lists/\n"
-"     Storage area for state information for each package resource specified in\n"
+"     Storage area for state information for each package "
+"resource specified in\n"
 "     &sources-list;\n"
-"     Configuration Item: Dir::State::Lists.\n"
+"     Configuration Item: Dir::State::Lists.<"
+"/listitem>\n"
 "     \n"
 msgstr ""
 "&statedir;/lists/\n"
-"     Zone de stockage pour les informations qui concernent chaque ressource de paquet spécifiée dans &sources-list;\n"
-"     Élément de configuration : Dir::State::Lists.\n"
+"     Zone de stockage pour les informations qui concernent "
+"chaque ressource de paquet spécifiée dans &sources-list;\n"
+"     Élément de configuration : Dir::State::Lists.<"
+"/listitem>\n"
 "     \n"
 
 #. type: Plain text
 #: apt.ent:150
 #, no-wrap
 msgid ""
-"     &statedir;/lists/partial/\n"
+"     &statedir;/lists/partial/"
+"\n"
 "     Storage area for state information in transit.\n"
-"     Configuration Item: Dir::State::Lists (partial will be implicitly appended)\n"
+"     Configuration Item: Dir::State::Lists ("
+"partial will be implicitly appended)\n"
 "     \n"
 "\">\n"
 msgstr ""
-"     &statedir;/lists/partial/\n"
+"     &statedir;/lists/partial/"
+"\n"
 "     Zone de stockage pour les informations en transit.\n"
-"     Élément de configuration : Dir::State::Lists (partial sera implicitement ajouté).\n"
+"     Élément de configuration : Dir::State::Lists (<"
+"filename>partial sera implicitement ajouté).\n"
 "     \n"
 "\">\n"
 
@@ -398,14 +447,18 @@ msgstr ""
 msgid ""
 "/etc/apt/trusted.gpg\n"
-"     Keyring of local trusted keys, new keys will be added here.\n"
-"     Configuration Item: Dir::Etc::Trusted.\n"
+"     Keyring of local trusted keys, new keys will be added "
+"here.\n"
+"     Configuration Item: Dir::Etc::Trusted.<"
+"/listitem>\n"
 "     \n"
 msgstr ""
 "/etc/apt/trusted.gpg\n"
-"     Porte-clés des clés de confiance locales. Les nouvelles clés y seront ajoutées.\n"
-"     Élément de configuration: Dir::Etc::Trusted.\n"
+"     Porte-clés des clés de confiance locales. Les nouvelles "
+"clés y seront ajoutées.\n"
+"     Élément de configuration: Dir::Etc::Trusted.<"
+"/listitem>\n"
 "     \n"
 
 #. type: Plain text
@@ -413,16 +466,21 @@ msgstr ""
 #, no-wrap
 msgid ""
 "     /etc/apt/trusted.gpg.d/\n"
-"     File fragments for the trusted keys, additional keyrings can\n"
+"     File fragments for the trusted keys, additional keyrings "
+"can\n"
 "     be stored here (by other packages or the administrator).\n"
-"     Configuration Item Dir::Etc::TrustedParts.\n"
+"     Configuration Item Dir::Etc::TrustedParts.<"
+"/listitem>\n"
 "     \n"
 "\">\n"
 msgstr ""
 "     /etc/apt/trusted.gpg.d/\n"
-"     Fragments de fichiers pour les clés de signatures sûres. Des fichiers\n"
-"     supplémentaires peuvent être placés à cet endroit (par des paquets ou par l'administrateur).\n"
-"     Élément de configuration : Dir::Etc::TrustedParts.\n"
+"     Fragments de fichiers pour les clés de signatures sûres. "
+"Des fichiers\n"
+"     supplémentaires peuvent être placés à cet endroit (par des paquets ou "
+"par l'administrateur).\n"
+"     Élément de configuration : Dir::Etc::TrustedParts.<"
+"/para>\n"
 "     \n"
 "\">\n"
 
@@ -431,7 +489,8 @@ msgstr ""
 #, no-wrap
 msgid ""
 "/var/lib/apt/extended_states\n"
+"      /var/lib/apt/extended_states<"
+"/term>\n"
 "      Status list of auto-installed packages.\n"
 "      Configuration Item: Dir::State::extended_states.\n"
 "      \n"
@@ -439,9 +498,11 @@ msgid ""
 "\">\n"
 msgstr ""
 "/var/lib/apt/extended_states\n"
+"     /var/lib/apt/extended_states<"
+"/term>\n"
 "     Liste d'état des paquets installés automatiquement.\n"
-"     Élément de configuration : Dir::State::extended_states.\n"
+"     Élément de configuration : Dir::State::extended_states"
+".\n"
 "     \n"
 "\">\n"
 
@@ -449,8 +510,10 @@ msgstr ""
 #: apt.ent:175
 #, no-wrap
 msgid ""
-"\n"
+"\n"
 "\n"
 msgstr "\n"
 
@@ -458,28 +521,39 @@ msgstr "\n"
 #: apt.ent:184
 #, no-wrap
 msgid ""
-"\n"
 "john@doe.org in 2009,\n"
-"     2010 and Daniela Acme daniela@acme.us in 2010 together with the\n"
-"     Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org.\n"
+"     The english translation was done by John Doe john@doe.org "
+"in 2009,\n"
+"     2010 and Daniela Acme daniela@acme.us in 2010 together "
+"with the\n"
+"     Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org"
+".\n"
 "\">\n"
 msgstr ""
 "bubulle@debian.org (2000, 2005, 2009, 2010),\n"
-"     Équipe de traduction francophone de Debian debian-l10n-french@lists.debian.org\n"
+"     Jérôme Marant, Philippe Batailler, Christian Perrier "
+"bubulle@debian.org (2000, 2005, 2009, 2010),\n"
+"     Équipe de traduction francophone de Debian "
+"debian-l10n-french@lists.debian.org\n"
 "\">\n"
 
 #. type: Plain text
 #: apt.ent:195
 #, no-wrap
 msgid ""
-"\n"
 "\n"
 msgstr ""
 "\n"
@@ -628,7 +703,7 @@ msgstr "APT"
 #. type: Content of: 
 #: apt.8.xml:28
 msgid "command-line interface"
-msgstr ""
+msgstr "interface en ligne de commande"
 
 #. type: Content of: 
 #: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
@@ -647,6 +722,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 +735,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,10 +746,11 @@ 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."
@@ -674,8 +758,8 @@ 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 +767,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,10 +809,11 @@ 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."
@@ -734,8 +821,8 @@ 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 +832,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 +845,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 +859,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 +870,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 +889,21 @@ 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 +911,18 @@ 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:552 apt-cache.8.xml:346 apt-key.8.xml:191
@@ -830,7 +935,6 @@ 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-"
@@ -839,9 +943,8 @@ 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:558 apt-cache.8.xml:351 apt-mark.8.xml:131
@@ -852,7 +955,6 @@ 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."
@@ -860,7 +962,7 @@ 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,7 +973,6 @@ 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 "
@@ -883,10 +984,10 @@ msgid ""
 "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,7 +1304,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 "
@@ -1221,10 +1321,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,7 +1407,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 "
@@ -1344,7 +1440,7 @@ 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 "
+"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>."
@@ -1496,7 +1592,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-"
@@ -1517,12 +1612,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-"
@@ -1537,13 +1631,13 @@ 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 +1673,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
@@ -1782,9 +1884,8 @@ msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
-"Ne traiter que les dépendances de construction dépendantes de "
-"l'architecture. Élément de configuration : <literal>APT::Get::Arch-Only</"
-"literal>."
+"Ne traiter que les dépendances de construction dépendantes de l'architecture. "
+"Élément de configuration : <literal>APT::Get::Arch-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:523
@@ -1807,6 +1908,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:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
@@ -1816,7 +1923,6 @@ msgstr "Fichiers"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:553
-#, fuzzy
 #| msgid ""
 #| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 #| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -1826,8 +1932,8 @@ msgid ""
 "&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>
@@ -2687,9 +2793,8 @@ msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
 msgstr ""
-"<literal>unhold</literal> est utilisé pour supprimer  l'état "
-"« hold » (conservé) d'un paquet afin de permettre toute action qui y est "
-"liée."
+"<literal>unhold</literal> est utilisé pour supprimer  l'état « hold » "
+"(conservé) d'un paquet afin de permettre toute action qui y est liée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:80
@@ -2845,7 +2950,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 "
@@ -2862,7 +2966,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
@@ -3125,7 +3230,6 @@ 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 "
@@ -3135,10 +3239,9 @@ msgid ""
 "<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
@@ -3453,7 +3556,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."
 
@@ -3697,6 +3800,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
@@ -4133,7 +4241,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 "
@@ -4149,9 +4256,9 @@ 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
@@ -4178,6 +4285,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
@@ -4354,8 +4470,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:517
 #, no-wrap
-msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
-msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";"
+msgid ""
+"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<"
+"replaceable>Methodname</replaceable>\";"
+msgstr ""
+"Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<"
+"replaceable>NomMethode</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:512
@@ -4504,8 +4624,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
 #: apt.conf.5.xml:569
 #, no-wrap
-msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
-msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
+msgid ""
+"Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
+msgstr ""
+"Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:557
@@ -4598,7 +4720,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:601
-#, fuzzy
 #| msgid ""
 #| "<literal>Dir::Cache</literal> contains locations pertaining to local "
 #| "cache information, such as the two package caches <literal>srcpkgcache</"
@@ -4624,12 +4745,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:611
@@ -4822,7 +4944,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:707
-#, 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 "
@@ -4839,14 +4960,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:714
-#, fuzzy
 #| msgid ""
 #| "Version 2 of this protocol dumps more information, including the protocol "
 #| "version, the APT configuration space and the packages, files and versions "
@@ -4861,10 +4982,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:719
@@ -4876,6 +4996,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:726
@@ -4887,6 +5013,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:736
@@ -5187,7 +5320,7 @@ msgstr ""
 
 #.  TODO: provide a
 #. 	   motivating example, except I haven't a clue why you'd want
-#. 	   to do this. 
+#. 	   to do this.
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.conf.5.xml:872
 msgid ""
@@ -5462,6 +5595,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:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
@@ -5478,7 +5614,7 @@ msgstr ""
 "Le fichier &configureindex; contient un modèle de fichier montrant des "
 "exemples pour toutes les options existantes."
 
-#.  ? reading apt.conf 
+#.  ? reading apt.conf
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -5591,8 +5727,12 @@ msgstr "Priorités affectées par défaut"
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:90
 #, no-wrap
-msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
-msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n"
+msgid ""
+"<command>apt-get install -t testing <replaceable>some-package</replaceable><"
+"/command>\n"
+msgstr ""
+"<command>apt-get install -t testing <replaceable>paquet</replaceable><"
+"/command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:93
@@ -5649,7 +5789,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>
@@ -5908,7 +6048,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
@@ -6739,8 +6879,10 @@ msgstr "Suivre l'évolution d'une version par son nom de code"
 #: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
-"Explanation: Uninstall or do not install any Debian-originated package versions\n"
-"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
+"Explanation: Uninstall or do not install any Debian-originated package "
+"versions\n"
+"Explanation: other than those in the distribution codenamed with "
+"&testing-codename; or sid\n"
 "Package: *\n"
 "Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
@@ -6944,10 +7086,10 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:76
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 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
@@ -6971,6 +7113,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
@@ -6978,10 +7137,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.  "
@@ -7003,17 +7163,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</"
+"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>distribution</literal> "
-"n'indique pas un chemin exact, un <literal>composant</literal> au moins doit "
-"être présent."
+"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 "
@@ -7031,9 +7189,9 @@ msgid ""
 "<literal>APT</literal> will automatically generate a URI with the current "
 "architecture otherwise."
 msgstr ""
-"<literal>distribution</literal> peut aussi contenir une variable <literal>"
+"<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 "
+"<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</"
@@ -7041,7 +7199,6 @@ msgstr ""
 
 #. 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 "
@@ -7067,7 +7224,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 "
@@ -7113,7 +7271,6 @@ 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 "
@@ -7126,11 +7283,10 @@ msgid ""
 "<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
@@ -7173,11 +7329,13 @@ msgstr "Exemples :"
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib "
+"non-free\n"
 "   "
 msgstr ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib "
+"non-free\n"
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
@@ -8497,8 +8655,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><programlisting>
 #: apt-ftparchive.1.xml:598
 #, no-wrap
-msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
-msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+msgid ""
+"<command>apt-ftparchive</command> packages <replaceable>directory<"
+"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+msgstr ""
+"<command>apt-ftparchive</command> packages <replaceable>répertoire<"
+"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-ftparchive.1.xml:594
@@ -8541,7 +8703,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
@@ -8561,7 +8723,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
@@ -8778,7 +8940,8 @@ msgid ""
 "Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
-"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
+"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ "
+"Packages\n"
 "Réception de http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Lecture des listes de paquets... Fait\n"
 "Construction de l'arbre des dépendances... Fait\n"
@@ -8884,7 +9047,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 "
@@ -8906,8 +9068,9 @@ 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>-"
+"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 "
@@ -9530,9 +9693,11 @@ msgid ""
 "12 packages not fully installed or removed.\n"
 "Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
-"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis à jour.\n"
+"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis "
+"à jour.\n"
 "12 paquets partiellement installés ou enlevés.\n"
-"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette opération, 26,5Mo d'espace disque supplémentaires seront utilisés.\n"
+"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette "
+"opération, 26,5Mo d'espace disque supplémentaires seront utilisés.\n"
 
 #. type: Content of: <book><chapter><section><section><para>
 #: guide.dbk:471
@@ -9602,10 +9767,12 @@ msgid ""
 "11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
-"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
+"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ "
+"Packages\n"
 "Réception de :2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Atteint http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
-"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
+"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ "
+"Packages\n"
 "Réception de :5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
 "11% [5 testing/non-free `Attente du fichier' 0/32.1k 0%] 2203b/s 1m52s\n"
 
@@ -9976,7 +10143,8 @@ msgstr ""
 " # apt-get update\n"
 " [ APT récupère les fichiers des paquets ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine distante ]\n"
+" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine "
+"distante ]\n"
 
 #. type: Content of: <book><chapter><section><para>
 #: offline.dbk:159
@@ -9998,7 +10166,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>
@@ -10097,7 +10265,8 @@ msgid ""
 " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
-" [ Répondre négativement à la question, pour être sûr(e) que les actions vous conviennent ]\n"
+" [ Répondre négativement à la question, pour être sûr(e) que les actions vous "
+"conviennent ]\n"
 " # apt-get -qq --print-uris dist-upgrade > uris\n"
 " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script\n"
 
-- 
cgit v1.2.3-70-g09d2


From 220cf74e3c33fefb9f90853a22a5f828a15ff521 Mon Sep 17 00:00:00 2001
From: Zhou Mo <cdluminate@gmail.com>
Date: Mon, 22 Dec 2014 12:36:25 +0100
Subject: Chinese (simplified) program translation update

Closes: 771982
---
 po/zh_CN.po | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 566735eb7..97a902914 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ 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-12-03 14:47+0100\n"
-"PO-Revision-Date: 2010-08-26 14:42+0800\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"
@@ -302,14 +302,14 @@ msgid "Can not find a package for architecture '%s'"
 msgstr "找不到‘%s’体系结构下的软件包"
 
 #: cmdline/apt-get.cc:327
-#, fuzzy, c-format
+#, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "找不到软件包‘%s’的‘%s’版本"
 
 #: cmdline/apt-get.cc:330
-#, fuzzy, c-format
+#, c-format
 msgid "Can not find a package '%s' with release '%s'"
-msgstr "找不到‘%s’软件包的‘%s’发行"
+msgstr "找不到软件包‘%s’的‘%s’发行"
 
 #: cmdline/apt-get.cc:367
 #, c-format
@@ -1066,6 +1066,7 @@ msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
+"明文签署文件不可用，结果为‘%s’（您的网络需要认证吗？）"
 
 #: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
@@ -1329,7 +1330,7 @@ msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
 #. YESEXPR/NOEXPR defined in your l10n.
 #: apt-private/private-output.cc:761
 msgid "[Y/n]"
-msgstr ""
+msgstr "[Y/n]"
 
 #. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
 #. e.g. "Should this file be removed? [y/N] "
@@ -1337,17 +1338,17 @@ msgstr ""
 #. YESEXPR/NOEXPR defined in your l10n.
 #: apt-private/private-output.cc:767
 msgid "[y/N]"
-msgstr ""
+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 ""
+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 ""
+msgstr "N"
 
 #: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
 #, c-format
@@ -2220,9 +2221,9 @@ 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:490
-#, fuzzy, c-format
+#, c-format
 msgid "Clean of %s is not supported"
-msgstr "%s 的 clean 不被支持"
+msgstr "%s 的 Clean (清理)不被支持"
 
 #: apt-pkg/clean.cc:64
 #, c-format
@@ -2294,7 +2295,7 @@ msgstr "无法读取或写入软件源缓存"
 
 #: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
 msgid "Send scenario to solver"
-msgstr ""
+msgstr "向solver发送情景"
 
 #: apt-pkg/edsp.cc:241
 msgid "Send request to solver"
@@ -3520,7 +3521,6 @@ msgid "Problem unlinking %s"
 msgstr "在使用 unlink 删除 %s 时出错"
 
 #: cmdline/apt-internal-solver.cc:49
-#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -3533,16 +3533,17 @@ 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
 msgid "Unknown package record!"
-- 
cgit v1.2.3-70-g09d2


From 3efd046e3f1168de5ca1e5e7c04cc55c2bf4e811 Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Mon, 22 Dec 2014 12:39:24 +0100
Subject: Japanese program translation update

Closes: 772678
---
 po/ja.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index a8b22e295..8a95df64b 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-12-03 14:47+0100\n"
-"PO-Revision-Date: 2014-09-27 19:32+0900\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"
@@ -1260,7 +1260,7 @@ msgstr "[%s からアップグレード可]"
 
 #: apt-private/private-output.cc:281
 msgid "[residual-config]"
-msgstr "[設定未完了]"
+msgstr "[設定が残存]"
 
 #: apt-private/private-output.cc:455
 #, c-format
@@ -1642,7 +1642,7 @@ msgstr "壊れたパッケージ"
 
 #: apt-private/private-install.cc:712
 msgid "The following extra packages will be installed:"
-msgstr "以下の特別パッケージがインストールされます:"
+msgstr "以下の追加パッケージがインストールされます:"
 
 #: apt-private/private-install.cc:802
 msgid "Suggested packages:"
-- 
cgit v1.2.3-70-g09d2


From 988d4f441eb2c7ac64cec339dbc02daa47fe84a4 Mon Sep 17 00:00:00 2001
From: Theppitak Karoonboonyanan <thep@debian.org>
Date: Mon, 22 Dec 2014 12:42:17 +0100
Subject: Thai program translation update

Closes: 772913
---
 po/th.po | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/po/th.po b/po/th.po
index ee636ef4f..b06bedffc 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-12-03 14:47+0100\n"
-"PO-Revision-Date: 2014-04-20 09:38+0700\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"
@@ -615,7 +615,7 @@ 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"
@@ -626,7 +626,6 @@ msgid "Download Failed"
 msgstr "ดาวน์โหลดไม่สำเร็จ"
 
 #: cmdline/apt-helper.cc:80
-#, fuzzy
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -646,6 +645,7 @@ msgstr ""
 "\n"
 "คำสั่ง:\n"
 "   download-file - ดาวน์โหลด URI ที่กำหนดลงในพาธปลายทาง\n"
+"   auto-detect-proxy - ตรวจหาพร็อกซีโดยใช้ apt.conf\n"
 "\n"
 "                       โปรแกรมช่วยเหลือของ APT นี้มีพลัง Super Meep\n"
 
@@ -1245,7 +1245,7 @@ msgstr "แต่แพกเกจนี้เป็นแพกเกจเส
 
 #: apt-private/private-output.cc:469
 msgid "but it is not installed"
-msgstr "แต่ได้ติดตั้งไว้"
+msgstr "แต่ไม่ได้ติดตั้งไว้"
 
 #: apt-private/private-output.cc:469
 msgid "but it is not going to be installed"
@@ -1362,10 +1362,11 @@ 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:101
 msgid "All packages are up to date."
-msgstr ""
+msgstr "ปรับรุ่นทุกแพกเกจเป็นรุ่นล่าสุดแล้ว"
 
 #: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
@@ -2222,9 +2223,9 @@ 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:490
-#, fuzzy, c-format
+#, c-format
 msgid "Clean of %s is not supported"
-msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'"
+msgstr "ไม่รองรับการล้างข้อมูลที่ %s"
 
 #: apt-pkg/clean.cc:64
 #, c-format
@@ -3346,9 +3347,8 @@ msgid "Unable to open DB file %s: %s"
 msgstr "ไม่สามารถเปิดแฟ้ม DB %s: %s"
 
 #: ftparchive/cachedb.cc:332
-#, fuzzy
 msgid "Failed to read .dsc"
-msgstr "readlink %s ไม่สำเร็จ"
+msgstr "อ่าน .dsc ไม่สำเร็จ"
 
 #: ftparchive/cachedb.cc:365
 msgid "Archive has no control record"
-- 
cgit v1.2.3-70-g09d2


From 92e8c1ff287ab829de825e00cdf94744e699ff97 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 29 Nov 2014 17:59:52 +0100
Subject: dispose http(s) 416 error page as non-content
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Real webservers (like apache) actually send an error page with a 416
response, but our client didn't expect it leaving the page on the socket
to be parsed as response for the next request (http) or as file content
(https), which isn't what we want at all… Symptom is a "Bad header line"
as html usually doesn't parse that well to an http-header.

This manifests itself e.g. if we have a complete file (or larger) in
partial/ which isn't discarded by If-Range as the server doesn't support
it (or it is just newer, think: mirror rotation).
It is a sort-of regression of 78c72d0ce22e00b194251445aae306df357d5c1a,
which removed the filesize - 1 trick, but this had its own problems…

To properly test this our webserver gains the ability to reply with
transfer-encoding: chunked as most real webservers will use it to send
the dynamically generated error pages.

(The tests and their binary helpers had to be slightly modified to
apply, but the patch to fix the issue itself is unchanged.)

Closes: 768797
---
 cmdline/apt-helper.cc                      |  35 ++++--
 methods/http.cc                            |   2 +
 methods/https.cc                           |  12 +-
 methods/server.cc                          |  26 +++--
 methods/server.h                           |   5 +-
 test/integration/framework                 |   6 +-
 test/integration/test-apt-helper           |  24 ++--
 test/integration/test-partial-file-support |  62 +++++++++-
 test/interactive-helper/aptwebserver.cc    | 181 ++++++++++++++++++-----------
 9 files changed, 241 insertions(+), 112 deletions(-)

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index dd43ea1bc..63f70983c 100644
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -48,23 +48,34 @@ static bool DoDownloadFile(CommandLine &CmdL)
    if (CmdL.FileSize() <= 2)
       return _error->Error(_("Must specify at least one pair url/filename"));
 
-
    pkgAcquire Fetcher;
    AcqTextStatus Stat(ScreenWidth, _config->FindI("quiet",0));
    Fetcher.Setup(&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);
-   Fetcher.Run();
+
+   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;
+   }
+
    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;
 }
 
diff --git a/methods/http.cc b/methods/http.cc
index f2a4a4db6..1b996db98 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -440,6 +440,8 @@ bool HttpServerState::RunData(FileFd * const File)
          loss of the connection means we are done */
       if (Encoding == Closes)
 	 In.Limit(-1);
+      else if (JunkSize != 0)
+	 In.Limit(JunkSize);
       else
 	 In.Limit(Size - StartPos);
       
diff --git a/methods/https.cc b/methods/https.cc
index 0499af0c5..65a744e2a 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -59,6 +59,9 @@ HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
       {
          me->Server->Result = 200;
 	 me->Server->StartPos = me->Server->Size;
+	 // 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->Server->JunkSize = std::numeric_limits<unsigned long long>::max();
       }
       else
 	 me->Server->StartPos = 0;
@@ -76,13 +79,18 @@ 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)
+   if(me->File->Write(buffer, buffer_size) != true)
       return false;
 
-   return size*nmemb;
+   return buffer_size;
 }
 
 int
diff --git a/methods/server.cc b/methods/server.cc
index 92d94e638..cb0341d5f 100644
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -55,6 +55,7 @@ ServerState::RunHeadersResult ServerState::RunHeaders(FileFd * const File,
    Minor = 0; 
    Result = 0; 
    Size = 0; 
+   JunkSize = 0;
    StartPos = 0;
    Encoding = Closes;
    HaveContent = false;
@@ -163,14 +164,14 @@ 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 * SizePtr = &Size;
+      if (Result == 416)
+	 SizePtr = &JunkSize;
 
-      Size = strtoull(Val.c_str(), NULL, 10);
-      if (Size >= std::numeric_limits<unsigned long long>::max())
+      *SizePtr = strtoull(Val.c_str(), NULL, 10);
+      if (*SizePtr >= 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 (*SizePtr == 0)
 	 HaveContent = false;
       return true;
    }
@@ -187,10 +188,7 @@ bool ServerState::HeaderLine(string Line)
 
       // §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;
-      }
+	 ; // we got the expected filesize which is all we wanted
       else if (sscanf(Val.c_str(),"bytes %llu-%*u/%llu",&StartPos,&Size) != 2)
 	 return _error->Error(_("The HTTP server sent an invalid Content-Range header"));
       if ((unsigned long long)StartPos > Size)
@@ -308,9 +306,15 @@ ServerMethod::DealWithHeaders(FetchResult &Res)
 	 if ((unsigned long long)SBuf.st_size == Server->Size)
 	 {
 	    // the file is completely downloaded, but was not moved
+	    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->Size;
 	    Server->Result = 200;
-	    Server->HaveContent = false;
 	 }
 	 else if (unlink(Queue->DestFile.c_str()) == 0)
 	 {
diff --git a/methods/server.h b/methods/server.h
index f5e68d902..1b81e3549 100644
--- a/methods/server.h
+++ b/methods/server.h
@@ -34,7 +34,8 @@ struct ServerState
    char Code[360];
 
    // These are some statistics from the last parsed header lines
-   unsigned long long Size;
+   unsigned long long Size; // size of the usable content (aka: the file)
+   unsigned long long JunkSize; // size of junk content (aka: server error pages)
    unsigned long long StartPos;
    time_t Date;
    bool HaveContent;
@@ -71,7 +72,7 @@ struct ServerState
    RunHeadersResult RunHeaders(FileFd * const File, const std::string &Uri);
 
    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'; Size = 0; JunkSize = 0;
 		 StartPos = 0; Encoding = Closes; time(&Date); HaveContent = false;
 		 State = Header; Persistent = false; Pipeline = true;};
    virtual bool WriteResponse(std::string const &Data) = 0;
diff --git a/test/integration/framework b/test/integration/framework
index df1942ff9..ac482a7a0 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1064,8 +1064,8 @@ 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 \
+	local PROTO="${1%%:*}"
+	apthelper -o Debug::Acquire::${PROTO}=1 -o Debug::pkgAcquire::Worker=1 \
 		download-file "$1" "$2" 2>&1 || true
 	# only if the file exists the download was successful
 	if [ -e "$2" ]; then
@@ -1221,7 +1221,7 @@ testsuccess() {
 		msgtest 'Test for successful execution of' "$*"
 	fi
 	local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output"
-	if $@ >${OUTPUT} 2>&1; then
+	if "$@" >${OUTPUT} 2>&1; then
 		msgpass
 	else
 		echo >&2
diff --git a/test/integration/test-apt-helper b/test/integration/test-apt-helper
index c749224ca..31e471677 100755
--- a/test/integration/test-apt-helper
+++ b/test/integration/test-apt-helper
@@ -10,34 +10,36 @@ configarchitecture "i386"
 changetohttpswebserver
 
 test_apt_helper_download() {
-    echo "foo" > aptarchive/foo
+    echo 'foo' > aptarchive/foo
+    echo 'bar' > aptarchive/foo2
 
     msgtest 'apt-file download-file md5sum'
-    apthelper -qq download-file http://localhost:8080/foo foo2 MD5Sum:d3b07384d113edec49eaa6238ad5ff00 && msgpass || msgfail
+    testsuccess --nomsg apthelper download-file http://localhost:8080/foo foo2 MD5Sum:d3b07384d113edec49eaa6238ad5ff00
     testfileequal foo2 'foo'
 
     msgtest 'apt-file download-file sha1'
-    apthelper -qq download-file http://localhost:8080/foo foo1 SHA1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 && msgpass || msgfail
+    testsuccess --nomsg apthelper download-file http://localhost:8080/foo foo1 SHA1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
     testfileequal foo1 'foo'
 
     msgtest 'apt-file download-file sha256'
-    apthelper -qq download-file http://localhost:8080/foo foo3 SHA256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c && msgpass || msgfail
+    testsuccess --nomsg apthelper download-file http://localhost:8080/foo foo3 SHA256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c
     testfileequal foo3 'foo'
 
     msgtest 'apt-file download-file no-hash'
-    apthelper -qq download-file http://localhost:8080/foo foo4 && msgpass || msgfail
+    testsuccess --nomsg apthelper download-file http://localhost:8080/foo foo4
     testfileequal foo4 'foo'
     
     msgtest 'apt-file download-file wrong hash'
-    if ! apthelper -qq download-file http://localhost:8080/foo 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
+    testfailure --nomsg apthelper -qq download-file http://localhost:8080/foo foo5 MD5Sum:aabbcc
+    testfileequal rootdir/tmp/testfailure.output 'E: Failed to fetch http://localhost:8080/foo  Hash Sum mismatch
 
 E: Download Failed'
     testfileequal foo5.FAILED 'foo'
+
+    msgtest 'apt-file download-file md5sum sha1'
+    testsuccess --nomsg apthelper download-file http://localhost:8080/foo foo6 MD5Sum:d3b07384d113edec49eaa6238ad5ff00 http://localhost:8080/foo2 foo7 SHA1:e242ed3bffccdf271b7fbaf34ed72d089537b42f
+    testfileequal foo6 'foo'
+    testfileequal foo7 'bar'
 }
 
 test_apt_helper_detect_proxy() {
diff --git a/test/integration/test-partial-file-support b/test/integration/test-partial-file-support
index 5ab326def..160d451b6 100755
--- a/test/integration/test-partial-file-support
+++ b/test/integration/test-partial-file-support
@@ -24,13 +24,25 @@ testdownloadfile() {
 	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,41 @@ 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='./testfile'
+
+	copysource $TESTFILE 1M $DOWN
+	testdownloadfile 'completely downloaded file' "${1}/testfile" "$DOWN" '='
+	testwebserverlaststatuscode '416' "$DOWNLOADLOG"
+
+	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'
@@ -65,9 +103,11 @@ testrun() {
 	testdownloadfile 'invalid partial data' "${1}/testfile" './testfile' '!='
 	testwebserverlaststatuscode '206' "$DOWNLOADLOG"
 
-	copysource $TESTFILE 1M ./testfile
-	testdownloadfile 'completely downloaded file' "${1}/testfile" './testfile' '='
-	testwebserverlaststatuscode '416' "$DOWNLOADLOG"
+	webserverconfig 'aptwebserver::closeOnError' 'false'
+	followuprequest "$1"
+	webserverconfig 'aptwebserver::closeOnError' 'true'
+	followuprequest "$1"
+	webserverconfig 'aptwebserver::closeOnError' 'false'
 
 	copysource /dev/zero 1M ./testfile
 	testdownloadfile 'too-big partial file' "${1}/testfile" './testfile' '='
@@ -85,8 +125,18 @@ testrun() {
 	testwebserverlaststatuscode '200' "$DOWNLOADLOG"
 }
 
+msgmsg 'http: Test with Content-Length'
+webserverconfig 'aptwebserver::chunked-transfer-encoding' 'false'
+testrun 'http://localhost:8080'
+msgmsg 'http: Test with Transfer-Encoding: chunked'
+webserverconfig 'aptwebserver::chunked-transfer-encoding' 'true'
 testrun 'http://localhost:8080'
 
 changetohttpswebserver
 
+msgmsg 'https: Test with Content-Length'
+webserverconfig 'aptwebserver::chunked-transfer-encoding' 'false'
+testrun 'https://localhost:4433'
+msgmsg 'https: Test with Transfer-Encoding: chunked'
+webserverconfig 'aptwebserver::chunked-transfer-encoding' 'true'
 testrun 'https://localhost:4433'
diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index 34476e1af..cd52da692 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -19,6 +19,8 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
+
+#include <algorithm>
 #include <iostream>
 #include <sstream>
 #include <list>
@@ -79,12 +81,21 @@ static char const * httpcodeToStr(int const httpcode)		/*{{{*/
    return NULL;
 }
 									/*}}}*/
+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());
-
+   if (chunkedTransferEncoding(headers) == false)
+   {
+      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);
@@ -92,9 +103,12 @@ static void addFileHeaders(std::list<std::string> &headers, FileFd &data)/*{{{*/
 									/*}}}*/
 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 +128,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 +147,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,34 +204,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 = "")
+	       bool const content, std::string const &error, std::list<std::string> &headers)
 {
-   std::list<std::string> headers;
    std::string response("<html><head><title>");
    response.append(httpcodeToStr(httpcode)).append("");
    response.append("
").append(httpcodeToStr(httpcode)).append("
");
    if (httpcode != 200)
-   {
-      if (error.empty() == false)
-	 response.append("
Error: ").append(error).append("
");
-      response.append("This error is a result of the request: 
");
-   }
+      response.append("
Error: ");
+   else
+      response.append("
Success: ");
+   if (error.empty() == false)
+      response.append(error);
+   else
+      response.append(httpcodeToStr(httpcode));
+   if (httpcode != 200)
+      response.append("
This error is a result of the request: 
");
    else
-   {
-      if (error.empty() == false)
-	 response.append("
Success: ").append(error).append("
");
       response.append("The successfully executed operation was requested by: 
");
-   }
    response.append(request).append("
");
+   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 &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,/*{{{*/
@@ -221,7 +272,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)			/*{{{*/
@@ -263,16 +314,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 &headers)
 {
-   std::list 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;
    }
 
@@ -311,18 +361,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 ¶ms, bool &sendContent,
-		    bool &closeConnection)
+		    bool &closeConnection, std::list &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;
    }
 
@@ -333,7 +383,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;
    }
 
@@ -345,14 +395,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;
    }
 
@@ -360,7 +410,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;
@@ -371,7 +421,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;
       }
       // strip the host from the request to make it an absolute path
@@ -379,7 +429,7 @@ static bool parseFirstLine(int const client, std::string const &request,/*{{{*/
    }
    else if (absolute.find("path") == std::string::npos)
    {
-      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;
    }
 
@@ -398,7 +448,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 headers;
+      sendError(client, 400, request, sendContent, "Filename contains illegal character (sequence)", headers);
       return false;
    }
 
@@ -434,46 +485,45 @@ static bool parseFirstLine(int const client, std::string const &request,/*{{{*/
    return true;
 }
 									/*}}}*/
-static bool handleOnTheFlyReconfiguration(int const client, std::string const &request, std::vector const &parts)/*{{{*/
+static bool handleOnTheFlyReconfiguration(int const client, std::string const &request,/*{{{*/
+      std::vector parts, std::list &headers)
 {
    size_t const pcount = parts.size();
    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 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 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;
 }
 									/*}}}*/
@@ -482,18 +532,22 @@ static void * handleClient(void * voidclient)				/*{{{*/
    int client = *((int*)(voidclient));
    std::clog << "ACCEPT client " << client << std::endl;
    std::vector messages;
-   while (ReadMessages(client, messages))
+   bool closeConnection = false;
+   std::list headers;
+   while (closeConnection == false && ReadMessages(client, messages))
    {
-      bool closeConnection = false;
+      // if we announced a closing, do the close
+      if (std::find(headers.begin(), headers.end(), std::string("Connection: close")) != headers.end())
+	 break;
+      headers.clear();
       for (std::vector::const_iterator m = messages.begin();
 	    m != messages.end() && closeConnection == false; ++m) {
 	 std::clog << ">>> REQUEST from " << client << " >>>" << std::endl << *m
 	    << std::endl << "<<<<<<<<<<<<<<<<" << std::endl;
-	 std::list 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
@@ -502,7 +556,7 @@ static void * handleClient(void * voidclient)				/*{{{*/
 	    std::vector parts = VectorizeString(filename, '/');
 	    if (parts[0] == "_config")
 	    {
-	       handleOnTheFlyReconfiguration(client, *m, parts);
+	       handleOnTheFlyReconfiguration(client, *m, parts, headers);
 	       continue;
 	    }
 	 }
@@ -534,7 +588,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)
@@ -553,7 +607,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)
@@ -609,17 +663,16 @@ static void * handleClient(void * voidclient)				/*{{{*/
 			headers.push_back(contentrange.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;
+			sendError(client, 416, *m, sendContent, "", headers);
+			break;
 		     }
 		  }
 	       }
@@ -628,22 +681,20 @@ 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)
-	 break;
    }
    close(client);
    std::clog << "CLOSE client " << client << std::endl;
-- 
cgit v1.2.3-70-g09d2


From e18f6133b254db9e1dc7b202366b067b15a68123 Mon Sep 17 00:00:00 2001
From: David Kalnischkies 
Date: Wed, 10 Dec 2014 22:26:59 +0100
Subject: do not make PTY slave the controlling terminal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If we have no controlling terminal opening a terminal will make this
terminal our controller, which is a serious problem if this happens to
be the pseudo terminal we created to run dpkg in as we will close this
terminal at the end hanging ourself up in the process…

The offending open is the one we do to have at least one slave fd open
all the time, but for good measure, we apply the flag also to the slave
fd opening in the child process as we set the controlling terminal
explicitely here.

This is a regression from 150bdc9ca5d656f9fba94d37c5f4f183b02bd746 with
the slight twist that this usecase was silently broken before in that it
wasn't logging the output in term.log (as a pseudo terminal wasn't
created).

Closes: 772641
---
 apt-pkg/deb/dpkgpm.cc                              |   4 +-
 test/integration/framework                         |   2 +-
 .../test-no-fds-leaked-to-maintainer-scripts       | 109 +++++++++++++--------
 3 files changed, 70 insertions(+), 45 deletions(-)

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index e36a52c3e..93a007d14 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1131,7 +1131,7 @@ void pkgDPkgPM::StartPtyMagic()
 	       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);
+	    d->protect_slave_from_dying = open(d->slave, O_RDWR | O_CLOEXEC | O_NOCTTY);
 	 }
       }
    }
@@ -1163,7 +1163,7 @@ void pkgDPkgPM::SetupSlavePtyMagic()
    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?"));
    else if (ioctl(slaveFd, TIOCSCTTY, 0) < 0)
diff --git a/test/integration/framework b/test/integration/framework
index ac482a7a0..9e183057f 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -102,7 +102,7 @@ runapt() {
 	local CMD="$1"
 	shift
 	case $CMD in
-	sh|aptitude|*/*) ;;
+	sh|aptitude|*/*|command) ;;
 	*) CMD="${BUILDDIRECTORY}/$CMD";;
 	esac
 	MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG="$(getaptconfig)" LD_LIBRARY_PATH=${BUILDDIRECTORY} $CMD "$@"
diff --git a/test/integration/test-no-fds-leaked-to-maintainer-scripts b/test/integration/test-no-fds-leaked-to-maintainer-scripts
index 3c6457cab..6eb033055 100755
--- a/test/integration/test-no-fds-leaked-to-maintainer-scripts
+++ b/test/integration/test-no-fds-leaked-to-maintainer-scripts
@@ -5,7 +5,7 @@ TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
 
 setupenvironment
-configarchitecture 'native'
+configarchitecture 'amd64' 'i386'
 configdpkgnoopchroot
 
 setupsimplenativepackage "fdleaks" 'all' '1.0' 'unstable'
@@ -17,58 +17,83 @@ 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
-msgtest 'Check if fds were not' 'leaked'
-if [ "$(grep 'root root' rootdir/tmp/testsuccess.output | wc -l)" = '8' ]; then
-	msgpass
-else
-	echo
-	cat rootdir/tmp/testsuccess.output
-	msgfail
-fi
 
-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)"
+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 fdleaks:all  1.0
-status half-installed fdleaks:all 1.0
-status unpacked fdleaks:all 1.0
-status unpacked fdleaks:all 1.0
+	testequal "startup archives unpack
+install $PKGNAME  1.0
+status half-installed $PKGNAME 1.0
+status unpacked $PKGNAME 1.0
+status unpacked $PKGNAME 1.0
 startup packages configure
-configure fdleaks:all 1.0 
-status unpacked fdleaks:all 1.0
-status half-configured fdleaks:all 1.0
-status installed fdleaks:all 1.0' cut -f 3- -d' ' rootdir/var/log/dpkg.log
+configure $PKGNAME 1.0 
+status unpacked $PKGNAME 1.0
+status half-configured $PKGNAME 1.0
+status installed $PKGNAME 1.0" 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
-msgtest 'Check if fds were not' 'leaked'
-if [ "$(grep 'root root' rootdir/tmp/testsuccess.output | wc -l)" = '12' ]; then
+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 
+status half-configured $PKGNAME 1.0
+status half-installed $PKGNAME 1.0
+status config-files $PKGNAME 1.0
+purge $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 config-files $PKGNAME 1.0
+status not-installed $PKGNAME " 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
-	echo
-	cat rootdir/tmp/testsuccess.output
-	msgfail
+	msgskip "$(command dpkg -l util-linux)"
+	exit
 fi
-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 fdleaks:all 1.0
-remove fdleaks:all 1.0 
-status half-configured fdleaks:all 1.0
-status half-installed fdleaks:all 1.0
-status config-files fdleaks:all 1.0
-purge fdleaks:all 1.0 
-status config-files fdleaks:all 1.0
-status config-files fdleaks:all 1.0
-status config-files fdleaks:all 1.0
-status config-files fdleaks:all 1.0
-status config-files fdleaks:all 1.0
-status not-installed fdleaks:all ' cut -f 3- -d' ' rootdir/var/log/dpkg.log
+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
-- 
cgit v1.2.3-70-g09d2


From a2a75ff4516f7609f4c55b42270abb8d08943c60 Mon Sep 17 00:00:00 2001
From: David Kalnischkies 
Date: Tue, 18 Nov 2014 19:53:56 +0100
Subject: always run 'dpkg --configure -a' at the end of our dpkg callings

dpkg checks now for dependencies before running triggers, so that
packages can now end up in trigger states (especially those we are not
touching at all with our calls) after apt is done running.

The solution to this is trivial: Just tell dpkg to configure everything
after we have (supposely) configured everything already. In the worst
case this means dpkg will have to run a bunch of triggers, usually it
will just do nothing though.

The code to make this happen was already available, so we just flip a
config option here to cause it to be run. This way we can keep
pretending that triggers are an implementation detail of dpkg.
--triggers-only would supposely work as well, but --configure is more
robust in regards to future changes to dpkg and something we will
hopefully make use of in future versions anyway (as it was planed at the
time this and related options were implemented).

Note that dpkg currently has a workaround implemented to allow upgrades
to jessie to be clean, so that the test works before and after. Also
note that test (compared to the one in the bug) drops the await test as
its is considered a loop by dpkg now.

Closes: 769609
---
 apt-pkg/deb/dpkgpm.cc                              |  9 ++-
 test/integration/framework                         | 25 ++++----
 test/integration/test-apt-progress-fd              | 67 ++++++++++---------
 test/integration/test-apt-progress-fd-deb822       | 18 ++++--
 test/integration/test-apt-progress-fd-error        |  2 +-
 ...est-bug-769609-triggers-still-pending-after-run | 75 ++++++++++++++++++++++
 .../test-no-fds-leaked-to-maintainer-scripts       |  6 +-
 7 files changed, 146 insertions(+), 56 deletions(-)
 create mode 100755 test/integration/test-bug-769609-triggers-still-pending-after-run

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 93a007d14..d54b7b50f 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1047,6 +1047,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;
 }
                                                                         /*}}}*/
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
@@ -1280,9 +1286,8 @@ bool pkgDPkgPM::GoNoABIBreak(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
diff --git a/test/integration/framework b/test/integration/framework
index 9e183057f..c9445065b 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1178,10 +1178,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
@@ -1190,16 +1193,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() {
diff --git a/test/integration/test-apt-progress-fd b/test/integration/test-apt-progress-fd
index d72e7e72d..68cc0439c 100755
--- a/test/integration/test-apt-progress-fd
+++ b/test/integration/test-apt-progress-fd
@@ -19,13 +19,14 @@ testequal "dlstatus:1:0:Retrieving file 1 of 1
 dlstatus:1:0: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" cat apt-progress.log
 
 # upgrade
 exec 3> apt-progress.log
@@ -34,13 +35,14 @@ testequal "dlstatus:1:0:Retrieving file 1 of 1
 dlstatus:1:0: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" cat apt-progress.log
 
 # reinstall
 exec 3> apt-progress.log
@@ -49,22 +51,24 @@ testequal "dlstatus:1:0:Retrieving file 1 of 1
 dlstatus:1:0: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" cat apt-progress.log
 
 # and remove
 exec 3> apt-progress.log
 testsuccess aptget remove testing -y -o APT::Status-Fd=3
 testequal "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" cat apt-progress.log
 
 # install non-native and ensure we get proper progress info
 exec 3> apt-progress.log
@@ -75,12 +79,13 @@ testequal "dlstatus:1:0:Retrieving file 1 of 1
 dlstatus:1:0: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" cat apt-progress.log
 
 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..badc985e4 100755
--- a/test/integration/test-apt-progress-fd-deb822
+++ b/test/integration/test-apt-progress-fd-deb822
@@ -27,37 +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)
+
+Status: progress
+Percent: 83.3333
+Message: Running dpkg
 " cat 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-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 < ${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-no-fds-leaked-to-maintainer-scripts b/test/integration/test-no-fds-leaked-to-maintainer-scripts
index 6eb033055..7d0c1c6c1 100755
--- a/test/integration/test-no-fds-leaked-to-maintainer-scripts
+++ b/test/integration/test-no-fds-leaked-to-maintainer-scripts
@@ -53,7 +53,8 @@ startup packages configure
 configure $PKGNAME 1.0 
 status unpacked $PKGNAME 1.0
 status half-configured $PKGNAME 1.0
-status installed $PKGNAME 1.0" cut -f 3- -d' ' rootdir/var/log/dpkg.log
+status installed $PKGNAME 1.0
+startup packages configure" cut -f 3- -d' ' rootdir/var/log/dpkg.log
 }
 checkinstall
 
@@ -78,7 +79,8 @@ 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 " cut -f 3- -d' ' rootdir/var/log/dpkg.log
+status not-installed $PKGNAME 
+startup packages configure" cut -f 3- -d' ' rootdir/var/log/dpkg.log
 }
 checkpurge
 
-- 
cgit v1.2.3-70-g09d2


From 748a2177dcf8ff72bca90f5c7d516559ddd67352 Mon Sep 17 00:00:00 2001
From: David Kalnischkies 
Date: Mon, 22 Dec 2014 23:14:08 +0100
Subject: pass-through stdin fd instead of content if not a terminal

Commit 299aea924ccef428219ed6f1a026c122678429e6 fixes the problem of
not logging terminal in case stdin & stdout are not a terminal. The
problem is that we are then trying to pass-through stdin content by
reading from the apt-process stdin and writing it to the stdin of the
child (dpkg), which works great for users who can control themselves,
but pipes and co are a bit less forgiving causing us to pass everything
to the first child process, which if the sending part of the pipe is
e.g. 'yes' we will never see the end of it (as the pipe is full at some
point and further writing blocks).

There is a simple solution for that of course: If stdin isn't a terminal,
we us the apt-process stdin as stdin for the child directly (We don't do
this if it is a terminal to be able to save the typed input in the log).

Closes: 773061
---
 apt-pkg/deb/dpkgpm.cc                              | 16 ++++++++++++----
 .../test-no-fds-leaked-to-maintainer-scripts       | 22 ++++++++++++++++++++--
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index d54b7b50f..e23ca466d 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -73,7 +73,8 @@ public:
    pkgDPkgPMPrivate() : stdin_is_dev_null(false), dpkgbuf_pos(0),
 			term_out(NULL), history_out(NULL),
 			progress(NULL), tt_is_valid(false), master(-1),
-			slave(NULL), protect_slave_from_dying(-1)
+			slave(NULL), protect_slave_from_dying(-1),
+			direct_stdin(false)
    {
       dpkgbuf[0] = '\0';
    }
@@ -100,6 +101,7 @@ public:
    sigset_t sigmask;
    sigset_t original_sigmask;
 
+   bool direct_stdin;
 };
 
 namespace
@@ -1079,6 +1081,9 @@ void pkgDPkgPM::StartPtyMagic()
       return;
    }
 
+   if (isatty(STDIN_FILENO) == 0)
+      d->direct_stdin = true;
+
    _error->PushToStack();
 
    d->master = posix_openpt(O_RDWR | O_NOCTTY);
@@ -1176,7 +1181,10 @@ void pkgDPkgPM::SetupSlavePtyMagic()
       _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);
 
@@ -1596,8 +1604,8 @@ bool pkgDPkgPM::GoNoABIBreak(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);
diff --git a/test/integration/test-no-fds-leaked-to-maintainer-scripts b/test/integration/test-no-fds-leaked-to-maintainer-scripts
index 7d0c1c6c1..41c057042 100755
--- a/test/integration/test-no-fds-leaked-to-maintainer-scripts
+++ b/test/integration/test-no-fds-leaked-to-maintainer-scripts
@@ -11,8 +11,14 @@ configdpkgnoopchroot
 setupsimplenativepackage "fdleaks" 'all' '1.0' 'unstable'
 BUILDDIR="incoming/fdleaks-1.0"
 for script in 'preinst' 'postinst' 'prerm' 'postrm'; do
-	echo '#!/bin/sh
-ls -l /proc/self/fd/' > ${BUILDDIR}/debian/$script
+	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"
@@ -99,3 +105,15 @@ 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
-- 
cgit v1.2.3-70-g09d2


From e5ef23145f0dc6523a5c5321a21407c955777ad2 Mon Sep 17 00:00:00 2001
From: James McCoy 
Date: Wed, 10 Dec 2014 10:16:02 -0500
Subject: tighten filtering of kernel images in apt.auto-removal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The current filtering matches the names of the image metapackages on the
i386 architecture:

$ dpkg-query -l | awk '/^ii[ ]+(linux|kfreebsd|gnumach)-image-[0-9]/ && $2 !~ /-dbg$/ { print $2 }'
linux-image-3.16.0-4-586
linux-image-586

This results in an extra image package being removed from
APT::NeverAutoRemove, losing the intended effect of keeping the {current,
previous, latest} set of images installed.

Requiring a “.” in the package name tightens the matched package names
to those that are installing a specific version of the image, thus
eliding the meta-packages.

Closes: 772732
---
 debian/apt.auto-removal.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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=""
-- 
cgit v1.2.3-70-g09d2


From 0312a4ab115195b3b34ddf5a7a50ee1a07a59d1a Mon Sep 17 00:00:00 2001
From: David Kalnischkies 
Date: Tue, 23 Dec 2014 14:11:13 +0100
Subject: release 1.0.9.5

---
 configure.ac         |   2 +-
 debian/changelog     |  26 +++
 doc/apt-verbatim.ent |   2 +-
 doc/po/apt-doc.pot   |   4 +-
 doc/po/fr.po         | 559 +++++++++++++++------------------------------------
 po/apt-all.pot       |  98 ++++-----
 po/ar.po             |  96 ++++-----
 po/ast.po            |  96 ++++-----
 po/bg.po             |  96 ++++-----
 po/bs.po             |  96 ++++-----
 po/ca.po             |  96 ++++-----
 po/cs.po             |  96 ++++-----
 po/cy.po             |  96 ++++-----
 po/da.po             |  96 ++++-----
 po/de.po             |  96 ++++-----
 po/dz.po             |  96 ++++-----
 po/el.po             |  96 ++++-----
 po/es.po             |  96 ++++-----
 po/eu.po             |  96 ++++-----
 po/fi.po             |  96 ++++-----
 po/fr.po             |  96 ++++-----
 po/gl.po             |  96 ++++-----
 po/hu.po             |  96 ++++-----
 po/it.po             |  96 ++++-----
 po/ja.po             |  96 ++++-----
 po/km.po             |  96 ++++-----
 po/ko.po             |  96 ++++-----
 po/ku.po             |  96 ++++-----
 po/lt.po             |  96 ++++-----
 po/mr.po             |  96 ++++-----
 po/nb.po             |  96 ++++-----
 po/ne.po             |  96 ++++-----
 po/nl.po             |  96 ++++-----
 po/nn.po             |  96 ++++-----
 po/pl.po             |  96 ++++-----
 po/pt.po             |  96 ++++-----
 po/pt_BR.po          |  96 ++++-----
 po/ro.po             |  96 ++++-----
 po/ru.po             |  96 ++++-----
 po/sk.po             |  96 ++++-----
 po/sl.po             |  96 ++++-----
 po/sv.po             |  96 ++++-----
 po/th.po             |  96 ++++-----
 po/tl.po             |  96 ++++-----
 po/tr.po             |  96 ++++-----
 po/uk.po             |  96 ++++-----
 po/vi.po             |  96 ++++-----
 po/zh_CN.po          | 100 +++++----
 po/zh_TW.po          |  96 ++++-----
 49 files changed, 2307 insertions(+), 2516 deletions(-)

diff --git a/configure.ac b/configure.ac
index 686c1eb47..5774ed67a 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.0.9.4"
+PACKAGE_VERSION="1.0.9.5"
 PACKAGE_MAIL="APT Development Team "
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
diff --git a/debian/changelog b/debian/changelog
index 7f67ae4e7..9b1e1a41b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+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   Tue, 23 Dec 2014 13:22:42 +0100
+
 apt (1.0.9.4) unstable; urgency=medium
 
   [ David Kalnischkies ]
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 67c86bf76..5f380377c 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -225,7 +225,7 @@
 ">
 
 
-
+
 
 
 
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 257521beb..72857de9f 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.0.9.4\n"
+"Project-Id-Version: apt-doc 1.0.9.5\n"
 "Report-Msgid-Bugs-To: APT Development Team \n"
-"POT-Creation-Date: 2014-12-03 14:48+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 0a8103852..a60b04de3 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team \n"
-"POT-Creation-Date: 2014-08-28 00:20+0000\n"
+"POT-Creation-Date: 2014-12-23 13:24+0100\n"
 "PO-Revision-Date: 2014-11-15 17:26+0100\n"
 "Last-Translator: Jean-Pierre Giraud \n"
 "Language-Team: French \n"
@@ -52,8 +52,7 @@ msgid ""
 msgstr ""
 "\n"
-"\t\tPage qualité"
-"\n"
+"\t\tPage qualité\n"
 "\t\n"
 "\">\n"
 
@@ -75,8 +74,7 @@ msgstr ""
 "\n"
 "Bogues\n"
-"   Page des bogues d'APT<"
-"/ulink>. \n"
+"   Page des bogues d'APT. \n"
 "   Si vous souhaitez signaler un bogue à propos d'APT, veuillez lire\n"
 "   /usr/share/doc/debian/bug-reporting.txt ou utiliser\n"
 "   la commande &reportbug;.\n"
@@ -91,8 +89,7 @@ msgid ""
 "\n"
 "Author\n"
-"   APT was written by the APT team apt@packages.debian.org<"
-"/email>.\n"
+"   APT was written by the APT team apt@packages.debian.org.\n"
 "   \n"
 " \n"
 "\">\n"
@@ -100,8 +97,7 @@ msgstr ""
 "\n"
 "Author\n"
-"   APT a été écrit par l'équipe de développement APT "
-"apt@packages.debian.org.\n"
+"   APT a été écrit par l'équipe de développement APT apt@packages.debian.org.\n"
 "   \n"
 " \n"
 "\">\n"
@@ -157,12 +153,10 @@ msgid ""
 "     \n"
 "      \n"
 "      \n"
-"     Configuration File; Specify a configuration file to use. "
-"\n"
+"     Configuration File; Specify a configuration file to use. \n"
 "     The program will read the default configuration file and then this \n"
 "     configuration file. If configuration settings need to be set before the\n"
-"     default configuration files are parsed specify a file with the "
-"APT_CONFIG\n"
+"     default configuration files are parsed specify a file with the APT_CONFIG\n"
 "     environment variable. See &apt-conf; for syntax information.\n"
 "     \n"
 "     \n"
@@ -171,15 +165,10 @@ msgstr ""
 "     \n"
 "      \n"
 "      \n"
-"     Fichier de configuration ; indique le fichier de "
-"configuration à utiliser. \n"
-"     Le programme lira le fichier de configuration par défaut puis le fichier "
-"indiqué ici. \n"
-"     Si les réglages de configuration doivent être établis avant l'analyse "
-"des fichiers\n"
-"     de configuration par défaut, un fichier peut être indiqué avec la "
-"variable d'environnement APT_CONFIG.     Veuillez consulter "
-"&apt-conf; pour des informations sur la syntaxe d'utilisation.     \n"
+"     Fichier de configuration ; indique le fichier de configuration à utiliser. \n"
+"     Le programme lira le fichier de configuration par défaut puis le fichier indiqué ici. \n"
+"     Si les réglages de configuration doivent être établis avant l'analyse des fichiers\n"
+"     de configuration par défaut, un fichier peut être indiqué avec la variable d'environnement APT_CONFIG.     Veuillez consulter &apt-conf; pour des informations sur la syntaxe d'utilisation.     \n"
 "     \n"
 "     \n"
 "     \n"
@@ -204,10 +193,8 @@ msgstr ""
 "      \n"
 "      \n"
 "     Définir une option de configuration ; permet de régler\n"
-"      une option de configuration donnée. La syntaxe est .\n"
-"       et  peuvent être utilisées "
-"plusieurs fois\n"
+"      une option de configuration donnée. La syntaxe est .\n"
+"       et  peuvent être utilisées plusieurs fois\n"
 "      pour définir des options différentes.\n"
 "     \n"
 "     \n"
@@ -221,8 +208,7 @@ msgid ""
 "\n"
 "All command line options may be set using the configuration file, "
-"the\n"
+"   All command line options may be set using the configuration file, the\n"
 "   descriptions indicate the configuration option to set. For boolean\n"
 "   options you can override the config file by using something like \n"
 "   ,, \n"
@@ -233,12 +219,9 @@ msgstr ""
 "\n"
 "Toutes les options de la ligne de commande peuvent être définies "
-"dans le fichier de configuration, \n"
-"   les descriptions indiquant l'option de configuration concernée. Pour les "
-"options\n"
-"   booléennes, vous pouvez inverser les réglages du fichiers de configuration "
-"avec \n"
+"   Toutes les options de la ligne de commande peuvent être définies dans le fichier de configuration, \n"
+"   les descriptions indiquant l'option de configuration concernée. Pour les options\n"
+"   booléennes, vous pouvez inverser les réglages du fichiers de configuration avec \n"
 "   ,, \n"
 "   et d'autres variantes analogues.\n"
 "   \n"
@@ -251,15 +234,13 @@ msgid ""
 "/etc/apt/apt.conf\n"
 "     APT configuration file.\n"
-"     Configuration Item: Dir::Etc::Main."
-"\n"
+"     Configuration Item: Dir::Etc::Main.\n"
 "     \n"
 msgstr ""
 "/etc/apt/apt.conf\n"
 "     Fichier de configuration d'APT.\n"
-"     Élément de configuration : Dir::Etc::Main.<"
-"/listitem>\n"
+"     Élément de configuration : Dir::Etc::Main.\n"
 "     \n"
 
 #. type: Plain text
@@ -268,15 +249,13 @@ msgstr ""
 msgid ""
 "     /etc/apt/apt.conf.d/\n"
 "     APT configuration file fragments.\n"
-"     Configuration Item: Dir::Etc::Parts."
-"\n"
+"     Configuration Item: Dir::Etc::Parts.\n"
 "     \n"
 "\">\n"
 msgstr ""
 "     /etc/apt/apt.conf.d/\n"
 "     Fragments du fichier de configuration d'APT.\n"
-"     Élément de configuration : Dir::Etc::Parts.<"
-"/listitem>\n"
+"     Élément de configuration : Dir::Etc::Parts.\n"
 "     \n"
 "\">\n"
 
@@ -287,34 +266,28 @@ msgid ""
 "&cachedir;/archives/\n"
 "     Storage area for retrieved package files.\n"
-"     Configuration Item: Dir::Cache::Archives.<"
-"/listitem>\n"
+"     Configuration Item: Dir::Cache::Archives.\n"
 "     \n"
 msgstr ""
 "&cachedir;/archives/\n"
 "     Zone de stockage des fichiers récupérés.\n"
-"     Élément de configuration : Dir::Cache::Archives.<"
-"/para>\n"
+"     Élément de configuration : Dir::Cache::Archives.\n"
 "     \n"
 
 #. type: Plain text
 #: apt.ent:109
 #, no-wrap
 msgid ""
-"     &cachedir;/archives/partial/<"
-"/term>\n"
+"     &cachedir;/archives/partial/\n"
 "     Storage area for package files in transit.\n"
-"     Configuration Item: Dir::Cache::Archives ("
-"partial will be implicitly appended)\n"
+"     Configuration Item: Dir::Cache::Archives (partial will be implicitly appended)\n"
 "     \n"
 "\">\n"
 msgstr ""
-"     &cachedir;/archives/partial/<"
-"/term>\n"
+"     &cachedir;/archives/partial/\n"
 "     Zone de stockage pour les paquets en transit.\n"
-"     Élément de configuration : Dir::Cache::Archives (<"
-"filename>partial sera implicitement ajouté). \n"
+"     Élément de configuration : Dir::Cache::Archives (partial sera implicitement ajouté). \n"
 "     \n"
 "\">\n"
 
@@ -329,18 +302,14 @@ msgid ""
 "     i.e. a preference to get certain packages\n"
 "     from a separate source\n"
 "     or from a different version of a distribution.\n"
-"     Configuration Item: Dir::Etc::Preferences.<"
-"/listitem>\n"
+"     Configuration Item: Dir::Etc::Preferences.\n"
 "     \n"
 msgstr ""
 "/etc/apt/preferences\n"
 "     Fichier des préférences.\n"
-"     C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) "
-"c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une "
-"distribution différente.\n"
-"     Élément de configuration : Dir::Etc::Preferences.<"
-"/para>\n"
+"     C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente.\n"
+"     Élément de configuration : Dir::Etc::Preferences.\n"
 "     \n"
 
 #. type: Plain text
@@ -349,15 +318,13 @@ msgstr ""
 msgid ""
 "     /etc/apt/preferences.d/\n"
 "     File fragments for the version preferences.\n"
-"     Configuration Item: Dir::Etc::PreferencesParts."
-"\n"
+"     Configuration Item: Dir::Etc::PreferencesParts.\n"
 "     \n"
 "\">\n"
 msgstr ""
 "     /etc/apt/preferences.d/\n"
 "     Fragments de fichiers pour la préférence des versions.\n"
-"     Élément de configuration : Dir::Etc::PreferencesParts"
-".\n"
+"     Élément de configuration : Dir::Etc::PreferencesParts.\n"
 "     \n"
 "\">\n"
 
@@ -368,35 +335,28 @@ msgid ""
 "/etc/apt/sources.list\n"
 "     Locations to fetch packages from.\n"
-"     Configuration Item: Dir::Etc::SourceList.<"
-"/listitem>\n"
+"     Configuration Item: Dir::Etc::SourceList.\n"
 "     \n"
 msgstr ""
 "/etc/apt/sources.list\n"
 "     Emplacement pour la récupération des paquets.\n"
-"     Élément de configuration : Dir::Etc::SourceList.<"
-"/para>\n"
+"     Élément de configuration : Dir::Etc::SourceList.\n"
 "     \n"
 
 #. type: Plain text
 #: apt.ent:137
 #, no-wrap
 msgid ""
-"     /etc/apt/sources.list.d/"
-"\n"
+"     /etc/apt/sources.list.d/\n"
 "     File fragments for locations to fetch packages from.\n"
-"     Configuration Item: Dir::Etc::SourceParts.<"
-"/listitem>\n"
+"     Configuration Item: Dir::Etc::SourceParts.\n"
 "     \n"
 "\">\n"
 msgstr ""
-"     /etc/apt/sources.list.d/"
-"\n"
-"     Fragments de fichiers définissant les emplacements de "
-"récupération de paquets.\n"
-"     Élément de configuration : Dir::Etc::SourceParts.<"
-"/para>\n"
+"     /etc/apt/sources.list.d/\n"
+"     Fragments de fichiers définissant les emplacements de récupération de paquets.\n"
+"     Élément de configuration : Dir::Etc::SourceParts.\n"
 "     \n"
 "\">\n"
 
@@ -406,38 +366,30 @@ msgstr ""
 msgid ""
 "&statedir;/lists/\n"
-"     Storage area for state information for each package "
-"resource specified in\n"
+"     Storage area for state information for each package resource specified in\n"
 "     &sources-list;\n"
-"     Configuration Item: Dir::State::Lists.<"
-"/listitem>\n"
+"     Configuration Item: Dir::State::Lists.\n"
 "     \n"
 msgstr ""
 "&statedir;/lists/\n"
-"     Zone de stockage pour les informations qui concernent "
-"chaque ressource de paquet spécifiée dans &sources-list;\n"
-"     Élément de configuration : Dir::State::Lists.<"
-"/listitem>\n"
+"     Zone de stockage pour les informations qui concernent chaque ressource de paquet spécifiée dans &sources-list;\n"
+"     Élément de configuration : Dir::State::Lists.\n"
 "     \n"
 
 #. type: Plain text
 #: apt.ent:150
 #, no-wrap
 msgid ""
-"     &statedir;/lists/partial/"
-"\n"
+"     &statedir;/lists/partial/\n"
 "     Storage area for state information in transit.\n"
-"     Configuration Item: Dir::State::Lists ("
-"partial will be implicitly appended)\n"
+"     Configuration Item: Dir::State::Lists (partial will be implicitly appended)\n"
 "     \n"
 "\">\n"
 msgstr ""
-"     &statedir;/lists/partial/"
-"\n"
+"     &statedir;/lists/partial/\n"
 "     Zone de stockage pour les informations en transit.\n"
-"     Élément de configuration : Dir::State::Lists (<"
-"filename>partial sera implicitement ajouté).\n"
+"     Élément de configuration : Dir::State::Lists (partial sera implicitement ajouté).\n"
 "     \n"
 "\">\n"
 
@@ -447,18 +399,14 @@ msgstr ""
 msgid ""
 "/etc/apt/trusted.gpg\n"
-"     Keyring of local trusted keys, new keys will be added "
-"here.\n"
-"     Configuration Item: Dir::Etc::Trusted.<"
-"/listitem>\n"
+"     Keyring of local trusted keys, new keys will be added here.\n"
+"     Configuration Item: Dir::Etc::Trusted.\n"
 "     \n"
 msgstr ""
 "/etc/apt/trusted.gpg\n"
-"     Porte-clés des clés de confiance locales. Les nouvelles "
-"clés y seront ajoutées.\n"
-"     Élément de configuration: Dir::Etc::Trusted.<"
-"/listitem>\n"
+"     Porte-clés des clés de confiance locales. Les nouvelles clés y seront ajoutées.\n"
+"     Élément de configuration: Dir::Etc::Trusted.\n"
 "     \n"
 
 #. type: Plain text
@@ -466,21 +414,16 @@ msgstr ""
 #, no-wrap
 msgid ""
 "     /etc/apt/trusted.gpg.d/\n"
-"     File fragments for the trusted keys, additional keyrings "
-"can\n"
+"     File fragments for the trusted keys, additional keyrings can\n"
 "     be stored here (by other packages or the administrator).\n"
-"     Configuration Item Dir::Etc::TrustedParts.<"
-"/listitem>\n"
+"     Configuration Item Dir::Etc::TrustedParts.\n"
 "     \n"
 "\">\n"
 msgstr ""
 "     /etc/apt/trusted.gpg.d/\n"
-"     Fragments de fichiers pour les clés de signatures sûres. "
-"Des fichiers\n"
-"     supplémentaires peuvent être placés à cet endroit (par des paquets ou "
-"par l'administrateur).\n"
-"     Élément de configuration : Dir::Etc::TrustedParts.<"
-"/para>\n"
+"     Fragments de fichiers pour les clés de signatures sûres. Des fichiers\n"
+"     supplémentaires peuvent être placés à cet endroit (par des paquets ou par l'administrateur).\n"
+"     Élément de configuration : Dir::Etc::TrustedParts.\n"
 "     \n"
 "\">\n"
 
@@ -489,8 +432,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "/var/lib/apt/extended_states<"
-"/term>\n"
+"      /var/lib/apt/extended_states\n"
 "      Status list of auto-installed packages.\n"
 "      Configuration Item: Dir::State::extended_states.\n"
 "      \n"
@@ -498,11 +440,9 @@ msgid ""
 "\">\n"
 msgstr ""
 "/var/lib/apt/extended_states<"
-"/term>\n"
+"     /var/lib/apt/extended_states\n"
 "     Liste d'état des paquets installés automatiquement.\n"
-"     Élément de configuration : Dir::State::extended_states"
-".\n"
+"     Élément de configuration : Dir::State::extended_states.\n"
 "     \n"
 "\">\n"
 
@@ -510,10 +450,8 @@ msgstr ""
 #: apt.ent:175
 #, no-wrap
 msgid ""
-"\n"
+"\n"
 "\n"
 msgstr "\n"
 
@@ -521,39 +459,28 @@ msgstr "\n"
 #: apt.ent:184
 #, no-wrap
 msgid ""
-"\n"
 "john@doe.org "
-"in 2009,\n"
-"     2010 and Daniela Acme daniela@acme.us in 2010 together "
-"with the\n"
-"     Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org"
-".\n"
+"     The english translation was done by John Doe john@doe.org in 2009,\n"
+"     2010 and Daniela Acme daniela@acme.us in 2010 together with the\n"
+"     Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org.\n"
 "\">\n"
 msgstr ""
 ""
-"bubulle@debian.org (2000, 2005, 2009, 2010),\n"
-"     Équipe de traduction francophone de Debian "
-"debian-l10n-french@lists.debian.org\n"
+"     Jérôme Marant, Philippe Batailler, Christian Perrier bubulle@debian.org (2000, 2005, 2009, 2010),\n"
+"     Équipe de traduction francophone de Debian debian-l10n-french@lists.debian.org\n"
 "\">\n"
 
 #. type: Plain text
 #: apt.ent:195
 #, no-wrap
 msgid ""
-"\n"
 "\n"
 msgstr ""
 "\n"
@@ -736,8 +662,8 @@ msgid ""
 "versions are supported."
 msgstr ""
 "La commande list 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 : , , , ."
 
 #. type: Content of: 
@@ -751,9 +677,6 @@ msgstr ""
 
 #. type: Content of: 
 #: apt.8.xml:60
-#| msgid ""
-#| "rdepends shows a listing of each reverse dependency a "
-#| "package has."
 msgid ""
 "show shows the package information for the given "
 "package(s)."
@@ -814,9 +737,6 @@ msgstr ""
 
 #. type: Content of: 
 #: apt.8.xml:95
-#| msgid ""
-#| "showhold is used to print a list of packages on hold "
-#| "in the same way as for the other show commands."
 msgid ""
 "update is used to resynchronize the package index files "
 "from their sources."
@@ -895,13 +815,11 @@ msgstr ""
 
 #. type: Content of: 
 #: apt.8.xml:147
-#| msgid "the Package: line"
 msgid "The option DPkg::Progress-Fancy is enabled."
 msgstr "L'option DPkg::Progress-Fancy est activée."
 
 #. type: Content of: 
 #: apt.8.xml:151
-#| msgid "the Component: line"
 msgid "The option APT::Color is enabled."
 msgstr "L'option APT::Color est activée."
 
@@ -911,18 +829,17 @@ msgid ""
 "A new list command is available similar to dpkg "
 "--list."
 msgstr ""
-"Une nouvelle commande list est disponible, semblable à "
-"la commande dpkg --list."
+"Une nouvelle commande list est disponible, semblable à la "
+"commande dpkg --list."
 
 #. type: Content of: 
 #: apt.8.xml:160
-#| msgid "the Archive: or Suite: line"
 msgid ""
 "The option upgrade has --with-new-pkgs "
 "enabled by default."
 msgstr ""
-"La commande upgrade a l'option --with-new-pkgs<"
-"/literal> activée par défaut."
+"La commande upgrade a l'option --with-new-pkgs activée par défaut."
 
 #. type: Content of: 
 #: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
@@ -935,16 +852,12 @@ msgstr "Voir aussi"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:171
-#| 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-get;, &apt-cache;, &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:558 apt-cache.8.xml:351 apt-mark.8.xml:131
@@ -955,9 +868,6 @@ msgstr "Diagnostics"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.8.xml:177
-#| 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."
@@ -973,11 +883,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:35
-#| 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 "
@@ -1304,14 +1209,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:211
-#| 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 "
@@ -1407,18 +1304,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:271
-#| 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 "
@@ -1440,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 <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>
@@ -1592,13 +1477,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:364
-#| 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 "
@@ -1617,13 +1495,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:374
-#| 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 "
@@ -1635,9 +1506,8 @@ msgstr ""
 "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>."
+"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
@@ -1675,12 +1545,12 @@ msgid ""
 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>."
+"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
@@ -1884,8 +1754,9 @@ msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
-"Ne traiter que les dépendances de construction dépendantes de l'architecture. "
-"Élément de configuration : <literal>APT::Get::Arch-Only</literal>."
+"Ne traiter que les dépendances de construction dépendantes de "
+"l'architecture. Élément de configuration : <literal>APT::Get::Arch-Only</"
+"literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:523
@@ -1912,8 +1783,8 @@ msgstr ""
 "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>."
+"configuration : <literal>Dpkg::Progress</literal> et <literal>Dpkg::Progress-"
+"Fancy</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
@@ -1923,10 +1794,6 @@ msgstr "Fichiers"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:553
-#| 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 "
@@ -2793,8 +2660,9 @@ msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
 msgstr ""
-"<literal>unhold</literal> est utilisé pour supprimer  l'état « hold » "
-"(conservé) d'un paquet afin de permettre toute action qui y est liée."
+"<literal>unhold</literal> est utilisé pour supprimer  l'état "
+"« hold » (conservé) d'un paquet afin de permettre toute action qui y est "
+"liée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:80
@@ -3230,18 +3098,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:81
-#| 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 ""
 "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>."
+"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
@@ -3803,8 +3667,8 @@ 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."
+"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
@@ -4241,12 +4105,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:394
-#| 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 "
@@ -4258,7 +4116,8 @@ msgstr ""
 "Limit</literal> qui peut prendre une valeur entière, l'unité utilisée étant "
 "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."
+"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
@@ -4288,12 +4147,12 @@ 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>."
+"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
@@ -4470,12 +4329,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:517
 #, no-wrap
-msgid ""
-"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<"
-"replaceable>Methodname</replaceable>\";"
-msgstr ""
-"Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<"
-"replaceable>NomMethode</replaceable>\";"
+msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
+msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:512
@@ -4624,10 +4479,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
 #: apt.conf.5.xml:569
 #, no-wrap
-msgid ""
-"Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
-msgstr ""
-"Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
+msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
+msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:557
@@ -4720,16 +4573,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:601
-#| 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> "
@@ -4748,10 +4591,10 @@ msgstr ""
 "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>."
+"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:611
@@ -4944,12 +4787,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:707
-#| 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 "
@@ -4960,20 +4797,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. 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."
+"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:714
-#| 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 "
@@ -4997,11 +4828,11 @@ msgid ""
 "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>::"
+"<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."
+"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:726
@@ -5320,7 +5151,7 @@ msgstr ""
 
 #.  TODO: provide a
 #. 	   motivating example, except I haven't a clue why you'd want
-#. 	   to do this.
+#. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.conf.5.xml:872
 msgid ""
@@ -5596,8 +5427,8 @@ msgid ""
 "<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>."
+"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:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
@@ -5614,7 +5445,7 @@ msgstr ""
 "Le fichier &configureindex; contient un modèle de fichier montrant des "
 "exemples pour toutes les options existantes."
 
-#.  ? reading apt.conf
+#.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:1223
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -5727,12 +5558,8 @@ msgstr "Priorités affectées par défaut"
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:90
 #, no-wrap
-msgid ""
-"<command>apt-get install -t testing <replaceable>some-package</replaceable><"
-"/command>\n"
-msgstr ""
-"<command>apt-get install -t testing <replaceable>paquet</replaceable><"
-"/command>\n"
+msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
+msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:93
@@ -6879,10 +6706,8 @@ msgstr "Suivre l'évolution d'une version par son nom de code"
 #: apt_preferences.5.xml:650
 #, no-wrap
 msgid ""
-"Explanation: Uninstall or do not install any Debian-originated package "
-"versions\n"
-"Explanation: other than those in the distribution codenamed with "
-"&testing-codename; or sid\n"
+"Explanation: Uninstall or do not install any Debian-originated package versions\n"
+"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
 "Package: *\n"
 "Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
@@ -7087,7 +6912,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:76
 #, no-wrap
-#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 msgid "deb [ options ] uri suite [component1] [component2] [...]"
 msgstr "deb [ options ] uri suite [composant1] [composant2] [...]"
 
@@ -7142,15 +6966,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:99
-#| 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.  "
@@ -7163,23 +6978,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>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."
+"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
-#| 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</"
@@ -7189,28 +6996,16 @@ msgid ""
 "<literal>APT</literal> will automatically generate a URI with the current "
 "architecture otherwise."
 msgstr ""
-"<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 "
+"<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
-#| 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 "
@@ -7224,8 +7019,8 @@ msgid ""
 "users. APT also parallelizes connections to different hosts to more "
 "effectively deal with sites with low bandwidth."
 msgstr ""
-"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 "
+"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 "
@@ -7271,12 +7066,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml:140
-#| 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>,"
@@ -7329,13 +7118,11 @@ msgstr "Exemples :"
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib "
-"non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
 "   "
 msgstr ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib "
-"non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
@@ -8655,12 +8442,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><programlisting>
 #: apt-ftparchive.1.xml:598
 #, no-wrap
-msgid ""
-"<command>apt-ftparchive</command> packages <replaceable>directory<"
-"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
-msgstr ""
-"<command>apt-ftparchive</command> packages <replaceable>répertoire<"
-"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-ftparchive.1.xml:594
@@ -8940,8 +8723,7 @@ msgid ""
 "Building Dependency Tree... Done\n"
 msgstr ""
 "# apt-get update\n"
-"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ "
-"Packages\n"
+"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Réception de http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Lecture des listes de paquets... Fait\n"
 "Construction de l'arbre des dépendances... Fait\n"
@@ -9047,15 +8829,6 @@ msgstr ""
 
 #. type: Content of: <book><chapter><para>
 #: guide.dbk:188
-#| 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</"
@@ -9070,8 +8843,8 @@ 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, "
 "<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 "
+"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>-"
@@ -9693,11 +9466,9 @@ msgid ""
 "12 packages not fully installed or removed.\n"
 "Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"
 msgstr ""
-"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis "
-"à jour.\n"
+"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis à jour.\n"
 "12 paquets partiellement installés ou enlevés.\n"
-"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette "
-"opération, 26,5Mo d'espace disque supplémentaires seront utilisés.\n"
+"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette opération, 26,5Mo d'espace disque supplémentaires seront utilisés.\n"
 
 #. type: Content of: <book><chapter><section><section><para>
 #: guide.dbk:471
@@ -9767,12 +9538,10 @@ msgid ""
 "11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"
 msgstr ""
 "# apt-get update\n"
-"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ "
-"Packages\n"
+"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
 "Réception de :2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Atteint http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
-"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ "
-"Packages\n"
+"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Réception de :5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
 "11% [5 testing/non-free `Attente du fichier' 0/32.1k 0%] 2203b/s 1m52s\n"
 
@@ -10143,8 +9912,7 @@ msgstr ""
 " # apt-get update\n"
 " [ APT récupère les fichiers des paquets ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine "
-"distante ]\n"
+" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine distante ]\n"
 
 #. type: Content of: <book><chapter><section><para>
 #: offline.dbk:159
@@ -10265,8 +10033,7 @@ msgid ""
 " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
-" [ Répondre négativement à la question, pour être sûr(e) que les actions vous "
-"conviennent ]\n"
+" [ Répondre négativement à la question, pour être sûr(e) que les actions vous conviennent ]\n"
 " # apt-get -qq --print-uris dist-upgrade > uris\n"
 " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script\n"
 
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 7e94b07aa..7e5e3aef5 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.0.9.1\n"
+"Project-Id-Version: apt 1.0.9.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -154,7 +154,7 @@ msgid "  Version table:"
 msgstr ""
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -521,11 +521,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -566,7 +566,7 @@ msgstr ""
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
@@ -802,7 +802,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr ""
 
@@ -930,31 +930,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr ""
 
@@ -962,39 +962,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr ""
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr ""
 
@@ -2832,134 +2832,134 @@ msgstr ""
 msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, c-format
 msgid "Can not write log (%s)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 21241d76c..921e1699c 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -161,7 +161,7 @@ msgid "  Version table:"
 msgstr " جدول النسخ:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -530,11 +530,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -575,7 +575,7 @@ msgstr "%s هي النسخة الأحدث.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
@@ -815,7 +815,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr "تعذر قبول الاتصال"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr ""
 
@@ -943,31 +943,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "خطأ في الكتابة إلى الملف"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "خطأ في القراءة من الخادم"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "خطأ في الكتابة إلى الملف"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "فشل التحديد"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "انتهى وقت الاتصال"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "خطأ في الكتابة إلى ملف المُخرجات"
 
@@ -975,39 +975,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "بيانات ترويسة سيئة"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "فشل الاتصال"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "خطأ داخلي"
 
@@ -2871,134 +2871,134 @@ msgstr ""
 msgid "Invalid operation %s"
 msgstr "عمليّة غير صالحة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "تم تثبيت %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "تهيئة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "إزالة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "تمت إزالة %s بالكامل"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "فشل إغلاق الملف %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "تحضير %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "فتح %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "التحضير لتهيئة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "تم تثبيت %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "التحضير لإزالة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "تم إزالة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "التحضير لإزالة %s بالكامل"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "تمت إزالة %s بالكامل"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "تعذرت الكتابة إلى %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/ast.po b/po/ast.po
index 76e1581ae..fceca5e5e 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -154,7 +154,7 @@ msgid "  Version table:"
 msgstr "  Tabla de versiones:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -636,11 +636,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -681,7 +681,7 @@ msgstr "%s yá ta na versión más nueva.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperaba %s pero nun taba ellí"
@@ -921,7 +921,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:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Hebo un problema al xenerar el hash del ficheru"
 
@@ -1052,31 +1052,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Fallu al escribir nel ficheru"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 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:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Fallu al lleer nel sirvidor"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Fallu al escribir nel ficheru"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Falló la escoyeta"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Gandió'l tiempu de conexón"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Fallu al escribir nel ficheru de salida"
 
@@ -1084,39 +1084,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Datos de testera incorreutos"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Fallo la conexón"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Fallu internu"
 
@@ -3043,110 +3043,110 @@ msgstr "El sentíu %s nun s'entiende, prueba con braeru o falsu."
 msgid "Invalid operation %s"
 msgstr "Operación incorreuta: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Desinstalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "Desinstalóse dafechu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Anotando desaniciáu de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta'l direutoriu '%s'."
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Nun pudo abrise'l ficheru '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparándose pa configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "%s instaláu"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparándose pa desinstalar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "%s desinstaláu"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparándose pa desinstalar dafechu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "Desinstalóse dafechu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Nun se pue escribir en %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemes de dependencies - déxase ensin configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3154,7 +3154,7 @@ 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:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3162,7 +3162,7 @@ msgstr ""
 "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
 "discu llenu"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3170,7 +3170,7 @@ msgstr ""
 "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
 "memoria"
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3179,7 +3179,7 @@ msgstr ""
 "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
 "discu llenu"
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index dae97727a..224f9da4a 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -160,7 +160,7 @@ msgid "  Version table:"
 msgstr "  Таблица с версиите:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -643,11 +643,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -688,7 +688,7 @@ msgstr "Пакетът „%s“ вече е задържан.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Изчака се завършването на %s, но той не беше пуснат"
@@ -950,7 +950,7 @@ msgstr "Времето за установяване на връзка с гне
 msgid "Unable to accept connection"
 msgstr "Невъзможно е да се приеме свързването"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Проблем при хеширане на файла"
 
@@ -1084,31 +1084,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Празни файлове не могат да бъдат валидни архиви"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Грешка при записа на файла"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Грешка при четене от сървъра"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Грешка при записа на файл"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Неуспех на избора"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Допустимото време за свързване изтече"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Грешка при записа на изходен файл"
 
@@ -1116,39 +1116,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Невалидни данни на заглавната част"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Неуспех при свързването"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Вътрешна грешка"
 
@@ -3097,112 +3097,112 @@ msgstr "Смисълът %s не е ясен, опитайте true или false
 msgid "Invalid operation %s"
 msgstr "Невалидна операция %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Инсталиране на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Конфигуриране на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "Окончателно премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Отбелязване на изчезването на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Директорията „%s“ липсва"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Неуспех при отваряне на файла „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Подготвяне на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Разпакетиране на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Подготвяне на %s за конфигуриране"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "%s е инсталиран"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Подготвяне за премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "%s е премахнат"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Подготовка за пълно премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s е напълно премахнат"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Неуспех при записа на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "Операцията е прекъсната"
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "отлагане на настройката поради неудовлетворени зависимости"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3210,7 +3210,7 @@ msgstr ""
 "Доклад за зависимостите не е записан защото съобщението за грешка е породено "
 "от друга грешка."
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3218,7 +3218,7 @@ msgstr ""
 "Доклад за зависимостите не е записан защото грешката е причинена от "
 "недостатъчно дисково пространство"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3226,7 +3226,7 @@ msgstr ""
 "Доклад за зависимостите не е записан защото грешката е причинена от "
 "недостатъчна оперативна памет"
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3235,7 +3235,7 @@ msgstr ""
 "Доклад за зависимостите не е записан защото грешката е причинена от "
 "недостатъчно дисково пространство"
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/bs.po b/po/bs.po
index 8a6070107..43497b638 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -158,7 +158,7 @@ msgid "  Version table:"
 msgstr ""
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -537,11 +537,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -582,7 +582,7 @@ msgstr ""
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
@@ -821,7 +821,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr ""
 
@@ -950,31 +950,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr ""
 
@@ -982,39 +982,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
@@ -2866,134 +2866,134 @@ msgstr ""
 msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Povezujem se sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Preporučuje"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Ne mogu zapisati na %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 6ce0751e8..671fa958d 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -158,7 +158,7 @@ msgid "  Version table:"
 msgstr "  Taula de versió:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -647,11 +647,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -692,7 +692,7 @@ msgstr "%s ja estava no retingut.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperava %s però no hi era"
@@ -933,7 +933,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:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Problema escollint el fitxer"
 
@@ -1067,32 +1067,32 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Els fitxers buits no poden ser arxius vàlids"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "S'ha produït un error en escriure al fitxer"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 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:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "S'ha produït un error en llegir des del servidor"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "S'ha produït un error en escriure al fitxer"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Ha fallat la selecció"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Connexió finalitzada"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "S'ha produït un error en escriure al fitxer de sortida"
 
@@ -1100,39 +1100,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Capçalera de dades no vàlida"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Ha fallat la connexió"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Error intern"
 
@@ -3090,110 +3090,110 @@ msgstr "El sentit %s no s'entén, proveu «true» (vertader) o «false» (fals).
 msgid "Invalid operation %s"
 msgstr "Operació no vàlida %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "S'està instaŀlant %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "S'està configurant el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "S'està suprimint el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "S'ha suprimit completament %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: 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:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Manca el directori «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "No s'ha pogut obrir el fitxer «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "S'està preparant el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "S'està desempaquetant %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "S'està preparant per a configurar el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "S'ha instaŀlat el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "S'està preparant per a la supressió del paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "S'ha suprimit el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "S'està preparant per a suprimir completament el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "S'ha suprimit completament el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "No es pot escriure en %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "S'ha interromput l'operació abans que pogués finalitzar"
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "S'han produït problemes de depències, es deixa sense configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3201,7 +3201,7 @@ 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:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3209,7 +3209,7 @@ msgstr ""
 "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
 "disc ple"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3217,7 +3217,7 @@ 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:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3226,7 +3226,7 @@ msgstr ""
 "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
 "disc ple"
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 74d2d31a4..5d51917b6 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -155,7 +155,7 @@ msgid "  Version table:"
 msgstr "  Tabulka verzí:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -628,11 +628,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr "Stažení selhalo"
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -683,7 +683,7 @@ msgstr "%s již nebyl držen v aktuální verzi.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Čekali jsme na %s, ale nebyl tam"
@@ -963,7 +963,7 @@ msgstr "Spojení datového socketu vypršelo"
 msgid "Unable to accept connection"
 msgstr "Nelze přijmout spojení"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Problém s kontrolním součtem souboru"
 
@@ -1095,31 +1095,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Prázdné soubory nejsou platnými archivy"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Chyba čtení ze serveru"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Výběr selhal"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Čas spojení vypršel"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupního souboru"
 
@@ -1127,39 +1127,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Špatné datové záhlaví"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
@@ -3076,111 +3076,111 @@ msgstr "Nechápu význam %s, zkuste true nebo false."
 msgid "Invalid operation %s"
 msgstr "Neplatná operace %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Instaluje se %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Nastavuje se %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Odstraňuje se %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "Kompletně se odstraňuje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Značím si zmizení %s"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Adresář „%s“ chybí"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Nelze otevřít soubor „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Připravuje se %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozbaluje se %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Připravuje se nastavení %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "Nainstalován %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Připravuje se odstranění %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "Odstraněn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Připravuje se úplné odstranění %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "Kompletně odstraněn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, c-format
 msgid "Can not write log (%s)"
 msgstr "Nelze zapsat log (%s)"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr "Je /dev/pts připojeno?"
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 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:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "problémy se závislostmi - ponechávám nezkonfigurované"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3188,7 +3188,7 @@ 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:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3196,7 +3196,7 @@ 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:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3204,7 +3204,7 @@ 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:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
@@ -3212,7 +3212,7 @@ 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:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/cy.po b/po/cy.po
index d8be6d0b2..87cab54ff 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -174,7 +174,7 @@ msgid "  Version table:"
 msgstr "  Tabl Fersiynnau:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -650,11 +650,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -695,7 +695,7 @@ msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, fuzzy, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Arhoswyd am %s ond nid oedd e yna"
@@ -942,7 +942,7 @@ msgstr "Goramserodd cysylltiad y soced data"
 msgid "Unable to accept connection"
 msgstr "Methwyd derbyn cysylltiad"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Problem wrth stwnshio ffeil"
 
@@ -1072,32 +1072,32 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Gwall wrth ysgrifennu at y ffeil"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 #, 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:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Gwall wrth ddarllen o'r gweinydd"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Gwall wrth ysgrifennu at ffeil"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Methwyd dewis"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Goramserodd y cysylltiad"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
 
@@ -1105,44 +1105,44 @@ 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:490
+#: methods/server.cc:494
 #, fuzzy
 msgid "Bad header data"
 msgstr "Data pennawd gwael"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Methodd y cysylltiad"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Gwall mewnol"
 
@@ -3084,134 +3084,134 @@ msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."
 msgid "Invalid operation %s"
 msgstr "Gweithred annilys %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Wedi Sefydlu: "
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Yn cysylltu i %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Methwyd dileu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Methwyd agor ffeil %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Wedi Sefydlu: "
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Argymell"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Methwyd dileu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Ni ellir ysgrifennu i %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 8ae5fdbb3..986e0a864 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -161,7 +161,7 @@ msgid "  Version table:"
 msgstr "  Versionstabel:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -637,11 +637,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr "Kunne ikke hente pakkerne"
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 #, fuzzy
 msgid ""
 "Usage: apt-helper [options] command\n"
@@ -692,7 +692,7 @@ msgstr "%s var allerede ikke i bero.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ventede på %s, men den var der ikke"
@@ -975,7 +975,7 @@ msgstr "Tidsudløb på datasokkel-forbindelse"
 msgid "Unable to accept connection"
 msgstr "Kunne ikke acceptere forbindelse"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Problem ved \"hashing\" af fil"
 
@@ -1109,31 +1109,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Tomme filer kan ikke være gyldige arkiver"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Fejl ved skrivning til filen"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Fejl ved læsning fra server"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Fejl ved skrivning til fil"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Valg mislykkedes"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Tidsudløb på forbindelsen"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Fejl ved skrivning af uddatafil"
 
@@ -1141,40 +1141,40 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Ugyldige hoved-data"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkedes"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Intern fejl"
 
@@ -3100,111 +3100,111 @@ msgstr "%s blev ikke forstået, prøv med »true« eller »false«."
 msgid "Invalid operation %s"
 msgstr "Ugyldig handling %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Installerer %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Sætter %s op"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Fjerner %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "Fjerner %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Bemærker forsvinding af %s"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mappe »%s« mangler"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Kunne ikke åbne filen »%s«"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Klargør %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Pakker %s ud"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Gør klar til at sætte %s op"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "Installerede %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Gør klar til afinstallation af %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "Fjernede %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Gør klar til at fjerne %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "Fjernede %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, c-format
 msgid "Can not write log (%s)"
 msgstr "Kan ikke skrive log (%s)"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr "Er /dev/pts monteret?"
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "Handling blev afbrudt før den kunne afsluttes"
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "afhængighedsproblemer - efterlader ukonfigureret"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3212,14 +3212,14 @@ msgstr ""
 "Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en "
 "opfølgningsfejl fra en tidligere fejl."
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 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:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3227,7 +3227,7 @@ msgstr ""
 "Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok "
 "hukommelsesfejl"
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
@@ -3235,7 +3235,7 @@ msgstr ""
 "Ingen apportrapport skrevet da fejlbeskeden indikerer en fejl på det lokale "
 "system"
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 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"
diff --git a/po/de.po b/po/de.po
index 2c9815571..887cdcfac 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -162,7 +162,7 @@ msgid "  Version table:"
 msgstr "  Versionstabelle:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -664,11 +664,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr "Herunterladen fehlgeschlagen"
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -720,7 +720,7 @@ msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
@@ -1010,7 +1010,7 @@ msgstr "Zeitüberschreitung bei Datenverbindungsaufbau"
 msgid "Unable to accept connection"
 msgstr "Verbindung konnte nicht angenommen werden."
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Problem bei Bestimmung des Hashwertes einer Datei"
 
@@ -1149,33 +1149,33 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Leere Dateien können kein gültiges Archiv sein."
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Fehler beim Schreiben der Datei"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 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:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Fehler beim Lesen vom Server"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Fehler beim Schreiben in Datei"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Auswahl fehlgeschlagen"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Zeitüberschreitung bei Verbindung"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Fehler beim Schreiben der Ausgabedatei"
 
@@ -1183,42 +1183,42 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Fehlerhafte Kopfzeilendaten"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Interner Fehler"
 
@@ -3206,112 +3206,112 @@ msgstr "Der Sinn von »%s« ist nicht klar, versuchen Sie »true« oder »false
 msgid "Invalid operation %s"
 msgstr "Ungültige Operation %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "%s wird installiert."
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "%s wird konfiguriert."
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "%s wird entfernt."
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s wird vollständig entfernt."
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Verschwinden von %s festgestellt"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Verzeichnis »%s« fehlt"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Datei »%s« konnte nicht geöffnet werden."
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "%s wird vorbereitet."
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s wird entpackt."
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Konfiguration von %s wird vorbereitet."
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "%s installiert"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Entfernen von %s wird vorbereitet."
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "%s entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Vollständiges Entfernen von %s wird vorbereitet."
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s vollständig entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, c-format
 msgid "Can not write log (%s)"
 msgstr "Schreiben des Protokolls nicht möglich (%s)"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr "Ist /dev/pts eingebunden?"
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte."
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3319,7 +3319,7 @@ 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:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3327,7 +3327,7 @@ msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
 "wegen voller Festplatte hindeutet."
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3335,7 +3335,7 @@ msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
 "wegen erschöpftem Arbeitsspeicher hindeutet."
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
@@ -3343,7 +3343,7 @@ msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
 "im lokalen System hindeutet."
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/dz.po b/po/dz.po
index 6dcd58cd9..e83a26f40 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -162,7 +162,7 @@ msgid "  Version table:"
 msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -628,11 +628,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -673,7 +673,7 @@ msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རི
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
@@ -914,7 +914,7 @@ msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ན
 msgid "Unable to accept connection"
 msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།"
 
@@ -1047,31 +1047,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
@@ -1079,39 +1079,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "ནང་འཁོད་འཛོལ་བ།"
 
@@ -3014,134 +3014,134 @@ msgstr "དྲན་ཤེས་ %s་འདི་ཧ་གོ་མ་ཚུག
 msgid "Invalid operation %s"
 msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "%s་རིམ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr " %sལུ་འབྲི་མ་ཚུགས།"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index ebc604fc9..30272b245 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -166,7 +166,7 @@ msgid "  Version table:"
 msgstr "  Πίνακας Έκδοσης:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -641,11 +641,11 @@ msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
 "κωδικάτου"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -686,7 +686,7 @@ msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
@@ -926,7 +926,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο
 msgid "Unable to accept connection"
 msgstr "Αδύνατη η αποδοχή συνδέσεων"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Πρόβλημα κατά το hashing του αρχείου"
 
@@ -1061,32 +1061,32 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Η επιλογή απέτυχε"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Λήξη χρόνου σύνδεσης"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
 
@@ -1094,39 +1094,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Εσωτερικό Σφάλμα"
 
@@ -3046,134 +3046,134 @@ msgstr "Η τιμή %s δεν είναι κατανοητή, δοκιμάστε
 msgid "Invalid operation %s"
 msgstr "Μη έγκυρη λειτουργία %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Εγκατάσταση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Ρύθμιση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Αφαιρώ το %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Το %s διαγράφηκε πλήρως"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Ο φάκελος %s αγνοείται."
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Προετοιμασία του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Ξεπακετάρισμα του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Προετοιμασία ρύθμισης του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "Έγινε εγκατάσταση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Προετοιμασία για την αφαίρεση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "Αφαίρεσα το %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Προετοιμασία πλήρης αφαίρεσης του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "Το %s διαγράφηκε πλήρως"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Αδύνατη η εγγραφή στο %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 641c4877a..9290a0731 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,7 +33,7 @@ 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+0100\n"
 "PO-Revision-Date: 2014-11-20 02:25+0100\n"
 "Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox."
 "org>\n"
@@ -214,7 +214,7 @@ msgid "  Version table:"
 msgstr "  Tabla de versión:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -709,11 +709,11 @@ msgstr "Se necesita una URL como argumento"
 msgid "Must specify at least one pair url/filename"
 msgstr "Debe especificar al menos una pareja url/nombre-fichero"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr "Falló la descarga"
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -764,7 +764,7 @@ msgstr "%s ya no estaba retenido.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Se esperaba %s pero no estaba presente"
@@ -1047,7 +1047,7 @@ msgstr "Caducó conexión al socket de datos"
 msgid "Unable to accept connection"
 msgstr "No se pudo aceptar la conexión"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Problema al cifrar el fichero"
 
@@ -1182,31 +1182,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Los ficheros vacíos no pueden ser archivos válidos"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Error escribiendo al archivo"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error leyendo del servidor, el lado remoto cerró la conexión."
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Error leyendo del servidor"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Error escribiendo a archivo"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Falló la selección"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Caducó la conexión"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Error escribiendo al fichero de salida"
 
@@ -1214,39 +1214,39 @@ msgstr "Error escribiendo al fichero de salida"
 msgid "Waiting for headers"
 msgstr "Esperando las cabeceras"
 
-#: methods/server.cc:110
+#: methods/server.cc:111
 msgid "Bad header line"
 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"
 
-#: 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"
 
-#: methods/server.cc:197
+#: methods/server.cc:195
 msgid "This HTTP server has broken range support"
 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Datos de cabecera incorrectos"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Falló la conexión"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Error interno"
 
@@ -3208,112 +3208,112 @@ msgstr "El sentido %s no se entiende, pruebe verdadero o falso."
 msgid "Invalid operation %s"
 msgstr "Operación inválida: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Eliminando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "Borrando completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: 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:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta el directorio «%s»."
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "No se pudo abrir el fichero «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparándose para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparándose para eliminar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "%s eliminado"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparándose para eliminar completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s se borró completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, c-format
 msgid "Can not write log (%s)"
 msgstr "No se pudo escribir el informe (%s)"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr "¿Está montado «/dev/pts»?"
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "Se interrumpió la operación antes de que pudiera terminar"
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependencias - dejando sin configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3321,7 +3321,7 @@ 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:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3329,7 +3329,7 @@ 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:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3337,7 +3337,7 @@ msgstr ""
 "No se escribió un informe «apport» porque el mensaje de error indica un "
 "error de memoria excedida"
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
@@ -3345,7 +3345,7 @@ msgstr ""
 "No se escribió un informe «apport» porque el mensaje de error indica un "
 "problema en el sistema local"
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/eu.po b/po/eu.po
index 5a48d5160..b4290dba9 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -160,7 +160,7 @@ msgid "  Version table:"
 msgstr "  Bertsio taula:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -627,11 +627,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -672,7 +672,7 @@ msgstr "%s bertsiorik berriena da jada.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s espero zen baina ez zegoen han"
@@ -916,7 +916,7 @@ msgstr "Datu-socket konexioak denbora muga gainditu du"
 msgid "Unable to accept connection"
 msgstr "Ezin da konexioa onartu"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Arazoa fitxategiaren hash egitean"
 
@@ -1048,31 +1048,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Errorea zerbitzaritik irakurtzean"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Hautapenak huts egin du"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Konexioaren denbora muga gainditu da"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Errorea irteerako fitxategian idaztean"
 
@@ -1080,39 +1080,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Goiburu data gaizki dago"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Konexioak huts egin du"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Barne errorea"
 
@@ -3016,134 +3016,134 @@ msgstr "%s zentzua ez da ulertzen; probatu egiazkoa edo faltsua."
 msgid "Invalid operation %s"
 msgstr "Eragiketa baliogabea: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "%s Instalatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "%s konfiguratzen"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "%s kentzen"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s guztiz ezabatu da"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "'%s' direktorioa falta da"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "%s fitxategia ezin izan da ireki"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "%s prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s irekitzen"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s konfiguratzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "%s Instalatuta"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s kentzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "%s kendurik"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s guztiz ezabatzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s guztiz ezabatu da"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "%s : ezin da idatzi"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index a3e97e835..835d5ffce 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -158,7 +158,7 @@ msgid "  Version table:"
 msgstr "  Versiotaulukko:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -622,11 +622,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -667,7 +667,7 @@ msgstr "%s on jo uusin versio.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Odotettiin %s, mutta sitä ei ollut"
@@ -907,7 +907,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
 msgid "Unable to accept connection"
 msgstr "Yhteyttä ei voitu hyväksyä"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Pulmia tiedoston hajautuksessa"
 
@@ -1040,31 +1040,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Tapahtui virhe luettaessa palvelimelta"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Select ei toiminut"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Yhteys aikakatkaistiin"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
 
@@ -1072,39 +1072,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Virheellinen otsikkotieto"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Yhteys ei toiminut"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Sisäinen virhe"
 
@@ -3004,134 +3004,134 @@ msgstr "Arvo %s on tuntematon, yritä tosi tai epätosi."
 msgid "Invalid operation %s"
 msgstr "Virheellinen toiminto %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Asennetaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Tehdään asetukset: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Poistetaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s poistettiin kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Kansio \"%s\" puuttuu."
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Tiedostoa %s ei voitu avata"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Valmistellaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Puretaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Valmistaudutaan tekemään asetukset: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "%s asennettu"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Valmistaudutaan poistamaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "%s poistettu"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Valmistaudutaan poistamaan %s kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s poistettiin kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 45196755d..1bff06bf9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -158,7 +158,7 @@ msgid "  Version table:"
 msgstr " Table de version :"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -657,11 +657,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -702,7 +702,7 @@ msgstr "%s était déjà marqué comme non figé.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "A attendu %s mais il n'était pas présent"
@@ -985,7 +985,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:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Problème de hachage du fichier"
 
@@ -1123,31 +1123,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Les fichiers vides ne peuvent être des archives valables"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Erreur d'écriture sur le fichier"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 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:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Erreur de lecture du serveur"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Erreur d'écriture sur un fichier"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Sélection défaillante"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Délai de connexion dépassé"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Erreur d'écriture du fichier de sortie"
 
@@ -1155,39 +1155,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Mauvais en-tête de donnée"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Échec de la connexion"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Erreur interne"
 
@@ -3189,110 +3189,110 @@ msgstr "La signification %s n'est pas comprise, veuillez essayer vrai ou faux."
 msgid "Invalid operation %s"
 msgstr "L'opération %s n'est pas valable"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Installation de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Configuration de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Suppression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "Suppression complète de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Disparition de %s constatée"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Répertoire %s inexistant"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Impossible d'ouvrir le fichier « %s »"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Préparation de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Décompression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Préparation de la configuration de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "%s installé"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Préparation de la suppression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "%s supprimé"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Préparation de la suppression complète de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s complètement supprimé"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, c-format
 msgid "Can not write log (%s)"
 msgstr "Impossible d'écrire le journal (%s)"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr "Est-ce que /dev/pts est monté ?"
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "L'opération a été interrompue avant de se terminer"
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "problème de dépendances : laissé non configuré"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3300,14 +3300,14 @@ 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:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 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:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3315,7 +3315,7 @@ 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:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
@@ -3323,7 +3323,7 @@ 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:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index e876546ef..49d33265f 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -162,7 +162,7 @@ msgid "  Version table:"
 msgstr "  Táboa de versións:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -645,11 +645,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -690,7 +690,7 @@ msgstr "%s xa é a versión máis recente.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Agardouse por %s pero non estaba alí"
@@ -931,7 +931,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:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Xurdiu un problema ao calcular o hash do ficheiro"
 
@@ -1065,32 +1065,32 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Os ficheiros baleiros non poden ser arquivadores válidos"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Produciuse un erro ao escribir no ficheiro"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 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:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Produciuse un erro ao ler do servidor"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Produciuse un erro ao escribir nun ficheiro"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Fallou a chamada a select"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "A conexión esgotou o tempo"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Produciuse un erro ao escribir no ficheiro de saída"
 
@@ -1098,40 +1098,40 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Datos da cabeceira incorrectos"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Produciuse un fallo na conexión"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Produciuse un erro interno"
 
@@ -3082,112 +3082,112 @@ msgstr "O senso %s non se entende, probe «true» ou «false»."
 msgid "Invalid operation %s"
 msgstr "Operación incorrecta: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Retirando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s completamente retirado"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: 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:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta o directorio «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Non foi posíbel abrir o ficheiro «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparandose para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "Instalouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparándose para o retirado de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "Retirouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparándose para retirar %s completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "Retirouse %s completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Non é posíbel escribir en %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependencias - déixase sen configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3195,7 +3195,7 @@ 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:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3203,7 +3203,7 @@ 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:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3211,7 +3211,7 @@ 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:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3220,7 +3220,7 @@ 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:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 584436e37..51a2a6bb9 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -160,7 +160,7 @@ msgid "  Version table:"
 msgstr "  Verziótáblázat:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -641,11 +641,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -686,7 +686,7 @@ msgstr "%s eddig sem volt visszafogva.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, 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"
@@ -951,7 +951,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:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Probléma a fájl hash értékének meghatározásakor"
 
@@ -1082,31 +1082,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Az üres fájlok biztosan nem érvényes csomagok"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Hiba a fájl írásakor"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 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:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Hiba a kiszolgálóról olvasáskor"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Hiba a fájl írásakor"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "A kiválasztás sikertelen"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Időtúllépés a kapcsolatban"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Hiba a kimeneti fájl írásakor"
 
@@ -1114,39 +1114,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Rossz fejlécadatok"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Sikertelen kapcsolódás"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Belső hiba"
 
@@ -3085,110 +3085,110 @@ msgstr "%s jelentés nem értelmezhető, próbálja a true vagy false értékeke
 msgid "Invalid operation %s"
 msgstr "%s érvénytelen művelet"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "%s telepítése"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "%s konfigurálása"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "%s eltávolítása"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s teljes eltávolítása"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "„%s” eltűnése feljegyezve"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "A(z) „%s” könyvtár hiányzik"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "A(z) „%s” fájl megnyitása sikertelen"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "%s előkészítése"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s kicsomagolása"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s konfigurálásának előkészítése"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "%s telepítve"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, 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:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "%s eltávolítva"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, 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:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s teljesen eltávolítva"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Nem lehet írni ebbe: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "A művelet megszakadt, mielőtt befejeződhetett volna"
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "függőségi hibák - a csomag beállítatlan maradt"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3196,7 +3196,7 @@ 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:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3204,7 +3204,7 @@ msgstr ""
 "Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint megtelt a "
 "lemez"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3212,7 +3212,7 @@ 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:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
@@ -3220,7 +3220,7 @@ 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:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index bac0d8272..905a8952f 100644
--- a/po/it.po
+++ b/po/it.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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+0100\n"
 "PO-Revision-Date: 2014-05-31 17:04+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -160,7 +160,7 @@ msgid "  Version table:"
 msgstr "  Tabella versione:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -649,11 +649,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "È necessario specificare almeno una coppia URL/nome file"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr "Scaricamento non riuscito"
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 #, fuzzy
 msgid ""
 "Usage: apt-helper [options] command\n"
@@ -704,7 +704,7 @@ msgstr "%s era già non bloccato.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "In attesa di %s ma non era presente"
@@ -991,7 +991,7 @@ msgstr "Connessione al socket dati terminata"
 msgid "Unable to accept connection"
 msgstr "Impossibile accettare connessioni"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Si è verificato un problema nel creare l'hash del file"
 
@@ -1128,31 +1128,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "File vuoti non possono essere archivi validi"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Errore nello scrivere sul file"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 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:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Errore nel leggere dal server"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Errore nello scrivere su file"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Select non riuscita"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Connessione terminata"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Errore nello scrivere sul file di output"
 
@@ -1160,39 +1160,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Header dati non corretto"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Connessione non riuscita"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Errore interno"
 
@@ -3178,112 +3178,112 @@ msgstr "Il valore %s non è comprensibile, provare \"true\" o \"false\"."
 msgid "Invalid operation %s"
 msgstr "Operazione %s non valida"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Installazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Rimozione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "Rimozione completa di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Notata la sparizione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directory \"%s\" mancante"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Impossibile aprire il file \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Estrazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparazione alla configurazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "Pacchetto %s installato"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparazione alla rimozione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "Pacchetto %s rimosso"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparazione alla rimozione completa di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "Pacchetto %s rimosso completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, c-format
 msgid "Can not write log (%s)"
 msgstr "Impossibile scrivere il registro (%s)"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr "È /dev/pts montato?"
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "L'operazione è stata interrotta prima di essere completata"
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "Problemi con le dipendenze - Viene lasciato non configurato"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3291,7 +3291,7 @@ msgstr ""
 "Segnalazione apport non scritta poiché il messaggio di errore indica la "
 "presenza di un fallimento precedente."
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3299,7 +3299,7 @@ msgstr ""
 "Segnalazione apport non scritta poiché il messaggio di errore indica un "
 "errore per disco pieno."
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3307,7 +3307,7 @@ msgstr ""
 "Segnalazione apport non scritta poiché il messaggio di errore indica un "
 "errore di memoria esaurita."
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
@@ -3315,7 +3315,7 @@ msgstr ""
 "Segnalazione apport non scritta poiché il messaggio di errore indica un "
 "errore nel sistema locale."
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 8a95df64b..460fb2b29 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -157,7 +157,7 @@ msgid "  Version table:"
 msgstr "  バージョンテーブル:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -646,11 +646,11 @@ msgstr "引数として URL が 1 つ必要です"
 msgid "Must specify at least one pair url/filename"
 msgstr "少なくとも URL / ファイル名を 1 組指定する必要があります"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr "ダウンロード失敗"
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -701,7 +701,7 @@ msgstr "%s はすでに保留されていません。\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s を待ちましたが、そこにはありませんでした"
@@ -985,7 +985,7 @@ msgstr "データソケット接続タイムアウト"
 msgid "Unable to accept connection"
 msgstr "接続を accept できません"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "ファイルのハッシュでの問題"
 
@@ -1117,31 +1117,31 @@ msgstr "公開鍵を利用できないため、以下の署名は検証できま
 msgid "Empty files can't be valid archives"
 msgstr "空のファイルは有効なアーカイブと認められません"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "サーバからの読み込みに失敗しました"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "select に失敗しました"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "接続タイムアウト"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "出力ファイルへの書き込みでエラーが発生しました"
 
@@ -1149,39 +1149,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "不正なヘッダです"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "接続失敗"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "内部エラー"
 
@@ -3115,110 +3115,110 @@ msgstr "%s を解釈することができません。true か false を試して
 msgid "Invalid operation %s"
 msgstr "不正な操作 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "%s をインストールしています"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "%s を設定しています"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "%s を削除しています"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s を完全に削除しています"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "%s の消失を記録しています"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ディレクトリ '%s' が見つかりません"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "ファイル '%s' をオープンできませんでした"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "%s を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s を展開しています"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s の設定を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "%s をインストールしました"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s の削除を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "%s を削除しました"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s を完全に削除する準備をしています"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s を完全に削除しました"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, c-format
 msgid "Can not write log (%s)"
 msgstr "ログを書き込めません (%s)"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr "/dev/pts はマウントされていますか?"
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "操作はそれが完了する前に中断されました"
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "依存関係の問題 - 未設定のままにしています"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3226,7 +3226,7 @@ msgstr ""
 "エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート"
 "は書き込まれません。"
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3234,7 +3234,7 @@ msgstr ""
 "エラーメッセージはディスクフルエラーであることを示しているので、レポートは書"
 "き込まれません。"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3242,7 +3242,7 @@ msgstr ""
 "エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き"
 "込まれません。"
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
@@ -3250,7 +3250,7 @@ msgstr ""
 "エラーメッセージはローカルシステムの問題であることを示しているので、レポート"
 "は書き込まれません。"
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/km.po b/po/km.po
index 162f54ff7..43560cc9e 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -163,7 +163,7 @@ msgid "  Version table:"
 msgstr "  តារាង​កំណែ ៖"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -621,11 +621,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -666,7 +666,7 @@ msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទ
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
@@ -905,7 +905,7 @@ msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័
 msgid "Unable to accept connection"
 msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ"
 
@@ -1034,31 +1034,31 @@ msgstr "ហត្ថលេខា​ខាងក្រោម​មិន​អា
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "ជ្រើស​បាន​បរាជ័យ​"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "ការតភ្ជាប់​បាន​អស់ពេល​"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល"
 
@@ -1066,39 +1066,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "ទិន្នន័យ​បឋមកថា​ខូច"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "កំហុស​ខាង​ក្នុង​"
 
@@ -2980,134 +2980,134 @@ msgstr "មិនបានយល់អំពី​ការស្គាល់​
 msgid "Invalid operation %s"
 msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "បាន​ដំឡើង %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "កំពុង​យក %s ចេញ"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "កំពុងរៀបចំ​ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "កំពុង​ស្រាយ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "បាន​ដំឡើង %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចេញ​នៃ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "បាន​យក %s ចេញ"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "មិន​អាច​សរសេរ​ទៅ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 3f138c4ca..88bdf72aa 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -153,7 +153,7 @@ msgid "  Version table:"
 msgstr "  버전 테이블:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -627,11 +627,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -672,7 +672,7 @@ msgstr "%s 패키지는 이미 최신 버전입니다.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
@@ -912,7 +912,7 @@ msgstr "데이터 소켓 연결 시간 초과"
 msgid "Unable to accept connection"
 msgstr "연결을 받을 수 없습니다"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "파일 해싱에 문제가 있습니다"
 
@@ -1041,31 +1041,31 @@ msgstr "다음 서명들은 공개키가 없기 때문에 인증할 수 없습
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "해당 파일에 쓰는데 오류가 발생했습니다"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "서버에서 읽고 연결을 닫는데 오류가 발생했습니다"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "서버에서 읽는데 오류가 발생했습니다"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "파일에 쓰는데 오류가 발생했습니다"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "select가 실패했습니다"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "연결 시간이 초과했습니다"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "출력 파일에 쓰는데 오류가 발생했습니다"
 
@@ -1073,39 +1073,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "헤더 데이터가 잘못되었습니다"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "내부 오류"
 
@@ -3001,110 +3001,110 @@ msgstr "%s 센스를 이해할 수 없습니다. 참 아니면 거짓으로 해
 msgid "Invalid operation %s"
 msgstr "잘못된 작업 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "%s 설치하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "%s 설정 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "%s 패키지를 지우는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s 패키지를 완전히 지우는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "%s 사라짐 발견했습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "디렉터리 '%s' 없습니다."
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "'%s' 파일을 열 수 없습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "%s 준비 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s 푸는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s 패키지를 설정할 준비하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "%s 설치"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s 패키지를 지울 준비하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "%s 지움"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s 패키지를 완전히 지웠습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "%s에 쓸 수 없습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3112,20 +3112,20 @@ msgstr ""
 "보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수"
 "적인 오류입니다."
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 "보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다."
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3133,7 +3133,7 @@ msgid ""
 msgstr ""
 "보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/ku.po b/po/ku.po
index 1e3cc4a53..38905589e 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -161,7 +161,7 @@ msgid "  Version table:"
 msgstr "  Tabloya guhertoyan:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -541,11 +541,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -586,7 +586,7 @@ msgstr "%s jixwe guhertoya nûtirîn e.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
@@ -823,7 +823,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr ""
 
@@ -953,31 +953,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Dema li pelî dihate nivîsîn çewtî"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Dema li pelî dihate nivîsîn çewtî"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Hilbijartin neserketî"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 #, fuzzy
 msgid "Error writing to output file"
 msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
@@ -986,39 +986,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Girêdan pêk nehatiye"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Çewtiya hundirîn"
 
@@ -2869,134 +2869,134 @@ msgstr ""
 msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "%s hatine sazkirin"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "%s tê mîhengkirin"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "%s tê rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s bi tevahî hatine rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Peldanka '%s' kêm e"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nikarî pelê %s veke"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "%s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s tê derxistin"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Mîhengkirina %s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "%s hatine sazkirin"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Rakirina %s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "%s hatine rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Bi tevahî rakirina %s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s bi tevahî hatine rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Nivîsandin ji bo %s ne pêkane"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index b6ef62cad..a4f8d0baa 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -161,7 +161,7 @@ msgid "  Version table:"
 msgstr "  Versijų lentelė:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -548,11 +548,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -593,7 +593,7 @@ msgstr "%s ir taip jau yra naujausias.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
@@ -829,7 +829,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr ""
 
@@ -957,31 +957,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:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Klaida bandant rašyti į failą"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Prisijungimo laiko limitas baigėsi"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr ""
 
@@ -989,39 +989,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Prisijungti nepavyko"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Vidinė klaida"
 
@@ -2900,134 +2900,134 @@ msgstr ""
 msgid "Invalid operation %s"
 msgstr "Klaidingas veiksmas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "Įdiegta %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfigūruojamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Šalinamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Visiškai pašalintas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Trūksta aplanko „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nepavyko atverti failo %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Ruošiamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Išpakuojamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Ruošiamasi konfigūruoti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "Įdiegta %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Ruošiamasi %s pašalinimui"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "Pašalintas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Ruošiamasi visiškai pašalinti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "Visiškai pašalintas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Nepavyko įrašyti į %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 991c09316..06438b87f 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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 "
@@ -157,7 +157,7 @@ msgid "  Version table:"
 msgstr "आवृत्ती कोष्टक:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -617,11 +617,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -662,7 +662,7 @@ msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
@@ -902,7 +902,7 @@ msgstr "डेटा सॉकेट जोडणी वेळेअभावी
 msgid "Unable to accept connection"
 msgstr "जोडणी स्विकारण्यास असमर्थ"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "फाईल हॅश करण्यात त्रुटी"
 
@@ -1032,31 +1032,31 @@ msgstr "खालील सह्यांची खात्री करता
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "सर्व्हर मधून वाचण्यात चूक"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "चुकले/असमर्थ निवड करा"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "जोडणी वेळेअभावी तुटली"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक"
 
@@ -1064,39 +1064,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "चुकीचा शीर्षक डाटा"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "जोडणी अयशस्वी"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "अंतर्गत त्रुटी"
 
@@ -2991,134 +2991,134 @@ msgstr "%s संवेदना हे समजत नाही, चूक क
 msgid "Invalid operation %s"
 msgstr "%s अवैध क्रिया"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "%s संस्थापित होत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "%s संरचित होत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "%s काढून टाकत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s संपूर्ण काढून टाकले"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "'%s' संचयिका गहाळ आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "%s फाईल उघडता येत नाही"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "%s तयार करित आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s सुटे/मोकळे करीत आहे "
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s संरचने साठी तयार करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "%s संस्थापित झाले"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "%s काढून टाकले"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s संपूर्ण काढून टाकले"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "%s मध्ये लिहिण्यास असमर्थ "
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 69a930a96..ada6f2292 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -161,7 +161,7 @@ msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -631,11 +631,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -676,7 +676,7 @@ msgstr "%s er allerede nyeste versjon.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ventet på %s, men den ble ikke funnet"
@@ -918,7 +918,7 @@ msgstr "Tidsavbrudd på tilkoblingen til datasokkelen"
 msgid "Unable to accept connection"
 msgstr "Klarte ikke å godta tilkoblingen"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nøkkel for fil"
 
@@ -1049,31 +1049,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Feil ved lesing fra tjeneren"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Utvalget mislykkes"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Tidsavbrudd på forbindelsen"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
@@ -1081,39 +1081,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Ødelagte hodedata"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkes"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Intern feil"
 
@@ -3031,110 +3031,110 @@ msgstr "Skjønner ikke %s. Prøv «true» eller «false»."
 msgid "Invalid operation %s"
 msgstr "Ugyldig operasjon %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Installerer %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Setter opp %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Fjerner %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "Fjerner %s fullstendig"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: 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:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mappa «%s» mangler"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikke åpne fila «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Forbereder %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Pakker ut %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Forbereder oppsett av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "Installerte %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Forbereder fjerning av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "Fjernet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Forbereder å fullstendig slette %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "Fjernet %s fullstendig"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Kan ikke skrive til %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "avhengighetsproblemer - lar den være uoppsatt"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3142,7 +3142,7 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en "
 "følgefeil fra en tidligere feil."
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3150,7 +3150,7 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
 "feil"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3158,7 +3158,7 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for "
 "minne»-feil"
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3167,7 +3167,7 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
 "feil"
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/ne.po b/po/ne.po
index caec89af5..de438d4ca 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -159,7 +159,7 @@ msgid "  Version table:"
 msgstr "  संस्करण तालिका:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -618,11 +618,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -663,7 +663,7 @@ msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
@@ -903,7 +903,7 @@ msgstr "डेटा सकेटको जडान समय सकियो"
 msgid "Unable to accept connection"
 msgstr "जडान स्वीकार गर्न असक्षम भयो"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "समस्या द्रुतान्वेषण फाइल"
 
@@ -1032,31 +1032,31 @@ msgstr "निम्न हस्ताक्षरहरू रूजू हु
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "सर्भरबाट त्रुटि पढिदैछ"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "असफल चयन गर्नुहोस्"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "जडान समय सकियो"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ"
 
@@ -1064,39 +1064,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "खराब हेडर डेटा"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "जडान असफल भयो"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "आन्तरिक त्रुटि"
 
@@ -2983,134 +2983,134 @@ msgstr "अर्थ %s बुझिएन, सत्य वा झूठो प
 msgid "Invalid operation %s"
 msgstr "अवैध सञ्चालन  %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr " %s स्थापना भयो"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr " %s कनफिगर गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr " %s हटाइदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr " %s पूर्ण रुपले हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "फाइल %s खोल्न सकिएन"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr " %s तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr " %s अनप्याक गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr " %s कनफिगर गर्न तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr " %s स्थापना भयो"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr " %s हटाउन तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr " %s हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr " %s पूर्ण रुपले हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr " %s मा लेख्न असक्षम"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 9e2b3cba2..febf39710 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@ 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -163,7 +163,7 @@ msgid "  Version table:"
 msgstr "  Versietabel:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -654,11 +654,11 @@ msgstr "Heb een URL als argument nodig"
 msgid "Must specify at least one pair url/filename"
 msgstr "U dient minstens 1 paar van url/bestandsnaam op te geven"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr "Ophalen mislukt"
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -709,7 +709,7 @@ msgstr "%s was reeds ingesteld op niet tegenhouden.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Er is gewacht op %s, maar die kwam niet"
@@ -994,7 +994,7 @@ msgstr "Verbinding met de datasocket is verlopen"
 msgid "Unable to accept connection"
 msgstr "Kan de verbinding niet aanvaarden"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Probleem bij het frommelen van het bestand"
 
@@ -1130,32 +1130,32 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Lege bestanden kunnen geen geldige archieven zijn"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Fout bij het schrijven naar het bestand"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Fout bij het lezen van de server. De andere kant heeft de verbinding gesloten"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Fout bij het lezen van de server"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Fout bij het schrijven naar bestand"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Selectie is mislukt"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Verbinding verliep"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Fout bij het schrijven naar uitvoerbestand"
 
@@ -1163,39 +1163,39 @@ msgstr "Fout bij het schrijven naar uitvoerbestand"
 msgid "Waiting for headers"
 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 "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 "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 "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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Foute koptekstdata"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Interne fout"
 
@@ -3172,112 +3172,112 @@ msgstr "Betekenis van %s wordt niet begrepen, probeer 'true' of 'false'."
 msgid "Invalid operation %s"
 msgstr "Ongeldige bewerking %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "%s wordt geïnstalleerd"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "%s wordt geconfigureerd"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "%s wordt verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s wordt volledig verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: 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:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Map '%s' ontbreekt"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Kon het bestand '%s' niet openen"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "%s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s wordt uitgepakt"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Configuratie van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "%s is geïnstalleerd"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Verwijderen van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "%s is verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Volledig verwijderen van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s is volledig verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, c-format
 msgid "Can not write log (%s)"
 msgstr "Kan log (%s) niet opschrijven"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr "Is /dev/pts aangekoppeld?"
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "Bewerking werd afgebroken vooraleer ze beëindigd was"
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemen met vereisten - wordt niet geconfigureerd"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3285,7 +3285,7 @@ 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:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3293,7 +3293,7 @@ msgstr ""
 "Er is geen apport-verslag weggeschreven omdat de foutmelding als oorzaak een "
 "volle schijf opgeeft."
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3301,7 +3301,7 @@ msgstr ""
 "Er is geen apport-verslag weggeschreven omdat de foutmelding als oorzaak "
 "onvoldoende-geheugen opgeeft."
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
@@ -3309,7 +3309,7 @@ msgstr ""
 "Er is geen apport-verslag weggeschreven omdat de foutmelding een probleem op "
 "het lokale systeem signaleert."
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/nn.po b/po/nn.po
index c85d6628c..4f57e4ed6 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -162,7 +162,7 @@ msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -626,11 +626,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -671,7 +671,7 @@ msgstr "Den nyaste versjonen av %s er installert fr
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Venta p %s, men den fanst ikkje"
@@ -913,7 +913,7 @@ msgstr "Tidsavbrot p
 msgid "Unable to accept connection"
 msgstr "Klarte ikkje godta tilkoplinga"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nkkel for fil"
 
@@ -1042,31 +1042,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Feil ved lesing fr tenaren"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Utvalet mislukkast"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Tidsavbrot p sambandet"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
@@ -1074,39 +1074,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "ydelagde hovuddata"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Sambandet mislukkast"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Intern feil"
 
@@ -3003,134 +3003,134 @@ msgstr "Skj
 msgid "Invalid operation %s"
 msgstr "Ugyldig operasjon %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Installert: "
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Koplar til %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Klarte ikkje fjerna %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Listekatalogen %spartial manglar."
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikkje opna fila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Installert: "
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Tilrdingar"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Klarte ikkje fjerna %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Klarte ikkje skriva til %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index ff360c9ff..e4c05c622 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -163,7 +163,7 @@ msgid "  Version table:"
 msgstr "  Tabela wersji:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -649,11 +649,11 @@ msgstr ""
 "Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
 "źródła"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -694,7 +694,7 @@ msgstr "%s został już odznaczony jako zatrzymany.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Oczekiwano na proces %s, ale nie było go"
@@ -960,7 +960,7 @@ msgstr "Przekroczony czas połączenia gniazda danych"
 msgid "Unable to accept connection"
 msgstr "Nie udało się przyjąć połączenia"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Nie udało się obliczyć skrótu pliku"
 
@@ -1093,31 +1093,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Puste pliki nie mogą być prawidłowymi archiwami"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Błąd przy pisaniu do pliku"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Błąd czytania z serwera"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Błąd przy pisaniu do pliku"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Operacja select nie powiodła się"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Przekroczenie czasu połączenia"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Błąd przy pisaniu do pliku wyjściowego"
 
@@ -1125,39 +1125,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Błędne dane nagłówka"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Połączenie nie powiodło się"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
@@ -3123,110 +3123,110 @@ msgstr "Znaczenie %s jest nieznane, proszę spróbować true lub false."
 msgid "Invalid operation %s"
 msgstr "Nieprawidłowa operacja %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Instalowanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfigurowanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Usuwanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "Całkowite usuwanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Proszę odnotować zniknięcie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Brakuje katalogu \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Nie udało się otworzyć pliku \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Przygotowywanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozpakowywanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Przygotowywanie do konfiguracji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "Pakiet %s został zainstalowany"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Przygotowywanie do usunięcia %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "Pakiet %s został usunięty"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Przygotowywanie do całkowitego usunięcia %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "Pakiet %s został całkowicie usunięty"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Nie udało się pisać do %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "Operacja została przerwana, zanim mogła zostać zakończona"
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3234,7 +3234,7 @@ msgstr ""
 "Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że "
 "przyczyna niepowodzenia leży w poprzednim błędzie."
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3242,7 +3242,7 @@ msgstr ""
 "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
 "przepełnienie dysku"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3250,7 +3250,7 @@ msgstr ""
 "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
 "braku wolnej pamięci"
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3259,7 +3259,7 @@ msgstr ""
 "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
 "przepełnienie dysku"
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index f024d8be4..d7f3bfbee 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -159,7 +159,7 @@ msgid "  Version table:"
 msgstr "  Tabela de Versão:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -643,11 +643,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -688,7 +688,7 @@ msgstr "%s já estava para não manter.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperou por %s mas não estava lá"
@@ -949,7 +949,7 @@ msgstr "Ligação de socket de dados expirou"
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar ligação"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Problema ao calcular o hash do ficheiro"
 
@@ -1083,31 +1083,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Ficheiros vazios não podem ser arquivos válidos"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Erro ao escrever para o ficheiro"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 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:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Erro ao escrever para ficheiro"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "A selecção falhou"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "O tempo da ligação expirou"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Erro ao escrever para o ficheiro de saída"
 
@@ -1115,39 +1115,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Dados de cabeçalho errados"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "A ligação falhou"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -3108,110 +3108,110 @@ msgstr "O sentido %s não é compreendido, tente verdadeiro ou falso."
 msgid "Invalid operation %s"
 msgstr "Operação %s inválida"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "A instalar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "A configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "A remover %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "A remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: 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:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta o directório '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Não foi possível abrir ficheiro o '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "A preparar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "A desempacotar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "A preparar para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "A preparar a remoção de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "%s removido"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "A preparar para remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "Remoção completa de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Não conseguiu escrever para %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "A operação foi interrompida antes de poder terminar"
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependências - deixando por configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3219,7 +3219,7 @@ 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:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3227,7 +3227,7 @@ msgstr ""
 "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
 "cheio"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3235,7 +3235,7 @@ msgstr ""
 "Nenhum relatório apport escrito pois a mensagem de erro indica um erro de "
 "memória esgotada"
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3244,7 +3244,7 @@ msgstr ""
 "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
 "cheio"
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9ee5b71d8..33b30e769 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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."
@@ -160,7 +160,7 @@ msgid "  Version table:"
 msgstr "  Tabela de versão:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -636,11 +636,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -681,7 +681,7 @@ msgstr "%s já é a versão mais nova.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperado %s mas este não estava lá"
@@ -921,7 +921,7 @@ msgstr "Conexão do socket de dados expirou"
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar conexão"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Problema criando o hash do arquivo"
 
@@ -1056,31 +1056,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Erro escrevendo para o arquivo"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Erro lendo do servidor"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Erro escrevendo para arquivo"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Seleção falhou"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Conexão expirou"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Erro escrevendo para arquivo de saída"
 
@@ -1088,39 +1088,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Dados de cabeçalho ruins"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -3044,134 +3044,134 @@ msgstr "Sentido %s não é compreendido, tente verdadeiro ou falso."
 msgid "Invalid operation %s"
 msgstr "Operação %s inválida"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Removendo %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s completamente removido"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Diretório '%s' está faltando"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Não foi possível abrir arquivo %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempacotando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparando para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparando para a remoção de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "%s removido"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparando para remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s completamente removido"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Impossível escrever para %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 88b69ed27..3814df182 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -160,7 +160,7 @@ msgid "  Version table:"
 msgstr "  Tabela de versiuni:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -634,11 +634,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -679,7 +679,7 @@ msgstr "%s este deja la cea mai nouă versiune.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Așteptat %s, dar n-a fost acolo"
@@ -921,7 +921,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:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Problemă la calcularea dispersiei pentru fișierul"
 
@@ -1056,32 +1056,32 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Eroare la scrierea în fișierul"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 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:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Eroare la citirea de la server"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Eroare la scrierea în fișier"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Selecția a eșuat"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Timp de conectare expirat"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Eroare la scrierea fișierului de rezultat"
 
@@ -1089,39 +1089,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Antet de date necorespunzător"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Conectare eșuată"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Eroare internă"
 
@@ -3047,134 +3047,134 @@ msgstr "Sensul %s nu este înțeles, încercați adevărat (true) sau fals (fals
 msgid "Invalid operation %s"
 msgstr "Operațiune invalidă %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Se instalează %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Se configurează %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Se șterge %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Șters complet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directorul „%s” lipsește."
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nu s-a putut deschide fișierul %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Se pregătește %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Se despachetează %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Se pregătește configurarea %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "Instalat %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Se pregătește ștergerea lui %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "Șters %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Se pregătește ștergerea completă a %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "Șters complet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Nu s-a putut scrie în %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 81cc4201c..256554beb 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -163,7 +163,7 @@ msgid "  Version table:"
 msgstr "  Таблица версий:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -646,11 +646,11 @@ msgid "Must specify at least one pair url/filename"
 msgstr ""
 "Укажите как минимум один пакет, исходный код которого необходимо получить"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -691,7 +691,7 @@ msgstr "%s уже помечен как не зафиксированный.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ожидалось завершение процесса %s, но он не был запущен"
@@ -958,7 +958,7 @@ msgstr "Время установления соединения для соке
 msgid "Unable to accept connection"
 msgstr "Невозможно принять соединение"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Проблема при хешировании файла"
 
@@ -1090,31 +1090,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Пустые файлы не могут быть допустимыми архивами"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Ошибка записи в файл"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Ошибка чтения, удалённый сервер прервал соединение"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Ошибка чтения с сервера"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Ошибка записи в файл"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Ошибка в select"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Время ожидания для соединения истекло"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Ошибка записи в выходной файл"
 
@@ -1122,39 +1122,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Неверный заголовок данных"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Соединение разорвано"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
@@ -3118,110 +3118,110 @@ msgstr "Смысл %s не ясен, используйте true или false."
 msgid "Invalid operation %s"
 msgstr "Неверная операция %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Устанавливается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Настраивается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Удаляется %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "Выполняется полное удаление %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Уведомление об исчезновении %s"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Отсутствует каталог «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Не удалось открыть файл «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Подготавливается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Распаковывается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Подготавливается для настройки %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "Установлен %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Подготавливается для удаления %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "Удалён %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Подготовка к полному удалению %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s полностью удалён"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Невозможно записать в %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "Действие прервано до его завершения"
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "проблемы с зависимостями — оставляем ненастроенным"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3229,7 +3229,7 @@ msgstr ""
 "Отчёты apport не записаны, так как сообщение об ошибке указывает на "
 "повторную ошибку от предыдущего отказа."
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3237,7 +3237,7 @@ msgstr ""
 "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
 "места на диске"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3245,7 +3245,7 @@ msgstr ""
 "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
 "памяти"
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3254,7 +3254,7 @@ msgstr ""
 "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
 "места на диске"
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 6a455ea1d..e7d001195 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -160,7 +160,7 @@ msgid "  Version table:"
 msgstr "  Tabuľka verzií:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -635,11 +635,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -680,7 +680,7 @@ msgstr "%s bol už nastavený na nepodržanie.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Čakalo sa na %s, ale nebolo to tam"
@@ -940,7 +940,7 @@ msgstr "Uplynulo spojenie dátového socketu"
 msgid "Unable to accept connection"
 msgstr "Spojenie sa nedá prijať"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Problém s hašovaním súboru"
 
@@ -1070,31 +1070,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Prázdne súbory nemôžu byť platné archívy"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do tohto súboru"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Chyba pri čítaní zo servera"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Chyba zápisu do súboru"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Výber zlyhal"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Uplynul čas spojenia"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupného súboru"
 
@@ -1102,39 +1102,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Zlé dátové záhlavie"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
@@ -3067,110 +3067,110 @@ msgstr "Nezrozumiteľný význam %s, skúste true alebo false. "
 msgid "Invalid operation %s"
 msgstr "Neplatná operácia %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Inštaluje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Nastavuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Odstraňuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "Úplne sa odstraňuje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Zaznamenali sme zmiznutie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Adresár „%s“ chýba"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Nedá sa otvoriť súbor „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Pripravuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozbaľuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Pripravuje sa nastavenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "Nainštalovaný balík %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Pripravuje sa odstránenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "Odstránený balík %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Pripravuje sa úplné odstránenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "Balík „%s“ je úplne odstránený"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Do %s sa nedá zapisovať"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 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:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "problém so závislosťami - ponecháva sa nenakonfigurované"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3178,7 +3178,7 @@ 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:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3186,7 +3186,7 @@ msgstr ""
 "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
 "zaplnený"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3194,7 +3194,7 @@ msgstr ""
 "Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku "
 "pamäte"
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3203,7 +3203,7 @@ msgstr ""
 "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
 "zaplnený"
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index daf96ddaf..c021d51a4 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -158,7 +158,7 @@ msgid "  Version table:"
 msgstr "  Preglednica različic:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -632,11 +632,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -677,7 +677,7 @@ msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Program je čakal na %s a ga ni bilo tam"
@@ -936,7 +936,7 @@ msgstr "Povezava podatkovne vtičnice je zakasnela"
 msgid "Unable to accept connection"
 msgstr "Ni mogoče sprejeti povezave"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Težava med razprševanjem datoteke"
 
@@ -1066,31 +1066,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Prazne datoteke ne morejo biti veljavni arhivi"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Napaka med pisanjem v datoteko"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Napaka med branjem s strežnika. Oddaljeni del je zaprl povezavo"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Napaka med branjem s strežnika"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Napaka med pisanjem v datoteko"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Izbira ni uspela"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Povezava je zakasnela"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Napaka med pisanjem v izhodno datoteko"
 
@@ -1098,39 +1098,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Napačni podatki glave"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Notranja napaka"
 
@@ -3072,111 +3072,111 @@ msgstr "Pomena %s ni mogoče razumeti, poskusite pravilno ali napačno."
 msgid "Invalid operation %s"
 msgstr "Neveljavno opravilo %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Nameščanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Nastavljanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Odstranjevanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s je bil popolnoma odstranjen"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "%s je izginil"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mapa '%s' manjka"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Ni mogoče odpreti datoteke '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Pripravljanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Razširjanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Pripravljanje na nastavljanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "%s je bil nameščen"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Pripravljanje na odstranitev %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "%s je bil odstranjen"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Pripravljanje na popolno odstranitev %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s je bil popolnoma odstranjen"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Ni mogoče pisati na %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo"
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "težave odvisnosti - puščanje nenastavljenega"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3184,7 +3184,7 @@ 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:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3192,7 +3192,7 @@ msgstr ""
 "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
 "polnega diska"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3200,7 +3200,7 @@ msgstr ""
 "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
 "zaradi pomanjkanja pomnilnika"
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
@@ -3208,7 +3208,7 @@ msgstr ""
 "Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na težavo "
 "na krajevnem sistemu"
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index bc79643a5..8217733cd 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -158,7 +158,7 @@ msgid "  Version table:"
 msgstr "  Versionstabell:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -634,11 +634,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -679,7 +679,7 @@ msgstr "%s är redan den senaste versionen.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Väntade på %s men den fanns inte där"
@@ -919,7 +919,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:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Problem med att lägga filen till hashtabellen"
 
@@ -1057,31 +1057,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Fel vid skrivning till filen"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 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:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Fel vid läsning från server"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Fel vid skrivning till fil"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "\"Select\" misslyckades"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Anslutningen överskred tidsgränsen"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Fel vid skrivning till utdatafil"
 
@@ -1089,39 +1089,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Felaktiga data i huvud"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Anslutningen misslyckades"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Internt fel"
 
@@ -3060,110 +3060,110 @@ msgstr "Förstår inte %s, prova med \"true\" eller \"false\"."
 msgid "Invalid operation %s"
 msgstr "Felaktig åtgärd %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Installerar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfigurerar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Tar bort %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "Tar bort hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: 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:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Katalogen \"%s\" saknas"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Kunde inte öppna filen \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Förbereder %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Packar upp %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Förbereder konfigurering av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "Installerade %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Förbereder borttagning av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "Tog bort %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Förbereder borttagning av hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "Tog bort hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Kunde inte skriva till %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "beroendeproblem - lämnar okonfigurerad"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3171,7 +3171,7 @@ 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:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3179,7 +3179,7 @@ msgstr ""
 "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
 "diskutrymmet är slut"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3187,7 +3187,7 @@ msgstr ""
 "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet "
 "är slut"
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3196,7 +3196,7 @@ msgstr ""
 "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
 "diskutrymmet är slut"
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/th.po b/po/th.po
index b06bedffc..155ab5709 100644
--- a/po/th.po
+++ b/po/th.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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -156,7 +156,7 @@ msgid "  Version table:"
 msgstr "  ตารางรุ่น:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -621,11 +621,11 @@ msgstr "ต้องการ URL หนึ่งรายการเป็น
 msgid "Must specify at least one pair url/filename"
 msgstr "ต้องระบุคู่ URL, ชื่อแฟ้ม อย่างน้อยหนึ่งคู่"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr "ดาวน์โหลดไม่สำเร็จ"
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -676,7 +676,7 @@ msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
@@ -953,7 +953,7 @@ msgstr "หมดเวลารอเชื่อมต่อซ็อกเก
 msgid "Unable to accept connection"
 msgstr "ไม่สามารถรับการเชื่อมต่อ"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม"
 
@@ -1083,31 +1083,31 @@ msgstr "ลายเซ็นต่อไปนี้ไม่สามารถ
 msgid "Empty files can't be valid archives"
 msgstr "แฟ้มว่างเปล่าไม่สามารถเป็นแฟ้มจัดเก็บที่ใช้การได้"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "select ไม่สำเร็จ"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "หมดเวลารอเชื่อมต่อ"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์"
 
@@ -1115,39 +1115,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "ข้อมูลส่วนหัวผิดพลาด"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "เชื่อมต่อไม่สำเร็จ"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "ข้อผิดพลาดภายใน"
 
@@ -3023,136 +3023,136 @@ msgstr "ไม่เข้าใจค่าบูลีน %s กรุณา
 msgid "Invalid operation %s"
 msgstr "ไม่รู้จักคำสั่ง %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "กำลังติดตั้ง %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "กำลังตั้งค่า %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "กำลังถอดถอน %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "กำลังถอดถอน %s อย่างสมบูรณ์"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "กำลังจดบันทึกการหายไปของ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ไม่มีไดเรกทอรี '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "ไม่สามารถเปิดแฟ้ม '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "กำลังเตรียม %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "กำลังแตกแพกเกจ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "กำลังเตรียมตั้งค่า %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "ติดตั้ง %s แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "กำลังเตรียมถอดถอน %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "ถอดถอน %s แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, c-format
 msgid "Can not write log (%s)"
 msgstr "ไม่สามารถเขียนปูม (%s)"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr "ได้เมานท์ /dev/pts ไว้หรือไม่?"
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ"
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 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:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม"
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากปัญหาของระบบในเครื่อง"
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/tl.po b/po/tl.po
index 510158ce1..0b2947983 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -162,7 +162,7 @@ msgid "  Version table:"
 msgstr "  Talaang Bersyon:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -631,11 +631,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -676,7 +676,7 @@ msgstr "%s ay pinakabagong bersyon na.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Naghintay, para sa %s ngunit wala nito doon"
@@ -916,7 +916,7 @@ msgstr "Nag-timeout ang socket ng datos"
 msgid "Unable to accept connection"
 msgstr "Hindi makatanggap ng koneksyon"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Problema sa pag-hash ng talaksan"
 
@@ -1050,31 +1050,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Error sa pagsusulat sa talaksan"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Error sa pagbasa mula sa server"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Error sa pagsulat sa talaksan"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Bigo ang pagpili"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Nag-timeout ang koneksyon"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Error sa pagsulat ng talaksang output"
 
@@ -1082,39 +1082,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Maling datos sa panimula"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Bigo ang koneksyon"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Internal na error"
 
@@ -3031,134 +3031,134 @@ msgstr "Hindi naintindihan ang %s, subukan ang true o false."
 msgid "Invalid operation %s"
 msgstr "Di tanggap na operasyon %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "Iniluklok ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Isasaayos ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Tinatanggal ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Natanggal ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Nawawala ang directory ng talaan %spartial."
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Hindi mabuksan ang talaksang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Hinahanda ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Binubuklat ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Hinahanda ang %s upang isaayos"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "Iniluklok ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Naghahanda para sa pagtanggal ng %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "Tinanggal ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "Natanggal ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Hindi makapagsulat sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 0c3de2a46..f2a070302 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -160,7 +160,7 @@ msgid "  Version table:"
 msgstr "  Sürüm çizelgesi:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -641,11 +641,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr "İndirme Başarısız"
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -696,7 +696,7 @@ msgstr "%s zaten tutulmayacak şekilde ayarlanmış.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s için beklenildi ama o gelmedi"
@@ -978,7 +978,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:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Dosya sağlaması yapılamadı"
 
@@ -1108,31 +1108,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:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Dosyaya yazılamadı"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Sunucundan okunurken hata. Uzak sonlu kapalı bağlantı"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Sunucundan okunurken hata"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Dosyaya yazılamadı"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Seçme başarısız"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Bağlantı zaman aşımına uğradı"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Çıktı dosyasına yazılırken hata"
 
@@ -1140,39 +1140,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Kötü başlık verisi"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Bağlantı başarısız"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "İç hata"
 
@@ -3123,111 +3123,111 @@ msgstr "%s algılaması anlaşılamadı, true (doğru) ya da false (yanlış) de
 msgid "Invalid operation %s"
 msgstr "Geçersiz işlem: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "%s kuruluyor"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "%s yapılandırılıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "%s kaldırılıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s tamamen kaldırılıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: 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:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "'%s' dizini bulunamadı"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "'%s' dosyası açılamadı"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "%s hazırlanıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s paketi açılıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s paketini yapılandırmaya hazırlanılıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "%s kuruldu"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s paketinin kaldırılmasına hazırlanılıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "%s kaldırıldı"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, 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:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s tamamen kaldırıldı"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, c-format
 msgid "Can not write log (%s)"
 msgstr "Günlük dosyasına yazılamıyor (%s)"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr "/dev/pts bağlı mı?"
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "İşlem yarıda kesildi"
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 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:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3235,14 +3235,14 @@ msgstr ""
 "Apport raporu yazılmadı çünkü hata iletisi bu durumun bir önceki hatadan "
 "kaynaklanan bir hata olduğunu belirtiyor."
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 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:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3250,7 +3250,7 @@ msgstr ""
 "Hata iletisi bir bellek yetersizliği hatasına işaret ettiği için apport "
 "raporu yazılamadı"
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
@@ -3258,7 +3258,7 @@ msgstr ""
 "Hata iletisi yerel bir sistem hatasına işaret ettiği için apport raporu "
 "yazılamadı"
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index b63e6d039..24291e8f2 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -165,7 +165,7 @@ msgid "  Version table:"
 msgstr "  Таблиця версій:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -649,11 +649,11 @@ msgstr ""
 "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
 "тексти"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -694,7 +694,7 @@ msgstr "%s вже був незафіксований.\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Очікував на %s, але його там не було"
@@ -956,7 +956,7 @@ msgstr "Час з'єднання з сокетом даних вичерпавс
 msgid "Unable to accept connection"
 msgstr "Неможливо прийняти з'єднання"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Проблема хешування файла"
 
@@ -1088,31 +1088,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr "Пусті файли не можуть бути правильними архівами"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Помилка запису у файл"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Помилка зчитування з сервера. Віддалена сторона закрила з'єднання"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Помилка зчитування з сервера"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Помилка запису у файл"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Вибір провалився"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Час очікування з'єднання вийшов"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Помилка запису у вихідний файл"
 
@@ -1120,39 +1120,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Погана заголовкова інформація"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "З'єднання не вдалося"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
@@ -3111,112 +3111,112 @@ msgstr "Незрозумілий вираз %s, спробуйте true чи fal
 msgid "Invalid operation %s"
 msgstr "Невірна дія %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Встановлюється %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Налаштовується %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Видаляється %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "Повністю видаляється %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Взято до відома зникнення %s"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Директорія '%s' відсутня"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Неможливо відкрити файл '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Підготовка %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Розпакування %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Підготовка до конфігурації %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "Встановлено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Підготовка до видалення %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "Видалено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Підготовка до повного видалення %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "Повністю видалено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Неможливо записати в %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "Операцію було перервано до того, як вона мала завершитися"
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "проблеми з залежностями - залишено неналаштованим"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3224,7 +3224,7 @@ msgstr ""
 "Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, "
 "що ця помилка є наслідком попередньої невдачі."
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3232,7 +3232,7 @@ msgstr ""
 "Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
 "відсутність вільного місця на диску"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3240,7 +3240,7 @@ msgstr ""
 "Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
 "відсутність вільного місця у пам'яті"
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3249,7 +3249,7 @@ msgstr ""
 "Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
 "відсутність вільного місця на диску"
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 416a9631d..b5c7a517a 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -162,7 +162,7 @@ msgid "  Version table:"
 msgstr "  Bảng phiên bản:"
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -653,11 +653,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:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr "Gặp lỗi khi tải về"
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -708,7 +708,7 @@ 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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Cần %s nhưng mà không thấy nó ở đây"
@@ -993,7 +993,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:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Gặp vấn đề băm tập tin"
 
@@ -1125,31 +1125,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:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "Gặp lỗi khi ghi vào tập tin"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 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:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "Gặp lỗi khi đọc từ máy phục vụ"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "Gặp lỗi khi ghi vào tập tin"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "Việc chọn bị lỗi"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "Kết nối đã quá giờ"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "Gặp lỗi khi ghi vào tập tin đầu ra"
 
@@ -1157,43 +1157,43 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "Dữ liệu phần đầu sai"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "Kết nối bị lỗi"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "Gặp lỗi nội bộ"
 
@@ -3120,111 +3120,111 @@ msgstr "Không hiểu %s: hãy thử dùng true (đúng) hoặc false (sai)."
 msgid "Invalid operation %s"
 msgstr "Thao tác “%s” không hợp lệ"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "Đang cài đặt %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "Đang cấu hình %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "Đang gỡ bỏ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: 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:114
+#: 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:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Thiếu thư mục “%s”"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Không thể mở tập tin “%s”"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "Đang chuẩn bị %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "Đang mở gói %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Đang chuẩn bị cấu hình %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "Đã cài đặt %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Đang chuẩn bị gỡ bỏ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "Đã gỡ bỏ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, 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:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "Gỡ bỏ hoàn toàn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, c-format
 msgid "Can not write log (%s)"
 msgstr "Không thể ghi nhật ký (%s)"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr "/dev/pts đã gắn chưa?"
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 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:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 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:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3232,14 +3232,14 @@ 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:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 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:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3247,7 +3247,7 @@ 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:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
@@ -3255,7 +3255,7 @@ 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:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 97a902914..55c4c221a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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"
@@ -158,7 +158,7 @@ msgid "  Version table:"
 msgstr "  版本列表："
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -623,11 +623,11 @@ msgstr "需要一个 URL 作为参数"
 msgid "Must specify at least one pair url/filename"
 msgstr "必须指定至少一对URL或者文件名"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr "下载失败"
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -678,7 +678,7 @@ msgstr "%s 已经设置为不保留。\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "等待子进程 %s 的退出，但是它并不存在"
@@ -957,7 +957,7 @@ msgstr "数据套接字连接超时"
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "把文件加入哈希表时出错"
 
@@ -1065,8 +1065,7 @@ msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)"
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
-msgstr ""
-"明文签署文件不可用，结果为‘%s’（您的网络需要认证吗？）"
+msgstr "明文签署文件不可用，结果为‘%s’（您的网络需要认证吗？）"
 
 #: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
@@ -1086,31 +1085,31 @@ msgstr "由于没有公钥，无法验证下列签名：\n"
 msgid "Empty files can't be valid archives"
 msgstr "空文件不能当作有效归档"
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "写入文件出错"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "写入文件出错"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "select 调用出错"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "连接超时"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 
@@ -1118,39 +1117,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "错误的报头数据"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "内部错误"
 
@@ -3023,134 +3022,134 @@ msgstr "不能识别参数 %s，请用 true 或 false"
 msgid "Invalid operation %s"
 msgstr "无效的操作 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "正在安装 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "正在配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "正在删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Completely removing %s"
 msgstr "完全删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "注意到 %s 已经消失"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "目录 %s 缺失"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "无法打开文件 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "正在准备 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解压缩 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "已安装 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在准备 %s 的删除操作"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "已删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在准备完全删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, c-format
 msgid "Can not write log (%s)"
 msgstr "无法写入日志 (%s)"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr "/dev/pts 挂载了吗？"
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr "操作在完成之前被打断"
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 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:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr "依赖问题 - 保持未配置"
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 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:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr "错误信息显示本地系统有一些问题，因此没有写入 apport 报告"
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。"
@@ -3544,7 +3543,6 @@ msgstr ""
 "  -c=? 读取指定配置文件\n"
 "  -o=? 设置任意配置项，比如 -o dir::cache=/tmp\n"
 
-
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "未知的软件包记录！"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 48e352971..40a09adad 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-12-03 14:47+0100\n"
+"POT-Creation-Date: 2014-12-23 13:28+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."
@@ -158,7 +158,7 @@ msgid "  Version table:"
 msgstr "  版本列表："
 
 #: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:73 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
 #: cmdline/apt-sortpkgs.cc:147
@@ -616,11 +616,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "在取得原始碼時必須至少指定一個套件"
 
-#: cmdline/apt-helper.cc:67
+#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:80
+#: cmdline/apt-helper.cc:91
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -661,7 +661,7 @@ msgstr "%s 已經是最新版本了。\n"
 
 #: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
 #: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1304
+#: apt-pkg/deb/dpkgpm.cc:1317
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "等待 %s 但是它並不存在"
@@ -899,7 +899,7 @@ msgstr "Data socket 連線逾時"
 msgid "Unable to accept connection"
 msgstr "無法接受連線"
 
-#: methods/ftp.cc:877 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "有問題的雜湊檔"
 
@@ -1028,31 +1028,31 @@ msgstr "由於無法取得它們的公鑰，以下簽章無法進行驗證：\n"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:511
+#: methods/http.cc:513
 msgid "Error writing to the file"
 msgstr "在寫入該檔時發生錯誤"
 
-#: methods/http.cc:525
+#: methods/http.cc:527
 msgid "Error reading from server. Remote end closed connection"
 msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線"
 
-#: methods/http.cc:527
+#: methods/http.cc:529
 msgid "Error reading from server"
 msgstr "在讀取伺服器時發生錯誤"
 
-#: methods/http.cc:563
+#: methods/http.cc:565
 msgid "Error writing to file"
 msgstr "在寫入檔案時發生錯誤"
 
-#: methods/http.cc:623
+#: methods/http.cc:625
 msgid "Select failed"
 msgstr "選擇失敗"
 
-#: methods/http.cc:628
+#: methods/http.cc:630
 msgid "Connection timed out"
 msgstr "連線逾時"
 
-#: methods/http.cc:651
+#: methods/http.cc:653
 msgid "Error writing to output file"
 msgstr "在寫入輸出檔時發生錯誤"
 
@@ -1060,39 +1060,39 @@ 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:490
+#: methods/server.cc:494
 msgid "Bad header data"
 msgstr "錯誤的標頭資料"
 
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: methods/server.cc:655
+#: methods/server.cc:659
 msgid "Internal error"
 msgstr "內部錯誤"
 
@@ -2969,134 +2969,134 @@ msgstr "偵測器 %s 無法理解，試試 true 或 false。"
 msgid "Invalid operation %s"
 msgstr "無效的操作 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/deb/dpkgpm.cc:112
 #, c-format
 msgid "Installing %s"
 msgstr "正在安裝 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Configuring %s"
 msgstr "正在設定 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023
 #, c-format
 msgid "Removing %s"
 msgstr "正在移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "已完整移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: 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:845
+#: apt-pkg/deb/dpkgpm.cc:847
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "找不到 '%s' 目錄"
 
-#: apt-pkg/deb/dpkgpm.cc:860 apt-pkg/deb/dpkgpm.cc:882
+#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "無法開啟檔案 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Preparing %s"
 msgstr "正在準備 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:1010
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解開 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1013
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在準備設定 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1017
 #, c-format
 msgid "Installed %s"
 msgstr "已安裝 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在準備移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1024
 #, c-format
 msgid "Removed %s"
 msgstr "已移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1027
+#: apt-pkg/deb/dpkgpm.cc:1029
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在準備完整移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1028
+#: apt-pkg/deb/dpkgpm.cc:1030
 #, c-format
 msgid "Completely removed %s"
 msgstr "已完整移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "無法寫入 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1657
+#: apt-pkg/deb/dpkgpm.cc:1670
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1719
+#: apt-pkg/deb/dpkgpm.cc:1732
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1724
+#: apt-pkg/deb/dpkgpm.cc:1737
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1726
+#: apt-pkg/deb/dpkgpm.cc:1739
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: apt-pkg/deb/dpkgpm.cc:1745
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1752
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1746 apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1774
+#: apt-pkg/deb/dpkgpm.cc:1787
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
-- 
cgit v1.2.3-70-g09d2


From 9127d7aecf01f2999a2589e4b0503288518b2927 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Mon, 5 Jan 2015 10:27:53 +0100
Subject: Fix missing URIStart() for https downloads

Add a explicit ReceivedData to HttpsMethod that indicates when
we got data from the connection so that we can send URISTart()
to the parent.

This is needed because URIStart got moved in f9b4f12d from
the progress_callback to write_data() and it only checks for
Res.Size. In the old code if progress_callback is called by
libcurl (and sets Res.Size) before write_data is called then
URIStart() is never send. Making this a explicit ReceivedData
variable fixes this issue.
---
 methods/https.cc | 9 +++++++--
 methods/https.h  | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/methods/https.cc b/methods/https.cc
index 65a744e2a..3a5981b58 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -85,8 +85,12 @@ HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
    if (me->Server->JunkSize != 0)
       return buffer_size;
 
-   if (me->Res.Size == 0)
+   if (me->ReceivedData == false)
+   {
       me->URIStart(me->Res);
+      me->ReceivedData = true;
+   }
+
    if(me->File->Write(buffer, buffer_size) != true)
       return false;
 
@@ -95,7 +99,7 @@ HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
 
 int
 HttpsMethod::progress_callback(void *clientp, double dltotal, double /*dlnow*/,
-			      double /*ultotal*/, double /*ulnow*/)
+                             double /*ultotal*/, double /*ulnow*/)
 {
    HttpsMethod *me = (HttpsMethod *)clientp;
    if(dltotal > 0 && me->Res.Size == 0) {
@@ -179,6 +183,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    char curl_errorstr[CURL_ERROR_SIZE];
    URI Uri = Itm->Uri;
    string remotehost = Uri.Host;
+   ReceivedData = false;
 
    // TODO:
    //       - http::Pipeline-Depth
diff --git a/methods/https.h b/methods/https.h
index faac8a3cd..411b71440 100644
--- a/methods/https.h
+++ b/methods/https.h
@@ -66,6 +66,7 @@ class HttpsMethod : public pkgAcqMethod
    CURL *curl;
    FetchResult Res;
    HttpsServerState *Server;
+   bool ReceivedData;
 
    public:
    FileFd *File;
-- 
cgit v1.2.3-70-g09d2


From d13f2ef5dd2cf41d7abd7f309a9e8965a77d2a63 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Tue, 6 Jan 2015 10:54:24 +0100
Subject: Add regression test for the previous commit

The issue was that https.cc never called URIStart(), one way to
detect this is that no download progress is generated without
this call. The test now checks for this and as a side-effect will
also ensure that we do not break download progress reporting and
Acquire::{http,https}::Dl-Limit accidently.
---
 test/integration/test-apt-download-progress | 43 +++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100755 test/integration/test-apt-download-progress

diff --git a/test/integration/test-apt-download-progress b/test/integration/test-apt-download-progress
new file mode 100755
index 000000000..0a9020bec
--- /dev/null
+++ b/test/integration/test-apt-download-progress
@@ -0,0 +1,43 @@
+#!/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:[0-9]{1,2}\.(.*):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"
+    #cat $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 
+
+msgtest 'download progress works via' 'http'
+printf '\n'
+exec 3> apt-progress.log
+testsuccess apthelper download-file "http://localhost:8080/$TESTFILE" http-$TESTFILE -o APT::Status-Fd=3 -o Acquire::http::Dl-Limit=800
+assertprogress apt-progress.log
+
+msgtest 'download progress works via' 'https'
+printf '\n'
+exec 3> apt-progress.log
+testsuccess apthelper download-file "https://localhost:4433/$TESTFILE" https-$TESTFILE -o APT::Status-Fd=3 -o Acquire::https::Dl-Limit=800
+assertprogress apt-progress.log
+
+# cleanup
+rm -f apt-progress*.log
-- 
cgit v1.2.3-70-g09d2


From 31be38d205406d4c756684e20b93d62c4701e091 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Fri, 9 Jan 2015 01:03:31 +0100
Subject: 128 KiB DSC files ought to be enough for everyone

Your mileage may vary, but don't worry: There is more than one way to
do it, but our one size fits all is not a bigger hammer, but an entire
roundhouse kick! So brace yourself for the tl;dr: The limit is gone.*

Beware: This fixes also the problem that a double newline is
unconditionally added 'later' which is an overcommitment in case
the dsc filesize is limit-2 <= x <= limit.

* limited to numbers fitting into an unsigned long long.

Closes: 774893
---
 ftparchive/cachedb.cc                            |  6 ++--
 ftparchive/sources.cc                            | 41 ++++++++++++++++--------
 ftparchive/sources.h                             | 26 ++++++---------
 ftparchive/writer.cc                             | 12 ++-----
 test/integration/framework                       |  2 +-
 test/integration/test-apt-ftparchive-src-cachedb |  4 ---
 6 files changed, 42 insertions(+), 49 deletions(-)

diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index 0901492f7..c73a64fb7 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -328,12 +328,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;
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 91e0b1376..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) {
-     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 7c1c9cc03..0f6cc177b 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -634,18 +634,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();
diff --git a/test/integration/framework b/test/integration/framework
index c9445065b..70ad381e9 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -780,7 +780,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
diff --git a/test/integration/test-apt-ftparchive-src-cachedb b/test/integration/test-apt-ftparchive-src-cachedb
index adcca6217..0ac4d558f 100755
--- a/test/integration/test-apt-ftparchive-src-cachedb
+++ b/test/integration/test-apt-ftparchive-src-cachedb
@@ -180,10 +180,6 @@ 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 
-- 
cgit v1.2.3-70-g09d2


From 77b6f202e1629b7794a03b6522d636ff1436d074 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 10 Jan 2015 12:31:18 +0100
Subject: award points for positive dependencies again

Commit 9ec748ff103840c4c65471ca00d3b72984131ce4 from Feb 23 last year
adds a version check after 8daf68e366fa9fa2794ae667f51562663856237c
added 8 days earlier negative points for breaks/conflicts with the
intended that only dependencies which are satisfied propagate points
(aka: old conflicts do not).

The implementation was needlessly complex and flawed through preventing
positive dependencies from gaining points like they did before these
commits making library transitions harder instead of simpler. It worked
out anyhow most of the time out of pure 'luck' (and other ways of
gaining points) or got miss attributed to being a temporary hick-up.

Closes: 774924
---
 apt-pkg/algorithms.cc                              |  2 +-
 .../test-allow-scores-for-all-dependency-types     | 28 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 608ec7fce..b83831053 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];
diff --git a/test/integration/test-allow-scores-for-all-dependency-types b/test/integration/test-allow-scores-for-all-dependency-types
index a5c98f3d6..d60cb8daf 100755
--- a/test/integration/test-allow-scores-for-all-dependency-types
+++ b/test/integration/test-allow-scores-for-all-dependency-types
@@ -32,6 +32,11 @@ 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
 
@@ -142,3 +147,26 @@ 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'
+testequal 'Reading package lists...
+Building dependency tree...
+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
-- 
cgit v1.2.3-70-g09d2


From cb7afb1386c678685b5eff53c3cbff1ec7059ef4 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Fri, 16 Jan 2015 04:38:46 -0500
Subject: prepare 1.0.9.6

---
 configure.ac         |    2 +-
 debian/changelog     |   12 +
 doc/apt-verbatim.ent |    2 +-
 doc/po/apt-doc.pot   |    2 +-
 po/apt-all.pot       |  980 +++++++++++++++++++++++-----------------------
 po/ar.po             |  996 +++++++++++++++++++++++-----------------------
 po/ast.po            |  986 +++++++++++++++++++++++-----------------------
 po/bg.po             | 1052 ++++++++++++++++++++++++-------------------------
 po/bs.po             |  988 +++++++++++++++++++++++-----------------------
 po/ca.po             |  994 +++++++++++++++++++++++-----------------------
 po/cs.po             | 1020 ++++++++++++++++++++++++------------------------
 po/cy.po             | 1012 +++++++++++++++++++++++------------------------
 po/da.po             | 1002 +++++++++++++++++++++++------------------------
 po/de.po             | 1002 +++++++++++++++++++++++------------------------
 po/dz.po             | 1002 +++++++++++++++++++++++------------------------
 po/el.po             |  986 +++++++++++++++++++++++-----------------------
 po/es.po             | 1058 ++++++++++++++++++++++++-------------------------
 po/eu.po             | 1002 +++++++++++++++++++++++------------------------
 po/fi.po             | 1004 +++++++++++++++++++++++------------------------
 po/fr.po             | 1012 +++++++++++++++++++++++------------------------
 po/gl.po             |  994 +++++++++++++++++++++++-----------------------
 po/hu.po             | 1004 +++++++++++++++++++++++------------------------
 po/it.po             | 1006 +++++++++++++++++++++++------------------------
 po/ja.po             | 1016 +++++++++++++++++++++++------------------------
 po/km.po             | 1004 +++++++++++++++++++++++------------------------
 po/ko.po             | 1000 +++++++++++++++++++++++------------------------
 po/ku.po             | 1002 +++++++++++++++++++++++------------------------
 po/lt.po             | 1002 +++++++++++++++++++++++------------------------
 po/mr.po             |  982 +++++++++++++++++++++++-----------------------
 po/nb.po             | 1002 +++++++++++++++++++++++------------------------
 po/ne.po             | 1002 +++++++++++++++++++++++------------------------
 po/nl.po             |  996 +++++++++++++++++++++++-----------------------
 po/nn.po             | 1006 +++++++++++++++++++++++------------------------
 po/pl.po             |  990 +++++++++++++++++++++++-----------------------
 po/pt.po             | 1062 +++++++++++++++++++++++++-------------------------
 po/pt_BR.po          |  994 +++++++++++++++++++++++-----------------------
 po/ro.po             |  988 +++++++++++++++++++++++-----------------------
 po/ru.po             |  992 +++++++++++++++++++++++-----------------------
 po/sk.po             | 1004 +++++++++++++++++++++++------------------------
 po/sl.po             | 1000 +++++++++++++++++++++++------------------------
 po/sv.po             | 1010 +++++++++++++++++++++++------------------------
 po/th.po             |  996 +++++++++++++++++++++++-----------------------
 po/tl.po             |  986 +++++++++++++++++++++++-----------------------
 po/tr.po             | 1008 +++++++++++++++++++++++------------------------
 po/uk.po             |  998 +++++++++++++++++++++++------------------------
 po/vi.po             | 1008 +++++++++++++++++++++++------------------------
 po/zh_CN.po          |  984 +++++++++++++++++++++++-----------------------
 po/zh_TW.po          | 1002 +++++++++++++++++++++++------------------------
 48 files changed, 22082 insertions(+), 22070 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5774ed67a..d728e5e6c 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.0.9.5"
+PACKAGE_VERSION="1.0.9.6"
 PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
diff --git a/debian/changelog b/debian/changelog
index 9b1e1a41b..4e6d385d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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 ]
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 5f380377c..e88d39332 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -225,7 +225,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.0.9.5">
+<!ENTITY apt-product-version "1.0.9.6">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "wheezy">
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 72857de9f..c403ad8e4 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.9.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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/po/apt-all.pot b/po/apt-all.pot
index 7e5e3aef5..3822dd9db 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.9.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -998,246 +998,10 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1422,61 +1186,297 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
+#: apt-private/private-install.cc:659
+msgid "Broken packages"
+msgstr ""
+
+#: apt-private/private-install.cc:712
+msgid "The following extra packages will be installed:"
+msgstr ""
+
+#: apt-private/private-install.cc:802
+msgid "Suggested packages:"
+msgstr ""
+
+#: apt-private/private-install.cc:803
+msgid "Recommended packages:"
+msgstr ""
+
+#: apt-private/private-install.cc:825
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:829
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:841
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:846
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:894
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr ""
+
+#: apt-private/private-install.cc:899
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr ""
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+
+#: apt-private/private-install.cc:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr ""
+
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:111
+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-install.cc:712
-msgid "The following extra packages will be installed:"
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
+#. 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 ""
 
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
+#. 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 ""
 
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
 msgstr ""
 
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+#. 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-install.cc:841
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
 #, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgid "Regex compilation error - %s"
 msgstr ""
 
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
 msgstr ""
 
-#: apt-private/private-install.cc:894
+#: apt-private/private-update.cc:97
 #, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
+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-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+#: apt-private/private-update.cc:101
+msgid "All packages are up to date."
 msgstr ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
+#: apt-private/private-show.cc:156
 #, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+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-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
+#: 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:36
@@ -1559,8 +1559,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1854,26 +1854,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -1967,182 +1947,55 @@ msgstr ""
 msgid "extra"
 msgstr ""
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-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)"
-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 ""
-
-#: 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:490
-#, c-format
-msgid "Clean of %s is not supported"
-msgstr ""
-
-#: apt-pkg/clean.cc:64
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
+msgid "The method driver %s could not be found."
 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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgid "Is the package %s installed?"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
 msgstr ""
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
@@ -2221,6 +2074,79 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2253,6 +2179,12 @@ msgstr ""
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2298,10 +2230,9 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 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."
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
 msgstr ""
 
 #: apt-pkg/cdrom.cc:571
@@ -2391,30 +2322,24 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr ""
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
 msgstr ""
 
 #: apt-pkg/tagfile.cc:140
@@ -2427,6 +2352,106 @@ msgstr ""
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:149
+#, 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)"
+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 ""
+
+#: 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:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2479,31 +2504,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3184,22 +3184,22 @@ msgstr ""
 msgid "Archive had no package field"
 msgstr ""
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 921e1699c..a22a38f33 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1011,251 +1011,10 @@ msgstr "فشل الاتصال"
 msgid "Internal error"
 msgstr "خطأ داخلي"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "تصحيح المعتمدات..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " فشل."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "لم يمكن تصحيح المعتمدات"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "لم يمكن تقليص مجموعة الترقية"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " تم"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه."
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
@@ -1469,41 +1228,282 @@ msgstr "الحزم المستحسنة:"
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
 
-#: apt-private/private-install.cc:829
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
+#: apt-private/private-install.cc:829
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
+
+#: apt-private/private-install.cc:841
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "إعادة تثبيت  %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n"
+
+#: apt-private/private-install.cc:846
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s هي النسخة الأحدث.\n"
+
+#: apt-private/private-install.cc:894
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
+
+#: apt-private/private-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
+
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "تصحيح المعتمدات..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " فشل."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "لم يمكن تصحيح المعتمدات"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "لم يمكن تقليص مجموعة الترقية"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " تم"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه."
+
+#: apt-private/private-cachefile.cc:111
+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-install.cc:841
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
 #, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "إعادة تثبيت  %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n"
+msgid "Regex compilation error - %s"
+msgstr ""
 
-#: apt-private/private-install.cc:846
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "لا يقبل الأمر update أية مُعطيات"
+
+#: apt-private/private-update.cc:97
 #, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s هي النسخة الأحدث.\n"
+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-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
+#: apt-private/private-update.cc:101
+msgid "All packages are up to date."
+msgstr ""
 
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
+#: 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] ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
+#: 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:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1588,8 +1588,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1885,26 +1885,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum غير متطابقة"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -1998,183 +1978,57 @@ msgstr "اختياري"
 msgid "extra"
 msgstr "إضافي"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-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)"
-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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Is the package %s installed?"
 msgstr ""
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "نظام الحزم '%s' غير مدعوم"
-
-#: apt-pkg/clean.cc:64
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "الرجاء إدخال القرص المُسمّى  '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "قراءة قوائم الحزم"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "تعذرت الكتابة إلى %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "دمج المعلومات المتوفرة"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "فشل فتح %s"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "فشلت كتابة الملف %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2254,6 +2108,79 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "نظام الحزم '%s' غير مدعوم"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "قراءة قوائم الحزم"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "تعذرت الكتابة إلى %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2286,6 +2213,12 @@ msgstr ""
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2331,10 +2264,9 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 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."
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
 msgstr ""
 
 #: apt-pkg/cdrom.cc:571
@@ -2426,32 +2358,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "دمج المعلومات المتوفرة"
-
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "فشل فتح %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "فشلت كتابة الملف %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2463,6 +2388,106 @@ msgstr ""
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "لاحظ، تحديد %s بدلاً من %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "لاحظ، تحديد %s بدلاً من %s\n"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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 ""
+
+#: 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:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2515,31 +2540,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-
-#: apt-pkg/indexrecords.cc:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3224,22 +3224,22 @@ msgstr ""
 msgid "Archive had no package field"
 msgstr ""
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
diff --git a/po/ast.po b/po/ast.po
index fceca5e5e..0e013f9fe 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1120,256 +1120,10 @@ msgstr "Fallo la conexón"
 msgid "Internal error"
 msgstr "Fallu internu"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Iguando dependencies..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " falló."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nun pudieron iguase les dependencies"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nun pue amenorgase'l conxuntu d'actualización"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fecho"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!"
@@ -1633,13 +1387,259 @@ 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-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVISU: ¡Nun pudieron autenticase los siguientes paquetes!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Avisu d'autenticación saltáu.\n"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Iguando dependencies..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " falló."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nun pudieron iguase les dependencies"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nun pue amenorgase'l conxuntu d'actualización"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fecho"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVISU: ¡Nun pudieron autenticase los siguientes paquetes!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Avisu d'autenticación saltáu.\n"
 
 #: apt-private/private-download.cc:45 apt-private/private-download.cc:52
 msgid "Some packages could not be authenticated"
@@ -1716,8 +1716,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2018,26 +2018,6 @@ 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:116
-#, 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:118
-#, 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:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El métodu %s nun entamó correchamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -2133,93 +2113,139 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada"
+msgid "The method driver %s could not be found."
+msgstr "Nun pudo alncontrase'l controlador de métodu %s."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, 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)"
+msgid "Is the package %s installed?"
+msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/acquire-worker.cc:169
 #, 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)"
+msgid "Method %s did not start correctly"
+msgstr "El métodu %s nun entamó correchamente"
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/acquire-worker.cc:455
 #, 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)"
+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/sourcelist.cc:184
+#: apt-pkg/pkgrecords.cc:38
 #, 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)"
+msgid "Index file type '%s' is not supported"
+msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada"
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Creando árbol de dependencies"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versiones candidates"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Xeneración de dependencies"
+
+#: 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/depcache.cc:250
 #, 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)"
+msgid "Failed to open StateFile %s"
+msgstr "Nun se pudo abrir el ficheru d'estáu %s"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Llinia %lu mal formada na llista d'oríxenes %s (URI)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falló la escritura del ficheru temporal d'estáu %s"
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "falló'l cambiu de nome, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "La suma hash nun concasa"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "El tamañu nun concasa"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Operación incorreuta: %s"
+
+#: apt-pkg/acquire-item.cc:1640
 #, 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)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1656
+#, 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:1698
+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:1736
 #, 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)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, 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)"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)"
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "Abriendo %s"
+msgid ""
+"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"
+msgstr ""
+"Hebo un fallu durante la verificación de la robla. El repositoriu nun ta "
+"anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Llinia %u enforma llarga na llista d'oríxenes %s."
+msgid "GPG error: %s: %s"
+msgstr "Fallu GPG: %s: %s"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)"
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
+"necesites iguar manualmente esti paquete (por faltar una arquitectura)"
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, 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"
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
 
-#: 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/acquire-item.cc:2050
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal "
+"paquete %s."
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2295,109 +2321,6 @@ msgstr "Nun se pue escribir en %s"
 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "falló'l cambiu de nome, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "La suma hash nun concasa"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "El tamañu nun concasa"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Operación incorreuta: %s"
-
-#: apt-pkg/acquire-item.cc:1640
-#, 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:1656
-#, 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:1698
-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:1736
-#, 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:1758
-#, 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:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-"Hebo un fallu durante la verificación de la robla. El repositoriu nun ta "
-"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:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Fallu GPG: %s: %s"
-
-#: apt-pkg/acquire-item.cc:1926
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
-"necesites iguar manualmente esti paquete (por faltar una arquitectura)"
-
-#: apt-pkg/acquire-item.cc:1992
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal "
-"paquete %s."
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2430,6 +2353,15 @@ msgstr "Descargando ficheru %li de %li (falten %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list"
@@ -2481,14 +2413,10 @@ 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/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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2586,31 +2514,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Creando árbol de dependencies"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versiones candidates"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Xeneración de dependencies"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nun se pudo abrir el ficheru d'estáu %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falló la escritura del ficheru temporal d'estáu %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2622,6 +2544,109 @@ msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nun se pudo parchear el ficheru release %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Ensin seiciones nel ficheru release %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Ensin entrada Hash nel ficheru release %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2682,31 +2707,6 @@ 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/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nun se pudo parchear el ficheru release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Ensin seiciones nel ficheru release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ensin entrada Hash nel ficheru release %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Entrada inválida pa 'Date' nel ficheru release %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3463,22 +3463,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:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nun tien la entrada saltos\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  el curiador de %s ye %s y non %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nun tien la entrada saltos de fonte\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s tampoco nun tiene una entrada binaria de saltos\n"
diff --git a/po/bg.po b/po/bg.po
index 224f9da4a..fc1d7b08a 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1152,257 +1152,10 @@ msgstr "Неуспех при свързването"
 msgid "Internal error"
 msgstr "Вътрешна грешка"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Коригиране на зависимостите..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " пропадна."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Неуспех при коригирането на зависимостите"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Неуспех при минимизирането на набора актуализации"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Готово"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
-"неизправности."
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!"
@@ -1670,13 +1423,260 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Пакетът „%s“ не е инсталиран, така че не е премахнат\n"
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Предупреждението за удостоверяването е пренебрегнато.\n"
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Коригиране на зависимостите..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " пропадна."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Неуспех при коригирането на зависимостите"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Неуспех при минимизирането на набора актуализации"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Готово"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
+"неизправности."
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Предупреждението за удостоверяването е пренебрегнато.\n"
 
 #: apt-private/private-download.cc:45 apt-private/private-download.cc:52
 msgid "Some packages could not be authenticated"
@@ -1753,8 +1753,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2050,26 +2050,6 @@ msgstr "Не е намерен oторизационен запис за: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Несъответствие на контролната сума за: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Неуспех при намирането на драйвер за метод %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Методът %s не стартира правилно"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -2166,97 +2146,142 @@ msgstr "незадължителен"
 msgid "extra"
 msgstr "допълнителен"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Не се поддържа индексен файл от типа „%s“"
+msgid "The method driver %s could not be found."
+msgstr "Неуспех при намирането на драйвер за метод %s."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
+msgid "Is the package %s installed?"
+msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])"
+msgid "Method %s did not start correctly"
+msgstr "Методът %s не стартира правилно"
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
 
-#: apt-pkg/sourcelist.cc:184
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s ([%s] не е присвояване)"
+msgid "Index file type '%s' is not supported"
+msgstr "Не се поддържа индексен файл от типа „%s“"
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Изграждане на дървото със зависимости"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Версии кандидати"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Генериране на зависимости"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Четене на информацията за състоянието"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Лошо форматиран ред %lu в списъка с източници %s (липсва ключ в [%s])"
+msgid "Failed to open StateFile %s"
+msgstr "Неуспех при отварянето на StateFile %s"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s ([%s] ключът %s няма "
-"стойност)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Неуспех при запис на временен StateFile %s"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "преименуването се провали, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Несъответствие на контролната сума"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Несъответствие на размера"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Невалидна операция %s"
+
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+"Не може да се открие елемент „%s“ във файла Release (объркан ред в sources."
+"list или повреден файл)"
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:1656
 #, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Не е открита контролна сума за „%s“  във файла Release"
 
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1698
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
+
+#: apt-pkg/acquire-item.cc:1736
 #, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
 msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)"
+"Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се "
+"прилагат обновявания от това хранилище."
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)"
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "Отваряне на %s"
+msgid ""
+"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"
+msgstr ""
+"Грешка при проверка на цифровия подпис. Хранилището не е обновено и ще се "
+"използват старите индексни файлове. Грешка от GPG: %s: %s\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Ред %u в списъка с източници %s е твърде дълъг."
+msgid "GPG error: %s: %s"
+msgstr "Грешка от GPG: %s: %s"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
+"ръчно да оправите този пакет (поради пропусната архитектура)."
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%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/acquire-item.cc:2050
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2295,154 +2320,46 @@ msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Еха, надхвърлихте броя описания, на който е способна тази версия на APT."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Четене на списъците с пакети"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Събиране на информация за „Осигурява“"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Неуспех при записа на %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Подготовка за приемане на решение"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Външната програма за удовлетворяване на зависимости се провали без да изведе "
-"съобщение за грешка"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "преименуването се провали, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Несъответствие на контролната сума"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Несъответствие на размера"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Невалидна операция %s"
-
-#: apt-pkg/acquire-item.cc:1640
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
-"Не може да се открие елемент „%s“ във файла Release (объркан ред в sources."
-"list или повреден файл)"
-
-#: apt-pkg/acquire-item.cc:1656
-#, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Не е открита контролна сума за „%s“  във файла Release"
+msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
 
-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте броя описания, на който е способна тази версия на APT."
 
-#: apt-pkg/acquire-item.cc:1736
-#, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
-"Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се "
-"прилагат обновявания от това хранилище."
+"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
-msgid ""
-"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"
+msgid "Couldn't stat source package list %s"
 msgstr ""
-"Грешка при проверка на цифровия подпис. Хранилището не е обновено и ще се "
-"използват старите индексни файлове. Грешка от GPG: %s: %s\n"
+"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Грешка от GPG: %s: %s"
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Четене на списъците с пакети"
 
-#: apt-pkg/acquire-item.cc:1926
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
-"ръчно да оправите този пакет (поради пропусната архитектура)."
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Събиране на информация за „Осигурява“"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“"
+msgid "Unable to write to %s"
+msgstr "Неуспех при записа на %s"
 
-#: apt-pkg/acquire-item.cc:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
 
 #: apt-pkg/vendorlist.cc:85
 #, c-format
@@ -2476,6 +2393,14 @@ msgstr "Изтегляне на файл %li от %li (остават %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list"
@@ -2529,13 +2454,10 @@ msgstr ""
 "пакет %s. Това често е лошо, но ако наистина искате да го направите, "
 "активирайте опцията APT::Force-LoopBreak."
 
-#: 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:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Ред %u в списъка с източници %s е твърде дълъг."
 
 #: apt-pkg/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2635,31 +2557,27 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Неуспех при коригирането на проблемите, имате задържани счупени пакети."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Изграждане на дървото със зависимости"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Версии кандидати"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Изпращане на сценарий към програмата за удовлетворяване на зависимости"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Генериране на зависимости"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Четене на информацията за състоянието"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Подготовка за приемане на решение"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Неуспех при отварянето на StateFile %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Външната програма за удовлетворяване на зависимости се провали без да изведе "
+"съобщение за грешка"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Неуспех при запис на временен StateFile %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2671,6 +2589,113 @@ msgstr "Неуспех при анализирането на пакетен ф
 msgid "Unable to parse package file %s (2)"
 msgstr "Неуспех при анализирането на пакетен файл %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Неуспех при анализиране на файл Release %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Във файла Release %s липсват раздели"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Във файла Release %s липсва контролна сума"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Неправилна стойност за „Valid-Until“ във файла Release %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2731,31 +2756,6 @@ msgstr ""
 "Не е възможно избиране на инсталирана версия на пакета „%s“, защото не е "
 "инсталиран"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Неуспех при анализиране на файл Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Във файла Release %s липсват раздели"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Във файла Release %s липсва контролна сума"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Неправилна стойност за „Valid-Until“ във файла Release %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Неправилна стойност за „Date“ във файла Release %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3525,22 +3525,22 @@ msgstr "Превишен лимит на DeLink от %sB.\n"
 msgid "Archive had no package field"
 msgstr "Архивът няма поле „package“"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s няма запис „override“\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  поддържащия пакета %s е %s, а не %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s няма запис „source override“\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s няма също и запис „binary override“\n"
diff --git a/po/bs.po b/po/bs.po
index 43497b638..5bbec432a 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1018,250 +1018,10 @@ msgstr "Povezivanje neuspješno"
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Ispravljam zavisnosti..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Ne mogu ispraviti zavisnosti"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Urađeno"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1468,40 +1228,280 @@ msgstr "Preporučeni paketi:"
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+#: apt-private/private-install.cc:829
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:841
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:846
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:894
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr ""
+
+#: apt-private/private-install.cc:899
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr ""
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+
+#: apt-private/private-install.cc:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr ""
+
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Ispravljam zavisnosti..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ne mogu ispraviti zavisnosti"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Urađeno"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:111
+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 ""
 
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+#. 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-install.cc:846
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
 #, c-format
-msgid "%s is already the newest version.\n"
+msgid "Regex compilation error - %s"
 msgstr ""
 
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
 msgstr ""
 
-#: apt-private/private-install.cc:899
+#: apt-private/private-update.cc:97
 #, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+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:101
+msgid "All packages are up to date."
 msgstr ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
+#: apt-private/private-show.cc:156
 #, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+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-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
+#: 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:36
@@ -1585,8 +1585,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1880,26 +1880,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -1994,183 +1974,57 @@ msgstr "opcionalno"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-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)"
-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: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:490
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Clean of %s is not supported"
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-pkg/clean.cc:64
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
+msgid "Is the package %s installed?"
 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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Čitam spiskove paketa"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Ne mogu zapisati na %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr ""
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Gradim stablo zavisnosti"
 
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Verzije kandidata"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Stvaranje zavisnosti"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-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/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ne mogu ukloniti %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2248,6 +2102,79 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Čitam spiskove paketa"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Ne mogu zapisati na %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2280,6 +2207,12 @@ msgstr ""
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2325,10 +2258,9 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 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."
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
 msgstr ""
 
 #: apt-pkg/cdrom.cc:571
@@ -2421,32 +2353,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Gradim stablo zavisnosti"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Verzije kandidata"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Stvaranje zavisnosti"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Ne mogu otvoriti %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Ne mogu ukloniti %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2458,6 +2383,106 @@ msgstr ""
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:149
+#, 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 ""
+
+#: 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:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2510,31 +2535,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3220,22 +3220,22 @@ msgstr ""
 msgid "Archive had no package field"
 msgstr ""
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 671fa958d..d916d73e1 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1136,255 +1136,10 @@ msgstr "Ha fallat la connexió"
 msgid "Internal error"
 msgstr "Error intern"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "S'estan corregint les dependències…"
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " ha fallat."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "No es poden corregir les dependències"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "No es pot minimitzar el joc de versions revisades"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fet"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1658,15 +1413,260 @@ 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-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVÍS: No es poden autenticar els següents paquets!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "S'ha descartat l'avís d'autenticació.\n"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "S'estan corregint les dependències…"
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " ha fallat."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "No es poden corregir les dependències"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "No es pot minimitzar el joc de versions revisades"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fet"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVÍS: No es poden autenticar els següents paquets!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "S'ha descartat l'avís d'autenticació.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
 msgid "Some packages could not be authenticated"
 msgstr "No s'ha pogut autenticar alguns paquets"
 
@@ -1741,8 +1741,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2043,26 +2043,6 @@ 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:116
-#, 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:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El mètode %s no s'ha iniciat correctament"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -2158,93 +2138,145 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "El tipus de fitxer índex «%s» no està suportat"
+msgid "The method driver %s could not be found."
+msgstr "No s'ha pogut trobar el mètode de control %s."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, 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)"
+msgid "Is the package %s installed?"
+msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/acquire-worker.cc:169
 #, 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)"
+msgid "Method %s did not start correctly"
+msgstr "El mètode %s no s'ha iniciat correctament"
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/acquire-worker.cc:455
 #, 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)"
+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/sourcelist.cc:184
+#: apt-pkg/pkgrecords.cc:38
 #, 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ó)"
+msgid "Index file type '%s' is not supported"
+msgstr "El tipus de fitxer índex «%s» no està suportat"
 
-#: apt-pkg/sourcelist.cc:190
+#: 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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versions candidates"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Dependències que genera"
+
+#: 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/depcache.cc:250
 #, 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)"
+msgid "Failed to open StateFile %s"
+msgstr "No s'ha pogut obrir el fitxer d'estat %s"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:256
 #, 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)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Línia %lu malformada en la llista de fonts %s (URI)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "La suma resum no concorda"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "La mida no concorda"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Operació no vàlida %s"
+
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Línia %lu malformada en la llista de fonts %s (dist)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+"No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada errònia "
+"al sources.list o fitxer malformat)"
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:1656
 #, 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)"
+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/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1698
+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:1736
 #, 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)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+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/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, 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)"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)"
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "S'està obrint %s"
+msgid ""
+"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"
+msgstr ""
+"S'ha produït un error durant la verificació de la signatura. El dipòsit no "
+"està actualitzat i s'emprarà el fitxer d'índex anterior. Error del GPG: %s: "
+"%s\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, 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."
+msgid "GPG error: %s: %s"
+msgstr "S'ha produït un error amb el GPG: %s: %s"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, 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 ""
+"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 ""
+"No ha estat possible localitzar un fitxer pel paquet %s. Això podria "
+"significar que haureu d'arreglar aquest paquet manualment (segons "
+"arquitectura)."
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, 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"
+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/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/acquire-item.cc:2050
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
+"per al paquet %s."
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2326,115 +2358,6 @@ msgstr "No es pot escriure en %s"
 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:241
-msgid "Send request to solver"
-msgstr "Envia la petició al resoledor"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Prepara per a rebre una solució"
-
-#: apt-pkg/edsp.cc:327
-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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Executa un resoledor extern"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "La suma resum no concorda"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "La mida no concorda"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Operació no vàlida %s"
-
-#: apt-pkg/acquire-item.cc:1640
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-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:1656
-#, 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:1698
-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:1736
-#, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-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:1758
-#, 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:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-"S'ha produït un error durant la verificació de la signatura. El dipòsit no "
-"està actualitzat i s'emprarà el fitxer d'índex anterior. Error del GPG: %s: "
-"%s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "S'ha produït un error amb el GPG: %s: %s"
-
-#: apt-pkg/acquire-item.cc:1926
-#, 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 ""
-"No ha estat possible localitzar un fitxer pel paquet %s. Això podria "
-"significar que haureu d'arreglar aquest paquet manualment (segons "
-"arquitectura)."
-
-#: apt-pkg/acquire-item.cc:1992
-#, 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:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
-"per al paquet %s."
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2467,6 +2390,14 @@ msgstr "S'està obtenint el fitxer %li de %li (falten %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Heu de posar algunes URI 'font' en el vostre sources.list"
@@ -2520,13 +2451,10 @@ msgstr ""
 "dolenta, però si realment desitgeu fer-la, activeu l'opció APT::Force-"
 "LoopBreak."
 
-#: 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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2626,31 +2554,25 @@ msgstr ""
 "No es poden corregir els problemes, teniu paquets retinguts que estan "
 "trencats."
 
-#: 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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versions candidates"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Envia l'escenari al resoledor"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Dependències que genera"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "Envia la petició al resoledor"
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Prepara per a rebre una solució"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "No s'ha pogut obrir el fitxer d'estat %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "El resoledor extern ha fallat sense un missatge d'error adient"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Executa un resoledor extern"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2662,6 +2584,109 @@ msgstr "No es pot analitzar el fitxer del paquet %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "No es pot analitzar el fitxer del paquet %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "No es pot analitzar el fitxer Release %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "No hi ha seccions al fitxer Release %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, 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:130
+#, 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:149
+#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2724,31 +2749,6 @@ msgstr ""
 "No s'ha pogut seleccionar la versió instaŀlada del paquet %s ja que no està "
 "instaŀlada"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "No es pot analitzar el fitxer Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "No hi ha seccions al fitxer Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "El camp «Date» al fitxer Release %s és invàlid"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3509,22 +3509,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:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s no té una entrada dominant\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  el mantenidor de %s és %s, no %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s no té una entrada dominant de font\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s no té una entrada dominant de binari\n"
diff --git a/po/cs.po b/po/cs.po
index 5d51917b6..e90f98d28 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1163,258 +1163,10 @@ msgstr "Spojení selhalo"
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr "Vypisuje se"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Opravují se závislosti…"
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " selhalo."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nelze opravit závislosti"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nelze minimalizovat sadu pro aktualizaci"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Hotovo"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!"
@@ -1657,32 +1409,280 @@ msgstr ""
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Přeinstalace %s není možná, protože nelze stáhnout.\n"
 
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s je již nejnovější verze.\n"
+#: apt-private/private-install.cc:846
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s je již nejnovější verze.\n"
+
+#: apt-private/private-install.cc:894
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Vybraná verze „%s“ (%s) pro „%s“\n"
+
+#: apt-private/private-install.cc:899
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Vybraná verze „%s“ (%s) pro „%s“ kvůli „%s“\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+"Balík „%s“ není nainstalován, nelze tedy odstranit. Mysleli jste „%s“?\n"
+
+#: apt-private/private-install.cc:947
+#, c-format
+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:129
+msgid "Listing"
+msgstr "Vypisuje se"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Opravují se závislosti…"
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " selhalo."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nelze opravit závislosti"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nelze minimalizovat sadu pro aktualizaci"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Hotovo"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+msgid "All packages are up to date."
+msgstr "Všechny balíky jsou aktuální."
 
-#: apt-private/private-install.cc:894
+#: apt-private/private-show.cc:156
 #, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Vybraná verze „%s“ (%s) pro „%s“\n"
+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-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Vybraná verze „%s“ (%s) pro „%s“ kvůli „%s“\n"
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "není skutečný balík (virtuální)"
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+#: 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 ""
-"Balík „%s“ není nainstalován, nelze tedy odstranit. Mysleli jste „%s“?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Balík „%s“ není nainstalován, nelze tedy odstranit\n"
+"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:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1767,8 +1767,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2062,26 +2062,6 @@ 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:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ovladač metody %s nemohl být nalezen."
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "Je balík %s nainstalován?"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nebyla spuštěna správně"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -2176,183 +2156,56 @@ msgstr "volitelný"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexový typ souboru „%s“ není podporován"
-
-#: 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/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/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
+#: apt-pkg/acquire-worker.cc:116
 #, 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 "The method driver %s could not be found."
+msgstr "Ovladač metody %s nemohl být nalezen."
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/acquire-worker.cc:118
 #, 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 "Is the package %s installed?"
+msgstr "Je balík %s nainstalován?"
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Clean of %s is not supported"
-msgstr "Vyčištění %s není podporováno"
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nebyla spuštěna správně"
 
-#: apt-pkg/clean.cc:64
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Unable to stat %s."
-msgstr "Nebylo možno vyhodnotit %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Cache má nekompatibilní systém správy verzí"
+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."
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Chyba při zpracování %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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."
+msgid "Index file type '%s' is not supported"
+msgstr "Indexový typ souboru „%s“ není podporován"
 
-#: apt-pkg/pkgcachegen.cc:576
-#, 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Vytváří se strom závislostí"
 
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidátské verze"
 
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Načítají se seznamy balíků"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generování závislostí"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Collecting File poskytuje"
+#: 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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Nelze zapsat do %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr "Požadavek odeslán řešiteli"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Příprava na obdržení řešení"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku"
+msgid "Failed to open StateFile %s"
+msgstr "Nelze otevřít stavový soubor %s"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Spuštění externího řešitele"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nelze zapsat dočasný stavový soubor %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2439,6 +2292,79 @@ msgid ""
 msgstr ""
 "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s."
 
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Chyba při zpracování %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Načítají se seznamy balíků"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Collecting File poskytuje"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nelze zapsat do %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Chyba IO při ukládání zdrojové cache"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2471,6 +2397,14 @@ msgstr "Stahuje se soubor %li z %li (zbývá %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Do sources.list musíte zadat „zdrojové“ URI"
@@ -2523,13 +2457,10 @@ 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/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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2626,31 +2557,25 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Vytváří se strom závislostí"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidátské verze"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Scénář odeslán řešiteli"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generování závislostí"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "Požadavek odeslán řešiteli"
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Příprava na obdržení řešení"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nelze otevřít stavový soubor %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nelze zapsat dočasný stavový soubor %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Spuštění externího řešitele"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2662,6 +2587,106 @@ msgstr "Nelze zpracovat soubor %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Nelze zpracovat soubor %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nelze zpracovat Release soubor %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Release soubor %s neobsahuje žádné sekce"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Release soubor %s neobsahuje Hash záznam"
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, 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/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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2716,31 +2741,6 @@ msgstr "Nelze vybrat kandidátskou verzi balíku %s, protože žádnou nemá"
 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/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nelze zpracovat Release soubor %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Release soubor %s neobsahuje žádné sekce"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Release soubor %s neobsahuje Hash záznam"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Neplatná položka „Date“ v Release souboru %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3488,22 +3488,22 @@ msgstr " Odlinkovací limit %sB dosažen.\n"
 msgid "Archive had no package field"
 msgstr "Archiv nemá pole Package"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr " %s nemá žádnou položku pro override\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  správce %s je %s, ne %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr " %s nemá žádnou zdrojovou položku pro override\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr " %s nemá ani žádnou binární položku pro override\n"
diff --git a/po/cy.po b/po/cy.po
index 87cab54ff..0f2fd4c14 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1146,256 +1146,10 @@ msgstr "Methodd y cysylltiad"
 msgid "Internal error"
 msgstr "Gwall mewnol"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Yn cywiro dibyniaethau..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " wedi methu."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Ni ellir cywiro dibyniaethau"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni ellir bychanu y set uwchraddio"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Wedi Gorffen"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1655,16 +1409,262 @@ 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-download.cc:36
-#, fuzzy
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
+#: apt-private/private-list.cc:129
+msgid "Listing"
 msgstr ""
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Yn cywiro dibyniaethau..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " wedi methu."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ni ellir cywiro dibyniaethau"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni ellir bychanu y set uwchraddio"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Wedi Gorffen"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
 #, fuzzy
 msgid "Some packages could not be authenticated"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
@@ -1741,8 +1741,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2048,29 +2048,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Camgyfatebiaeth swm MD5"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Methwyd canfod y gyrrydd dull %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Ni gychwynodd y dull %s yn gywir"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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."
@@ -2166,95 +2143,146 @@ msgstr "opsiynnol"
 msgid "extra"
 msgstr "ychwanegol"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Methwyd canfod y gyrrydd dull %s."
+
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Ni gychwynodd y dull %s yn gywir"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Ni chynhelir y math ffeil mynegai '%s'"
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+#, fuzzy
+msgid "Building dependency tree"
+msgstr "Yn Aideladu Coeden Dibyniaeth"
 
-#: 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:139
+#, fuzzy
+msgid "Candidate versions"
+msgstr "Fersiynau Posib"
 
-#: 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:168
+#, fuzzy
+msgid "Dependency generation"
+msgstr "Cynhyrchaid Dibyniaeth"
 
-#: 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: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:190
+#: apt-pkg/depcache.cc:250
 #, 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)"
+msgid "Failed to open StateFile %s"
+msgstr "Methwyd agor %s"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:256
 #, 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)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "methwyd ailenwi, %s (%s -> %s)."
 
-#: 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/acquire-item.cc:163
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Camgyfatebiaeth swm MD5"
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Camgyfatebiaeth maint"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Gweithred annilys %s"
+
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:217
+# FIXME: number?
+#: apt-pkg/acquire-item.cc:1656
 #, fuzzy, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1698
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1736
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
 msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1758
 #, c-format
-msgid "Opening %s"
-msgstr "Yn agor %s"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+msgid ""
+"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"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:371
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
+msgid "GPG error: %s: %s"
+msgstr ""
 
-#: 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"
+# FIXME: case
+#: apt-pkg/acquire-item.cc:1926
+#, 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 ""
+"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/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/acquire-item.cc:1992
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2050
+#, 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/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2333,109 +2361,6 @@ msgstr "Ni ellir ysgrifennu i %s"
 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "methwyd ailenwi, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-#, fuzzy
-msgid "Hash Sum mismatch"
-msgstr "Camgyfatebiaeth swm MD5"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Camgyfatebiaeth maint"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Gweithred annilys %s"
-
-#: apt-pkg/acquire-item.cc:1640
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
-
-# FIXME: number?
-#: apt-pkg/acquire-item.cc:1656
-#, 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:1698
-msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1736
-#, 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:1758
-#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
-
-# FIXME: case
-#: apt-pkg/acquire-item.cc:1926
-#, 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 ""
-"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:1992
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:2050
-#, 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/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2468,6 +2393,15 @@ msgstr ""
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
@@ -2520,14 +2454,10 @@ 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/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: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/cdrom.cc:571
 #, fuzzy
@@ -2625,35 +2555,25 @@ 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/depcache.cc:138 apt-pkg/depcache.cc:167
-#, fuzzy
-msgid "Building dependency tree"
-msgstr "Yn Aideladu Coeden Dibyniaeth"
-
-#: apt-pkg/depcache.cc:139
-#, fuzzy
-msgid "Candidate versions"
-msgstr "Fersiynau Posib"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-#, fuzzy
-msgid "Dependency generation"
-msgstr "Cynhyrchaid Dibyniaeth"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Methwyd agor %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 # FIXME: number?
 #: apt-pkg/tagfile.cc:140
@@ -2666,6 +2586,113 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
 
+# FIXME: number?
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, 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/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 "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)"
+
+#: apt-pkg/sourcelist.cc:217
+#, 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)"
+
+#: apt-pkg/sourcelist.cc:335
+#, 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"
+
 #: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2718,33 +2745,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-# FIXME: number?
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3491,22 +3491,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:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  Cynaliwr %s yw %s nid %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, fuzzy, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
diff --git a/po/da.po b/po/da.po
index 986e0a864..2f6f9982d 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1178,259 +1178,10 @@ msgstr "Forbindelsen mislykkedes"
 msgid "Internal error"
 msgstr "Intern fejl"
 
-# måske visning, kategorisering
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr "Listing"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Retter afhængigheder ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " mislykkedes."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Kunne ikke rette afhængigheder"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Kunne ikke minimere opgraderingssættet"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Færdig"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!"
@@ -1682,21 +1433,270 @@ msgstr "%s er allerede den nyeste version.\n"
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Valgt version »%s« (%s) for »%s«\n"
 
-#: apt-private/private-install.cc:899
+#: apt-private/private-install.cc:899
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Valgt version »%s« (%s) for »%s« på grund af »%s«\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "Pakke »%s« er ikke installeret, så blev ikke fjernet. Mente du »%s«?\n"
+
+#: apt-private/private-install.cc:947
+#, c-format
+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:129
+msgid "Listing"
+msgstr "Listing"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Retter afhængigheder ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " mislykkedes."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Kunne ikke rette afhængigheder"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Kunne ikke minimere opgraderingssættet"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Færdig"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
 #, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Valgt version »%s« (%s) for »%s« på grund af »%s«\n"
+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"
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Pakke »%s« er ikke installeret, så blev ikke fjernet. Mente du »%s«?\n"
+#: apt-private/private-update.cc:101
+msgid "All packages are up to date."
+msgstr "Alle pakker er opdateret."
 
-#: apt-private/private-install.cc:947
+#: apt-private/private-show.cc:156
 #, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Pakke »%s« er ikke installeret, så blev ikke fjernet\n"
+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:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1781,8 +1781,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2081,26 +2081,6 @@ msgstr "Kan ikke finde godkendelsesregistrering for: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hashsum stemmer ikke: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Metodedriveren %s blev ikke fundet."
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "Er pakken %s installeret?"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startede ikke korrekt"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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."
@@ -2194,185 +2174,56 @@ msgstr "frivillig"
 msgid "extra"
 msgstr "ekstra"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indeksfiler af typen »%s« understøttes ikke"
-
-#: 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/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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Opening %s"
-msgstr "Åbner %s"
+msgid "The method driver %s could not be found."
+msgstr "Metodedriveren %s blev ikke fundet."
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linjen %u er for lang i kildelisten %s."
+msgid "Is the package %s installed?"
+msgstr "Er pakken %s installeret?"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Ugyldig linje %u i kildelisten %s (type)"
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startede ikke korrekt"
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/acquire-worker.cc:455
 #, 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 "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/sourcelist.cc:416
+#: apt-pkg/pkgrecords.cc:38
 #, 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:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
+msgid "Index file type '%s' is not supported"
 msgstr "Indeksfiler af typen »%s« understøttes ikke"
 
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kunne ikke finde %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, 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:257
-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:260
-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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Opbygger afhængighedstræ"
 
-#: apt-pkg/pkgcachegen.cc:263
-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:139
+msgid "Candidate versions"
+msgstr "Kandidatversioner"
 
-#: apt-pkg/pkgcachegen.cc:266
-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/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Afhængighedsgenerering"
 
-#: apt-pkg/pkgcachegen.cc:576
-#, 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/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:1211
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kunne ikke finde kildepakkelisten %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Indlæser pakkelisterne"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samler filudbud"
+msgid "Failed to open StateFile %s"
+msgstr "Kunne ikke åbne StateFile %s"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Kunne ikke skrive til %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr "Send forespørgsel til problemløser"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Forbered for modtagelse af løsning"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Kør ekstern problemløser"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Kunne ikke skrive den midlertidige StateFile %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2459,6 +2310,81 @@ 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/clean.cc:39 apt-pkg/acquire.cc:490
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "Indeksfiler af typen »%s« understøttes ikke"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Kunne ikke finde %s."
+
+#: apt-pkg/pkgcachegen.cc:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, 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:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Kunne ikke finde kildepakkelisten %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Indlæser pakkelisterne"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Samler filudbud"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kunne ikke skrive til %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "IO-fejl ved gemning af kilde-mellemlageret"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2491,6 +2417,14 @@ msgstr "Henter fil %li ud af %li (%s tilbage)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Du skal have nogle »source«-URI'er i din sources.list"
@@ -2544,13 +2478,10 @@ msgstr ""
 "ide, men hvis du virkelig vil gøre det, kan du aktivere valget »APT::Force-"
 "LoopBreak«."
 
-#: 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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2649,31 +2580,25 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Opbygger afhængighedstræ"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidatversioner"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Send scenarie til problemløser"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Afhængighedsgenerering"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "Send forespørgsel til problemløser"
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Forbered for modtagelse af løsning"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Kunne ikke åbne StateFile %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Kunne ikke skrive den midlertidige StateFile %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Kør ekstern problemløser"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2685,6 +2610,106 @@ msgstr "Kunne ikke tolke pakkefilen %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Kunne ikke tolke pakkefilen %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Kunne ikke fortolke udgivelsesfil %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Ingen afsnit i udgivelsesfil %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Intet hashpunkt i udgivelsesfil %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ugyldigt punkt »Valid-Until« i udgivelsesfil %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2741,31 +2766,6 @@ 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/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Kunne ikke fortolke udgivelsesfil %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Ingen afsnit i udgivelsesfil %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Intet hashpunkt i udgivelsesfil %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ugyldigt punkt »Valid-Until« i udgivelsesfil %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ugyldigt punkt »Date« i udgivelsesfil %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3511,22 +3511,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:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s har ingen tvangs-post\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  pakkeansvarlig for %s er %s, ikke %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, 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:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 887cdcfac..733739ce1 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1222,266 +1222,10 @@ msgstr "Verbindung fehlgeschlagen"
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr "Auflistung"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Abhängigkeiten werden korrigiert ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " fehlgeschlagen."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Abhängigkeiten konnten nicht korrigiert werden."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden."
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fertig"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!"
@@ -1759,6 +1503,262 @@ 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:129
+msgid "Listing"
+msgstr "Auflistung"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Abhängigkeiten werden korrigiert ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " fehlgeschlagen."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Abhängigkeiten konnten nicht korrigiert werden."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden."
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fertig"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:36
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!"
@@ -1843,8 +1843,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2145,28 +2145,6 @@ 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:116
-#, 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:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "Ist das Paket %s installiert?"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Methode %s ist nicht korrekt gestartet."
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -2263,91 +2241,148 @@ msgstr "optional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexdateityp »%s« wird nicht unterstützt."
+msgid "The method driver %s could not be found."
+msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Missgestalteter Absatz %u in Quellliste %s (»URI parse«)"
+msgid "Is the package %s installed?"
+msgstr "Ist das Paket %s installiert?"
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] nicht auswertbar)"
+msgid "Method %s did not start correctly"
+msgstr "Methode %s ist nicht korrekt gestartet."
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] zu kurz)"
+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/sourcelist.cc:184
+#: apt-pkg/pkgrecords.cc:38
 #, 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)"
+msgid "Index file type '%s' is not supported"
+msgstr "Indexdateityp »%s« wird nicht unterstützt."
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Abhängigkeitsbaum wird aufgebaut."
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Installationskandidat-Versionen"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Abhängigkeitsgenerierung"
+
+#: 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/depcache.cc:250
 #, 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)"
+msgid "Failed to open StateFile %s"
+msgstr "StateFile %s konnte nicht geöffnet werden."
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:256
 #, 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)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Temporäres StateFile %s konnte nicht geschrieben werden."
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Hash-Summe stimmt nicht überein"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Größe stimmt nicht überein"
+
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
+msgstr "Ungültiges Dateiformat"
+
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+"Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden "
+"(falscher Eintrag in sources.list oder missgebildete Datei)."
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:1656
 #, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
+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/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1698
+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:1736
 #, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+"Release-Datei für %s ist abgelaufen (ungültig seit %s). Aktualisierungen für "
+"dieses Depot werden nicht angewendet."
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)"
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "%s wird geöffnet."
+msgid ""
+"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"
+msgstr ""
+"Während der Überprüfung der Signatur trat ein Fehler auf. Das Repository "
+"wurde nicht aktualisiert und die vorherigen Indexdateien werden verwendet. "
+"GPG-Fehler: %s: %s\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Zeile %u in Quellliste %s zu lang."
+msgid "GPG error: %s: %s"
+msgstr "GPG-Fehler: %s: %s"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
+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 ""
+"Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass "
+"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
+"Architektur)."
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, 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 "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/sourcelist.cc:416
+#: apt-pkg/acquire-item.cc:2050
 #, 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 ""
+"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/clean.cc:39 apt-pkg/acquire.cc:490
 #, c-format
@@ -2431,117 +2466,6 @@ msgstr "Schreiben nach %s nicht möglich"
 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:241
-msgid "Send request to solver"
-msgstr "Anfrage an Problemlöser senden"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Vorbereiten, eine Lösung zu erhalten"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen."
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Externen Problemlöser ausführen"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Hash-Summe stimmt nicht überein"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Größe stimmt nicht überein"
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
-msgstr "Ungültiges Dateiformat"
-
-#: apt-pkg/acquire-item.cc:1640
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
-"Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden "
-"(falscher Eintrag in sources.list oder missgebildete Datei)."
-
-#: apt-pkg/acquire-item.cc:1656
-#, 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:1698
-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:1736
-#, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-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:1758
-#, 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:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-"Während der Überprüfung der Signatur trat ein Fehler auf. Das Repository "
-"wurde nicht aktualisiert und die vorherigen Indexdateien werden verwendet. "
-"GPG-Fehler: %s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG-Fehler: %s: %s"
-
-#: apt-pkg/acquire-item.cc:1926
-#, 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 ""
-"Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass "
-"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
-"Architektur)."
-
-#: apt-pkg/acquire-item.cc:1992
-#, 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:2050
-#, 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/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2574,6 +2498,14 @@ msgstr "Holen der Datei %li von %li (noch %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2630,13 +2562,10 @@ msgstr ""
 "ist oft schlimm, aber wenn Sie es wirklich tun wollen, aktivieren Sie bitte "
 "die Option APT::Force-LoopBreak."
 
-#: 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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2737,31 +2666,26 @@ msgstr ""
 "Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte "
 "Pakete."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Abhängigkeitsbaum wird aufgebaut."
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Installationskandidat-Versionen"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Szenario an Problemlöser senden"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Abhängigkeitsgenerierung"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "Anfrage an Problemlöser senden"
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Vorbereiten, eine Lösung zu erhalten"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "StateFile %s konnte nicht geöffnet werden."
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen."
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Temporäres StateFile %s konnte nicht geschrieben werden."
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Externen Problemlöser ausführen"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2773,6 +2697,107 @@ msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)."
 msgid "Unable to parse package file %s (2)"
 msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)."
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Release-Datei %s kann nicht verarbeitet werden."
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Keine Bereiche (Sections) in Release-Datei %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Kein Hash-Eintrag in Release-Datei %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, 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/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/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/sourcelist.cc:371
+#, c-format
+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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2835,31 +2860,6 @@ msgstr ""
 "Die installierte Version von Paket »%s« kann nicht ausgewählt werden, da es "
 "nicht installiert ist."
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Release-Datei %s kann nicht verarbeitet werden."
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Keine Bereiche (Sections) in Release-Datei %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Kein Hash-Eintrag in Release-Datei %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3634,22 +3634,22 @@ msgstr " DeLink-Limit von %sB erreicht\n"
 msgid "Archive had no package field"
 msgstr "Archiv hatte kein Feld »package«"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s hat keinen Eintrag in der Override-Liste.\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s-Betreuer ist %s und nicht %s.\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s hat keinen Eintrag in der Source-Override-Liste.\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s hat keinen Eintrag in der Binary-Override-Liste.\n"
diff --git a/po/dz.po b/po/dz.po
index e83a26f40..76723a589 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1115,251 +1115,10 @@ msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོ
 msgid "Internal error"
 msgstr "ནང་འཁོད་འཛོལ་བ།"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།"
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr "འབད་ཚར་ཡི།"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1601,26 +1360,267 @@ msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འ
 msgid "%s is already the newest version.\n"
 msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
 
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
+#: apt-private/private-install.cc:894
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
+
+#: apt-private/private-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
+
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།"
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr "འབད་ཚར་ཡི།"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+msgid "All packages are up to date."
+msgstr ""
 
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
+#: 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] ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
+#: 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:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1706,8 +1706,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2009,26 +2009,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།"
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་ན་གནས་ཚད་ཡིག་སྣོད་ཚུ་ མིང་དཔྱད་ཡང་ན་ཁ་ཕྱེ་མ་ཚུགས།"
@@ -2123,184 +2103,57 @@ msgstr "གདམ་ཁ་ཅན།"
 msgid "extra"
 msgstr "ཐེབས།"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-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/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 མིང་དཔྱད་འབད་ནི་)ནང་ན།"
+msgid "The method driver %s could not be found."
+msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/acquire-worker.cc:118
 #, 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་ཁ་ཕྱེ་དོ།"
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག"
+msgid "Method %s did not start correctly"
+msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/pkgrecords.cc:38
 #, 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:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
+msgid "Index file type '%s' is not supported"
 msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།"
 
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགས།"
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ།"
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "མི་ངོ་འཐོན་རིམཚུ།"
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "བརྟེན་པའི་བཟོ་བཏོན།"
 
-#: apt-pkg/pkgcachegen.cc:263
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
 #, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr " %sལུ་འབྲི་མ་ཚུགས།"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+msgid "Reading state information"
+msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2383,6 +2236,80 @@ msgid ""
 msgstr ""
 "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག  ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།"
 
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, fuzzy, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:263
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr " %sལུ་འབྲི་མ་ཚུགས།"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2415,6 +2342,15 @@ msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2465,14 +2401,10 @@ msgstr ""
 "འདི་འབདཝ་ད་ཁྱོད་ཀྱི་ཐད་རི་འབའ་རི་འབད་དགོཔ་ཨིན་པ་ཅིན་ APT::Force-LoopBreak གདམ་ཁ་འདི་ཤུགས་"
 "ལྡན་བཟོ།"
 
-#: 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:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག"
 
 #: apt-pkg/cdrom.cc:571
 #, fuzzy
@@ -2568,32 +2500,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ།"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "མི་ངོ་འཐོན་རིམཚུ།"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "བརྟེན་པའི་བཟོ་བཏོན།"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2605,6 +2530,106 @@ msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་
 msgid "Unable to parse package file %s (2)"
 msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/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 (ཡུ་ཨར་ཨའི་)གི་ནང་ན།"
+
+#: 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 (དབྱེ་བ)་ནང་ན།"
+
+#: 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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2657,31 +2682,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
-
-#: apt-pkg/indexrecords.cc:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3422,22 +3422,22 @@ msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེ
 msgid "Archive had no package field"
 msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s ་རྒྱུན་སྐྱོང་པ་འདི་  %s ཨིན་   %s མེན།\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n"
diff --git a/po/el.po b/po/el.po
index 30272b245..4c7e02634 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1130,253 +1130,10 @@ msgstr "Η σύνδεση απέτυχε"
 msgid "Internal error"
 msgstr "Εσωτερικό Σφάλμα"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Διόρθωση εξαρτήσεων..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " απέτυχε."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Ετοιμο"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
-"προβλήματα."
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
@@ -1645,17 +1402,260 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n"
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν"
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Διόρθωση εξαρτήσεων..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " απέτυχε."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Ετοιμο"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
+"προβλήματα."
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν"
 
 #: apt-private/private-download.cc:50
 msgid "Install these packages without verification?"
@@ -1728,8 +1728,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2029,28 +2029,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Ανόμοιο MD5Sum"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -2147,90 +2125,139 @@ msgstr "προαιρετικό"
 msgid "extra"
 msgstr "επιπλέον"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί."
+
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
+
+#: apt-pkg/acquire-worker.cc:455
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
+"enter."
+
 #: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 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/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+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:139
+msgid "Candidate versions"
+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:168
+msgid "Dependency generation"
+msgstr "Παραγωγή Εξαρτήσεων"
 
-#: 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/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση"
 
-#: 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/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Αποτυχία ανοίγματος του αρχείου κατάστασης %s"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s"
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Ανόμοιο MD5Sum"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Ανόμοιο μέγεθος"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Μη έγκυρη λειτουργία %s"
+
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1656
+#, fuzzy, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
+
+#: apt-pkg/acquire-item.cc:1698
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n"
+
+#: apt-pkg/acquire-item.cc:1736
 #, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "Άνοιγμα του %s"
+msgid ""
+"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"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s."
+msgid "GPG error: %s: %s"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
+"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
 
-#: 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/acquire-item.cc:2050
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
+"πακέτο %s."
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2309,107 +2336,6 @@ msgstr "Αδύνατη η εγγραφή στο %s"
 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Ανόμοιο MD5Sum"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Ανόμοιο μέγεθος"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Μη έγκυρη λειτουργία %s"
-
-#: apt-pkg/acquire-item.cc:1640
-#, 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:1656
-#, fuzzy, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-
-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n"
-
-#: apt-pkg/acquire-item.cc:1736
-#, 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:1758
-#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1926
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
-"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-
-#: apt-pkg/acquire-item.cc:1992
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
-"πακέτο %s."
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2442,6 +2368,15 @@ msgstr "Κατέβασμα του αρχείου %li του %li (απομένο
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list"
@@ -2492,14 +2427,10 @@ msgstr ""
 "είναι καλό, αλλά εάν πραγματικά θέλετε να συνεχίσετε ενεργοποιήστε την "
 "επιλογή APT::Force-LoopBreak option."
 
-#: 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:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s."
 
 #: apt-pkg/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2596,31 +2527,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Υποψήφιες Εκδόσεις"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Παραγωγή Εξαρτήσεων"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Αποτυχία ανοίγματος του αρχείου κατάστασης %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2632,6 +2557,106 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s
 msgid "Unable to parse package file %s (2)"
 msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/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 (τύπος)"
+
+#: 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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2684,31 +2709,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3454,22 +3454,22 @@ msgstr " Αποσύνδεση ορίου του %sB hit.\n"
 msgid "Archive had no package field"
 msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s δεν περιέχει εγγραφή παράκαμψης\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s συντηρητής είναι ο %s όχι ο %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s δεν έχει εγγραφή πηγαίας παράκαμψης\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n"
diff --git a/po/es.po b/po/es.po
index 9290a0731..3384c0e7d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,7 +33,7 @@ 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\n"
 "PO-Revision-Date: 2014-11-20 02:25+0100\n"
 "Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox."
 "org>\n"
@@ -1250,255 +1250,10 @@ msgstr "Falló la conexión"
 msgid "Internal error"
 msgstr "Error interno"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr "Listando"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Corrigiendo dependencias..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " falló."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "No se pueden corregir las dependencias"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "No se puede minimizar el conjunto de actualización"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Listo"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!"
@@ -1769,15 +1524,260 @@ msgstr ""
 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ATENCIÓN: ¡No se han podido autenticar los siguientes paquetes!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Aviso de autenticación ignorado.\n"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "Listando"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Corrigiendo dependencias..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " falló."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "No se pueden corregir las dependencias"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "No se puede minimizar el conjunto de actualización"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Listo"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+msgid "All packages are up to date."
+msgstr "Todos los paquetes están actualizados."
+
+#: 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-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ATENCIÓN: ¡No se han podido autenticar los siguientes paquetes!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Aviso de autenticación ignorado.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
 msgid "Some packages could not be authenticated"
 msgstr "Algunos paquetes no se pueden autenticar"
 
@@ -1852,8 +1852,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2155,26 +2155,6 @@ 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:116
-#, 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:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "¿Está instalado el paquete %s?"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El método %s no se inició correctamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -2270,96 +2250,147 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "El tipo de fichero de índice «%s» no se admite"
+msgid "The method driver %s could not be found."
+msgstr "No se pudo encontrar el método %s."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, 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)"
+msgid "Is the package %s installed?"
+msgstr "¿Está instalado el paquete %s?"
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/acquire-worker.cc:169
 #, 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 analizable)"
+msgid "Method %s did not start correctly"
+msgstr "El método %s no se inició correctamente"
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/acquire-worker.cc:455
 #, 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)"
+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/sourcelist.cc:184
+#: apt-pkg/pkgrecords.cc:38
 #, 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)"
+msgid "Index file type '%s' is not supported"
+msgstr "El tipo de fichero de índice «%s» no se admite"
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Creando árbol de dependencias"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versiones candidatas"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generación de dependencias"
+
+#: 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/depcache.cc:250
 #, 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])"
+msgid "Failed to open StateFile %s"
+msgstr "No se pudo abrir el fichero de estado %s"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:256
 #, 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)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falló la escritura del fichero de estado temporal %s"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Línea %lu mal formada en la lista de fuentes %s (URI)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "falló el cambio de nombre, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "La suma hash difiere"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "El tamaño difiere"
+
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
+msgstr "Formato inválido de fichero"
+
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Línea %lu mal formada en la lista de fuentes %s (dist)"
+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/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:1656
 #, 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)"
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "No se pudo leer el archivo «Release» %s"
 
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1698
+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:1736
 #, 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)"
+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/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, 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)"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)"
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "Abriendo %s"
+msgid ""
+"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"
+msgstr ""
+"Se produjo un error durante la verificación de las firmas. El repositorio no "
+"está actualizado y se utilizarán los ficheros de índice antiguos. El error "
+"GPG es: %s: %s\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Línea %u demasiado larga en la lista de fuentes %s."
+msgid "GPG error: %s: %s"
+msgstr "Error de GPG: %s: %s"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, 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 ""
+"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 ""
+"No se pudo localizar un archivo para el paquete %s. Esto puede significar "
+"que necesita arreglar manualmente este paquete (debido a que falta una "
+"arquitectura)"
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, 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"
+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/sourcelist.cc:416
+#: apt-pkg/acquire-item.cc:2050
 #, 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"
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Los archivos de índice de paquetes están dañados. No existe un campo "
+"«Filename:» para el paquete %s."
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, c-format
@@ -2395,156 +2426,45 @@ 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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Leyendo lista de paquetes"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Recogiendo archivos que proveen"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "No se pudo escribir en %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr "Enviar petición al solucionador"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Preparar para recibir una solución"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Falló solucionador externo sin un mensaje de error apropiado"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Ejecutar solucionador externo"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "falló el cambio de nombre, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "La suma hash difiere"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "El tamaño difiere"
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
-msgstr "Formato inválido de fichero"
-
-#: apt-pkg/acquire-item.cc:1640
-#, 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:1656
-#, 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:1698
-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"
+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/acquire-item.cc:1736
-#, 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/pkgcachegen.cc:263
+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/acquire-item.cc:1758
-#, 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/pkgcachegen.cc:266
+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/acquire-item.cc:1788
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
-msgid ""
-"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"
+msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
-"Se produjo un error durante la verificación de las firmas. El repositorio no "
-"está actualizado y se utilizarán los ficheros de índice antiguos. El error "
-"GPG es: %s: %s\n"
+"No se encontró el paquete %s %s mientras se procesaban las dependencias"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "Error de GPG: %s: %s"
+msgid "Couldn't stat source package list %s"
+msgstr "No se pudo leer la lista de paquetes fuente %s"
 
-#: apt-pkg/acquire-item.cc:1926
-#, 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 ""
-"No se pudo localizar un archivo para el paquete %s. Esto puede significar "
-"que necesita arreglar manualmente este paquete (debido a que falta una "
-"arquitectura)"
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Leyendo lista de paquetes"
 
-#: apt-pkg/acquire-item.cc:1992
-#, 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/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Recogiendo archivos que proveen"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Los archivos de índice de paquetes están dañados. No existe un campo "
-"«Filename:» para el paquete %s."
+msgid "Unable to write to %s"
+msgstr "No se pudo escribir en %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Error de E/S al guardar la caché fuente"
 
 #: apt-pkg/vendorlist.cc:85
 #, c-format
@@ -2578,6 +2498,14 @@ msgstr "Descargando fichero %li de %li (falta %s)"
 msgid "Retrieving file %li of %li"
 msgstr "Descargando fichero %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 ""
+"No se han podido descargar algunos archivos de índice, se han omitido, o se "
+"han utilizado unos antiguos en su lugar."
+
 #: 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"
@@ -2634,13 +2562,10 @@ msgstr ""
 "esto es malo, pero si quiere hacerlo de todas formas, active la opción |APT::"
 "Force-LoopBreak»."
 
-#: 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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2740,31 +2665,25 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "No se pudieron corregir los problemas, usted ha retenido paquetes rotos."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Creando árbol de dependencias"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versiones candidatas"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Enviar situación al solucionador"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generación de dependencias"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "Enviar petición al solucionador"
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Preparar para recibir una solución"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "No se pudo abrir el fichero de estado %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "Falló solucionador externo sin un mensaje de error apropiado"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falló la escritura del fichero de estado temporal %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Ejecutar solucionador externo"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2776,6 +2695,112 @@ msgstr "No se pudo tratar el archivo de paquetes %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "No se pudo tratar el archivo de paquetes %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "No se pudo leer el archivo «Release» %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "No se encontraron secciones en el archivo «Release» %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, 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:130
+#, 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:149
+#, 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
+#, 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/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 analizable)"
+
+#: 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/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/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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2838,31 +2863,6 @@ msgstr ""
 "No se puede seleccionar la versión instalada del paquete «%s» puesto que no "
 "está instalado"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "No se pudo leer el archivo «Release» %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "No se encontraron secciones en el archivo «Release» %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Entrada «Date» inválida en el archivo «Release» %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3634,22 +3634,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:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr " %s no tiene entrada de predominio\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr " el encargado de %s es %s y no %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr " %s no tiene una entrada fuente predominante\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr " %s tampoco tiene una entrada binaria predominante\n"
diff --git a/po/eu.po b/po/eu.po
index b4290dba9..5271613ef 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1116,251 +1116,10 @@ msgstr "Konexioak huts egin du"
 msgid "Internal error"
 msgstr "Barne errorea"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Mendekotasunak zuzentzen..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " : huts egin du."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Ezin dira mendekotasunak zuzendu"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Eginda"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
@@ -1601,31 +1360,272 @@ msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n"
 
-#: apt-private/private-install.cc:846
+#: apt-private/private-install.cc:846
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s bertsiorik berriena da jada.\n"
+
+#: apt-private/private-install.cc:894
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
+
+#: apt-private/private-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+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:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Mendekotasunak zuzentzen..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " : huts egin du."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ezin dira mendekotasunak zuzendu"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Eginda"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
 #, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s bertsiorik berriena da jada.\n"
+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-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
+#: apt-private/private-update.cc:101
+msgid "All packages are up to date."
+msgstr ""
 
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
+#: 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] ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-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-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:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1710,8 +1710,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2010,26 +2010,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Egiaztapena ez dator bat"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s metodoa ez da behar bezala abiarazi"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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."
@@ -2124,183 +2104,56 @@ msgstr "aukerakoa"
 msgid "extra"
 msgstr "estra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "'%s' motako indize fitxategirik ez da onartzen"
-
-#: 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)"
+msgid "The method driver %s could not be found."
+msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/acquire-worker.cc:118
 #, 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/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/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"
+msgid "Is the package %s installed?"
+msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da."
+msgid "Method %s did not start correctly"
+msgstr "%s metodoa ez da behar bezala abiarazi"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
+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/sourcelist.cc:375
+#: apt-pkg/pkgrecords.cc:38
 #, 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:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
+msgid "Index file type '%s' is not supported"
 msgstr "'%s' motako indize fitxategirik ez da onartzen"
 
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ezin da %s atzitu."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Dependentzia zuhaitza eraikitzen"
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "APT honek maneia dezakeen azalpen kopurua gainditu duzu."
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Hautagaien bertsioak"
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "APT honek maneia dezakeen mendekotasun muga gainditu duzu."
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Dependentzi Sormena"
 
-#: apt-pkg/pkgcachegen.cc:576
-#, 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/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:1211
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Pakete Zerrenda irakurtzen"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Fitxategiaren erreferentziak biltzen"
+msgid "Failed to open StateFile %s"
+msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Unable to write to %s"
-msgstr "%s : ezin da idatzi"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2383,6 +2236,79 @@ msgstr ""
 "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
 "paketearentzat."
 
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "'%s' motako indize fitxategirik ez da onartzen"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ezin da %s atzitu."
+
+#: apt-pkg/pkgcachegen.cc:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Pakete Zerrenda irakurtzen"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Fitxategiaren erreferentziak biltzen"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s : ezin da idatzi"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "S/I errorea iturburu katxea gordetzean"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2415,6 +2341,15 @@ msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en"
@@ -2464,14 +2399,10 @@ msgstr ""
 "izaten da, baina hala ere egin nahi baduzu, aktibatu APT::Force-LoopBreak "
 "aukera."
 
-#: 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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2567,31 +2498,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Dependentzia zuhaitza eraikitzen"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Hautagaien bertsioak"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Dependentzi Sormena"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2603,6 +2528,106 @@ msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Ezin da %s pakete fitxategia analizatu (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ezin da %s pakete fitxategia analizatu (1)"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Lerro baliogabea desbideratze fitxategian: %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2655,31 +2680,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Lerro baliogabea desbideratze fitxategian: %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3419,22 +3419,22 @@ msgstr " DeLink-en mugara (%sB) heldu da.\n"
 msgid "Archive had no package field"
 msgstr "Artxiboak ez du pakete eremurik"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s: ez du override sarrerarik\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s mantentzailea %s da, eta ez %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s: ez du jatorri gainidazketa sarrerarik\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s: ez du bitar gainidazketa sarrerarik\n"
diff --git a/po/fi.po b/po/fi.po
index 835d5ffce..bf4994788 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1108,251 +1108,10 @@ msgstr "Yhteys ei toiminut"
 msgid "Internal error"
 msgstr "Sisäinen virhe"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Korjataan riippuvuuksia..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " ei onnistunut."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Riippuvuuksien korjaus ei onnistu"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Päivitysjoukon minimointi ei onnistu"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Valmis"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!"
@@ -1593,31 +1352,272 @@ msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n"
 
-#: apt-private/private-install.cc:846
+#: apt-private/private-install.cc:846
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s on jo uusin versio.\n"
+
+#: apt-private/private-install.cc:894
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Valittiin versio %s (%s) paketille %s\n"
+
+#: apt-private/private-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Valittiin versio %s (%s) paketille %s\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+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:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Korjataan riippuvuuksia..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " ei onnistunut."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Riippuvuuksien korjaus ei onnistu"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Päivitysjoukon minimointi ei onnistu"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Valmis"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
 #, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s on jo uusin versio.\n"
+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-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Valittiin versio %s (%s) paketille %s\n"
+#: apt-private/private-update.cc:101
+msgid "All packages are up to date."
+msgstr ""
 
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Valittiin versio %s (%s) paketille %s\n"
+#: 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] ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
+#: 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:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1702,8 +1702,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2004,26 +2004,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Kohteen %s tarkistussumma ei täsmää"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Menetelmän ajuria %s ei löytynyt"
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Menetelmä %s ei käynnistynyt oikein"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -2119,184 +2099,56 @@ msgstr "valinnainen"
 msgid "extra"
 msgstr "ylimääräinen"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
-
-#: 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)"
+msgid "The method driver %s could not be found."
+msgstr "Menetelmän ajuria %s ei löytynyt"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/acquire-worker.cc:118
 #, 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/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/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"
+msgid "Is the package %s installed?"
+msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Rivi %u on liian pitkä lähdeluettelossa %s."
+msgid "Method %s did not start correctly"
+msgstr "Menetelmä %s ei käynnistynyt oikein"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
+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/sourcelist.cc:375
+#: apt-pkg/pkgrecords.cc:38
 #, 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:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
+msgid "Index file type '%s' is not supported"
 msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
 
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "stat %s ei onnistu."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Muodostetaan riippuvuussuhteiden puu"
 
-#: apt-pkg/pkgcachegen.cc:263
-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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Mahdolliset versiot"
 
-#: apt-pkg/pkgcachegen.cc:266
-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/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Luodaan riippuvuudet"
 
-#: apt-pkg/pkgcachegen.cc:576
-#, 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/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Luetaan tilatiedot"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "stat ei toiminut lähdepakettiluettelolle %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Luetaan pakettiluetteloita"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Kootaan tiedostojen tarjoamistietoja"
+msgid "Failed to open StateFile %s"
+msgstr "Tilatiedoston %s avaaminen ei onnistunut"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+msgid "Failed to write temporary StateFile %s"
+msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2379,6 +2231,80 @@ msgstr ""
 "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
 "kenttää."
 
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "stat %s ei onnistu."
+
+#: apt-pkg/pkgcachegen.cc:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "stat ei toiminut lähdepakettiluettelolle %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Luetaan pakettiluetteloita"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Kootaan tiedostojen tarjoamistietoja"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2411,6 +2337,15 @@ msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI"
@@ -2459,14 +2394,10 @@ 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/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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2561,31 +2492,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Muodostetaan riippuvuussuhteiden puu"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Mahdolliset versiot"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Luodaan riippuvuudet"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Luetaan tilatiedot"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Tilatiedoston %s avaaminen ei onnistunut"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2597,6 +2522,106 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
 msgid "Unable to parse package file %s (2)"
 msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Huomautus, valitaan %s eikä %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Virheellinen rivi korvautustiedostossa: %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2649,31 +2674,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Huomautus, valitaan %s eikä %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Virheellinen rivi korvautustiedostossa: %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3411,22 +3411,22 @@ msgstr " DeLinkin yläraja %st saavutettu.\n"
 msgid "Archive had no package field"
 msgstr "Arkistossa ei ollut pakettikenttää"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s:llä ei ole poikkeustietuetta\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s ylläpitäjä on %s eikä %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s:llä ei ole poikkeustietuetta\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s:llä ei  ole binääristäkään poikkeustietuetta\n"
diff --git a/po/fr.po b/po/fr.po
index 1bff06bf9..6c3d7f20e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1191,255 +1191,10 @@ msgstr "Échec de la connexion"
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr "En train de lister"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Correction des dépendances..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " a échoué."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Impossible de corriger les dépendances"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossible de minimiser le nombre des paquets mis à jour"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fait"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
@@ -1724,15 +1479,260 @@ 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-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Avertissement d'authentification ignoré.\n"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "En train de lister"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Correction des dépendances..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " a échoué."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Impossible de corriger les dépendances"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossible de minimiser le nombre des paquets mis à jour"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fait"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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 "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-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Avertissement d'authentification ignoré.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
 msgid "Some packages could not be authenticated"
 msgstr "Certains paquets n'ont pas pu être authentifiés"
 
@@ -1807,8 +1807,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2109,28 +2109,6 @@ 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:116
-#, 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:118
-#, 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:169
-#, 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:455
-#, 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 ""
@@ -2226,102 +2204,149 @@ msgstr "optionnel"
 msgid "extra"
 msgstr "supplémentaire"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Le type de fichier d'index « %s » n'est pas accepté"
+msgid "The method driver %s could not be found."
+msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, 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)"
+msgid "Is the package %s installed?"
+msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/acquire-worker.cc:169
 #, 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])"
+msgid "Method %s did not start correctly"
+msgstr "La méthode %s n'a pas démarré correctement"
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Ligne %lu mal formée dans la liste de sources %s ([option] trop courte)"
+"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
+"touche Entrée."
 
-#: apt-pkg/sourcelist.cc:184
+#: apt-pkg/pkgrecords.cc:38
 #, 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)"
+msgid "Index file type '%s' is not supported"
+msgstr "Le type de fichier d'index « %s » n'est pas accepté"
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construction de l'arbre des dépendances"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versions possibles"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Génération des dépendances"
+
+#: 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/depcache.cc:250
 #, 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)"
+msgid "Failed to open StateFile %s"
+msgstr "Impossible d'ouvrir le fichier d'état %s"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Erreur d'écriture du fichier d'état temporaire %s"
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "impossible de changer le nom, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Somme de contrôle de hachage incohérente"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Taille incohérente"
+
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
+msgstr "Format de fichier invalide"
+
+#: apt-pkg/acquire-item.cc:1640
 #, 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)"
+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"
 
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1656
 #, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
+msgid "Unable to find hash sum for '%s' in Release file"
 msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
+"Impossible de trouver la somme de contrôle de « %s » dans le fichier Release"
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1698
+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:1736
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
 msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
+"Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises "
+"à jour depuis ce dépôt ne s'effectueront pas."
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1758
 #, c-format
-msgid "Opening %s"
-msgstr "Ouverture de %s"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#: apt-pkg/acquire-item.cc:1788
 #, 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."
+msgid ""
+"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"
+msgstr ""
+"Une erreur s'est produite lors du contrôle de la signature. Le dépôt n'est "
+"pas mis à jour et les fichiers d'index précédents seront utilisés. Erreur de "
+"GPG : %s : %s\n"
 
-#: apt-pkg/sourcelist.cc:371
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, 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 "GPG error: %s: %s"
+msgstr "Erreur de GPG : %s : %s"
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1926
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+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 ""
-"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
+"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
+"devrez corriger ce paquet vous-même (absence d'architecture)."
 
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+#: apt-pkg/acquire-item.cc:1992
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
-"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
+"Impossible de trouver une source de téléchargement de la version « %s » de "
+"« %s »"
+
+#: apt-pkg/acquire-item.cc:2050
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
+"pour le paquet %s."
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2407,117 +2432,6 @@ 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:241
-msgid "Send request to solver"
-msgstr "Envoi d'une requête au solveur"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Préparation à la réception de la solution"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Échec du solveur externe sans message d'erreur adapté"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Exécution du solveur externe"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "impossible de changer le nom, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Somme de contrôle de hachage incohérente"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Taille incohérente"
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
-msgstr "Format de fichier invalide"
-
-#: apt-pkg/acquire-item.cc:1640
-#, 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"
-
-#: apt-pkg/acquire-item.cc:1656
-#, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
-"Impossible de trouver la somme de contrôle de « %s » dans le fichier Release"
-
-#: apt-pkg/acquire-item.cc:1698
-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:1736
-#, 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."
-
-#: apt-pkg/acquire-item.cc:1758
-#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)"
-
-#: apt-pkg/acquire-item.cc:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-"Une erreur s'est produite lors du contrôle de la signature. Le dépôt n'est "
-"pas mis à jour et les fichiers d'index précédents seront utilisés. Erreur de "
-"GPG : %s : %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Erreur de GPG : %s : %s"
-
-#: apt-pkg/acquire-item.cc:1926
-#, 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 ""
-"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:1992
-#, 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:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
-"pour le paquet %s."
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2550,6 +2464,14 @@ msgstr "Téléchargement du fichier %li sur %li (%s restant)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2607,13 +2529,10 @@ msgstr ""
 "Depends. C'est souvent une mauvaise chose, mais si vous souhaitez réellement "
 "le faire, activez l'option APT::Force-LoopBreak."
 
-#: 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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2716,31 +2635,25 @@ msgstr ""
 "Impossible de corriger les problèmes, des paquets défectueux sont en mode "
 "« garder en l'état »."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Construction de l'arbre des dépendances"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versions possibles"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Envoi du scénario au solveur"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Génération des dépendances"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "Envoi d'une requête au solveur"
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Préparation à la réception de la solution"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Impossible d'ouvrir le fichier d'état %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "Échec du solveur externe sans message d'erreur adapté"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Erreur d'écriture du fichier d'état temporaire %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Exécution du solveur externe"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2752,6 +2665,118 @@ msgstr "Impossible de traiter le fichier %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Impossible de traiter le fichier %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Impossible d'analyser le fichier Release %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Pas de sections dans le fichier Release %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, 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:130
+#, 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:149
+#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2817,31 +2842,6 @@ msgstr ""
 "Impossible de choisir la version installée du paquet « %s » qui n'est pas "
 "installé"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Impossible d'analyser le fichier Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Pas de sections dans le fichier Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Entrée « Date » non valable dans le fichier Release %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3613,22 +3613,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:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "%s ne possède pas d'entrée « override »\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr " le responsable de %s est %s et non %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, 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:710
+#: ftparchive/writer.cc:702
 #, 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"
diff --git a/po/gl.po b/po/gl.po
index 49d33265f..3311b9382 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1135,256 +1135,10 @@ msgstr "Produciuse un fallo na conexión"
 msgid "Internal error"
 msgstr "Produciuse un erro interno"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Corrixindo as dependencias..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " fallou."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Non foi posíbel corrixir as dependencias."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Non foi posíbel minimizar o conxunto de anovacións"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Feito"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1656,13 +1410,259 @@ 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-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVISO: Non se poden autenticar os seguintes paquetes!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Ignórase o aviso de autenticación.\n"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Corrixindo as dependencias..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " fallou."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Non foi posíbel corrixir as dependencias."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Non foi posíbel minimizar o conxunto de anovacións"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Feito"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVISO: Non se poden autenticar os seguintes paquetes!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Ignórase o aviso de autenticación.\n"
 
 #: apt-private/private-download.cc:45 apt-private/private-download.cc:52
 msgid "Some packages could not be authenticated"
@@ -1739,8 +1739,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2039,26 +2039,6 @@ 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:116
-#, 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:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "O método %s non se iniciou correctamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -2155,94 +2135,143 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "O tipo de ficheiros de índices «%s» non está admitido"
+msgid "The method driver %s could not be found."
+msgstr "Non foi posíbel atopar o controlador de métodos %s."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, 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)"
+msgid "Is the package %s installed?"
+msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/acquire-worker.cc:169
 #, 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)"
+msgid "Method %s did not start correctly"
+msgstr "O método %s non se iniciou correctamente"
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/acquire-worker.cc:455
 #, 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)"
+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/sourcelist.cc:184
+#: apt-pkg/pkgrecords.cc:38
 #, 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)"
+msgid "Index file type '%s' is not supported"
+msgstr "O tipo de ficheiros de índices «%s» non está admitido"
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construindo a árbore de dependencias"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versións candidatas"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Xeración de dependencias"
+
+#: 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/depcache.cc:250
 #, 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)"
+msgid "Failed to open StateFile %s"
+msgstr "Non foi posíbel abrir o ficheiro de estado %s"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:256
 #, 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)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Liña %lu mal construída na lista de orixes %s (URI)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "A sumas «hash» non coinciden"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Os tamaños non coinciden"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Operación incorrecta: %s"
+
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Liña %lu mal construída na lista de orixes %s (dist)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+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/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:1656
 #, 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)"
+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/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1698
+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:1736
 #, 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)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, 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)"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)"
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "Abrindo %s"
+msgid ""
+"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"
+msgstr ""
+"Produciuse un erro durante a verificación da sinatura. O repositorio non foi "
+"actualizado, empregaranse os ficheiros de índice anteriores. Erro de GPG: "
+"%s: %s\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Liña %u longa de máis na lista de orixes %s."
+msgid "GPG error: %s: %s"
+msgstr "Produciuse un erro de GPG: %s %s"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, 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 ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Non é 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/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, 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"
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
 
-#: 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/acquire-item.cc:2050
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Os ficheiros de índices de paquetes están danados. Non hai un campo "
+"Filename: para o paquete %s."
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2320,113 +2349,6 @@ msgstr "Non é posíbel escribir en %s"
 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "A sumas «hash» non coinciden"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Os tamaños non coinciden"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Operación incorrecta: %s"
-
-#: apt-pkg/acquire-item.cc:1640
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-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:1656
-#, 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:1698
-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:1736
-#, 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:1758
-#, 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:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-"Produciuse un erro durante a verificación da sinatura. O repositorio non foi "
-"actualizado, empregaranse os ficheiros de índice anteriores. Erro de GPG: "
-"%s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Produciuse un erro de GPG: %s %s"
-
-#: apt-pkg/acquire-item.cc:1926
-#, 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 ""
-"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:1992
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Os ficheiros de índices de paquetes están danados. Non hai un campo "
-"Filename: para o paquete %s."
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2459,6 +2381,15 @@ msgstr "Obtendo o ficheiro %li de %li (restan %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Debe introducir algúns URI «orixe» no seu ficheiro sources.list"
@@ -2511,14 +2442,10 @@ 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/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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2617,31 +2544,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Construindo a árbore de dependencias"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versións candidatas"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Xeración de dependencias"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Non foi posíbel abrir o ficheiro de estado %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2653,6 +2574,110 @@ msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Non se puido analizar o ficheiro de publicación %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Non hai seccións no ficheiro de publicación %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, 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:130
+#, 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:149
+#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2715,31 +2740,6 @@ msgstr ""
 "Non é posíbel seleccionar a versión instalada do paquete %s xa que non está "
 "instalado"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Non se puido analizar o ficheiro de publicación %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Non hai seccións no ficheiro de publicación %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "A entrada «Date» no ficheiro de publicación %s non é válida"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3507,22 +3507,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:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s non ten unha entrada de «override»\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  O mantedor de %s é %s, non %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, 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:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s tampouco ten unha entrada de «override» de binarios\n"
diff --git a/po/hu.po b/po/hu.po
index 51a2a6bb9..3b5865600 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1150,255 +1150,10 @@ msgstr "Sikertelen kapcsolódás"
 msgid "Internal error"
 msgstr "Belső hiba"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Függőségek javítása..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " sikertelen."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nem lehet javítani a függőségeket"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Kész"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!"
@@ -1663,15 +1418,260 @@ 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-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "FIGYELMEZTETÉS: Az alábbi csomagok nem hitelesíthetők!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "A hitelesítési figyelmeztetés felülbírálva.\n"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Függőségek javítása..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " sikertelen."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nem lehet javítani a függőségeket"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Kész"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "FIGYELMEZTETÉS: Az alábbi csomagok nem hitelesíthetők!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "A hitelesítési figyelmeztetés felülbírálva.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
 msgid "Some packages could not be authenticated"
 msgstr "Néhány csomag nem hitelesíthető"
 
@@ -1746,8 +1746,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2043,28 +2043,6 @@ 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:116
-#, 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:118
-#, 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:169
-#, 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:455
-#, 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 ""
@@ -2160,100 +2138,144 @@ msgstr "opcionális"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "A(z) „%s” indexfájltípus nem támogatott"
+msgid "The method driver %s could not be found."
+msgstr "A(z) %s metódusvezérlő nem található."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, 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)"
+msgid "Is the package %s installed?"
+msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n"
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/acquire-worker.cc:169
 #, 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)"
+msgid "Method %s did not start correctly"
+msgstr "A(z) %s metódus nem indult el megfelelően"
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] túl "
-"rövid)"
+"Helyezze be a(z) „%s” címkéjű lemezt a(z) „%s” meghajtóba, és nyomja meg az "
+"Entert."
 
-#: apt-pkg/sourcelist.cc:184
+#: apt-pkg/pkgrecords.cc:38
 #, 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)"
+msgid "Index file type '%s' is not supported"
+msgstr "A(z) „%s” indexfájltípus nem támogatott"
 
-#: apt-pkg/sourcelist.cc:190
+#: 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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Lehetséges verziók"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Függőséggenerálá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/depcache.cc:250
 #, 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)"
+msgid "Failed to open StateFile %s"
+msgstr "%s állapotfájl megnyitása sikertelen"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:256
 #, 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)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s átmeneti állapotfájl írása sikertelen"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, 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)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "sikertelen átnevezés, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "A Hash Sum nem megfelelő"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "A méret nem megfelelő"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "%s érvénytelen művelet"
+
+#: apt-pkg/acquire-item.cc:1640
 #, 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)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+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/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:1656
 #, 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)"
+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/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1698
+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:1736
 #, 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)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+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/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, 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)"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)"
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "%s megnyitása"
+msgid ""
+"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"
+msgstr ""
+"Hiba történt az aláírás ellenőrzése közben. A tároló nem frissült, és az "
+"előző indexfájl lesz használva. GPG hiba: %s: %s\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, 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."
+msgid "GPG error: %s: %s"
+msgstr "GPG hiba: %s: %s"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, 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 ""
+"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 ""
+"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/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, 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"
+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/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/acquire-item.cc:2050
+#, 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/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2331,112 +2353,6 @@ msgstr "Nem lehet írni ebbe: %s"
 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:241
-msgid "Send request to solver"
-msgstr "Kérés küldése a solvernek"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Felkészülés megoldás fogadására"
-
-#: apt-pkg/edsp.cc:327
-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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Külső solver végrehajtása"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "sikertelen átnevezés, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "A Hash Sum nem megfelelő"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "A méret nem megfelelő"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "%s érvénytelen művelet"
-
-#: apt-pkg/acquire-item.cc:1640
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-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:1656
-#, 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:1698
-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:1736
-#, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-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:1758
-#, 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:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-"Hiba történt az aláírás ellenőrzése közben. A tároló nem frissült, és az "
-"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:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG hiba: %s: %s"
-
-#: apt-pkg/acquire-item.cc:1926
-#, 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 ""
-"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:1992
-#, 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:2050
-#, 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/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2469,6 +2385,14 @@ msgstr "%li/%li fájl letöltése (%s marad)"
 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: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"
@@ -2521,13 +2445,10 @@ 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/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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2625,31 +2546,25 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Függőségi fa építése"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Lehetséges verziók"
+#: 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/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Függőséggenerálás"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "Kérés küldése a solvernek"
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Felkészülés megoldás fogadására"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s állapotfájl megnyitása sikertelen"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s átmeneti állapotfájl írása sikertelen"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Külső solver végrehajtása"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2661,6 +2576,116 @@ msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "A(z) %s Release fájl nem dolgozható fel"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "A(z) %s Release fájl nem tartalmaz szakaszokat"
+
+#: apt-pkg/indexrecords.cc:117
+#, 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:130
+#, 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:149
+#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2718,31 +2743,6 @@ 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/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "A(z) %s Release fájl nem dolgozható fel"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "A(z) %s Release fájl nem tartalmaz szakaszokat"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Érvénytelen „Date” bejegyzés a(z) %s Release fájlban"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3505,22 +3505,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:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nem rendelkezik felülbíráló bejegyzéssel\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s karbantartója %s, nem %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, 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:710
+#: ftparchive/writer.cc:702
 #, 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"
diff --git a/po/it.po b/po/it.po
index 905a8952f..b382fd2af 100644
--- a/po/it.po
+++ b/po/it.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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\n"
 "PO-Revision-Date: 2014-05-31 17:04+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -1196,253 +1196,10 @@ msgstr "Connessione non riuscita"
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr "Elencazione"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Correzione delle dipendenze..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " non riuscita."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Impossibile correggere le dipendenze"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossibile minimizzare l'insieme da aggiornare"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fatto"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-msgid "All packages are up to date."
-msgstr ""
-
 #: 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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1721,17 +1478,260 @@ 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-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati."
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Avviso di autenticazione disabilitato.\n"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "Elencazione"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Alcuni pacchetti non possono essere autenticati"
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Correzione delle dipendenze..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " non riuscita."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Impossibile correggere le dipendenze"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossibile minimizzare l'insieme da aggiornare"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fatto"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati."
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Avviso di autenticazione disabilitato.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Alcuni pacchetti non possono essere autenticati"
 
 #: apt-private/private-download.cc:50
 msgid "Install these packages without verification?"
@@ -1806,8 +1806,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2110,26 +2110,6 @@ 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:116
-#, 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:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "Il pacchetto %s è installato?"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Il metodo %s non si è avviato correttamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -2226,101 +2206,145 @@ msgstr "opzionale"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Il file indice di tipo \"%s\" non è supportato"
+msgid "The method driver %s could not be found."
+msgstr "Impossibile trovare un driver per il metodo %s."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, 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)"
+msgid "Is the package %s installed?"
+msgstr "Il pacchetto %s è installato?"
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/acquire-worker.cc:169
 #, 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)"
+msgid "Method %s did not start correctly"
+msgstr "Il metodo %s non si è avviato correttamente"
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/acquire-worker.cc:455
 #, 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)"
+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/sourcelist.cc:184
+#: apt-pkg/pkgrecords.cc:38
 #, 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)"
+msgid "Index file type '%s' is not supported"
+msgstr "Il file indice di tipo \"%s\" non è supportato"
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Generazione albero delle dipendenze"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versioni candidate"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generazione delle dipendenze"
+
+#: 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/depcache.cc:250
 #, 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)"
+msgid "Failed to open StateFile %s"
+msgstr "Apertura del file di stato %s non riuscita"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:256
 #, 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)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Scrittura del file temporaneo di stato %s non riuscita"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "La riga %lu nel file %s non è corretta (URI)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "rename() non riuscita: %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Somma hash non corrispondente"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Le dimensioni non corrispondono"
+
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
+msgstr "Formato file non valido"
+
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "La riga %lu nel file %s non è corretta (dist)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+"Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list "
+"errata o file danneggiato)"
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:1656
 #, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "La riga %lu nel file %s non è corretta (URI parse)"
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Impossibile trovare la somma hash per \"%s\" nel file Release"
 
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1698
+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:1736
 #, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "La riga %lu nel file %s non è corretta (absolute dist)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+"Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per "
+"questo repository non verranno applicati."
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "La riga %lu nel file %s non è corretta (dist parse)"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)"
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "Apertura di %s"
+msgid ""
+"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"
+msgstr ""
+"Si è verificato un errore nel verificare la firma. Il repository non è "
+"aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Riga %u troppo lunga nel file %s."
+msgid "GPG error: %s: %s"
+msgstr "Errore GPG: %s: %s"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "La riga %u nel file %s non è corretta (type)"
+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 ""
+"Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
+"sistemare manualmente questo pacchetto (a causa dell'architettura mancante)."
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, 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 "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+"Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s\""
 
-#: apt-pkg/sourcelist.cc:416
+# (ndt) sarebbe da controllare se veramente possono esistere più file indice
+#: apt-pkg/acquire-item.cc:2050
 #, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
-"Tipo \"%s\" non riconosciuto nella stanza %u nel file delle sorgenti %s"
+"I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" "
+"per il pacchetto %s."
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2400,115 +2424,6 @@ msgstr "Impossibile scrivere in %s"
 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:241
-msgid "Send request to solver"
-msgstr "Invia la richiesta al solver"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Preparazione alla ricezione della soluzione"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Il solver esterno è terminato senza un errore di messaggio"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Esecuzione solver esterno"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "rename() non riuscita: %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Somma hash non corrispondente"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Le dimensioni non corrispondono"
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
-msgstr "Formato file non valido"
-
-#: apt-pkg/acquire-item.cc:1640
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
-"Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list "
-"errata o file danneggiato)"
-
-#: apt-pkg/acquire-item.cc:1656
-#, 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:1698
-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:1736
-#, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-"Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per "
-"questo repository non verranno applicati."
-
-#: apt-pkg/acquire-item.cc:1758
-#, 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:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-"Si è verificato un errore nel verificare la firma. Il repository non è "
-"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:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Errore GPG: %s: %s"
-
-#: apt-pkg/acquire-item.cc:1926
-#, 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 ""
-"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:1992
-#, 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:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" "
-"per il pacchetto %s."
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2542,6 +2457,14 @@ msgstr "Scaricamento file %li di %li (%s rimanente)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2599,13 +2522,10 @@ msgstr ""
 "situazione critica, ma se si vuole realmente procedere, attivare l'opzione "
 "APT::Force-LoopBreak."
 
-#: 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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2705,31 +2625,25 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Generazione albero delle dipendenze"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versioni candidate"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Invia lo scenario al solver"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generazione delle dipendenze"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "Invia la richiesta al solver"
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Preparazione alla ricezione della soluzione"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Apertura del file di stato %s non riuscita"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "Il solver esterno è terminato senza un errore di messaggio"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Scrittura del file temporaneo di stato %s non riuscita"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Esecuzione solver esterno"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2741,6 +2655,117 @@ msgstr "Impossibile analizzare il file di pacchetto %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Impossibile analizzare il file di pacchetto %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Impossibile analizzare il file Release %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Nessuna sezione nel file Release %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Nessuna voce Hash nel file Release %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, 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/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/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: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"
+
 # (ndt) dovrebbe essere inteso il file Release
 #: apt-pkg/cacheset.cc:489
 #, c-format
@@ -2805,31 +2830,6 @@ msgstr ""
 "Impossibile selezionare la versione installata dal pacchetto %s poiché non è "
 "installato"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Impossibile analizzare il file Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Nessuna sezione nel file Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Nessuna voce Hash nel file Release %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Voce \"Date\" nel file Release %s non valida"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3603,22 +3603,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:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s non ha un campo override\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  il responsabile di %s è %s non %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s non ha un campo source override\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s non ha neppure un campo binario override\n"
diff --git a/po/ja.po b/po/ja.po
index 460fb2b29..9da59c1cf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1185,255 +1185,10 @@ msgstr "接続失敗"
 msgid "Internal error"
 msgstr "内部エラー"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr "一覧表示"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "依存関係を解決しています ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " 失敗しました。"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "依存関係を訂正できません"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "アップグレードセットを最小化できません"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " 完了"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
-"ん。"
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!"
@@ -1676,28 +1431,273 @@ msgstr "%s はダウンロードできないため、再インストールは不
 msgid "%s is already the newest version.\n"
 msgstr "%s はすでに最新版です。\n"
 
-#: apt-private/private-install.cc:894
+#: apt-private/private-install.cc:894
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "'%3$s' のバージョン '%1$s' (%2$s) を選択しました\n"
+
+#: apt-private/private-install.cc:899
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%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:941
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+"パッケージ '%s' はインストールされていないため削除もされません。削除したかっ"
+"たのは '%s' でしょうか?\n"
+
+#: apt-private/private-install.cc:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "パッケージ '%s' はインストールされていないため、削除もされません\n"
+
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "一覧表示"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "依存関係を解決しています ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " 失敗しました。"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "依存関係を訂正できません"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "アップグレードセットを最小化できません"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " 完了"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
+"ん。"
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+msgid "All packages are up to date."
+msgstr "パッケージはすべて最新です。"
+
+#: apt-private/private-show.cc:156
 #, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "'%3$s' のバージョン '%1$s' (%2$s) を選択しました\n"
+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-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "'%4$s' のために '%3$s' のバージョン '%1$s' (%2$s) を選択しました\n"
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "実際のパッケージではありません (仮想)"
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+#: 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 ""
-"パッケージ '%s' はインストールされていないため削除もされません。削除したかっ"
-"たのは '%s' でしょうか?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "パッケージ '%s' はインストールされていないため、削除もされません\n"
+"注意: これはシミュレーションにすぎません!\n"
+"      apt-get は実際の実行に root 権限を必要とします。\n"
+"      ロックが非アクティブであることから、今この時点の状態に妥当性が\n"
+"      あるとは言い切れないことに注意してください!"
 
 #: apt-private/private-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1783,8 +1783,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2081,28 +2081,6 @@ msgstr "認証レコードが見つかりません: %s"
 msgid "Hash mismatch for: %s"
 msgstr "ハッシュサムが適合しません: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "メソッドドライバ %s が見つかりません。"
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "パッケージ %s はインストールされていますか?"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "メソッド %s が正常に開始しませんでした"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -2200,187 +2178,58 @@ msgstr "任意"
 msgid "extra"
 msgstr "特別"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "インデックスファイルのタイプ '%s' はサポートされていません"
-
-#: 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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] が短かすぎます)"
+msgid "The method driver %s could not be found."
+msgstr "メソッドドライバ %s が見つかりません。"
 
-#: apt-pkg/sourcelist.cc:184
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] は割り当てられていません)"
+msgid "Is the package %s installed?"
+msgstr "パッケージ %s はインストールされていますか?"
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s にキーがありません)"
+msgid "Method %s did not start correctly"
+msgstr "メソッド %s が正常に開始しませんでした"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 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/sourcelist.cc:217
-#, c-format
-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:490
-#, 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:93
-msgid "Cache has an incompatible versioning system"
-msgstr "キャッシュに非互換なバージョニングシステムがあります"
+"'%s' とラベルの付いたディスクをドライブ '%s' に入れて Enter キーを押してくだ"
+"さい。"
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s を処理中にエラーが発生しました (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "この APT が対応している以上の数のパッケージが指定されました。"
+msgid "Index file type '%s' is not supported"
+msgstr "インデックスファイルのタイプ '%s' はサポートされていません"
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "この APT が対応している以上の数のバージョンが要求されました。"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "依存関係ツリーを作成しています"
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "この APT が対応している以上の数の説明が要求されました。"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候補バージョン"
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "この APT が対応している以上の数の依存関係が発生しました。"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "依存関係の生成"
 
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "パッケージ %s %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:1211
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "ソースパッケージリスト %s の状態を取得できません"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "パッケージリストを読み込んでいます"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "ファイル提供情報を収集しています"
+msgid "Failed to open StateFile %s"
+msgstr "状態ファイル %s のオープンに失敗しました"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Unable to write to %s"
-msgstr "%s に書き込めません"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr "ソルバにリクエストを送信"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "解決を受け取る準備"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "外部ソルバを実行"
+msgid "Failed to write temporary StateFile %s"
+msgstr "一時状態ファイル %s の書き込みに失敗しました"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2470,6 +2319,79 @@ msgstr ""
 "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
 "フィールドがありません。"
 
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s を処理中にエラーが発生しました (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "この APT が対応している以上の数のパッケージが指定されました。"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "この APT が対応している以上の数のバージョンが要求されました。"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "この APT が対応している以上の数の説明が要求されました。"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "この APT が対応している以上の数の依存関係が発生しました。"
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "ソースパッケージリスト %s の状態を取得できません"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "パッケージリストを読み込んでいます"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "ファイル提供情報を収集しています"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s に書き込めません"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2502,6 +2424,14 @@ msgstr "ファイルを取得しています %li/%li (残り %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "sources.list に 'ソース' URI を指定する必要があります"
@@ -2556,13 +2486,10 @@ msgstr ""
 "ケージ %s を削除します。これは多くの場合に問題が起こる原因となります。本当に"
 "これを行いたいなら、APT::Force-LoopBreak オプションを有効にしてください。"
 
-#: 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:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。"
 
 #: apt-pkg/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2661,31 +2588,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "依存関係ツリーを作成しています"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "候補バージョン"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "ソルバにシナリオを送信"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "依存関係の生成"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "ソルバにリクエストを送信"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "状態情報を読み取っています"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "解決を受け取る準備"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "状態ファイル %s のオープンに失敗しました"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "一時状態ファイル %s の書き込みに失敗しました"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "外部ソルバを実行"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2697,6 +2618,110 @@ msgstr "パッケージファイル %s を解釈することができません (
 msgid "Unable to parse package file %s (2)"
 msgstr "パッケージファイル %s を解釈することができません (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Release ファイル %s を解釈することができません"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Release ファイル %s にセクションがありません"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Release ファイル %s に Hash エントリがありません"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Release ファイル %s に無効な 'Valid-Until' エントリがあります"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/sourcelist.cc:217
+#, c-format
+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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2754,31 +2779,6 @@ msgstr ""
 "インストールされていないので、パッケージ %s のインストール済みバージョンを選"
 "べません。"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Release ファイル %s を解釈することができません"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Release ファイル %s にセクションがありません"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Release ファイル %s に Hash エントリがありません"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Release ファイル %s に無効な 'Valid-Until' エントリがあります"
-
-#: apt-pkg/indexrecords.cc:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Release ファイル %s に無効な 'Date' エントリがあります"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3534,22 +3534,22 @@ msgstr " リンクを外す制限の %sB に到達しました。\n"
 msgid "Archive had no package field"
 msgstr "アーカイブにパッケージフィールドがありませんでした"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s に override エントリがありません\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %1$s メンテナは %3$s ではなく %2$s です\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s にソース override エントリがありません\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s にバイナリ override エントリがありません\n"
diff --git a/po/km.po b/po/km.po
index 43560cc9e..d57d7def9 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1102,251 +1102,10 @@ msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
 msgid "Internal error"
 msgstr "កំហុស​ខាង​ក្នុង​"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " បាន​បរាជ័យ ។"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " ធ្វើ​រួច"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។"
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "កំហុស​ខាងក្នុង កញ្ចប់​ដំឡើង​ត្រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​ខូច !"
@@ -1577,29 +1336,270 @@ msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវ
 
 #: apt-private/private-install.cc:846
 #, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
+msgid "%s is already the newest version.\n"
+msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
+
+#: apt-private/private-install.cc:894
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
+
+#: apt-private/private-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
+
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " បាន​បរាជ័យ ។"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " ធ្វើ​រួច"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។"
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
+#: apt-private/private-update.cc:101
+msgid "All packages are up to date."
+msgstr ""
 
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
+#: 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] ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
+#: 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:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1685,8 +1685,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1982,26 +1982,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ត្រ %s ឡើយ ។"
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថានភាព​មិន​អាចត្រូវបាន​​ញែក ​​ឬ ត្រូវបាន​បើកបានឡើយ​​ ។"
@@ -2096,184 +2076,57 @@ msgstr "ស្រេចចិត្ត"
 msgid "extra"
 msgstr "បន្ថែម"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​"
-
-#: 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/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 ញែក​)"
+msgid "The method driver %s could not be found."
+msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ត្រ %s ឡើយ ។"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/acquire-worker.cc:118
 #, 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"
+msgid "Is the package %s installed?"
+msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។"
+msgid "Method %s did not start correctly"
+msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "បន្ទាត់​ Malformed  %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/pkgrecords.cc:38
 #, 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:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
+msgid "Index file type '%s' is not supported"
 msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​"
 
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "មិនអាច​ថ្លែង %s បានឡើយ ។"
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "កំពុងស្ថាបនា​មែកធាងភាពអាស្រ័យ"
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​  APT នេះ​ឆបគ្នា​​  ។"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "កំណែ​សាកល្បង​"
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "ការបង្កើត​ភាពអាស្រ័យ​"
 
-#: apt-pkg/pkgcachegen.cc:263
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
 #, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "មិន​អាច​សរសេរ​ទៅ %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+msgid "Reading state information"
+msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2355,6 +2208,80 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។"
 
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, fuzzy, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​  APT នេះ​ឆបគ្នា​​  ។"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
+
+#: apt-pkg/pkgcachegen.cc:263
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "មិន​អាច​សរសេរ​ទៅ %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2387,6 +2314,14 @@ msgstr "កំពុង​ទៅ​យក​ឯកសារ %li នៃ %li (ន
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក"
@@ -2435,13 +2370,10 @@ msgstr ""
 "ភាពអាស្រ័យជាមុន ។ ជាញឹកញាប់គឺ មិនត្រឹមត្រូវ ប៉ុន្តែ ប្រសិនបើអ្នក​ពិតជាចង់ធ្វើវា ធ្វើឲ្យជម្រើស APT::"
 "Force-LoopBreak សកម្ម ។"
 
-#: 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:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។"
 
 #: apt-pkg/cdrom.cc:571
 #, fuzzy
@@ -2535,32 +2467,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "កំពុងស្ថាបនា​មែកធាងភាពអាស្រ័យ"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "កំណែ​សាកល្បង​"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "ការបង្កើត​ភាពអាស្រ័យ​"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2572,6 +2497,106 @@ msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1
 msgid "Unable to parse package file %s (2)"
 msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ"
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/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 "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 (ប្រភេទ​)"
+
+#: 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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2624,31 +2649,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3385,22 +3385,22 @@ msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n"
 msgid "Archive had no package field"
 msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n"
diff --git a/po/ko.po b/po/ko.po
index 88bdf72aa..3d7c36109 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1109,253 +1109,10 @@ msgstr "연결이 실패했습니다"
 msgid "Internal error"
 msgstr "내부 오류"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "의존성을 바로잡는 중입니다..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " 실패."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "의존성을 바로잡을 수 없습니다"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "업그레이드 집합을 최소화할 수 없습니다"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " 완료"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다."
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습니다!"
@@ -1594,26 +1351,269 @@ msgstr "%s 패키지를 다시 설치하는 건 불가능합니다. 다운로드
 msgid "%s is already the newest version.\n"
 msgstr "%s 패키지는 이미 최신 버전입니다.\n"
 
-#: apt-private/private-install.cc:894
+#: apt-private/private-install.cc:894
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
+
+#: apt-private/private-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
+
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "의존성을 바로잡는 중입니다..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " 실패."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "의존성을 바로잡을 수 없습니다"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "업그레이드 집합을 최소화할 수 없습니다"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " 완료"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다."
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
 #, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
+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-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
+#: apt-private/private-update.cc:101
+msgid "All packages are up to date."
+msgstr ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
+#: 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-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
+#: 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:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1698,8 +1698,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1994,27 +1994,6 @@ msgstr "다음의 인증 기록을 찾을 수 없습니다: %s"
 msgid "Hash mismatch for: %s"
 msgstr "다음의 해시가 다릅니다: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 "패키지 목록이나 상태 파일을 파싱할 수 없거나 열 수 없습니다."
@@ -2109,184 +2088,57 @@ msgstr "옵션"
 msgid "extra"
 msgstr "별도"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다"
+msgid "The method driver %s could not be found."
+msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, 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] 대입이 아님)"
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 키가 없음)"
+msgid "Method %s did not start correctly"
+msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 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 파싱)"
-
-#: 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번 줄이 잘못되었습니다 (타입)"
+"'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 넣고 Enter를 누르십시오."
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/pkgrecords.cc:38
 #, 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:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
+msgid "Index file type '%s' is not supported"
 msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다"
 
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s의 정보를 읽을 수 없습니다."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "의존성 트리를 만드는 중입니다"
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다."
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "후보 버전"
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "의존성 만들기"
 
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "파일 의존성을 처리하는 데, %s %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:1211
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "패키지 목록을 읽는 중입니다"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "파일에서 제공하는 것을 모으는 중입니다"
+msgid "Failed to open StateFile %s"
+msgstr "상태파일 %s 여는데 실패했습니다"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Unable to write to %s"
-msgstr "%s에 쓸 수 없습니다"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+msgid "Failed to write temporary StateFile %s"
+msgstr "임시 상태파일 %s 쓰는데 실패했습니다"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2370,6 +2222,79 @@ msgid ""
 msgstr ""
 "패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다."
 
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, fuzzy, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "패키지 목록을 읽는 중입니다"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "파일에서 제공하는 것을 모으는 중입니다"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s에 쓸 수 없습니다"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2402,6 +2327,15 @@ msgstr "파일 받아오는 중: %2$li 중 %1$li (%3$s 남았음)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "sources.list에 '소스' URI를 써 넣어야 합니다"
@@ -2452,14 +2386,10 @@ msgstr ""
 "잠깐 제거해야 합니다. 이 패키지를 제거하는 건 좋지 않지만, 정말 지우려면 "
 "APT::Force-LoopBreak 옵션을 켜십시오."
 
-#: 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:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다."
 
 #: apt-pkg/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2555,31 +2485,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "의존성 트리를 만드는 중입니다"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "후보 버전"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "의존성 만들기"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "상태 정보를 읽는 중입니다"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "상태파일 %s 여는데 실패했습니다"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "임시 상태파일 %s 쓰는데 실패했습니다"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2591,6 +2515,107 @@ msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Release 파일 %s에 섹션이 없습니다"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Release 파일 %s에 Hash 항목이 없습니다"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2645,31 +2670,6 @@ msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "'%s' 패키지에서 설치한 버전을 선택할 수 없습니다. 설치하지 않았습니다."
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Release 파일 %s에 섹션이 없습니다"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Release 파일 %s에 Hash 항목이 없습니다"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다"
-
-#: apt-pkg/indexrecords.cc:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3416,22 +3416,22 @@ msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n"
 msgid "Archive had no package field"
 msgstr "아카이브에 패키지 필드가 없습니다"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s에는 override 항목이 없습니다\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s 관리자가 %s입니다 (%s 아님)\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s에는 source override 항목이 없습니다\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s에는 binary override 항목이 없습니다\n"
diff --git a/po/ku.po b/po/ku.po
index 38905589e..4dbe31fbb 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1022,250 +1022,10 @@ msgstr "Girêdan pêk nehatiye"
 msgid "Internal error"
 msgstr "Çewtiya hundirîn"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Bindestî tên serrastkirin..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " neserketî."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nikare bindestiyan rast kirin"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Temam"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1459,53 +1219,293 @@ msgstr "Paketên şikestî"
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Paketên tên pêşniyaz kirin:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Paketên tên tawsiyê kirin:"
+#: apt-private/private-install.cc:802
+msgid "Suggested packages:"
+msgstr "Paketên tên pêşniyaz kirin:"
+
+#: apt-private/private-install.cc:803
+msgid "Recommended packages:"
+msgstr "Paketên tên tawsiyê kirin:"
+
+#: apt-private/private-install.cc:825
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:829
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:841
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:846
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s jixwe guhertoya nûtirîn e.\n"
+
+#: apt-private/private-install.cc:894
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr ""
+
+#: apt-private/private-install.cc:899
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr ""
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+
+#: apt-private/private-install.cc:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr ""
+
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Bindestî tên serrastkirin..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " neserketî."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nikare bindestiyan rast kirin"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Temam"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:111
+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"
 
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+#. 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-install.cc:829
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
 #, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgid "Regex compilation error - %s"
 msgstr ""
 
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
 msgstr ""
 
-#: apt-private/private-install.cc:846
+#: apt-private/private-update.cc:97
 #, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s jixwe guhertoya nûtirîn e.\n"
+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-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
+#: apt-private/private-update.cc:101
+msgid "All packages are up to date."
 msgstr ""
 
-#: apt-private/private-install.cc:899
+#: apt-private/private-show.cc:156
 #, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+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] ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
+#: 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:36
@@ -1588,8 +1588,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1886,26 +1886,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum li hev nayên"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -1999,183 +1979,56 @@ msgstr "opsiyonel"
 msgid "extra"
 msgstr "ekstra"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-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)"
-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: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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Is the package %s installed?"
 msgstr ""
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Clean of %s is not supported"
-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/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
+msgid "Method %s did not start correctly"
 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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:455
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Dema şixulandina naveroka %s çewtî"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Lîsteya pakêtan tê xwendin"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr ""
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Guhartoyên berendam"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
 msgstr ""
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Vekirina StateFile %s biserneket"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s ji hev nehate veçirandin"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2253,6 +2106,79 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, c-format
+msgid "Clean of %s is not supported"
+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/pkgcachegen.cc:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Dema şixulandina naveroka %s çewtî"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Lîsteya pakêtan tê xwendin"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nivîsandin ji bo %s ne pêkane"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2285,6 +2211,12 @@ msgstr ""
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2330,10 +2262,9 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 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."
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
 msgstr ""
 
 #: apt-pkg/cdrom.cc:571
@@ -2425,31 +2356,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Guhartoyên berendam"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Vekirina StateFile %s biserneket"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s ji hev nehate veçirandin"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, fuzzy, c-format
@@ -2461,6 +2386,106 @@ msgstr "Pakêt nehate dîtin %s"
 msgid "Unable to parse package file %s (2)"
 msgstr "Pakêt nehate dîtin %s"
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Pakêt nehate dîtin %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+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:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2513,31 +2538,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Pakêt nehate dîtin %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Pakêt nehate dîtin %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3222,22 +3222,22 @@ msgstr ""
 msgid "Archive had no package field"
 msgstr "Di arşîvê de qada pakêtê tuneye"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index a4f8d0baa..42959db62 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1025,252 +1025,10 @@ msgstr "Prisijungti nepavyko"
 msgid "Internal error"
 msgstr "Vidinė klaida"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Taisomos priklausomybės..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " nepavyko."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nepavyko patenkinti priklausomybių"
-
-#: apt-private/private-cachefile.cc:102
-#, fuzzy
-msgid "Unable to minimize the upgrade set"
-msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Įvykdyta"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1496,36 +1254,278 @@ msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
 
-#: apt-private/private-install.cc:841
+#: apt-private/private-install.cc:841
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n"
+
+#: apt-private/private-install.cc:846
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s ir taip jau yra naujausias.\n"
+
+#: apt-private/private-install.cc:894
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Pažymėta versija %s (%s) paketui %s\n"
+
+#: apt-private/private-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Pažymėta versija %s (%s) paketui %s\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+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:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Taisomos priklausomybės..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " nepavyko."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nepavyko patenkinti priklausomybių"
+
+#: apt-private/private-cachefile.cc:102
+#, fuzzy
+msgid "Unable to minimize the upgrade set"
+msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Įvykdyta"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
 #, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n"
+msgid "Regex compilation error - %s"
+msgstr ""
 
-#: apt-private/private-install.cc:846
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Atnaujinimo komandai argumentų nereikia"
+
+#: apt-private/private-update.cc:97
 #, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ir taip jau yra naujausias.\n"
+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-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Pažymėta versija %s (%s) paketui %s\n"
+#: apt-private/private-update.cc:101
+msgid "All packages are up to date."
+msgstr ""
 
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Pažymėta versija %s (%s) paketui %s\n"
+#: 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] ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-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-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:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1610,8 +1610,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1911,26 +1911,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Maišos sumos nesutapimas"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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."
@@ -2026,182 +2006,55 @@ msgstr "nebūtinas"
 msgid "extra"
 msgstr "papildomas"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-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)"
-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 "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:490
-#, c-format
-msgid "Clean of %s is not supported"
-msgstr ""
-
-#: apt-pkg/clean.cc:64
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
+msgid "The method driver %s could not be found."
 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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Klaida apdorojant turinį %s"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
+msgid "Is the package %s installed?"
+msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Skaitomi paketų sąrašai"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr ""
+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/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Nepavyko įrašyti į %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Konstruojamas priklausomybių medis"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Galimos versijos"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Priklausomybių generavimas"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
+#: 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/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
@@ -2281,6 +2134,79 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Klaida apdorojant turinį %s"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Skaitomi paketų sąrašai"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nepavyko įrašyti į %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2313,6 +2239,15 @@ msgstr "Parsiunčiamas %li failas iš %li (liko %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2358,14 +2293,10 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
-#: 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."
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
 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"
@@ -2456,30 +2387,24 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Konstruojamas priklausomybių medis"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Galimos versijos"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Priklausomybių generavimas"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
 msgstr ""
 
 #: apt-pkg/tagfile.cc:140
@@ -2492,6 +2417,106 @@ msgstr ""
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nepavyko atverti DB failo %s: %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Pastaba: pažymimas %s vietoje %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Pastaba: pažymimas %s vietoje %s\n"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/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 "Atveriama %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 ""
+
+#: 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:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2544,31 +2569,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nepavyko atverti DB failo %s: %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Pastaba: pažymimas %s vietoje %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Pastaba: pažymimas %s vietoje %s\n"
-
-#: apt-pkg/indexrecords.cc:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Nepavyko atverti DB failo %s: %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3311,22 +3311,22 @@ msgstr ""
 msgid "Archive had no package field"
 msgstr "Archyvas neturėjo paketo lauko"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s neturi perrašymo įrašo\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, 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:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 06438b87f..ffc91baf6 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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 "
@@ -1100,251 +1100,10 @@ msgstr "जोडणी अयशस्वी"
 msgid "Internal error"
 msgstr "अंतर्गत त्रुटी"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr "अयशस्वी/चूकीचे झाले."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे "
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr "झाले"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल."
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "अंतर्गत त्रुटी, तुटलेल्या पॅकेजेस बरोबर  संस्थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!"
@@ -1605,19 +1364,260 @@ msgstr "%s पॅकेज संस्थापित केलेले ना
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n"
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! "
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "प्रमाणीकरणाची धोक्याची सूचना दुर्लक्षित करा.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "काही पॅकेजेसचे प्रमाणिकरण होऊ शकत नाही"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr "अयशस्वी/चूकीचे झाले."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे "
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr "झाले"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल."
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! "
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "प्रमाणीकरणाची धोक्याची सूचना दुर्लक्षित करा.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "काही पॅकेजेसचे प्रमाणिकरण होऊ शकत नाही"
+
+#: apt-private/private-download.cc:50
 #, fuzzy
 msgid "Install these packages without verification?"
 msgstr "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]?"
@@ -1689,8 +1689,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1987,26 +1987,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "हॅश बेरीज जुळत नाही"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. "
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 "पॅकेजच्या याद्या किंवा संचिकेची स्थिती स्पष्ट होऊ शकत नाही किंवा ती उघडू शकत नाही."
@@ -2101,90 +2081,137 @@ msgstr "एच्छिक"
 msgid "extra"
 msgstr "अधिक"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. "
+
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
+
+#: apt-pkg/acquire-worker.cc:455
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."
+
 #: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही"
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "अवलंबित रचना बांधणी करत आहे"
 
-#: apt-pkg/sourcelist.cc:173
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "कंॅडिडेट आवृत्त्या"
 
-#: 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/depcache.cc:168
+msgid "Dependency generation"
+msgstr "अवलंबित/विसंबून असलेले उत्पादन "
 
-#: 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/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "स्थिती माहिती वाचत आहे"
 
-#: 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/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s StateFile उघडणे असफल"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "स्त्रोत सुची %2$s (यूआरआय) मध्ये %1$lu वाईट/व्यंग रेषा"
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल"
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "स्त्रोत सुची %2$s (डिआयएसटी) मध्ये %1$lu वाईट/व्यंग रेषा"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "हॅश बेरीज जुळत नाही"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "आकार जुळतनाही"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "%s अवैध क्रिया"
+
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "स्त्रोत सुची %2$s (यूआरआय पार्स) मध्ये %1$lu वाईट/व्यंग रेषा"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1656
+#, fuzzy, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
+
+#: apt-pkg/acquire-item.cc:1698
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n"
+
+#: apt-pkg/acquire-item.cc:1736
 #, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "स्त्रोत सुची %2$s (absolute dist) मध्ये %1$lu वाईट/व्यंग रेषा"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "स्त्रोत सुची %2$s (डीआयएसटी पार्स) मध्ये %1$lu वाईट/व्यंग रेषा"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "%s उघडत आहे"
+msgid ""
+"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"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "%2$s स्त्रोत सुचीमध्ये ओळ %1$u खूप लांब आहे."
+msgid "GPG error: %s: %s"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "स्त्रोत सुची %2$s (प्रकार) मध्ये %1$u वाईट/व्यंग रेषा"
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"मी %s पॅकेजकरीता संचिका शोधण्यास  समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते "
+"स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) "
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
 
-#: 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/acquire-item.cc:2050
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/"
+"ठिकाण %s."
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2264,107 +2291,6 @@ msgstr "%s मध्ये लिहिण्यास असमर्थ "
 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "हॅश बेरीज जुळत नाही"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "आकार जुळतनाही"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "%s अवैध क्रिया"
-
-#: apt-pkg/acquire-item.cc:1640
-#, 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:1656
-#, fuzzy, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-
-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n"
-
-#: apt-pkg/acquire-item.cc:1736
-#, 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:1758
-#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1926
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"मी %s पॅकेजकरीता संचिका शोधण्यास  समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते "
-"स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) "
-
-#: apt-pkg/acquire-item.cc:1992
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/"
-"ठिकाण %s."
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2397,6 +2323,15 @@ msgstr "%li ची %li(%s राहिलेले) संचिका पुन
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "तुम्ही तुमच्या उगमस्थान यादीत URI घाला"
@@ -2445,14 +2380,10 @@ msgstr ""
 "गुंतागुंतीमुळे/Pre-Depends पूर्व अवलंबित आवर्तन.हे नेहमीच वाईट असते, पण जर तुम्हाला ते खरोखर "
 "करावयाचे असेल तर,APT::Force-LoopBreak पर्याय कार्यान्वित करा."
 
-#: 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:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "%2$s स्त्रोत सुचीमध्ये ओळ %1$u खूप लांब आहे."
 
 #: apt-pkg/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2548,31 +2479,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "अवलंबित रचना बांधणी करत आहे"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "कंॅडिडेट आवृत्त्या"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "अवलंबित/विसंबून असलेले उत्पादन "
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "स्थिती माहिती वाचत आहे"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s StateFile उघडणे असफल"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2584,6 +2509,106 @@ msgstr "%s (1) पॅकेज फाईल पार्स करण्या
 msgid "Unable to parse package file %s (2)"
 msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ"
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/sourcelist.cc:211
+#, c-format
+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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2636,31 +2661,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
-
-#: apt-pkg/indexrecords.cc:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3396,22 +3396,22 @@ msgstr "%sB हीट ची डिलींक मर्यादा\n"
 msgid "Archive had no package field"
 msgstr "अर्काईव्ह ला पॅकेज जागा नाही"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n"
diff --git a/po/nb.po b/po/nb.po
index ada6f2292..d096e9a69 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1117,255 +1117,10 @@ msgstr "Forbindelsen mislykkes"
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Retter på avhengighetsforhold ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " mislyktes."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Klarer ikke å rette på avhengighetsforholdene"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Klarer ikke å minimere oppgraderingsettet"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Utført"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
@@ -1612,26 +1367,271 @@ msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s er allerede nyeste versjon.\n"
 
-#: apt-private/private-install.cc:894
+#: apt-private/private-install.cc:894
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
+
+#: apt-private/private-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+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:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Retter på avhengighetsforhold ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " mislyktes."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Klarer ikke å rette på avhengighetsforholdene"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Klarer ikke å minimere oppgraderingsettet"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Utført"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
 #, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
+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-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
+#: apt-private/private-update.cc:101
+msgid "All packages are up to date."
+msgstr ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
+#: 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-install.cc:947
-#, fuzzy, c-format
-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-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:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1716,8 +1716,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2014,26 +2014,6 @@ msgstr "Klarte ikke finne autentiseringsoppføring for: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hashsummen stemmer ikke for: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Finner ikke metode-driveren %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startet ikke korrekt"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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."
@@ -2129,183 +2109,56 @@ msgstr "valgfri"
 msgid "extra"
 msgstr "tillegg"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Oversiktsfil av typen «%s» støttes ikke"
+msgid "The method driver %s could not be found."
+msgstr "Finner ikke metode-driveren %s."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, 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/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"
+msgid "Is the package %s installed?"
+msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linje %u i kildelista %s er for lang"
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startet ikke korrekt"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Feil på %u i kildelista %s (type)"
+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/sourcelist.cc:375
+#: apt-pkg/pkgrecords.cc:38
 #, 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:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
+msgid "Index file type '%s' is not supported"
 msgstr "Oversiktsfil av typen «%s» støttes ikke"
 
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Klarer ikke finne informasjonom %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Feil oppsto under behandling av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Skaper oversikt over avhengighetsforhold"
 
-#: apt-pkg/pkgcachegen.cc:263
-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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versjons-kandidater"
 
-#: apt-pkg/pkgcachegen.cc:266
-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/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Oppretter avhengighetsforhold"
 
-#: apt-pkg/pkgcachegen.cc:576
-#, 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/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Leser tilstandsinformasjon"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Leser pakkelister"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samler inn filtilbud"
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikke å åpne StateFile %s"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Kan ikke skrive til %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikke å skrive midlertidig StateFile %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2389,6 +2242,79 @@ 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/clean.cc:39 apt-pkg/acquire.cc:490
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "Oversiktsfil av typen «%s» støttes ikke"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Klarer ikke finne informasjonom %s."
+
+#: apt-pkg/pkgcachegen.cc:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Feil oppsto under behandling av %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Leser pakkelister"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Samler inn filtilbud"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kan ikke skrive til %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "IO-feil ved lagring av kildekode-lager"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2421,6 +2347,15 @@ msgstr "Henter fil %li av %li (%s gjenværende)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2472,14 +2407,10 @@ 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/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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2577,31 +2508,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Skaper oversikt over avhengighetsforhold"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versjons-kandidater"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Oppretter avhengighetsforhold"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Leser tilstandsinformasjon"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Klarte ikke å åpne StateFile %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Klarte ikke å skrive midlertidig StateFile %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2613,6 +2538,106 @@ msgstr "Klarer ikke å fortolke pakkefila %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Klarer ikke å fortolke pakkefila %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Klarer ikke å fortolke Release-fila %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Ingen avsnitt i Release-fila %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Ingen sjekksumoppføring i Release-fila %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2672,31 +2697,6 @@ msgstr ""
 "Klarte ikke velge installert versjon fra pakken «%s» siden den ikke er "
 "installert"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Klarer ikke å fortolke Release-fila %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Ingen avsnitt i Release-fila %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ingen sjekksumoppføring i Release-fila %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ugyldig «Date»-oppføring i Release-fila %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3448,22 +3448,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:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s har ingen overstyringsoppføring\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr " %s-vedlikeholderen er %s, ikke %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s har ingen kildeoverstyringsoppføring\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s har ingen binæroverstyringsoppføring heller\n"
diff --git a/po/ne.po b/po/ne.po
index de438d4ca..6743a9bdb 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1100,251 +1100,10 @@ msgstr "जडान असफल भयो"
 msgid "Internal error"
 msgstr "आन्तरिक त्रुटि"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "निर्भरताहरू सुधार गरिदैछ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr "असफल भयो ।"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr "काम भयो"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।"
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "आन्तरिक त्रुटि, स्थापना प्याकेजहरुलाई भाँचिएको प्याकेज भनिन्थ्यो!"
@@ -1580,26 +1339,267 @@ msgstr " %s को पुन: स्थापना सम्भव छैन, 
 msgid "%s is already the newest version.\n"
 msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
 
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
+#: apt-private/private-install.cc:894
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
+
+#: apt-private/private-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
+
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "निर्भरताहरू सुधार गरिदैछ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr "असफल भयो ।"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr "काम भयो"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।"
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+msgid "All packages are up to date."
+msgstr ""
 
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
+#: 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] ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
+#: 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:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1685,8 +1685,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1984,26 +1984,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum मेल भएन"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।"
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "विधि %s सही रुपले सुरू हुन सकेन"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 "प्याकेज सूचीहरू वा वस्तुस्थिति फाइल पद वर्णन गर्न वा खोल्न सकिएन ।"
@@ -2098,184 +2078,57 @@ msgstr "वैकल्पिक"
 msgid "extra"
 msgstr "अतिरिक्त"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-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/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 पद वर्णन )"
+msgid "The method driver %s could not be found."
+msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/acquire-worker.cc:118
 #, 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 खोलिदैछ"
+msgid "Is the package %s installed?"
+msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।"
+msgid "Method %s did not start correctly"
+msgstr "विधि %s सही रुपले सुरू हुन सकेन"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/pkgrecords.cc:38
 #, 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:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
+msgid "Index file type '%s' is not supported"
 msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन"
 
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s स्थिर गर्न असक्षम भयो ।"
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "निर्भरता ट्री निर्माण गरिदैछ"
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "उमेद्वार संस्करणहरू"
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "निर्भरता सिर्जना"
 
-#: apt-pkg/pkgcachegen.cc:263
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
 #, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "प्याकेज सूचिहरू पढिदैछ"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr " %s मा लेख्न असक्षम"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+msgid "Reading state information"
+msgstr "उपलब्ध सूचना गाँभिदैछ"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s खोल्न असफल"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "फाइल %s लेख्न असफल भयो"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2357,6 +2210,80 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।"
 
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, fuzzy, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:263
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "प्याकेज सूचिहरू पढिदैछ"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr " %s मा लेख्न असक्षम"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2389,6 +2316,15 @@ msgstr "%li को %li फाइल पुन:प्राप्त गरिद
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्"
@@ -2437,14 +2373,10 @@ msgstr ""
 "हटाउनु पर्नेछ । यो प्राय नराम्रो हो, तर यदि तपाईँ यो साँच्चै गर्न चाहनुहुन्छ भने, APT::"
 "Force-LoopBreak विकल्प सक्रिय गर्नुहोस् ।"
 
-#: 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:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।"
 
 #: apt-pkg/cdrom.cc:571
 #, fuzzy
@@ -2538,32 +2470,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "निर्भरता ट्री निर्माण गरिदैछ"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "उमेद्वार संस्करणहरू"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "निर्भरता सिर्जना"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "उपलब्ध सूचना गाँभिदैछ"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s खोल्न असफल"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "फाइल %s लेख्न असफल भयो"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2575,6 +2500,106 @@ msgstr "प्याकेज फाइल पद वर्णन गर्न 
 msgid "Unable to parse package file %s (2)"
 msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)"
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "द्रष्टब्य, %s को सट्टा  %s चयन भइरहेछ\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/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/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 (प्रकार)"
+
+#: 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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2627,31 +2652,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "द्रष्टब्य, %s को सट्टा  %s चयन भइरहेछ\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
-
-#: apt-pkg/indexrecords.cc:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3387,22 +3387,22 @@ msgstr "यस %sB हिटको डि लिङ्क सिमा।\n"
 msgid "Archive had no package field"
 msgstr "संग्रह संग कुनै प्याकेज फाँट छैन"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s संभारकर्ता %s हो %s होइन\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, fuzzy, c-format
 msgid "  %s has no source override entry\n"
 msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
diff --git a/po/nl.po b/po/nl.po
index febf39710..74e839b78 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@ 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1199,259 +1199,10 @@ msgstr "Verbinding mislukt"
 msgid "Internal error"
 msgstr "Interne fout"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr "Bezig met oplijsten"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Vereisten worden gecorrigeerd..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " mislukt."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Kan vereisten niet corrigeren"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Klaar"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interne fout. InstallPackages is aangeroepen met defecte pakketten!"
@@ -1725,10 +1476,259 @@ msgstr ""
 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr ""
-"WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden!"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "Bezig met oplijsten"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Vereisten worden gecorrigeerd..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " mislukt."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Kan vereisten niet corrigeren"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Klaar"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+msgid "All packages are up to date."
+msgstr "Alle pakketten zijn up-to-date."
+
+#: 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-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr ""
+"WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden!"
 
 #: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
@@ -1809,8 +1809,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2114,28 +2114,6 @@ msgstr "Kan geen authenticiteitsrecord vinden voor: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash-som komt niet overeen voor: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "Is het pakket %s geïnstalleerd?"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Methode %s startte niet op de juiste manier"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -2232,94 +2210,146 @@ msgstr "optioneel"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexbestand van type '%s' wordt niet ondersteund"
+msgid "The method driver %s could not be found."
+msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Niet juist gevormd element %lu in bronlijst %s (URI-verwerking)"
+msgid "Is the package %s installed?"
+msgstr "Is het pakket %s geïnstalleerd?"
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Niet juist gevormde regel %lu in bronlijst %s ([optie] onbegrijpelijk)"
+msgid "Method %s did not start correctly"
+msgstr "Methode %s startte niet op de juiste manier"
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Niet juist gevormde regel %lu in bronlijst %s ([optie] te kort)"
+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/sourcelist.cc:184
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Niet juist gevormde regel %lu in bronlijst %s ([%s] is geen toekenning)"
+msgid "Index file type '%s' is not supported"
+msgstr "Indexbestand van type '%s' wordt niet ondersteund"
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Boom van vereisten wordt opgebouwd"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidaat-versies"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Genereren van vereisten"
+
+#: 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/depcache.cc:250
 #, c-format
-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)"
+msgid "Failed to open StateFile %s"
+msgstr "Openen van StateFile %s is mislukt"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:256
 #, 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)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Niet juist gevormde regel %lu in bronlijst %s (URI)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "het hernoemen is mislukt, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Hash-som komt niet overeen"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Grootte komt niet overeen"
+
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
+msgstr "Ongeldig bestandsformaat"
+
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Niet juist gevormde regel %lu in bronlijst %s (dist)"
+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/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:1656
 #, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Niet juist gevormde regel %lu in bronlijst %s (URI-verwerking)"
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Kon de hash-som voor '%s' niet vinden in het Release-bestand"
 
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1698
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+"Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-ID's:\n"
+
+#: apt-pkg/acquire-item.cc:1736
 #, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Niet juist gevormde regel %lu in bronlijst %s (absolute dist)"
+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/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Niet juist gevormde regel %lu in bronlijst %s (ontleding van dist)"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)"
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "%s wordt geopend"
+msgid ""
+"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"
+msgstr ""
+"Er is een fout opgetreden bij de handtekeningcontrole. De pakketbron is niet "
+"bijgewerkt en de oude indexbestanden zullen worden gebruikt. GPG-fout: %s: "
+"%s\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Regel %u van de bronlijst %s is te lang."
+msgid "GPG error: %s: %s"
+msgstr "GPG-fout: %s: %s"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Niet juist gevormde regel %u in bronlijst %s (type)"
+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 ontbrekende architectuur)"
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, 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"
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr "Kan geen bron vinden om versie '%s' van '%s' op te halen"
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/acquire-item.cc:2050
 #, 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"
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
+"pakket %s."
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, c-format
@@ -2403,114 +2433,6 @@ msgstr "Kan niet naar %s schrijven"
 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:241
-msgid "Send request to solver"
-msgstr "Verzoek naar de oplosser sturen"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Instellen op het ontvangen van een oplossing"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Externe oplosser faalde zonder passende foutmelding"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Externe oplosser uitvoeren"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "het hernoemen is mislukt, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Hash-som komt niet overeen"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Grootte komt niet overeen"
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
-msgstr "Ongeldig bestandsformaat"
-
-#: apt-pkg/acquire-item.cc:1640
-#, 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:1656
-#, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Kon de hash-som voor '%s' niet vinden in het Release-bestand"
-
-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
-"Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-ID's:\n"
-
-#: apt-pkg/acquire-item.cc:1736
-#, 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:1758
-#, 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:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-"Er is een fout opgetreden bij de handtekeningcontrole. De pakketbron is niet "
-"bijgewerkt en de oude indexbestanden zullen worden gebruikt. GPG-fout: %s: "
-"%s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG-fout: %s: %s"
-
-#: apt-pkg/acquire-item.cc:1926
-#, 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 ontbrekende architectuur)"
-
-#: apt-pkg/acquire-item.cc:1992
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr "Kan geen bron vinden om versie '%s' van '%s' op te halen"
-
-#: apt-pkg/acquire-item.cc:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
-"pakket %s."
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2543,6 +2465,14 @@ msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)"
 msgid "Retrieving file %li of %li"
 msgstr "Bestand %li van %li wordt opgehaald"
 
+#: 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/srcrecords.cc:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2599,13 +2529,10 @@ msgstr ""
 "slecht, maar als u dit echt wilt doen, dan dient u de optie APT::Force-"
 "LoopBreak te activeren."
 
-#: 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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2704,31 +2631,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Boom van vereisten wordt opgebouwd"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidaat-versies"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Scenario naar de oplosser sturen"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Genereren van vereisten"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "Verzoek naar de oplosser sturen"
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Instellen op het ontvangen van een oplossing"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Openen van StateFile %s is mislukt"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "Externe oplosser faalde zonder passende foutmelding"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Externe oplosser uitvoeren"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2740,6 +2661,110 @@ msgstr "Kon pakketbestand %s niet ontleden (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Kon pakketbestand %s niet ontleden (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Kon Release-bestand %s niet ontleden"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Geen secties in Release-bestand %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Geen Hash-vermelding in Release-bestand %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ongeldige 'Valid-Until'-vermelding in Release-bestand %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ongeldige 'Date'-vermelding in Release-bestand %s"
+
+#: 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/sourcelist.cc:170
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Niet juist gevormde 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 "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 ""
+"Niet juist gevormde 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 ""
+"Niet juist gevormde 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 ""
+"Niet juist gevormde 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 "Niet juist gevormde regel %lu in bronlijst %s (URI)"
+
+#: 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/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/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Niet juist gevormde regel %lu in bronlijst %s (absolute dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2801,31 +2826,6 @@ msgstr ""
 "Kan de geïnstalleerde versie van het pakket %s niet selecteren omdat het "
 "niet geïnstalleerd is"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Kon Release-bestand %s niet ontleden"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Geen secties in Release-bestand %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Geen Hash-vermelding in Release-bestand %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ongeldige 'Valid-Until'-vermelding in Release-bestand %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ongeldige 'Date'-vermelding in Release-bestand %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3593,22 +3593,22 @@ msgstr " DeLink-limiet van %sB bereikt.\n"
 msgid "Archive had no package field"
 msgstr "Archief heeft geen 'package'-veld"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr " %s heeft geen voorrangsingang\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s beheerder is %s, niet %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n"
diff --git a/po/nn.po b/po/nn.po
index 4f57e4ed6..070feb567 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1110,253 +1110,10 @@ msgstr "Sambandet mislukkast"
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Rettar p krav ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " mislukkast."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Klarte ikkje retta p krav"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Klarte ikkje minimera oppgraderingsmengda"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Ferdig"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1602,21 +1359,264 @@ msgstr "Den nyaste versjonen av %s er installert fr
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Vald versjon %s (%s) for %s\n"
 
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Vald versjon %s (%s) for %s\n"
+#: apt-private/private-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Vald versjon %s (%s) for %s\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+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:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Rettar p krav ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " mislukkast."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Klarte ikkje retta p krav"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Klarte ikkje minimera oppgraderingsmengda"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Ferdig"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+msgid "All packages are up to date."
+msgstr ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
+#: 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-install.cc:947
-#, fuzzy, c-format
-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-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:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1701,8 +1701,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1998,29 +1998,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Feil MD5-sum"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Finn ikkje metodedrivaren %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s starta ikkje rett"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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."
@@ -2116,184 +2093,60 @@ msgstr "valfri"
 msgid "extra"
 msgstr "tillegg"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indeksfiltypen %s er ikkje sttta"
-
-#: 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 "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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Opening %s"
-msgstr "Opnar %s"
+msgid "The method driver %s could not be found."
+msgstr "Finn ikkje metodedrivaren %s."
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linja %u i kjeldelista %s er for lang."
+msgid "Is the package %s installed?"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-worker.cc:169
 #, 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 "Method %s did not start correctly"
+msgstr "Metoden %s starta ikkje rett"
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#: apt-pkg/acquire-worker.cc:455
 #, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Indeksfiltypen %s er ikkje sttta"
+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/clean.cc:64
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Unable to stat %s."
-msgstr "Klarte ikkje f status p %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
+msgid "Index file type '%s' is not supported"
+msgstr "Indeksfiltypen %s er ikkje sttta"
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Feil ved behandling av %s (FindPkg)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Byggjer kravtre"
 
-#: apt-pkg/pkgcachegen.cc:257
-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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidatversjonar"
 
-#: apt-pkg/pkgcachegen.cc:260
-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/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Genererer kravforhold"
 
-#: apt-pkg/pkgcachegen.cc:263
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
 #, 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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Klarte ikkje f status p kjeldepakkelista %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Les pakkelister"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samlar inn filtilbod"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Klarte ikkje skriva til %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+msgid "Reading state information"
+msgstr "Flettar informasjon om tilgjengelege pakkar"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikkje opna %s"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikkje skriva fila %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2376,6 +2229,80 @@ msgid ""
 msgstr ""
 "Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s."
 
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Feil ved behandling av %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+#, 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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Klarte ikkje f status p kjeldepakkelista %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Les pakkelister"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Samlar inn filtilbod"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Klarte ikkje skriva til %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "IU-feil ved lagring av kjeldelager"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2408,6 +2335,15 @@ msgstr ""
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Du m leggja nokre kjelde-URI-ar i fila sources.list."
@@ -2457,14 +2393,10 @@ msgstr ""
 "om du verkeleg vil gjera det, kan du bruka innstillinga APT::Force-"
 "LoopBreak."
 
-#: 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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2558,32 +2490,25 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Byggjer kravtre"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidatversjonar"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Genererer kravforhold"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Klarte ikkje opna %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Klarte ikkje skriva fila %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2595,6 +2520,106 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Klarte ikkje tolka pakkefila %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Klarte ikkje tolka pakkefila %s (1)"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Merk, vel %s i staden for %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ugyldig linje i avleiingsfila: %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/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 "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"
+
+#: 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/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"
+
 #: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2647,31 +2672,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Klarte ikkje tolka pakkefila %s (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Merk, vel %s i staden for %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ugyldig linje i avleiingsfila: %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Klarte ikkje tolka pakkefila %s (1)"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3404,22 +3404,22 @@ msgstr " DeLink-grensa p
 msgid "Archive had no package field"
 msgstr "Arkivet har ikkje noko pakkefelt"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s har inga overstyringsoppfring\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s-vedlikehaldaren er %s, ikkje %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, fuzzy, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s har inga overstyringsoppfring\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s har inga overstyringsoppfring\n"
diff --git a/po/pl.po b/po/pl.po
index e4c05c622..32173ad87 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1161,258 +1161,10 @@ msgstr "Połączenie nie powiodło się"
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Naprawianie zależności..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " nie udało się."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nie udało się naprawić zależności"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nie udało się zminimalizować zbioru aktualizacji"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Gotowe"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Błąd wewnętrzny, użyto InstallPackages z uszkodzonymi pakietami!"
@@ -1698,12 +1450,260 @@ 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-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Naprawianie zależności..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " nie udało się."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nie udało się naprawić zależności"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nie udało się zminimalizować zbioru aktualizacji"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Gotowe"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
 msgstr "Zignorowano ostrzeżenie uwierzytelniania.\n"
 
 #: apt-private/private-download.cc:45 apt-private/private-download.cc:52
@@ -1784,8 +1784,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2084,26 +2084,6 @@ 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:116
-#, 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:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nie uruchomiła się poprawnie"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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."
@@ -2197,92 +2177,142 @@ msgstr "opcjonalny"
 msgid "extra"
 msgstr "dodatkowy"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany"
+msgid "The method driver %s could not be found."
+msgstr "Nie udało się odnaleźć sterownika metody %s."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, 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)"
+msgid "Is the package %s installed?"
+msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/acquire-worker.cc:169
 #, 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ć)"
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nie uruchomiła się poprawnie"
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/acquire-worker.cc:455
 #, 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)"
+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/sourcelist.cc:184
+#: apt-pkg/pkgrecords.cc:38
 #, 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)"
+msgid "Index file type '%s' is not supported"
+msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany"
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Budowanie drzewa zależności"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandydujące wersje"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generowanie zależności"
+
+#: 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/depcache.cc:250
 #, 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)"
+msgid "Failed to open StateFile %s"
+msgstr "Nie udało się otworzyć pliku stanu %s"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:256
 #, 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)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "nie udało się zmienić nazwy, %s (%s -> %s)"
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Błędna suma kontrolna"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Błędny rozmiar"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Nieprawidłowa operacja %s"
+
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+"Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release "
+"(nieprawidłowy wpis sources.list lub nieprawidłowy plik)"
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:1656
 #, 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)"
+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/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1698
+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:1736
 #, 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)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+"Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego "
+"repozytorium nie będą wykonywane."
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, 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)"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)"
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "Otwieranie %s"
+msgid ""
+"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"
+msgstr ""
+"Podczas weryfikacji podpisu wystąpił błąd. Nie zaktualizowano repozytorium i "
+"w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linia %u w liście źródeł %s jest zbyt długa."
+msgid "GPG error: %s: %s"
+msgstr "Błąd GPG: %s: %s"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)"
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba "
+"będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)."
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, 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"
+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/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/acquire-item.cc:2050
+#, 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/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2358,114 +2388,6 @@ msgstr "Nie udało się pisać do %s"
 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:241
-msgid "Send request to solver"
-msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Przygotowywanie na otrzymanie rozwiązania"
-
-#: apt-pkg/edsp.cc:327
-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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "nie udało się zmienić nazwy, %s (%s -> %s)"
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Błędna suma kontrolna"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Błędny rozmiar"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Nieprawidłowa operacja %s"
-
-#: apt-pkg/acquire-item.cc:1640
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-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:1656
-#, 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:1698
-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:1736
-#, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-"Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego "
-"repozytorium nie będą wykonywane."
-
-#: apt-pkg/acquire-item.cc:1758
-#, 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:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-"Podczas weryfikacji podpisu wystąpił błąd. Nie zaktualizowano repozytorium i "
-"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:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Błąd GPG: %s: %s"
-
-#: apt-pkg/acquire-item.cc:1926
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba "
-"będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)."
-
-#: apt-pkg/acquire-item.cc:1992
-#, 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:2050
-#, 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/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2498,6 +2420,14 @@ msgstr "Pobieranie pliku %li z %li (pozostało %s)"
 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: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"
@@ -2552,13 +2482,10 @@ msgstr ""
 "rozwiązanie, ale jeśli jest się pewnym swoich działań, należy włączyć opcję "
 "APT::Force-LoopBreak."
 
-#: 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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2657,31 +2584,27 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Budowanie drzewa zależności"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandydujące wersje"
+#: 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/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generowanie zależności"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności"
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Przygotowywanie na otrzymanie rozwiązania"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nie udało się otworzyć pliku stanu %s"
+#: apt-pkg/edsp.cc:327
+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/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2693,6 +2616,108 @@ msgstr "Nie udało się zanalizować pliku pakietu %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Nie udało się zanalizować pliku pakietu %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nie udało się przeanalizować pliku Release %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Brak sekcji w pliku Release %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Brak wpisu Hash w pliku Release %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2757,31 +2782,6 @@ msgstr ""
 "Nie udało się wybrać zainstalowanej wersji z pakietu %s, ponieważ nie jest "
 "zainstalowany"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nie udało się przeanalizować pliku Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Brak sekcji w pliku Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Brak wpisu Hash w pliku Release %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Nieprawidłowy wpis Date w pliku Release %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3546,22 +3546,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:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nie posiada wpisu w pliku override\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  opiekunem %s jest %s, a nie %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nie posiada wpisu w pliku override źródeł\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s nie posiada również wpisu w pliku override binariów\n"
diff --git a/po/pt.po b/po/pt.po
index d7f3bfbee..8e21e97ef 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1151,255 +1151,10 @@ msgstr "A ligação falhou"
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "A corrigir dependências..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " falhou."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Não foi possível corrigir dependências"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Não foi possível minimizar o conjunto de actualizações"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Feito"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
@@ -1668,15 +1423,260 @@ 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-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Aviso de autenticação ultrapassado.\n"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "A corrigir dependências..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " falhou."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Não foi possível corrigir dependências"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Não foi possível minimizar o conjunto de actualizações"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Feito"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Aviso de autenticação ultrapassado.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
 msgid "Some packages could not be authenticated"
 msgstr "Alguns pacotes não puderam ser autenticados"
 
@@ -1751,8 +1751,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2055,27 +2055,6 @@ 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:116
-#, 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:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Método %s não iniciou correctamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -2171,93 +2150,148 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Tipo do ficheiro de índice '%s' não é suportado"
+msgid "The method driver %s could not be found."
+msgstr "O driver do método %s não pôde ser encontrado."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, 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)"
+msgid "Is the package %s installed?"
+msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/acquire-worker.cc:169
 #, 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)"
+msgid "Method %s did not start correctly"
+msgstr "Método %s não iniciou correctamente"
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/acquire-worker.cc:455
 #, 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)"
+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/sourcelist.cc:184
+#: apt-pkg/pkgrecords.cc:38
 #, 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)"
+msgid "Index file type '%s' is not supported"
+msgstr "Tipo do ficheiro de índice '%s' não é suportado"
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "A construir árvore de dependências"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versões candidatas"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Geração de dependências"
+
+#: 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/depcache.cc:250
 #, 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)"
+msgid "Failed to open StateFile %s"
+msgstr "Falhou abrir o StateFile %s"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:256
 #, 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)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha escrever ficheiro temporário StateFile %s"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Linha mal formada %lu na lista de fontes %s (URI)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "falhou renomear, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Código de verificação hash não coincide"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Tamanho incorrecto"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Operação %s inválida"
+
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Linha mal formada %lu na lista de fontes %s (distribuição)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+"Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada "
+"errada em sources.list ou ficheiro malformado)"
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:1656
 #, 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)"
+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/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1698
+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:1736
 #, 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)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+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/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Linha mal formada %lu na lista de fontes %s (dist parse)"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)"
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "A abrir %s"
+msgid ""
+"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"
+msgstr ""
+"Ocorreu um erro durante a verificação da assinatura. O repositório não está "
+"actualizado e serão utilizados os ficheiros anteriores de índice. Erro do "
+"GPG: %s: %s\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linha %u é demasiado longa na lista de fontes %s."
+msgid "GPG error: %s: %s"
+msgstr "Erro GPG: %s: %s"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Linha mal formada %u na lista de fontes %s (tipo)"
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Não foi possível localizar um ficheiro para o pacote %s. Isto pode "
+"significar que você precisa corrigir manualmente este pacote. (devido a "
+"arquitectura em falta)"
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, 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"
+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/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/acquire-item.cc:2050
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
+"para o pacote %s."
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2293,161 +2327,50 @@ 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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "A ler as listas de pacotes"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "A obter File Provides"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Não conseguiu escrever para %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr "Enviar pedido para resolvedor"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Preparar para receber solução"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Executar resolvedor externo"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "falhou renomear, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Código de verificação hash não coincide"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Tamanho incorrecto"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Operação %s inválida"
-
-#: apt-pkg/acquire-item.cc:1640
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
-"Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada "
-"errada em sources.list ou ficheiro malformado)"
-
-#: apt-pkg/acquire-item.cc:1656
-#, 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:1698
-msgid "There is no public key available for the following key IDs:\n"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
-"Não existe qualquer chave pública disponível para as seguintes IDs de "
-"chave:\n"
+"Uau, você excedeu o número de versões que este APT é capaz de suportar."
 
-#: apt-pkg/acquire-item.cc:1736
-#, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
-"O ficheiro Release para %s está expirado (inválido desde %s). Não serão "
-"aplicadas as actualizações para este repositório."
+"Uau, você excedeu o número de descrições que este APT é capaz de suportar."
 
-#: apt-pkg/acquire-item.cc:1758
-#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)"
+#: apt-pkg/pkgcachegen.cc:266
+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/acquire-item.cc:1788
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
-msgid ""
-"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"
+msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
-"Ocorreu um erro durante a verificação da assinatura. O repositório não está "
-"actualizado e serão utilizados os ficheiros anteriores de índice. Erro do "
-"GPG: %s: %s\n"
+"O pacote %s %s não foi encontrado ao processar as dependências de ficheiros"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "Erro GPG: %s: %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/acquire-item.cc:1926
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"Não foi possível localizar um ficheiro para o pacote %s. Isto pode "
-"significar que você precisa corrigir manualmente este pacote. (devido a "
-"arquitectura em falta)"
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "A ler as listas de pacotes"
 
-#: apt-pkg/acquire-item.cc:1992
-#, 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/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "A obter File Provides"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
-"para o pacote %s."
+msgid "Unable to write to %s"
+msgstr "Não conseguiu escrever para %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "Erro de I/O ao gravar a cache de código fonte"
 
 #: apt-pkg/vendorlist.cc:85
 #, c-format
@@ -2481,6 +2404,14 @@ msgstr "A obter o ficheiro %li de %li (%s restantes)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
@@ -2534,13 +2465,10 @@ msgstr ""
 "normalmente é mau, mas se você quer realmente fazer isso, active a opção "
 "APT::Force-LoopBreak."
 
-#: 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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2641,31 +2569,25 @@ msgstr ""
 "Não foi possível corrigir problemas, você tem pacotes mantidos (hold) "
 "estragados."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "A construir árvore de dependências"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versões candidatas"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Enviar cenário a resolver"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Geração de dependências"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "Enviar pedido para resolvedor"
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Preparar para receber solução"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Falhou abrir o StateFile %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falha escrever ficheiro temporário StateFile %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Executar resolvedor externo"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2677,6 +2599,109 @@ msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
 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:78
+#, 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:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Nenhuma secção, no ficheiro Release %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Nenhuma entrada hash no ficheiro Release %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2738,31 +2763,6 @@ msgstr ""
 "Não é possível seleccionar a versão instalada do pacote %s pois não está "
 "instalado"
 
-#: apt-pkg/indexrecords.cc:78
-#, 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:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Nenhuma secção, no ficheiro Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Nenhuma entrada hash no ficheiro Release %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Entrada, 'Date', inválida no ficheiro Release %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3530,22 +3530,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:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s não possui entrada override\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr " o maintainer de %s é %s, não %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s não possui fonte de entrada de 'override'\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s também não possui entrada binária de 'override'\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 33b30e769..f50171edc 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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."
@@ -1124,252 +1124,10 @@ msgstr "Conexão falhou"
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Corrigindo dependências..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " falhou."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Impossível corrigir dependências"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossível minimizar o conjunto de atualizações"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Pronto"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!"
@@ -1637,17 +1395,259 @@ 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-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Aviso de autenticação sobreposto.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Alguns pacotes não puderam ser autenticados"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Corrigindo dependências..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " falhou."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Impossível corrigir dependências"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossível minimizar o conjunto de atualizações"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Pronto"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Aviso de autenticação sobreposto.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "Alguns pacotes não puderam ser autenticados"
 
 #: apt-private/private-download.cc:50
 msgid "Install these packages without verification?"
@@ -1720,8 +1720,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2025,27 +2025,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum incorreto"
 
-#: apt-pkg/acquire-worker.cc:116
-#, 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:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Método %s não iniciou corretamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -2142,95 +2121,139 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Tipo de arquivo de índice '%s' não é suportado"
+msgid "The method driver %s could not be found."
+msgstr "O driver do método %s não pode ser encontrado."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, 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)"
+msgid "Is the package %s installed?"
+msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
 
-#: apt-pkg/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Método %s não iniciou corretamente"
+
+#: apt-pkg/acquire-worker.cc:455
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
+"Por favor, insira o disco nomeado: '%s' na unidade '%s' e pressione enter."
 
-#: 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/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Tipo de arquivo de índice '%s' não é suportado"
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construindo árvore de dependências"
 
-#: 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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versões candidatas"
 
-#: 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/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Geração de dependência"
 
-#: apt-pkg/sourcelist.cc:206
+#: 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/depcache.cc:250
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)"
+msgid "Failed to open StateFile %s"
+msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, 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)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "renomeação falhou, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Hash Sum incorreto"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Tamanho incorreto"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Operação %s inválida"
+
+#: apt-pkg/acquire-item.cc:1640
 #, 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)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1656
+#, 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:1698
+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:1736
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
 msgstr ""
-"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1758
 #, c-format
-msgid "Opening %s"
-msgstr "Abrindo %s"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linha %u muito longa na lista de fontes %s."
+msgid ""
+"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"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:371
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)"
+msgid "GPG error: %s: %s"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1926
 #, 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"
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Não foi possível localizar um arquivo para o pacote %s. Isto pode significar "
+"que você precisa consertar manualmente este pacote. (devido a arquitetura "
+"não especificada)."
 
-#: 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/acquire-item.cc:1992
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2050
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
+"\" para o pacote %s."
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2311,108 +2334,6 @@ msgstr "Impossível escrever para %s"
 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "renomeação falhou, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Hash Sum incorreto"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Tamanho incorreto"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Operação %s inválida"
-
-#: apt-pkg/acquire-item.cc:1640
-#, 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:1656
-#, 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:1698
-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:1736
-#, 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:1758
-#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1926
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"Não foi possível localizar um arquivo para o pacote %s. Isto pode significar "
-"que você precisa consertar manualmente este pacote. (devido a arquitetura "
-"não especificada)."
-
-#: apt-pkg/acquire-item.cc:1992
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
-"\" para o pacote %s."
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2445,6 +2366,15 @@ msgstr "Obtendo o arquivo %li de %li (%s restantes)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Você deve colocar algumas URIs 'source' em seu sources.list"
@@ -2494,14 +2424,10 @@ msgstr ""
 "é ruim, mas se você realmente quer fazer isso, ative a opção APT::Force-"
 "LoopBreak."
 
-#: 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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2598,31 +2524,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Construindo árvore de dependências"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versões candidatas"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Geração de dependência"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2634,6 +2554,111 @@ msgstr "Impossível analisar arquivo de pacote %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Impossível analisar arquivo de pacote %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Impossível analisar arquivo de pacote %s (1)"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Nota, selecionando %s ao invés de %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, 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/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 ""
+"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Abrindo %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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2686,31 +2711,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Impossível analisar arquivo de pacote %s (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Nota, selecionando %s ao invés de %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Impossível analisar arquivo de pacote %s (1)"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3451,22 +3451,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:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s não possui entrada override\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  mantenedor de %s é %s, não %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s não possui entrada override fonte\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s também não possui entrada override binária\n"
diff --git a/po/ro.po b/po/ro.po
index 3814df182..522ba61f3 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1125,254 +1125,10 @@ msgstr "Conectare eșuată"
 msgid "Internal error"
 msgstr "Eroare internă"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Corectez dependențele..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " eșec."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nu s-au putut corecta dependențele"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Terminat"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
@@ -1644,16 +1400,260 @@ 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-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Avertisment de autentificare înlocuit.\n"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Corectez dependențele..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " eșec."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nu s-au putut corecta dependențele"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Terminat"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Avertisment de autentificare înlocuit.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
 msgstr "Unele pachete n-au putut fi autentificate"
 
 #: apt-private/private-download.cc:50
@@ -1727,8 +1727,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2031,27 +2031,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Nepotrivire la suma de căutare"
 
-#: apt-pkg/acquire-worker.cc:116
-#, 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:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nu s-a lansat corect"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -2149,90 +2128,140 @@ msgstr "opțional"
 msgid "extra"
 msgstr "extra"
 
+#: apt-pkg/acquire-worker.cc:116
+#, 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:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nu s-a lansat corect"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Tipul de fișier index '%s' nu este suportat"
 
-#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Se construiește arborele de dependență"
 
-#: 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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versiuni candidat"
 
-#: 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/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generare dependențe"
 
-#: 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/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: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/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Eșec la deschiderea fișierului de stare %s"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Linie greșită %lu în lista sursă %s (URI)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Eșec la scrierea fișierului temporar de stare %s"
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Linie greșită %lu în lista sursă %s (dist)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "redenumire eșuată, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Nepotrivire la suma de căutare"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Nepotrivire dimensiune"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Operațiune invalidă %s"
+
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1656
+#, 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:1698
+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:1736
 #, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "Deschidere %s"
+msgid ""
+"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"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linia %u prea lungă în lista sursă %s."
+msgid "GPG error: %s: %s"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Linie greșită %u în lista sursă %s (tip)"
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna "
+"că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)"
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, 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"
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
 
-#: 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/acquire-item.cc:2050
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la "
+"pachetul %s."
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2313,109 +2342,6 @@ msgstr "Nu s-a putut scrie în %s"
 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "redenumire eșuată, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Nepotrivire la suma de căutare"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Nepotrivire dimensiune"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Operațiune invalidă %s"
-
-#: apt-pkg/acquire-item.cc:1640
-#, 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:1656
-#, 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:1698
-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:1736
-#, 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:1758
-#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1926
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna "
-"că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)"
-
-#: apt-pkg/acquire-item.cc:1992
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la "
-"pachetul %s."
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2448,6 +2374,15 @@ msgstr "Se descarcă fișierul %li din %li (%s rămas)"
 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: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"
@@ -2497,14 +2432,10 @@ msgstr ""
 "nu-i de bine, dar dacă vreți întradevăr s-o faceți, activați opțiunea APT::"
 "Force-LoopBreak."
 
-#: 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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2601,31 +2532,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nu pot corecta problema, ați ținut pachete deteriorate."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Se construiește arborele de dependență"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versiuni candidat"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generare dependențe"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Eșec la deschiderea fișierului de stare %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Eșec la scrierea fișierului temporar de stare %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2637,6 +2562,106 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Nu s-a putut analiza fișierul pachet %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, 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:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Notă, se selectează %s în locul lui %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, 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/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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2689,31 +2714,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, 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:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Notă, se selectează %s în locul lui %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3459,22 +3459,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:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nu are intrare de înlocuire\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s responsabil este %s nu %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nu are nici o intrare sursă de înlocuire\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s nu are nici intrare binară de înlocuire\n"
diff --git a/po/ru.po b/po/ru.po
index 256554beb..38276c0c2 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1158,261 +1158,10 @@ msgstr "Соединение разорвано"
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Исправление зависимостей…"
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " не удалось."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Невозможно скорректировать зависимости"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Невозможно минимизировать набор обновлений"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Готово"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
-"f install»."
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1691,11 +1440,262 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Пакет «%s» не установлен, поэтому не может быть удалён\n"
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!"
-
-#: apt-private/private-download.cc:40
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Исправление зависимостей…"
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " не удалось."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Невозможно скорректировать зависимости"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Невозможно минимизировать набор обновлений"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Готово"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
+"f install»."
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!"
+
+#: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
 msgstr "Предупреждение об аутентификации не принято в внимание.\n"
 
@@ -1774,8 +1774,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2075,26 +2075,6 @@ msgstr "Не удалось найти аутентификационную за
 msgid "Hash mismatch for: %s"
 msgstr "Не совпадает хеш сумма для: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Драйвер для метода %s не найден."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Метод %s запустился не корректно"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 "Списки пакетов или файл состояния не могут быть открыты или прочитаны."
@@ -2188,94 +2168,141 @@ msgstr "необязательный"
 msgid "extra"
 msgstr "дополнительный"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Не поддерживается индексный файл типа «%s»"
+msgid "The method driver %s could not be found."
+msgstr "Драйвер для метода %s не найден."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
+msgid "Is the package %s installed?"
+msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n"
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Искажённая строка %lu в списке источников %s ([параметр] неразбираем)"
+msgid "Method %s did not start correctly"
+msgstr "Метод %s запустился не корректно"
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Искажённая строка %lu в списке источников %s ([параметр] слишком короткий)"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод."
 
-#: apt-pkg/sourcelist.cc:184
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Искажённая строка %lu в списке источников %s (([%s] не назначаем)"
+msgid "Index file type '%s' is not supported"
+msgstr "Не поддерживается индексный файл типа «%s»"
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Построение дерева зависимостей"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Версии-кандидаты"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Генерирование зависимостей"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Чтение информации о состоянии"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Искажённая строка %lu в списке источников %s ([%s] не имеет ключа)"
+msgid "Failed to open StateFile %s"
+msgstr "Не удалось открыть StateFile %s"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Искажённая строка %lu в списке источников %s (([%s] ключ %s не имеет "
-"значения)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Не удалось записать временный StateFile %s"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "переименовать не удалось, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Хеш сумма не совпадает"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Не совпадает размер"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Неверная операция %s"
+
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
 msgstr ""
-"Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
+"Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись "
+"в sources.list или файл)"
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:1656
 #, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Невозможно найти хеш-сумму «%s» в файле Release"
 
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1698
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "Недоступен открытый ключ для следующих ID ключей:\n"
+
+#: apt-pkg/acquire-item.cc:1736
 #, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Искажённая строка %lu в списке источников %s (absolute dist)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+"Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого "
+"репозитория производиться не будет."
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Искажённая строка %lu в списке источников %s (dist parse)"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)"
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "Открытие %s"
+msgid ""
+"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"
+msgstr ""
+"Произошла ошибка при проверке подписи. Репозиторий не обновлён и будут "
+"использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Строка %u в списке источников %s слишком длинна."
+msgid "GPG error: %s: %s"
+msgstr "Ошибка GPG: %s: %s"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Искажённая строка %u в списке источников %s (тип)"
+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/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$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/acquire-item.cc:2050
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2356,111 +2383,6 @@ msgstr "Невозможно записать в %s"
 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:241
-msgid "Send request to solver"
-msgstr "Отправка запроса решателю"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Подготовка к приёму решения"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Запустить внешний решатель"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "переименовать не удалось, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Хеш сумма не совпадает"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Не совпадает размер"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Неверная операция %s"
-
-#: apt-pkg/acquire-item.cc:1640
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
-"Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись "
-"в sources.list или файл)"
-
-#: apt-pkg/acquire-item.cc:1656
-#, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Невозможно найти хеш-сумму «%s» в файле Release"
-
-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "Недоступен открытый ключ для следующих ID ключей:\n"
-
-#: apt-pkg/acquire-item.cc:1736
-#, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-"Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого "
-"репозитория производиться не будет."
-
-#: apt-pkg/acquire-item.cc:1758
-#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)"
-
-#: apt-pkg/acquire-item.cc:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-"Произошла ошибка при проверке подписи. Репозиторий не обновлён и будут "
-"использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Ошибка GPG: %s: %s"
-
-#: apt-pkg/acquire-item.cc:1926
-#, 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:1992
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»"
-
-#: apt-pkg/acquire-item.cc:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2493,6 +2415,14 @@ msgstr "Скачивается файл %li из %li (осталось %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Вы должны заполнить sources.list, поместив туда URI источников пакетов"
@@ -2547,13 +2477,10 @@ msgstr ""
 "Если вы действительно хотите продолжить, установите параметр APT::Force-"
 "LoopBreak."
 
-#: 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:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Строка %u в списке источников %s слишком длинна."
 
 #: apt-pkg/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2651,31 +2578,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Построение дерева зависимостей"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Версии-кандидаты"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Отправка сценария решателю"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Генерирование зависимостей"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "Отправка запроса решателю"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Чтение информации о состоянии"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Подготовка к приёму решения"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Не удалось открыть StateFile %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Не удалось записать временный StateFile %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Запустить внешний решатель"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2687,6 +2608,110 @@ msgstr "Невозможно разобрать содержимое пакет
 msgid "Unable to parse package file %s (2)"
 msgstr "Невозможно разобрать содержимое пакета %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Невозможно разобрать содержимое файла Release (%s)"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Отсутствуют разделы в файле Release (%s)"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Отсутствуют элементы Hash в файле Release (%s)"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Неправильный элемент «Valid-Until» в файле Release %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2748,31 +2773,6 @@ msgstr ""
 "Не удалось выбрать установленную версию из пакета %s, так как он не "
 "установлен"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Невозможно разобрать содержимое файла Release (%s)"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Отсутствуют разделы в файле Release (%s)"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Отсутствуют элементы Hash в файле Release (%s)"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Неправильный элемент «Valid-Until» в файле Release %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Неправильный элемент «Date» в файле Release %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3544,22 +3544,22 @@ msgstr " Превышен лимит в %sB в DeLink.\n"
 msgid "Archive had no package field"
 msgstr "В архиве нет поля package"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  Нет записи о переназначении (override) для %s\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  пакет %s сопровождает %s, а не %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  Нет записи source override для %s\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  Нет записи binary override для %s\n"
diff --git a/po/sk.po b/po/sk.po
index e7d001195..4c40d4f2d 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1138,258 +1138,10 @@ msgstr "Spojenie zlyhalo"
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Opravujú sa závislosti..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " zlyhalo."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Závislosti sa nedajú opraviť"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Sada na aktualizáciu sa nedá minimalizovať"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Hotovo"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!"
@@ -1647,23 +1399,271 @@ msgstr "%s je už najnovšej verzie.\n"
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Vybraná verzia „%s“ (%s) pre „%s“\n"
 
-#: apt-private/private-install.cc:899
+#: apt-private/private-install.cc:899
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Vybraná verzia „%s“ (%s) pre „%s“ kvôli „%s“\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+"Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť. Mali ste na mysli "
+"„%s“?\n"
+
+#: apt-private/private-install.cc:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť\n"
+
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Opravujú sa závislosti..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " zlyhalo."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Závislosti sa nedajú opraviť"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Sada na aktualizáciu sa nedá minimalizovať"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Hotovo"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
 #, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Vybraná verzia „%s“ (%s) pre „%s“ kvôli „%s“\n"
+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] ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+#: apt-private/private-update.cc:101
+msgid "All packages are up to date."
 msgstr ""
-"Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť. Mali ste na mysli "
-"„%s“?\n"
 
-#: apt-private/private-install.cc:947
+#: apt-private/private-show.cc:156
 #, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť\n"
+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:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1748,8 +1748,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2045,26 +2045,6 @@ 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:116
-#, 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:118
-#, 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:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Spôsob %s nebol správne spustený"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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ť."
@@ -2158,186 +2138,56 @@ msgstr "voliteľný"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexový súbor typu „%s“ nie je podporovaný"
+msgid "The method driver %s could not be found."
+msgstr "Nedá sa nájsť ovládač spôsobu %s."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, 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/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"
+msgid "Is the package %s installed?"
+msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý."
+msgid "Method %s did not start correctly"
+msgstr "Spôsob %s nebol správne spustený"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
+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/sourcelist.cc:375
+#: apt-pkg/pkgrecords.cc:38
 #, 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:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
+msgid "Index file type '%s' is not supported"
 msgstr "Indexový súbor typu „%s“ nie je podporovaný"
 
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nie je možné vykonať stat %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Vytvára sa strom závislostí"
 
-#: apt-pkg/pkgcachegen.cc:263
-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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidátske verzie"
 
-#: apt-pkg/pkgcachegen.cc:266
-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/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generovanie závislostí"
 
-#: apt-pkg/pkgcachegen.cc:576
-#, 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/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:1211
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Načítavajú sa zoznamy balíkov"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Collecting File poskytuje"
+msgid "Failed to open StateFile %s"
+msgstr "Nie je možné otvoriť StateFile %s"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Do %s sa nedá zapisovať"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr "Poslať požiadavku riešiteľovi"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Pripraviť sa na prijatie riešenia"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Spustiť externého riešiteľa"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie je možné zapísať dočasný StateFile %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2424,6 +2274,81 @@ 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/clean.cc:39 apt-pkg/acquire.cc:490
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "Indexový súbor typu „%s“ nie je podporovaný"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nie je možné vykonať stat %s."
+
+#: apt-pkg/pkgcachegen.cc:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Načítavajú sa zoznamy balíkov"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Collecting File poskytuje"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Do %s sa nedá zapisovať"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2456,6 +2381,14 @@ msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI"
@@ -2508,13 +2441,10 @@ 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/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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2611,31 +2541,25 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Vytvára sa strom závislostí"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidátske verzie"
+#: 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/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generovanie závislostí"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "Poslať požiadavku riešiteľovi"
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Pripraviť sa na prijatie riešenia"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nie je možné otvoriť StateFile %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nie je možné zapísať dočasný StateFile %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Spustiť externého riešiteľa"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2647,6 +2571,107 @@ msgstr "Súbor %s sa nedá spracovať (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Súbor %s sa nedá spracovať (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nedá spracovať súbor Release %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Žiadne sekcie v Release súbore %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, 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:130
+#, 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:149
+#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2706,31 +2731,6 @@ msgstr ""
 "Nie je možné vybrať nainštalovanú verziu z balíka „%s“, pretože nie je "
 "nainštalovaný"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nedá spracovať súbor Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Žiadne sekcie v Release súbore %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Chýba položka „Date“ v súbore Release %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3480,22 +3480,22 @@ msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
 msgid "Archive had no package field"
 msgstr "Archív neobsahuje pole „package“"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr " %s nemá žiadnu položku override\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  správcom %s je %s, nie %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr " %s nemá žiadnu položku „source override“\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr " %s nemá žiadnu položku „binary override“\n"
diff --git a/po/sl.po b/po/sl.po
index c021d51a4..20d2db317 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1134,261 +1134,10 @@ msgstr "Povezava ni uspela"
 msgid "Internal error"
 msgstr "Notranja napaka"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Popravljanje odvisnosti ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " spodletelo."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Ni mogoče popraviti odvisnosti"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Opravljeno"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!"
@@ -1666,11 +1415,262 @@ 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-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "POZOR: Naslednjih paketov ni bilo mogoče overiti!"
-
-#: apt-private/private-download.cc:40
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Popravljanje odvisnosti ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " spodletelo."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ni mogoče popraviti odvisnosti"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Opravljeno"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "POZOR: Naslednjih paketov ni bilo mogoče overiti!"
+
+#: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
 msgstr "Opozorilo overitve je bilo prepisano.\n"
 
@@ -1749,8 +1749,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2049,26 +2049,6 @@ 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:116
-#, 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:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Način %s se ni začel pravilno"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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."
@@ -2162,96 +2142,143 @@ msgstr "izbirno"
 msgid "extra"
 msgstr "dodatno"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
+msgid "The method driver %s could not be found."
+msgstr "Gonilnika načinov %s ni mogoče najti."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, 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)"
+msgid "Is the package %s installed?"
+msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/acquire-worker.cc:169
 #, 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)"
+msgid "Method %s did not start correctly"
+msgstr "Način %s se ni začel pravilno"
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/acquire-worker.cc:455
 #, 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)"
+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/sourcelist.cc:184
+#: apt-pkg/pkgrecords.cc:38
 #, 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)"
+msgid "Index file type '%s' is not supported"
+msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Gradnja drevesa odvisnosti"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Različice kandidatov"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Ustvarjanje odvisnosti"
+
+#: 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/depcache.cc:250
 #, 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)"
+msgid "Failed to open StateFile %s"
+msgstr "Odpiranje DatotekeStanja %s je spodletelo"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:256
 #, 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)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Pisanje začasne DatotekeStanja %s je spodletelo"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "preimenovanje je spodletelo, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Neujemanje vsote razpršil"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Neujemanje velikosti"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Neveljavno opravilo %s"
+
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (distribucija)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+"Ni mogoče najti pričakovanega vnosa '%s' v datoteki Release (napačen vnos "
+"sources.list ali slabo oblikovana datoteka)"
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:1656
 #, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)"
+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/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1698
+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:1736
 #, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
 msgstr ""
-"Slabo oblikovana vrstica %lu v seznamu virov %s (absolutna distribucija)"
+"Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to "
+"skladišče ne bo uveljavljena."
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev distribucije)"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)"
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "Odpiranje %s"
+msgid ""
+"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"
+msgstr ""
+"Med preverjanjem podpisa je prišlo do napake. Skladišče ni bilo posodobljeno "
+"zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Vrstica %u v seznamu virov %s je predolga."
+msgid "GPG error: %s: %s"
+msgstr "Napaka GPG: %s: %s"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)"
+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 ""
+"Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno "
+"popraviti ta paket (zaradi manjkajočega arhiva)."
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, 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"
+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/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/acquire-item.cc:2050
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket "
+"%s."
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2326,113 +2353,6 @@ msgstr "Ni mogoče pisati na %s"
 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:241
-msgid "Send request to solver"
-msgstr "Pošlji zahtevo reševalniku"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Priprava za rešitev prejemanja"
-
-#: apt-pkg/edsp.cc:327
-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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Izvedi zunanji reševalnik"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "preimenovanje je spodletelo, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Neujemanje vsote razpršil"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Neujemanje velikosti"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Neveljavno opravilo %s"
-
-#: apt-pkg/acquire-item.cc:1640
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-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:1656
-#, 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:1698
-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:1736
-#, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-"Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to "
-"skladišče ne bo uveljavljena."
-
-#: apt-pkg/acquire-item.cc:1758
-#, 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:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-"Med preverjanjem podpisa je prišlo do napake. Skladišče ni bilo posodobljeno "
-"zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Napaka GPG: %s: %s"
-
-#: apt-pkg/acquire-item.cc:1926
-#, 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 ""
-"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:1992
-#, 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:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket "
-"%s."
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2465,6 +2385,14 @@ msgstr "Pridobivanje datoteke %li od %li (%s preostalo)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "V sources.list morate vstaviti URI-je z viri"
@@ -2517,13 +2445,10 @@ msgstr ""
 "zanke spora/predodvisnosti. To je ponavadi slabo, toda če zares želite "
 "nadaljevati, vključite možnost APT::Force-LoopBreak."
 
-#: 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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2620,31 +2545,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Gradnja drevesa odvisnosti"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Različice kandidatov"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Pošlji scenarij reševalniku"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Ustvarjanje odvisnosti"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "Pošlji zahtevo reševalniku"
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Priprava za rešitev prejemanja"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Odpiranje DatotekeStanja %s je spodletelo"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Pisanje začasne DatotekeStanja %s je spodletelo"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Izvedi zunanji reševalnik"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2656,6 +2575,112 @@ msgstr "Ni mogoče razčleniti datoteke paketa %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Ni mogoče razčleniti datoteke paketa %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ni mogoče razčleniti Release datoteke %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Ni izbir v Release datoteki %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Ni vnosa razpršila v Release datoteki %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2712,31 +2737,6 @@ msgstr "Ni mogoče izbrati različice kandidata iz paketa %s, ker nima kandidata
 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/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ni mogoče razčleniti Release datoteke %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Ni izbir v Release datoteki %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ni vnosa razpršila v Release datoteki %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Neveljavne vnos 'Datum' v Release datoteki %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3487,22 +3487,22 @@ msgstr " Dosežena meja RazVezovanja %sB.\n"
 msgid "Archive had no package field"
 msgstr "Arhiv ni imel polja s paketom"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nima prepisanega vnosa\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  Vzdrževalec %s je %s in ne %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nima izvornega vnosa prepisa\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s nima tudi binarnega vnosa prepisa\n"
diff --git a/po/sv.po b/po/sv.po
index 8217733cd..995de1630 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1125,255 +1125,10 @@ msgstr "Anslutningen misslyckades"
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Korrigerar beroenden..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " misslyckades."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Kunde inte korrigera beroenden"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Kunde inte minimera uppgraderingsuppsättningen"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Färdig"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Internt fel. InstallPackages anropades med trasiga paket!"
@@ -1624,26 +1379,271 @@ msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s är redan den senaste versionen.\n"
 
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
+#: apt-private/private-install.cc:894
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
+
+#: apt-private/private-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+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:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Korrigerar beroenden..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " misslyckades."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Kunde inte korrigera beroenden"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Kunde inte minimera uppgraderingsuppsättningen"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Färdig"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+msgid "All packages are up to date."
+msgstr ""
 
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
+#: 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] ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-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-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:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1733,8 +1733,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2034,27 +2034,6 @@ 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:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Metoddrivrutinen %s kunde inte hittas."
-
-#: apt-pkg/acquire-worker.cc:118
-#, 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:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startade inte korrekt"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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."
@@ -2152,185 +2131,57 @@ msgstr "valfri"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexfiler av typ \"%s\" stöds inte"
+msgid "The method driver %s could not be found."
+msgstr "Metoddrivrutinen %s kunde inte hittas."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, 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/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"
+msgid "Is the package %s installed?"
+msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Rad %u är för lång i källistan %s."
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startade inte korrekt"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Rad %u i källistan %s har fel format (typ)"
+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/sourcelist.cc:375
+#: apt-pkg/pkgrecords.cc:38
 #, 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:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
+msgid "Index file type '%s' is not supported"
 msgstr "Indexfiler av typ \"%s\" stöds inte"
 
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kunde inte ta status på %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fel uppstod vid hantering av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Bygger beroendeträd"
 
-#: apt-pkg/pkgcachegen.cc:263
-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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandiderande versioner"
 
-#: apt-pkg/pkgcachegen.cc:266
-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/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Beroendegenerering"
 
-#: apt-pkg/pkgcachegen.cc:576
-#, 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/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:1211
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kunde inte ta status på källkodspaketlistan %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Läser paketlistor"
-
-# Bättre ord?
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samlar filtillhandahållningar"
+msgid "Failed to open StateFile %s"
+msgstr "Misslyckades med att öppna StateFile %s"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Kunde inte skriva till %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+msgid "Failed to write temporary StateFile %s"
+msgstr "Misslyckades med att skriva temporär StateFile %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2414,6 +2265,81 @@ 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/clean.cc:39 apt-pkg/acquire.cc:490
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "Indexfiler av typ \"%s\" stöds inte"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Kunde inte ta status på %s."
+
+#: apt-pkg/pkgcachegen.cc:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Fel uppstod vid hantering av %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Kunde inte ta status på källkodspaketlistan %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Läser paketlistor"
+
+# Bättre ord?
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Samlar filtillhandahållningar"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kunde inte skriva till %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "In-/utfel vid lagring av källcache"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2446,6 +2372,15 @@ msgstr "Hämtar fil %li av %li (%s återstår)"
 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: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"
@@ -2498,14 +2433,10 @@ 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/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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2603,31 +2534,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Bygger beroendeträd"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandiderande versioner"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Beroendegenerering"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Misslyckades med att öppna StateFile %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Misslyckades med att skriva temporär StateFile %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2639,6 +2564,106 @@ msgstr "Kunde inte tolka paketfilen %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Kunde inte tolka paketfilen %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Kunde inte tolka \"Release\"-filen %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Inga sektioner i Release-filen %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Ingen Hash-post i Release-filen %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2700,31 +2725,6 @@ msgstr ""
 "Kan inte välja installerad version från paketet %s eftersom det inte är "
 "installerat"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Kunde inte tolka \"Release\"-filen %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Inga sektioner i Release-filen %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ingen Hash-post i Release-filen %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ogiltig \"Date\"-post i Release-filen %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3479,23 +3479,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:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, 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:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  ansvarig för paketet %s är %s ej %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s har ingen källåsidosättningspost\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s har heller ingen binär åsidosättningspost\n"
diff --git a/po/th.po b/po/th.po
index 155ab5709..c9577c01f 100644
--- a/po/th.po
+++ b/po/th.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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1151,250 +1151,10 @@ msgstr "เชื่อมต่อไม่สำเร็จ"
 msgid "Internal error"
 msgstr "ข้อผิดพลาดภายใน"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr "กำลังแสดงรายชื่อ"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " ล้มเหลว"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " เสร็จแล้ว"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้"
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "เกิดข้อผิดพลาดภายใน: มีการเรียก InstallPackages ด้วยแพกเกจที่เสีย!"
@@ -1620,31 +1380,271 @@ msgstr "จะข้าม %s เนื่องจากแพกเกจไ
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ เนื่องจากไม่สามารถดาวน์โหลดได้\n"
 
-#: apt-private/private-install.cc:846
+#: apt-private/private-install.cc:846
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n"
+
+#: apt-private/private-install.cc:894
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว\n"
+
+#: apt-private/private-install.cc:899
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว อันเนื่องมาจาก '%s'\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน คุณหมายถึง '%s' หรือเปล่า?\n"
+
+#: apt-private/private-install.cc:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n"
+
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "กำลังแสดงรายชื่อ"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " ล้มเหลว"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " เสร็จแล้ว"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้"
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
 #, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n"
+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-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว\n"
+#: apt-private/private-update.cc:101
+msgid "All packages are up to date."
+msgstr "ปรับรุ่นทุกแพกเกจเป็นรุ่นล่าสุดแล้ว"
 
-#: apt-private/private-install.cc:899
+#: apt-private/private-show.cc:156
 #, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว อันเนื่องมาจาก '%s'\n"
+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' หากต้องการดูเพิ่ม"
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน คุณหมายถึง '%s' หรือเปล่า?\n"
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "ไม่ใช่แพกเกจจริง (เสมือน)"
 
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n"
+#: 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:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1729,8 +1729,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2024,26 +2024,6 @@ msgstr "ไม่พบระเบียนยืนยันความแท
 msgid "Hash mismatch for: %s"
 msgstr "แฮชไม่ตรงกันสำหรับ: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s"
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "ได้ติดตั้งแพกเกจ %s ไว้หรือไม่?"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 "ไม่สามารถแจงหรือเปิดรายชื่อแพกเกจหรือสถานะแพกเกจได้"
@@ -2137,183 +2117,56 @@ msgstr "ตัวเลือก"
 msgid "extra"
 msgstr "ส่วนเสริม"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%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/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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
+msgid "The method driver %s could not be found."
+msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s"
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "ไม่รู้จักชนิด '%s' ที่วรรคที่ %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
+msgid "Is the package %s installed?"
+msgstr "ได้ติดตั้งแพกเกจ %s ไว้หรือไม่?"
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Clean of %s is not supported"
-msgstr "ไม่รองรับการล้างข้อมูลที่ %s"
+msgid "Method %s did not start correctly"
+msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
 
-#: apt-pkg/clean.cc:64
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Unable to stat %s."
-msgstr "ไม่สามารถ stat %s"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "แคชมีระบบนับรุ่นที่ไม่ตรงกัน"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
+msgid "Index file type '%s' is not supported"
+msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'"
 
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์"
 
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "รุ่นแพกเกจที่มี"
 
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "กำลังอ่านรายชื่อแพกเกจ"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "สร้างลำดับความสัมพันธ์"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "กำลังอ่านข้อมูลสถานะ"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Unable to write to %s"
-msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "เตรียมรับคำตอบ"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
+msgid "Failed to open StateFile %s"
+msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2397,6 +2250,79 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s"
 
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "กำลังอ่านรายชื่อแพกเกจ"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2429,6 +2355,12 @@ msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จ
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย"
@@ -2480,11 +2412,10 @@ msgstr ""
 "ซึ่งแพกเกจดังกล่าวเป็นแพกเกจที่จำเป็นสำหรับระบบ การลบดังกล่าวมักเป็นอันตราย "
 "แต่ถ้าคุณต้องการทำเช่นนั้นจริงๆ ก็ให้เปิดตัวเลือก APT::Force-LoopBreak"
 
-#: 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:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป"
 
 #: apt-pkg/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2579,31 +2510,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "รุ่นแพกเกจที่มี"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "ส่งสภาวการณ์ไปยังกลไกการแก้ปัญหา"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "สร้างลำดับความสัมพันธ์"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "กำลังอ่านข้อมูลสถานะ"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "เตรียมรับคำตอบ"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2615,6 +2540,106 @@ msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1
 msgid "Unable to parse package file %s (2)"
 msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "ไม่สามารถแจงแฟ้ม Release %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "ไม่มีหัวข้อย่อยในแฟ้ม Release %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "ไม่มีรายการแฮชในแฟ้ม Release %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "รายการ 'Valid-Until' ไม่ถูกต้องในแฟ้ม Release %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/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 ผิดรูปแบบ (ชนิด)"
+
+#: 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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2668,31 +2693,6 @@ msgstr "ไม่สามารถเลือกรุ่นสำหรับ
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้ของแพกเกจ '%s' ได้ เนื่องจากแพกเกจไม่ได้ติดตั้งไว้"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "ไม่สามารถแจงแฟ้ม Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "ไม่มีหัวข้อย่อยในแฟ้ม Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "ไม่มีรายการแฮชในแฟ้ม Release %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "รายการ 'Valid-Until' ไม่ถูกต้องในแฟ้ม Release %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "รายการ 'Date' ไม่ถูกต้องในแฟ้ม Release %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3423,22 +3423,22 @@ msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB 
 msgid "Archive had no package field"
 msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s ไม่มีข้อมูล override\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  ผู้ดูแล %s คือ %s ไม่ใช่ %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s ไม่มีข้อมูล override สำหรับซอร์ส\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n"
diff --git a/po/tl.po b/po/tl.po
index 0b2947983..1060c582e 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1118,251 +1118,10 @@ msgstr "Bigo ang koneksyon"
 msgid "Internal error"
 msgstr "Internal na error"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Inaayos ang mga dependensiya..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " ay bigo."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Hindi maayos ang mga dependensiya"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Hindi mai-minimize ang upgrade set"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Tapos"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1625,21 +1384,262 @@ 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-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr ""
-"BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
+#: apt-private/private-list.cc:129
+msgid "Listing"
 msgstr ""
-"Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Inaayos ang mga dependensiya..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " ay bigo."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Hindi maayos ang mga dependensiya"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Hindi mai-minimize ang upgrade set"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Tapos"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr ""
+"BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr ""
+"Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+msgid "Some packages could not be authenticated"
+msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko"
+
+#: apt-private/private-download.cc:50
 msgid "Install these packages without verification?"
 msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?"
 
@@ -1710,8 +1710,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2012,27 +2012,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Di tugmang MD5Sum"
 
-#: apt-pkg/acquire-worker.cc:116
-#, 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:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Hindi umandar ng tama ang paraang %s"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 ""
@@ -2130,90 +2109,140 @@ msgstr "optional"
 msgid "extra"
 msgstr "extra"
 
+#: apt-pkg/acquire-worker.cc:116
+#, 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:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Hindi umandar ng tama ang paraang %s"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
 
-#: 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:250
 #, 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:256
 #, 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)<"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Bigo sa pagsulat ng talaksang %s"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
 
-#: 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/acquire-item.cc:163
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Di tugmang MD5Sum"
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Di tugmang laki"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Di tanggap na operasyon %s"
+
+#: apt-pkg/acquire-item.cc:1640
 #, 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)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1656
+#, 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:1698
+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:1736
 #, 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)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, 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)<"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "Binubuksan %s"
+msgid ""
+"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"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s."
+msgid "GPG error: %s: %s"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
+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 ""
+"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/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, 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"
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
 
-#: 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"
+#: apt-pkg/acquire-item.cc:2050
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
+"paketeng %s."
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2291,108 +2320,6 @@ msgstr "Hindi makapagsulat sa %s"
 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-#, fuzzy
-msgid "Hash Sum mismatch"
-msgstr "Di tugmang MD5Sum"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Di tugmang laki"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Di tanggap na operasyon %s"
-
-#: apt-pkg/acquire-item.cc:1640
-#, 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:1656
-#, 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:1698
-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:1736
-#, 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:1758
-#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1926
-#, 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 ""
-"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:1992
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
-"paketeng %s."
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2425,6 +2352,15 @@ msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list"
@@ -2474,14 +2410,10 @@ msgstr ""
 "loop. Madalas ay masama ito, ngunit kung nais niyo talagang gawin ito, i-"
 "activate ang APT::Force-LoopBreak na option."
 
-#: 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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2579,32 +2511,25 @@ 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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Ginagawa ang puno ng mga dependensiya"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Bersyong Kandidato"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Pagbuo ng Dependensiya"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Bigo ang pagbukas ng %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Bigo sa pagsulat ng talaksang %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2616,6 +2541,106 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Paunawa, pinili ang %s imbes na %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, 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/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 "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"
+
+#: 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/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"
+
 #: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2668,31 +2693,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Paunawa, pinili ang %s imbes na %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3440,22 +3440,22 @@ msgstr " DeLink limit na %sB tinamaan.\n"
 msgid "Archive had no package field"
 msgstr "Walang field ng pakete ang arkibo"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s ay walang override entry\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  Tagapangalaga ng %s ay %s hindi %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s ay walang override entry para sa pinagmulan\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s ay wala ring override entry na binary\n"
diff --git a/po/tr.po b/po/tr.po
index f2a070302..47f8b914b 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1176,262 +1176,10 @@ msgstr "Bağlantı başarısız"
 msgid "Internal error"
 msgstr "İç hata"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr "Listeleme"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Bağımlılıklar düzeltiliyor..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " başarısız oldu."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Bağımlılıklar düzeltilemedi"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Yükseltme kümesi küçültülemiyor"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Tamamlandı"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "İç hata, InstallPackages bozuk paketler ile çağrıldı!"
@@ -1703,10 +1451,262 @@ 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-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "UYARI: Aşağıdaki paketler doğrulanamıyor!"
-
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "Listeleme"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Bağımlılıklar düzeltiliyor..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " başarısız oldu."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Bağımlılıklar düzeltilemedi"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Yükseltme kümesi küçültülemiyor"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Tamamlandı"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "UYARI: Aşağıdaki paketler doğrulanamıyor!"
+
 #: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
 msgstr "Kimlik denetimi uyarısı görmezden geliniyor.\n"
@@ -1786,8 +1786,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2086,28 +2086,6 @@ 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:116
-#, 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:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "%s paketi kurulu mu?"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s yöntemi düzgün şekilde başlamadı"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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ı."
@@ -2201,102 +2179,143 @@ msgstr "seçimlik"
 msgid "extra"
 msgstr "ilave"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "İndeks dosyası türü '%s' desteklenmiyor"
+msgid "The method driver %s could not be found."
+msgstr "Yöntem sürücüsü %s bulunamadı."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, 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)"
+msgid "Is the package %s installed?"
+msgstr "%s paketi kurulu mu?"
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/acquire-worker.cc:169
 #, 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)"
+msgid "Method %s did not start correctly"
+msgstr "%s yöntemi düzgün şekilde başlamadı"
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] çok kısa)"
+"Lütfen '%s' olarak etiketlenmiş diski '%s' sürücüsüne yerleştirin ve giriş "
+"(enter) tuşuna basın."
 
-#: apt-pkg/sourcelist.cc:184
+#: apt-pkg/pkgrecords.cc:38
 #, 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)"
+msgid "Index file type '%s' is not supported"
+msgstr "İndeks dosyası türü '%s' desteklenmiyor"
 
-#: 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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Bağımlılık ağacı oluşturuluyor"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Aday sürümler"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Bağımlılık oluşturma"
+
+#: 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/depcache.cc:250
 #, 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ış)"
+msgid "Failed to open StateFile %s"
+msgstr "Durum dosyası (StateFile) %s açılamadı"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu"
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dist)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "yeniden adlandırma başarısız, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Sağlama toplamları eşleşmiyor"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Boyutlar eşleşmiyor"
+
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
+msgstr "Geçersiz dosya biçimi"
+
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
 msgstr ""
-"Kaynak listesinin (%2$s)  %1$lu numaralı satırı hatalı (URI ayrıştırma)"
+"'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list "
+"dosyasındaki girdi ya da satır hatalı)"
 
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1656
 #, 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)"
+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/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1698
+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:1736
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
 msgstr ""
-"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dağıtım ayrıştırma)"
+"%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun "
+"güncelleştirmeleri uygulanmayacak."
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1758
 #, c-format
-msgid "Opening %s"
-msgstr "%s Açılıyor"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı çok uzun."
+msgid ""
+"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"
+msgstr ""
+"İmza doğrulama sırasında bir hata meydana geldi. Depo güncel değil ve önceki "
+"indeks dosyaları kullanılacak. GPG hatası: %s:%s\n"
 
-#: apt-pkg/sourcelist.cc:371
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, 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 "GPG error: %s: %s"
+msgstr "GPG hatası: %s: %s"
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1926
 #, 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 ""
+"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 paketindeki dosyalardan biri konumlandırılamadı. Bu durum, bu paketi elle "
+"düzeltmeniz gerektiği anlamına gelebilir. (eksik mimariden dolayı)"
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/acquire-item.cc:1992
 #, 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 "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:2050
+#, 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/clean.cc:39 apt-pkg/acquire.cc:490
 #, c-format
@@ -2371,111 +2390,6 @@ msgstr "%s dosyasına yazılamıyor"
 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:241
-msgid "Send request to solver"
-msgstr "Çözücüye istek gönder"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Çözüm almak için hazırlan"
-
-#: apt-pkg/edsp.cc:327
-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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Harici çözücüyü çalıştır"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "yeniden adlandırma başarısız, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Sağlama toplamları eşleşmiyor"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Boyutlar eşleşmiyor"
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
-msgstr "Geçersiz dosya biçimi"
-
-#: apt-pkg/acquire-item.cc:1640
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
-"'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list "
-"dosyasındaki girdi ya da satır hatalı)"
-
-#: apt-pkg/acquire-item.cc:1656
-#, 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:1698
-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:1736
-#, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-"%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun "
-"güncelleştirmeleri uygulanmayacak."
-
-#: apt-pkg/acquire-item.cc:1758
-#, 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:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-"İmza doğrulama sırasında bir hata meydana geldi. Depo güncel değil ve önceki "
-"indeks dosyaları kullanılacak. GPG hatası: %s:%s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG hatası: %s: %s"
-
-#: apt-pkg/acquire-item.cc:1926
-#, 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 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:1992
-#, 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:2050
-#, 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/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2508,6 +2422,14 @@ msgstr "Alınan dosya: %li / %li (%s kaldı)"
 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: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"
@@ -2561,13 +2483,10 @@ msgstr ""
 "kötü bir durumdur, ama ille de devam etmek isterseniz, APT::Force-LoopBreak "
 "seçeneğini etkinleştirin."
 
-#: 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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2666,31 +2585,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Sorunlar giderilemedi, tutulan bozuk paketleriniz var."
 
-#: 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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Aday sürümler"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Çözücüye senaryo gönder"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Bağımlılık oluşturma"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "Çözücüye istek gönder"
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Çözüm almak için hazırlan"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Durum dosyası (StateFile) %s açılamadı"
+#: apt-pkg/edsp.cc:327
+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/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Harici çözücüyü çalıştır"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2702,6 +2615,118 @@ msgstr "Paket dosyası %s ayrıştırılamadı (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Paket dosyası %s ayrıştırılamadı (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "'Release' dosyası (%s) ayrıştırılamadı"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "'Release' dosyası %s içinde hiç bölüm yok"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "'Release' dosyasında (%s) sağlama girdisi yok"
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, 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/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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2756,31 +2781,6 @@ msgstr "'%s' paketinin aday sürümü olmadığı için aday sürüm seçilemiyo
 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/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "'Release' dosyası (%s) ayrıştırılamadı"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "'Release' dosyası %s içinde hiç bölüm yok"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "'Release' dosyasında (%s) sağlama girdisi yok"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "'Release' dosyasında (%s) geçersiz 'Date' girdisi"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3541,22 +3541,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:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s için geçersiz kılma girdisi yok\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s geliştiricisi %s, %s değil\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  '%s' paketinin yerine geçecek bir kaynak paket yok\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  '%s' paketinin yerine geçecek bir ikili paket de yok\n"
diff --git a/po/uk.po b/po/uk.po
index 24291e8f2..493c9002c 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1156,259 +1156,10 @@ msgstr "З'єднання не вдалося"
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Виправлення залежностей..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " невдача."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Неможливо скоригувати залежності"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Неможливо мінімізувати набір оновлень"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Виконано"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Для виправлення цих помилок ви можете скористатися 'apt-get -f install'."
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1686,11 +1437,260 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Пакунок '%s' не встановлений, тому не видалений\n"
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
 
-#: apt-private/private-download.cc:40
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Виправлення залежностей..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " невдача."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Неможливо скоригувати залежності"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Неможливо мінімізувати набір оновлень"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Виконано"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Для виправлення цих помилок ви можете скористатися 'apt-get -f install'."
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!"
+
+#: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
 msgstr "Автентифікаційне попередження не прийнято до уваги.\n"
 
@@ -1769,8 +1769,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2073,27 +2073,6 @@ msgstr "Неможливо знайти аутентифікаційний за
 msgid "Hash mismatch for: %s"
 msgstr "Невідповідність хешу для: %s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Драйвер для метода %s не знайдено."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Метод %s стартував некоректно"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 "Не можу обробити чи відкрити перелік пакунків чи статусний файл."
@@ -2187,92 +2166,143 @@ msgstr "необов'язкові (optional)"
 msgid "extra"
 msgstr "додаткові (extra)"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Тип '%s' індексного файлу не підтримується"
+msgid "The method driver %s could not be found."
+msgstr "Драйвер для метода %s не знайдено."
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
+msgid "Is the package %s installed?"
+msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (нечитабельний [параметр])"
+msgid "Method %s did not start correctly"
+msgstr "Метод %s стартував некоректно"
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Спотворений рядок %lu у переліку джерел %s ([параметр] занадто короткий)"
+"Будь-ласка, вставте диск з поміткою: '%s' в привід '%s' і натисніть Enter."
 
-#: apt-pkg/sourcelist.cc:184
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не є призначенням)"
+msgid "Index file type '%s' is not supported"
+msgstr "Тип '%s' індексного файлу не підтримується"
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Побудова дерева залежностей"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Версії кандидатів"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Ґенерація залежностей"
+
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Зчитування інформації про стан"
+
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не має ключа)"
+msgid "Failed to open StateFile %s"
+msgstr "Не вдалося відкрити StateFile %s"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Спотворений рядок %lu у переліку джерел %s ([%s] ключ %s не має значення)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Не вдалося записати до тимчасового StateFile файла %s"
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (проблема з URI)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "не вдалося перейменувати, %s (%s -> %s)."
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Невідповідність хешу MD5Sum"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Невідповідність розміру"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Невірна дія %s"
+
+#: apt-pkg/acquire-item.cc:1640
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (dist)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+"Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у "
+"sources.list, або пошкоджений файл)"
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:1656
 #, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі"
 
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1698
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n"
+
+#: apt-pkg/acquire-item.cc:1736
 #, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (absolute dist)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+"Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього "
+"репозиторія не будуть застосовані."
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (dist parse)"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)"
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "Відкриття %s"
+msgid ""
+"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"
+msgstr ""
+"Виникла помилка під час перевірки підпису. Репозиторій не оновлено, "
+"попередні індексні файли будуть використані. Помилка GPG: %s: %s\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Рядок %u є занадто довгим у переліку джерел %s."
+msgid "GPG error: %s: %s"
+msgstr "Помилка GPG: %s: %s"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Спотворений рядок %u у переліку джерел %s (тип)"
+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/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%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/acquire-item.cc:2050
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %s."
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2348,118 +2378,6 @@ msgstr "Неможливо записати в %s"
 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:241
-#, fuzzy
-msgid "Send request to solver"
-msgstr "Відправити запит розв'язувачу"
-
-#: apt-pkg/edsp.cc:320
-#, fuzzy
-msgid "Prepare for receiving solution"
-msgstr "Пригодуватися до отримання розв'язку"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про "
-"помилку"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-#, fuzzy
-msgid "Execute external solver"
-msgstr "Виконати зовнішній розв'язувач"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "не вдалося перейменувати, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Невідповідність хешу MD5Sum"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Невідповідність розміру"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Невірна дія %s"
-
-#: apt-pkg/acquire-item.cc:1640
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
-"Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у "
-"sources.list, або пошкоджений файл)"
-
-#: apt-pkg/acquire-item.cc:1656
-#, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі"
-
-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n"
-
-#: apt-pkg/acquire-item.cc:1736
-#, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-"Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього "
-"репозиторія не будуть застосовані."
-
-#: apt-pkg/acquire-item.cc:1758
-#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)"
-
-#: apt-pkg/acquire-item.cc:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-"Виникла помилка під час перевірки підпису. Репозиторій не оновлено, "
-"попередні індексні файли будуть використані. Помилка GPG: %s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Помилка GPG: %s: %s"
-
-#: apt-pkg/acquire-item.cc:1926
-#, 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:1992
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'"
-
-#: apt-pkg/acquire-item.cc:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %s."
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2492,6 +2410,14 @@ msgstr "Завантажується файл %li з %li (залишилось %
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Додайте деякі посилання (URI) на вихідні тексти у ваш sources.list"
@@ -2545,13 +2471,10 @@ msgstr ""
 "погано, але якщо Ви дійсно бажаєте зробити це, активуйте параметр APT::Force-"
 "LoopBreak."
 
-#: 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:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Рядок %u є занадто довгим у переліку джерел %s."
 
 #: apt-pkg/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2649,31 +2572,31 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки."
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Побудова дерева залежностей"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Версії кандидатів"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+#, fuzzy
+msgid "Send scenario to solver"
+msgstr "Відправити сценарій розв'язувачу"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Ґенерація залежностей"
+#: apt-pkg/edsp.cc:241
+#, fuzzy
+msgid "Send request to solver"
+msgstr "Відправити запит розв'язувачу"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Зчитування інформації про стан"
+#: apt-pkg/edsp.cc:320
+#, fuzzy
+msgid "Prepare for receiving solution"
+msgstr "Пригодуватися до отримання розв'язку"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Не вдалося відкрити StateFile %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про "
+"помилку"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Не вдалося записати до тимчасового StateFile файла %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+#, fuzzy
+msgid "Execute external solver"
+msgstr "Виконати зовнішній розв'язувач"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2685,6 +2608,108 @@ msgstr "Неможливо проаналізувати файл пакунку
 msgid "Unable to parse package file %s (2)"
 msgstr "Неможливо проаналізувати файл пакунку %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Неможливо проаналізувати 'Release' файл %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Немає секцій у 'Release' файлі %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Немає запису 'Hash' у 'Release' файлі %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Невірний запис 'Valid-Until' у 'Release' файлі %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2743,31 +2768,6 @@ msgstr ""
 "Неможливо вибрати встановлену версію пакунку %s, так як такий пакунок не "
 "встановлено"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Неможливо проаналізувати 'Release' файл %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Немає секцій у 'Release' файлі %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Немає запису 'Hash' у 'Release' файлі %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Невірний запис 'Valid-Until' у 'Release' файлі %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Невірний запис 'Date' у 'Release' файлі %s"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3541,22 +3541,22 @@ msgstr " Перевищено ліміт в %sB в DeLink.\n"
 msgid "Archive had no package field"
 msgstr "Архів не мав поля 'package'"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, fuzzy, c-format
 msgid "  %s has no override entry\n"
 msgstr "  Відсутній запис про перепризначення (override) для %s\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  пакунок %s супроводжується %s, а не %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, fuzzy, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  Відсутній запис про перепризначення вихідних текстів для %s\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  Крім того, відсутній запис про бінарне перепризначення для %s\n"
diff --git a/po/vi.po b/po/vi.po
index b5c7a517a..1c36fcef3 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1197,250 +1197,10 @@ msgstr "Kết nối bị lỗi"
 msgid "Internal error"
 msgstr "Gặp lỗi nội bộ"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr "Đang liệt kê"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Đang sửa chữa quan hệ phụ thuộc..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " gặp lỗi."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Không thể sửa phần phụ thuộc"
-
-#: apt-private/private-cachefile.cc:102
-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:104
-msgid " Done"
-msgstr " Xong"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 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!"
@@ -1701,15 +1461,255 @@ 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-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "CẢNH BÁO: Không thể xác thực những gói sau đây!"
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "Đang liệt kê"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Cảnh báo xác thực bị đè.\n"
+#: apt-private/private-list.cc:159
+#, 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-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-cachefile.cc:93
+msgid "Correcting dependencies..."
+msgstr "Đang sửa chữa quan hệ phụ thuộc..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " gặp lỗi."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Không thể sửa phần phụ thuộc"
+
+#: apt-private/private-cachefile.cc:102
+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:104
+msgid " Done"
+msgstr " Xong"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "CẢNH BÁO: Không thể xác thực những gói sau đây!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Cảnh báo xác thực bị đè.\n"
+
+#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
 msgid "Some packages could not be authenticated"
 msgstr "Một số gói không thể được xác thực"
 
@@ -1784,8 +1784,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2083,35 +2083,15 @@ 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:116
-#, 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/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."
 
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "Gói “%s” đã được cài đặt chưa?"
-
-#: apt-pkg/acquire-worker.cc:169
-#, 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:455
-#, 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."
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"Bạn nên lấy cơ sở dữ liệu mới bằng lệnh “apt-get update” để sửa các vấn đề "
-"này"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr ""
+"Bạn nên lấy cơ sở dữ liệu mới bằng lệnh “apt-get update” để sửa các vấn đề "
+"này"
 
 #: apt-pkg/cachefile.cc:116
 msgid "The list of sources could not be read."
@@ -2198,99 +2178,143 @@ msgstr "tùy chọn"
 msgid "extra"
 msgstr "bổ sung"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, 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 "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/sourcelist.cc:127
+#: apt-pkg/acquire-worker.cc:118
 #, 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)"
+msgid "Is the package %s installed?"
+msgstr "Gói “%s” đã được cài đặt chưa?"
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/acquire-worker.cc:169
 #, 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)"
+msgid "Method %s did not start correctly"
+msgstr "Phương thức %s đã không khởi chạy đúng đắn."
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/acquire-worker.cc:455
 #, 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)"
+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/sourcelist.cc:184
+#: apt-pkg/pkgrecords.cc:38
 #, 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)"
+msgid "Index file type '%s' is not supported"
+msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”"
 
-#: apt-pkg/sourcelist.cc:190
+#: 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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Phiên bản ứng cử"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Tạo ra quan hệ phụ thuộc"
+
+#: 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/depcache.cc:250
 #, 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)"
+msgid "Failed to open StateFile %s"
+msgstr "Lỗi mở tập tin tình trạng StateFile %s"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:256
 #, 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ị)"
+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:206
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, 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)"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "gặp lỗi khi đổi tên, %s (%s → %s)."
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Mã băm tổng kiểm tra không khớp"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Kích cỡ không khớp nhau"
+
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
+msgstr "Định dạng tập tập tin không hợp lệ"
+
+#: apt-pkg/acquire-item.cc:1640
 #, 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)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+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/sourcelist.cc:211
+#: apt-pkg/acquire-item.cc:1656
 #, 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)"
+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/sourcelist.cc:217
+#: apt-pkg/acquire-item.cc:1698
+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:1736
 #, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
 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)"
+"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/sourcelist.cc:224
+#: apt-pkg/acquire-item.cc:1758
 #, 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)"
+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/sourcelist.cc:335
+#: apt-pkg/acquire-item.cc:1788
 #, c-format
-msgid "Opening %s"
-msgstr "Đang mở %s"
+msgid ""
+"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"
+msgstr ""
+"Gặp lỗi trong khi thẩm tra chữ ký.\n"
+"Kho lưu chưa được cập nhật nên dùng những tập tin chỉ mục trước.\n"
+"Lỗi GPG: %s: %s\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
 #, 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."
+msgid "GPG error: %s: %s"
+msgstr "Lỗi GPG: %s: %s"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-item.cc:1926
 #, 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 ""
+"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 ""
+"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/sourcelist.cc:375
+#: apt-pkg/acquire-item.cc:1992
 #, 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 "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/sourcelist.cc:416
+#: apt-pkg/acquire-item.cc:2050
 #, 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 ""
+"The package index files are corrupted. No Filename: field for package %s."
+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/clean.cc:39 apt-pkg/acquire.cc:490
 #, c-format
@@ -2365,113 +2389,6 @@ msgstr "Không thể ghi vào %s"
 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:241
-msgid "Send request to solver"
-msgstr "Gửi yêu cầu đến bộ phân giải"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Chuẩn bị để lấy cách giải quyết"
-
-#: apt-pkg/edsp.cc:327
-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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Thi hành bộ phân giải từ bên ngoài"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, 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:163
-msgid "Hash Sum mismatch"
-msgstr "Mã băm tổng kiểm tra không khớp"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Kích cỡ không khớp nhau"
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
-msgstr "Định dạng tập tập tin không hợp lệ"
-
-#: apt-pkg/acquire-item.cc:1640
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-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:1656
-#, 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:1698
-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:1736
-#, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-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:1758
-#, 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:1788
-#, c-format
-msgid ""
-"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"
-msgstr ""
-"Gặp lỗi trong khi thẩm tra chữ ký.\n"
-"Kho lưu chưa được cập nhật nên dùng những tập tin chỉ mục trước.\n"
-"Lỗi GPG: %s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Lỗi GPG: %s: %s"
-
-#: apt-pkg/acquire-item.cc:1926
-#, 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 ""
-"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:1992
-#, 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:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-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/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2504,6 +2421,14 @@ msgstr "Đang tải tập tin thứ %li trong tổng số %li (còn lại %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2559,13 +2484,10 @@ 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/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: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/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2661,31 +2583,25 @@ msgstr ""
 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/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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Phiên bản ứng cử"
+#: 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/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Tạo ra quan hệ phụ thuộc"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "Gửi yêu cầu đến bộ phân giải"
 
-#: 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/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Chuẩn bị để lấy cách giải quyết"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Lỗi mở tập tin tình trạng StateFile %s"
+#: apt-pkg/edsp.cc:327
+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/depcache.cc:256
-#, 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"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Thi hành bộ phân giải từ bên ngoài"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2697,6 +2613,118 @@ msgstr "Không thể phân tích tập tin gói %s (1)"
 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:78
+#, 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:86
+#, 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:117
+#, 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:130
+#, 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:149
+#, 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/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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2753,34 +2781,6 @@ 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/indexrecords.cc:78
-#, 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:86
-#, 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:117
-#, 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:130
-#, 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:149
-#, 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"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3555,22 +3555,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:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s không có mục ghi đè (override)\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, 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:706
+#: ftparchive/writer.cc:698
 #, 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:710
+#: ftparchive/writer.cc:702
 #, 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"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 55c4c221a..5022016b2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -1153,249 +1153,10 @@ msgstr "连接失败"
 msgid "Internal error"
 msgstr "内部错误"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr "正在列表"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "正在更正依赖关系..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " 失败。"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "无法更正依赖关系"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "无法最小化要升级的软件包集合"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " 完成"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
@@ -1622,26 +1383,265 @@ msgstr "不能重新安装 %s，因为无法下载它。\n"
 msgid "%s is already the newest version.\n"
 msgstr "%s 已经是最新的版本。\n"
 
-#: apt-private/private-install.cc:894
+#: apt-private/private-install.cc:894
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
+
+#: apt-private/private-install.cc:899
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%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:941
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "软件包 %s 还未安装，因而不会被卸载。您的意思是 ‘%s’ 吗？\n"
+
+#: apt-private/private-install.cc:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "软件包 %s 还未安装，因而不会被卸载\n"
+
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "正在列表"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "正在更正依赖关系..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " 失败。"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "无法更正依赖关系"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "无法最小化要升级的软件包集合"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " 完成"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
+
+#: apt-private/private-cachefile.cc:111
+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:35
 #, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
+msgid "Regex compilation error - %s"
+msgstr "编译正则表达式时出错 - %s"
 
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "由于 %4$s，为 %3$s 选定了版本 %1$s (%2$s)\n"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr " update 命令不需要参数"
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
+#: apt-private/private-update.cc:97
 #, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "软件包 %s 还未安装，因而不会被卸载。您的意思是 ‘%s’ 吗？\n"
+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-install.cc:947
+#: apt-private/private-update.cc:101
+msgid "All packages are up to date."
+msgstr "所有软件包均为最新。"
+
+#: apt-private/private-show.cc:156
 #, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "软件包 %s 还未安装，因而不会被卸载\n"
+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-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1726,8 +1726,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2021,26 +2021,6 @@ msgstr "无法找到认证记录：%s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash 校验和不符：%s"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr "请检查是否安装了 %s 软件包"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 "无法解析或打开软件包的列表或是状态文件。"
@@ -2134,183 +2114,56 @@ msgstr "可选"
 msgid "extra"
 msgstr "额外"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "不支持索引文件类型“%s”"
-
-#: 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/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/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 行有错误(独立发行版)"
-
-#: 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
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
+msgid "The method driver %s could not be found."
+msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "无法识别在源列表 %3$s 里，第 %2$u 节中的软件包类别“%1$s”"
+msgid "Is the package %s installed?"
+msgstr "请检查是否安装了 %s 软件包"
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Clean of %s is not supported"
-msgstr "%s 的 Clean (清理)不被支持"
+msgid "Method %s did not start correctly"
+msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
 
-#: apt-pkg/clean.cc:64
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Unable to stat %s."
-msgstr "无法读取 %s 的状态。"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "软件包暂存区使用的是不兼容的版本控制系统"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "请把标有“%s”的盘片插入驱动器“%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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "处理 %s (%s%d) 时出错"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "哇，软件包数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
+msgid "Index file type '%s' is not supported"
+msgstr "不支持索引文件类型“%s”"
 
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "正在分析软件包的依赖关系树"
 
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "无法获取源软件包列表 %s 的状态"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候选版本"
 
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "正在读取软件包列表"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "生成依赖关系"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "正在收集文件所提供的软件包"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "正在读取状态信息"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Unable to write to %s"
-msgstr "无法写入 %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr "向solver发送请求"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "准备接收解决方案"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "外部solver出错，错误信息不恰当"
+msgid "Failed to open StateFile %s"
+msgstr "无法打开状态文件 %s"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "执行外部solver"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "无法写入临时状态文件 %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2393,6 +2246,79 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
 
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "处理 %s (%s%d) 时出错"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "哇，软件包数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "无法获取源软件包列表 %s 的状态"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "正在读取软件包列表"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "正在收集文件所提供的软件包"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "无法写入 %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "无法读取或写入软件源缓存"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2425,6 +2351,12 @@ msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
@@ -2476,11 +2408,10 @@ msgstr ""
 "少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::"
 "Force-LoopBreak 选项。"
 
-#: 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:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "源列表 %2$s 的第 %1$u 行太长了。"
 
 #: apt-pkg/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2579,31 +2510,25 @@ msgstr ""
 "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
 "系。"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "正在分析软件包的依赖关系树"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "候选版本"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "向solver发送情景"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "生成依赖关系"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr "向solver发送请求"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "正在读取状态信息"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "准备接收解决方案"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "无法打开状态文件 %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "外部solver出错，错误信息不恰当"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "无法写入临时状态文件 %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "执行外部solver"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2615,6 +2540,106 @@ msgstr "无法解析软件包文件 %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "无法解析软件包文件 %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "无法解析软件包仓库 Release 文件 %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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 解析)"
+
+#: 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/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 行有错误(独立发行版)"
+
+#: 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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2667,31 +2692,6 @@ msgstr "因为软件包 %s 没有候选版本，无法进行选择"
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "无法解析软件包仓库 Release 文件 %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
-
-#: apt-pkg/indexrecords.cc:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3423,22 +3423,22 @@ msgstr " 达到了 DeLink 的上限 %sB。\n"
 msgid "Archive had no package field"
 msgstr "归档文件没有包含 package 字段"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s 中没有 override 项\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s 的维护者 %s 并非 %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s 没有源代码的 override 项\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s 中没有二进制文件的 override 项\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 40a09adad..b24011151 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-12-23 13:28+0100\n"
+"POT-Creation-Date: 2015-01-16 04:37-0500\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."
@@ -1096,251 +1096,10 @@ msgstr "連線失敗"
 msgid "Internal error"
 msgstr "內部錯誤"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "正在修正相依關係..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " 失敗。"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "無法修正相依關係"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "無法將升級計劃最小化"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " 完成"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。"
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "內部錯誤，在損毀的套件上執行 InstallPackages！"
@@ -1570,31 +1329,272 @@ msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "無法重新安裝 %s，因為它無法下載。\n"
 
-#: apt-private/private-install.cc:846
+#: apt-private/private-install.cc:846
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s 已經是最新版本了。\n"
+
+#: apt-private/private-install.cc:894
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
+
+#: apt-private/private-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
+
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "正在修正相依關係..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " 失敗。"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "無法修正相依關係"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "無法將升級計劃最小化"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " 完成"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。"
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
 #, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s 已經是最新版本了。\n"
+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-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
+#: apt-private/private-update.cc:101
+msgid "All packages are up to date."
+msgstr ""
 
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
+#: 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] ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
+#: 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:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1679,8 +1679,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1976,26 +1976,6 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum 不符"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "找不到安裝方式的驅動程式 %s。"
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "安裝方式 %s 沒有正確啟動"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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 "無法分析或開啟套件清單或狀況檔。"
@@ -2090,183 +2070,56 @@ msgstr "次要"
 msgid "extra"
 msgstr "額外"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "不被支援的索引檔類型 '%s'"
-
-#: 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 行的格式錯誤（發行版分析）"
+msgid "The method driver %s could not be found."
+msgstr "找不到安裝方式的驅動程式 %s。"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/acquire-worker.cc:118
 #, 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/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 行的格式錯誤（絕對發行版）"
-
-#: 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"
+msgid "Is the package %s installed?"
+msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Line %u too long in source list %s."
-msgstr "來源列表 %2$s 中的第 %1$u 行太長。"
+msgid "Method %s did not start correctly"
+msgstr "安裝方式 %s 沒有正確啟動"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。"
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/pkgrecords.cc:38
 #, 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:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
+msgid "Index file type '%s' is not supported"
 msgstr "不被支援的索引檔類型 '%s'"
 
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "無法取得 %s 的狀態。"
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "在處理 %s 時發生錯誤 (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "哇呀，您已經超過這個 APT 所能處理的套件名稱數量了。"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "哇呀，您已經超過這個 APT 所能處理的版本數量了。"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "哇呀，您已經超過這個 APT 所能處理的說明數量了。"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "哇呀，您已經超過這個 APT 所能處理的相依關係數量了。"
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "在計算檔案相依性時找不到套件 %s %s"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "正在重建相依關係"
 
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "無法取得來源套件列表 %s 的狀態"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候選版本"
 
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "正在讀取套件清單"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "建立相依關係"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "正在收集檔案提供者"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "正在讀取狀態資料"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/depcache.cc:250
 #, c-format
-msgid "Unable to write to %s"
-msgstr "無法寫入 %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+msgid "Failed to open StateFile %s"
+msgstr "無法開啟 StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "無法寫入暫存的 StateFile %s"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2347,6 +2200,79 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。"
 
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, fuzzy, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "在處理 %s 時發生錯誤 (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "哇呀，您已經超過這個 APT 所能處理的套件名稱數量了。"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "哇呀，您已經超過這個 APT 所能處理的版本數量了。"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "哇呀，您已經超過這個 APT 所能處理的說明數量了。"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "哇呀，您已經超過這個 APT 所能處理的相依關係數量了。"
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "在計算檔案相依性時找不到套件 %s %s"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "無法取得來源套件列表 %s 的狀態"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "正在讀取套件清單"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "正在收集檔案提供者"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "無法寫入 %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
+msgstr "在儲存來源快取時 IO 錯誤"
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2379,6 +2305,13 @@ msgstr "正在取得檔案 %li/%li（還有 %s）"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "在 sources.list 中必須包含一些 'source' URI"
@@ -2426,12 +2359,10 @@ msgstr ""
 "此安裝因衝突或預先相依關係，需暫時刪除 %s 這個基本套件。這通常不是好主意，但"
 "若您執意進行，請設定 APT::Force-LoopBreak 選項。"
 
-#: 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:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "來源列表 %2$s 中的第 %1$u 行太長。"
 
 #: apt-pkg/cdrom.cc:571
 msgid "Unmounting CD-ROM...\n"
@@ -2524,31 +2455,25 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "無法修正問題，您保留 (hold) 了損毀的套件。"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "正在重建相依關係"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "候選版本"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "建立相依關係"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "正在讀取狀態資料"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "無法開啟 StateFile %s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "無法寫入暫存的 StateFile %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2560,6 +2485,106 @@ msgstr "無法辨識套件檔 %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "無法辨識套件檔 %s (2)"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "無法辨別 Release 檔 %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有區段"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
+
+#: apt-pkg/indexrecords.cc:149
+#, 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/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 行的格式錯誤（絕對發行版）"
+
+#: 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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2612,31 +2637,6 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "無法辨別 Release 檔 %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有區段"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-
-#: apt-pkg/indexrecords.cc:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
@@ -3370,22 +3370,22 @@ msgstr " 達到了 DeLink 的上限 %sB。\n"
 msgid "Archive had no package field"
 msgstr "套件檔裡沒有套件資訊"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s 沒有重新定義項目\n"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s 的維護者是 %s，而非 %s\n"
 
-#: ftparchive/writer.cc:706
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s 沒有原始碼重新定義項目\n"
 
-#: ftparchive/writer.cc:710
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s 也沒有二元碼重新定義項目\n"
-- 
cgit v1.2.3-70-g09d2

-- 
cgit v1.2.3-70-g09d2


From 0c2dc43d4fe1d026650b5e2920a021557f9534a6 Mon Sep 17 00:00:00 2001
From: Tomasz Buchert <tomasz.buchert@inria.fr>
Date: Mon, 16 Feb 2015 00:57:29 +0100
Subject: Fix crash in the apt-transport-https when Owner is NULL

Do not crash in ServerState::HeaderLine if there is no Owner.

Closes: #778375
---
 methods/server.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/methods/server.cc b/methods/server.cc
index cb0341d5f..e321e0230 100644
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -129,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)
-- 
cgit v1.2.3-70-g09d2


From 1a0619ac765cc0b2f4906c96c1a4d7f510569a3f Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Mon, 23 Feb 2015 12:56:42 +0100
Subject: releasing package apt version 1.0.9.7

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4e6d385d2..4b38ba8ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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 ]
-- 
cgit v1.2.3-70-g09d2


From b0be0e09cfbbcb033eb0b92eaf17ac31a6b9f423 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 22 Dec 2014 12:20:28 +0100
Subject: rework dpkg-wrapping in test framework

We are able to run maintainer scripts if needed before, but we need to
set ADMINDIR to be able to call dpkg tools like dpkg-trigger inside of
them.

Git-Dch: Ignore
---
 test/integration/framework | 44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/test/integration/framework b/test/integration/framework
index f7f69f5d5..2c794d1f3 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -131,7 +131,7 @@ 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 "$@"
@@ -247,15 +247,28 @@ 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
+
+	cat > "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" <<EOF
+#!/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
+	cat "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg"
+	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\";" >> 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
@@ -388,22 +401,15 @@ int execvp(const char *file, char *const argv[]) {
 	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
-
-	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
 }
 
 configallowinsecurerepositories() {
-- 
cgit v1.2.3-70-g09d2


From 905fba60a046646a26a56b4c5d4a5dc7d5906f0d Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 9 Mar 2015 01:54:46 +0100
Subject: derive more of https from http method

Bug #778375 uncovered that https wasn't properly integrated in the class
family tree of http as it was supposed to be leading to a NULL pointer
dereference. Fixing this 'properly' was deemed to much diff for
practically no gain that late in the release, so commit
0c2dc43d4fe1d026650b5e2920a021557f9534a6 just fixed the synptom, while
this commit here is fixing the cause plus adding a test.
---
 methods/http.cc                                    |  2 -
 methods/https.cc                                   | 37 +++++----
 methods/https.h                                    | 16 ++--
 methods/server.cc                                  |  7 +-
 methods/server.h                                   |  3 +-
 .../test-bug-778375-server-has-no-reason-phrase    | 40 ++++++++++
 test/interactive-helper/aptwebserver.cc            | 88 +++++++++++-----------
 7 files changed, 124 insertions(+), 69 deletions(-)
 create mode 100755 test/integration/test-bug-778375-server-has-no-reason-phrase

diff --git a/methods/http.cc b/methods/http.cc
index ad1347d36..021b284d0 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -772,8 +772,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/https.cc b/methods/https.cc
index 37a8ff5fd..32de42e4b 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -37,16 +37,6 @@
 									/*}}}*/
 using namespace std;
 
-bool HttpsMethod::Configuration(std::string Message)
-{
-   if (pkgAcqMethod::Configuration(Message) == false)
-      return false;
-
-   DropPrivsOrDie();
-
-   return true;
-}
-
 size_t
 HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
 {
@@ -131,7 +121,7 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double /*dlnow*/,
 }
 
 // HttpsServerState::HttpsServerState - Constructor			/*{{{*/
-HttpsServerState::HttpsServerState(URI Srv,HttpsMethod * /*Owner*/) : ServerState(Srv, NULL)
+HttpsServerState::HttpsServerState(URI Srv,HttpsMethod * Owner) : ServerState(Srv, Owner)
 {
    TimeOut = _config->FindI("Acquire::https::Timeout",TimeOut);
    ReceivedData = false;
@@ -335,13 +325,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
@@ -378,7 +366,7 @@ 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);
 
    // keep apt updated
    Res.Filename = Itm->DestFile;
@@ -473,6 +461,25 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
 
    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 6917a6ff6..433a84680 100644
--- a/methods/https.h
+++ b/methods/https.h
@@ -50,17 +50,14 @@ class HttpsServerState : public ServerState
 
    HttpsServerState(URI Srv, HttpsMethod *Owner);
    virtual ~HttpsServerState() {Close();};
-
-   bool ReceivedData;
 };
 
-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);
@@ -69,12 +66,19 @@ class HttpsMethod : public pkgAcqMethod
    void SetupProxy();
    CURL *curl;
    FetchResult Res;
-   HttpsServerState *Server;
+   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), File(NULL)
+   virtual bool Configuration(std::string Message);
+   virtual ServerState * CreateServerState(URI uri);
+
+   HttpsMethod() : ServerMethod("1.2",Pipeline | SendConfig), File(NULL)
    {
       curl = curl_easy_init();
    };
diff --git a/methods/server.cc b/methods/server.cc
index c17f27f73..91ec824d1 100644
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -238,7 +238,12 @@ ServerState::ServerState(URI Srv, ServerMethod *Owner) : ServerName(Srv), TimeOu
 
 bool ServerMethod::Configuration(string Message)			/*{{{*/
 {
-   return pkgAcqMethod::Configuration(Message);
+   if (pkgAcqMethod::Configuration(Message) == false)
+      return false;
+
+   DropPrivsOrDie();
+
+   return true;
 }
 									/*}}}*/
 
diff --git a/methods/server.h b/methods/server.h
index b974ec89a..3b232dcac 100644
--- a/methods/server.h
+++ b/methods/server.h
@@ -37,6 +37,7 @@ struct ServerState
    unsigned long long Size; // size of the usable content (aka: the file)
    unsigned long long JunkSize; // size of junk content (aka: server error pages)
    unsigned long long StartPos;
+   bool ReceivedData;
    time_t Date;
    bool HaveContent;
    enum {Chunked,Stream,Closes} Encoding;
@@ -75,7 +76,7 @@ struct ServerState
 
    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; JunkSize = 0;
-		 StartPos = 0; Encoding = Closes; time(&Date); HaveContent = false;
+		 StartPos = 0; ReceivedData = false; Encoding = Closes; time(&Date); HaveContent = false;
 		 State = Header; Persistent = false; Pipeline = true; MaximumSize = 0;};
    virtual bool WriteResponse(std::string const &Data) = 0;
 
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/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index 3403bbdd2..644629a33 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -27,58 +27,58 @@
 #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) {
-- 
cgit v1.2.3-70-g09d2


From 3de7789a75c58204bcc979c72899cfdacba4e2ac Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 7 Mar 2015 13:11:49 +0100
Subject: fix another d(e)select-upgrade typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

You would think one instance of this is enough, but
80e8d923ebc8d5f3f84eb3f922b28ca309c25026 wasn't as
globally applied as the commit message suggested…

LP: #1399037
---
 apt-private/private-cmndline.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index bb9a00803..41aab81f6 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -170,7 +170,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);
-- 
cgit v1.2.3-70-g09d2


From 2f6a2fbbdc9f76dc4eace83a427013f4e1c03afc Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 8 Jan 2015 21:07:37 +0100
Subject: properly implement pkgRecord::Parser for *.deb files

Implementing FileName() works for most cases for us, but other
frontends might need more and even for us its not very stable as
the normal Jump() implementation is pretty bad on a deb file and
produce errors on its own at times.
So, replacing this makeshift with a complete implementation by
mostly just shuffling code around.
---
 apt-pkg/deb/debindexfile.cc |   73 +-
 apt-pkg/deb/debindexfile.h  |    8 +
 apt-pkg/deb/debrecords.cc   |  108 +-
 apt-pkg/deb/debrecords.h    |   49 +-
 apt-pkg/tagfile.cc          |    6 +-
 doc/po/apt-doc.pot          |    4 +-
 doc/po/fr.po                |  215 +--
 po/apt-all.pot              | 2286 ++++++++++++++++----------------
 po/ar.po                    | 2611 ++++++++++++++++++------------------
 po/ast.po                   | 2772 +++++++++++++++++++-------------------
 po/bg.po                    | 2805 ++++++++++++++++++++-------------------
 po/bs.po                    | 2370 +++++++++++++++++----------------
 po/ca.po                    | 3029 +++++++++++++++++++++---------------------
 po/cs.po                    | 2993 ++++++++++++++++++++---------------------
 po/cy.po                    | 2782 +++++++++++++++++++-------------------
 po/da.po                    | 2768 +++++++++++++++++++-------------------
 po/de.po                    | 3063 +++++++++++++++++++++---------------------
 po/dz.po                    | 2761 +++++++++++++++++++-------------------
 po/el.po                    | 3006 ++++++++++++++++++++---------------------
 po/es.po                    | 3024 +++++++++++++++++++++---------------------
 po/eu.po                    | 2987 +++++++++++++++++++++--------------------
 po/fi.po                    | 2762 +++++++++++++++++++-------------------
 po/fr.po                    | 3087 ++++++++++++++++++++++---------------------
 po/gl.po                    | 3033 +++++++++++++++++++++---------------------
 po/hu.po                    | 2798 ++++++++++++++++++++-------------------
 po/it.po                    | 3033 +++++++++++++++++++++---------------------
 po/ja.po                    | 2775 +++++++++++++++++++-------------------
 po/km.po                    | 2740 +++++++++++++++++++-------------------
 po/ko.po                    | 2746 +++++++++++++++++++-------------------
 po/ku.po                    | 2575 ++++++++++++++++++------------------
 po/lt.po                    | 2725 +++++++++++++++++++-------------------
 po/mr.po                    | 2760 +++++++++++++++++++-------------------
 po/nb.po                    | 2772 +++++++++++++++++++-------------------
 po/ne.po                    | 2742 +++++++++++++++++++-------------------
 po/nl.po                    | 3051 +++++++++++++++++++++---------------------
 po/nn.po                    | 2760 +++++++++++++++++++-------------------
 po/pl.po                    | 3023 +++++++++++++++++++++---------------------
 po/pt.po                    | 3019 +++++++++++++++++++++---------------------
 po/pt_BR.po                 | 2764 +++++++++++++++++++-------------------
 po/ro.po                    | 3013 ++++++++++++++++++++---------------------
 po/ru.po                    | 3052 +++++++++++++++++++++---------------------
 po/sk.po                    | 3012 ++++++++++++++++++++---------------------
 po/sl.po                    | 3036 +++++++++++++++++++++---------------------
 po/sv.po                    | 3006 ++++++++++++++++++++---------------------
 po/th.po                    | 2737 +++++++++++++++++++-------------------
 po/tl.po                    | 2766 +++++++++++++++++++-------------------
 po/tr.po                    | 3047 +++++++++++++++++++++---------------------
 po/uk.po                    | 3046 +++++++++++++++++++++---------------------
 po/vi.po                    | 2824 ++++++++++++++++++++-------------------
 po/zh_CN.po                 | 2731 +++++++++++++++++++-------------------
 po/zh_TW.po                 | 2730 +++++++++++++++++++-------------------
 51 files changed, 64173 insertions(+), 61712 deletions(-)

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index cecfe41a9..49c6e8cc0 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>
 									/*}}}*/
@@ -671,8 +672,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,53 +688,56 @@ 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
@@ -838,7 +841,7 @@ 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";};
 };
diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index 312e915f1..81914f203 100644
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -177,6 +177,14 @@ class APT_HIDDEN 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 {
diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index b41aa5584..335bcfda0 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,28 @@ 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() {}
+
+// 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 +82,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 +106,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 +149,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 +160,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 +181,29 @@ 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;
+}
diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index 7091c38e6..38e071940 100644
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -25,21 +25,12 @@
 #include <apt-pkg/indexfile.h>
 #endif
 
-class APT_HIDDEN 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 +49,42 @@ class APT_HIDDEN debRecordParser : public pkgRecords::Parser
    virtual std::string RecordField(const char *fieldName);
 
    virtual void GetRec(const char *&Start,const char *&Stop);
-   
+
+   debRecordParserBase() : Parser() {}
+   virtual ~debRecordParserBase();
+};
+
+class APT_HIDDEN debRecordParser : public debRecordParserBase
+{
+ 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 APT_HIDDEN debDebFileRecordParser : public debRecordParser
+class APT_HIDDEN debDebFileRecordParser : public debRecordParserBase
 {
+   std::string debFileName;
+   std::string controlContent;
+
+   APT_HIDDEN bool LoadContent();
+ protected:
+   // single file files, so no jumping whatsoever
+   bool Jump(pkgCache::VerFileIterator const &) { return LoadContent(); }
+   bool Jump(pkgCache::DescFileIterator const &) { return LoadContent(); }
+
  public:
-   virtual std::string FileName() {
-      return File.Name();
-   }
-   debDebFileRecordParser(std::string FileName,pkgCache &Cache)
-      : debRecordParser(FileName, Cache) {};
+   virtual std::string FileName() { return debFileName; }
+
+   debDebFileRecordParser(std::string FileName)
+      : debRecordParserBase(), debFileName(FileName) {};
 };
 
 #endif
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 590206f17..9c40c8c92 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -183,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);
    }
@@ -283,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;
 }
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index e3d3afa3c..1e9a5127b 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.0.9.5\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: 2015-01-16 04:37-0500\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"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index a60b04de3..85869a2b7 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-12-23 13:24+0100\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"
@@ -842,9 +842,9 @@ msgstr ""
 "literal> activée par défaut."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:170 apt-get.8.xml:552 apt-cache.8.xml:346 apt-key.8.xml:191
+#: apt.8.xml:170 apt-get.8.xml:560 apt-cache.8.xml:346 apt-key.8.xml:191
 #: apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148
-#: apt-config.8.xml:105 apt.conf.5.xml:1222 apt_preferences.5.xml:701
+#: apt-config.8.xml:105 apt.conf.5.xml:1254 apt_preferences.5.xml:701
 #: sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59
 #: apt-ftparchive.1.xml:603
 msgid "See Also"
@@ -860,7 +860,7 @@ msgstr ""
 "d'APT dans &guidesdir;, &apt-preferences;, le « HOWTO » d'APT."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:176 apt-get.8.xml:558 apt-cache.8.xml:351 apt-mark.8.xml:131
+#: apt.8.xml:176 apt-get.8.xml:566 apt-cache.8.xml:351 apt-mark.8.xml:131
 #: apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70
 #: apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "Diagnostics"
@@ -1773,6 +1773,15 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:529
 msgid ""
+"Forbid the update command to acquire unverifiable data from configured "
+"sources. Apt will fail at the update command for repositories without valid "
+"cryptographically signatures.  Configuration Item: <literal>Acquire::"
+"AllowInsecureRepositories</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:537
+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 "
@@ -1787,13 +1796,13 @@ msgstr ""
 "Fancy</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:542 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
-#: apt.conf.5.xml:1216 apt_preferences.5.xml:694
+#: apt-get.8.xml:550 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
+#: apt.conf.5.xml:1248 apt_preferences.5.xml:694
 msgid "Files"
 msgstr "Fichiers"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:553
+#: apt-get.8.xml:561
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1804,7 +1813,7 @@ msgstr ""
 "« HOWTO » d'APT."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:559
+#: apt-get.8.xml:567
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -4076,14 +4085,23 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:384
+#, fuzzy
+#| msgid ""
+#| "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used "
+#| "to enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be "
+#| "beneficial e.g. on high-latency connections. It specifies how many "
+#| "requests are sent in a pipeline.  Previous APT versions had a default of "
+#| "10 for this setting, but the default value is now 0 (= disabled) to avoid "
+#| "problems with the ever-growing amount of webservers and proxies which "
+#| "choose to not conform to the HTTP/1.1 specification."
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
 "g. on high-latency connections. It specifies how many requests are sent in a "
-"pipeline.  Previous APT versions had a default of 10 for this setting, but "
-"the default value is now 0 (= disabled) to avoid problems with the ever-"
-"growing amount of webservers and proxies which choose to not conform to the "
-"HTTP/1.1 specification."
+"pipeline.  APT tries to detect and workaround misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the "
+"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
+"It is enabled by default with the value 10."
 msgstr ""
 "Le réglage <literal>Acquire::http::Pipeline-Depth</literal> permet "
 "d'utiliser l'enchaînement HTTP (« HTTP pipelining », RFC 2616 section "
@@ -4546,13 +4564,40 @@ msgstr "Utilisation imposée du protocole IPv4 lors des téléchargements."
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr "Utilisation imposée du protocole IPv6 lors des téléchargements."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:591
+msgid ""
+"The maximum file size of Release/Release.gpg/InRelease files.  The default "
+"is 10MB."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:598
+msgid ""
+"Allow the update operation to load data files from a repository without a "
+"trusted signature. If enabled this option no data files will be loaded and "
+"the update operation fails with a error for this source. The default is "
+"false for backward compatibility. This will be changed in the future."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:609
+msgid ""
+"Allow that a repository that was previously gpg signed to become unsigned "
+"durign a update operation. When there is no valid signature of a perviously "
+"trusted repository apt will refuse the update. This option can be used to "
+"override this protection. You almost certainly never want to enable this. "
+"The default is false.  Note that apt will still consider packages from this "
+"source untrusted and warn about them if you try to install them."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:624
 msgid "Directories"
 msgstr "Les répertoires"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:594
+#: apt.conf.5.xml:626
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4572,7 +4617,7 @@ msgstr ""
 "<filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:601
+#: apt.conf.5.xml:633
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4597,7 +4642,7 @@ msgstr ""
 "dans <literal>Dir::Cache</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:611
+#: apt.conf.5.xml:643
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4612,7 +4657,7 @@ msgstr ""
 "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:617
+#: apt.conf.5.xml:649
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -4623,7 +4668,7 @@ msgstr ""
 "configuration est chargé."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:653
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4641,7 +4686,7 @@ msgstr ""
 "programmes correspondants."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:629
+#: apt.conf.5.xml:661
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4663,7 +4708,7 @@ msgstr ""
 "staging/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:642
+#: apt.conf.5.xml:674
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -4681,12 +4726,12 @@ msgstr ""
 "est possible d'utiliser la syntaxe des expressions rationnelles."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:651
+#: apt.conf.5.xml:683
 msgid "APT in DSelect"
 msgstr "APT et DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:653
+#: apt.conf.5.xml:685
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -4697,7 +4742,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:658
+#: apt.conf.5.xml:690
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
@@ -4720,7 +4765,7 @@ msgstr ""
 "avant de récupérer de nouveaux paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:672
+#: apt.conf.5.xml:704
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
@@ -4729,7 +4774,7 @@ msgstr ""
 "&apt-get; lors de la phase d'installation."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:709
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
@@ -4738,7 +4783,7 @@ msgstr ""
 "&apt-get; lors de la phase de mise à jour."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:714
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
@@ -4748,12 +4793,12 @@ msgstr ""
 "d'erreur que l'on propose à l'utilisateur d'intervenir."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:688
+#: apt.conf.5.xml:720
 msgid "How APT calls &dpkg;"
 msgstr "Méthode d'appel de &dpkg; par APT"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:721
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
@@ -4762,7 +4807,7 @@ msgstr ""
 "&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:726
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -4773,7 +4818,7 @@ msgstr ""
 "est passé comme un seul paramètre à &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:732
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4786,7 +4831,7 @@ msgstr ""
 "<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:707
+#: apt.conf.5.xml:739
 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 "
@@ -4804,7 +4849,7 @@ msgstr ""
 "l'entrée standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:746
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -4818,7 +4863,7 @@ msgstr ""
 "déposée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:751
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -4835,7 +4880,7 @@ msgstr ""
 "version la plus haute qu'il gère."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:758
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
@@ -4853,7 +4898,7 @@ msgstr ""
 "confirmation le numéro du descripteur de fichier utilisé."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:736
+#: apt.conf.5.xml:768
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
@@ -4862,7 +4907,7 @@ msgstr ""
 "le répertoire <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:773
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
@@ -4872,14 +4917,14 @@ msgstr ""
 "créés."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:778
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 "utilisation des actions différées (« triggers ») de dpkg (et options "
 "associées)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:747
+#: apt.conf.5.xml:779
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4906,7 +4951,7 @@ msgstr ""
 "pendant la configuration des paquets."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:762
+#: apt.conf.5.xml:794
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -4920,7 +4965,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:756
+#: apt.conf.5.xml:788
 msgid ""
 "Note that it is not guaranteed that APT will support these options or that "
 "these options will not cause (big) trouble in the future. If you have "
@@ -4944,7 +4989,7 @@ msgstr ""
 "<placeholder type=\"literallayout\" id=\"0\"/>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:801
 msgid ""
 "Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
@@ -4967,7 +5012,7 @@ msgstr ""
 "options « unpack » et « remove »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:777
+#: apt.conf.5.xml:809
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -4997,7 +5042,7 @@ msgstr ""
 "configuré et donc éventuellement non amorçable."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:792
+#: apt.conf.5.xml:824
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5016,7 +5061,7 @@ msgstr ""
 "peut conserver l'option active."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:799
+#: apt.conf.5.xml:831
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
@@ -5034,7 +5079,7 @@ msgstr ""
 "celles concernant le paquet en cours de traitement."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:812
+#: apt.conf.5.xml:844
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5052,7 +5097,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:837
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -5078,12 +5123,12 @@ msgstr ""
 "id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:825
+#: apt.conf.5.xml:857
 msgid "Periodic and Archives options"
 msgstr "Options « Periodic » et « Archive »"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:826
+#: apt.conf.5.xml:858
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -5095,12 +5140,12 @@ msgstr ""
 "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:866
 msgid "Debug options"
 msgstr "Les options de débogage"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:836
+#: apt.conf.5.xml:868
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5118,7 +5163,7 @@ msgstr ""
 "peuvent tout de même être utiles :"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:847
+#: apt.conf.5.xml:879
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5129,7 +5174,7 @@ msgstr ""
 "upgrade, upgrade, install, remove et purge</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:887
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5141,7 +5186,7 @@ msgstr ""
 "superutilisateur."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:864
+#: apt.conf.5.xml:896
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5153,7 +5198,7 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:872
+#: apt.conf.5.xml:904
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
@@ -5162,12 +5207,12 @@ msgstr ""
 "type statfs dans les identifiants de CD."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:882
+#: apt.conf.5.xml:914
 msgid "A full list of debugging options to apt follows."
 msgstr "Liste complète des options de débogage de APT :"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:891
+#: apt.conf.5.xml:923
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
@@ -5175,24 +5220,24 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:902
+#: apt.conf.5.xml:934
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "Affiche les informations concernant le téléchargement de paquets par FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:913
+#: apt.conf.5.xml:945
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Affiche les informations concernant le téléchargement de paquets par HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:924
+#: apt.conf.5.xml:956
 msgid "Print information related to downloading packages using HTTPS."
 msgstr "Print information related to downloading packages using HTTPS."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:935
+#: apt.conf.5.xml:967
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
@@ -5201,7 +5246,7 @@ msgstr ""
 "cryptographiques avec <literal>gpg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:946
+#: apt.conf.5.xml:978
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
@@ -5210,14 +5255,14 @@ msgstr ""
 "stockées sur CD."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:988
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "Décrit le processus de résolution des dépendances pour la construction de "
 "paquets source ( « build-dependencies » ) par &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:998
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
@@ -5226,7 +5271,7 @@ msgstr ""
 "librairies d'<literal>apt</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:976
+#: apt.conf.5.xml:1008
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5237,7 +5282,7 @@ msgstr ""
 "utilisés sur le système de fichier du CD."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:987
+#: apt.conf.5.xml:1019
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -5247,14 +5292,14 @@ msgstr ""
 "temps."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:999
+#: apt.conf.5.xml:1031
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "Trace les ajouts et suppressions d'éléments de la queue globale de "
 "téléchargement."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1009
+#: apt.conf.5.xml:1041
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
@@ -5264,7 +5309,7 @@ msgstr ""
 "éventuelles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1051
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
@@ -5274,7 +5319,7 @@ msgstr ""
 "éventuelles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1031
+#: apt.conf.5.xml:1063
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
@@ -5284,7 +5329,7 @@ msgstr ""
 "place des fichiers complets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1042
+#: apt.conf.5.xml:1074
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
@@ -5292,7 +5337,7 @@ msgstr ""
 "effectivement des téléchargements."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1053
+#: apt.conf.5.xml:1085
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
@@ -5301,7 +5346,7 @@ msgstr ""
 "automatiquement, et la suppression des paquets inutiles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1063
+#: apt.conf.5.xml:1095
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5316,7 +5361,7 @@ msgstr ""
 "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1077
+#: apt.conf.5.xml:1109
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
@@ -5352,7 +5397,7 @@ msgstr ""
 "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1098
+#: apt.conf.5.xml:1130
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
@@ -5361,7 +5406,7 @@ msgstr ""
 "paramètres sont séparés par des espaces."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1109
+#: apt.conf.5.xml:1141
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
@@ -5371,7 +5416,7 @@ msgstr ""
 "fichier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1120
+#: apt.conf.5.xml:1152
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
@@ -5380,18 +5425,18 @@ msgstr ""
 "<literal>apt</literal> passe les paquets à &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1132
+#: apt.conf.5.xml:1164
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1143
+#: apt.conf.5.xml:1175
 msgid "Output the priority of each package list on startup."
 msgstr "Affiche, au lancement, la priorité de chaque liste de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1153
+#: apt.conf.5.xml:1185
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
@@ -5400,7 +5445,7 @@ msgstr ""
 "concerne que les cas où un problème de dépendances complexe se présente)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1164
+#: apt.conf.5.xml:1196
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -5411,7 +5456,7 @@ msgstr ""
 "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1176
+#: apt.conf.5.xml:1208
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
@@ -5420,7 +5465,7 @@ msgstr ""
 "list</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1186
+#: apt.conf.5.xml:1218
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -5431,13 +5476,13 @@ msgstr ""
 "Post}-Invoke</literal> ou <literal>APT::Update::{Pre,Post}-Invoke</literal>."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1210 apt_preferences.5.xml:541 sources.list.5.xml:233
+#: apt.conf.5.xml:1242 apt_preferences.5.xml:541 sources.list.5.xml:233
 #: apt-ftparchive.1.xml:592
 msgid "Examples"
 msgstr "Exemples"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1211
+#: apt.conf.5.xml:1243
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -5447,7 +5492,7 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1223
+#: apt.conf.5.xml:1255
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 4e91a8e33..b68d801ea 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.0.9.5\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: 2015-01-16 04:37-0500\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,148 +21,144 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -199,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"
@@ -220,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 ""
 
@@ -244,78 +240,78 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224
 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:367
+#: cmdline/apt-get.cc:358
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -323,151 +319,150 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-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:895
+#: 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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:968
+#: cmdline/apt-get.cc:943
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: 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:1385
+#: cmdline/apt-get.cc:1388
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr ""
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -521,11 +516,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -539,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -662,12 +657,12 @@ msgstr ""
 msgid "File not found"
 msgstr ""
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr ""
 
@@ -676,156 +671,156 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr ""
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr ""
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr ""
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr ""
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr ""
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr ""
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 ""
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr ""
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr ""
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr ""
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr ""
 
@@ -891,70 +886,70 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr ""
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:174
+#: 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr ""
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr ""
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr ""
 
@@ -986,268 +981,30 @@ msgstr ""
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr ""
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr ""
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr ""
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of 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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of 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
-#: apt-private/private-install.cc:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\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
-#: apt-private/private-install.cc:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr ""
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr ""
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr ""
-
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr ""
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr ""
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr ""
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr ""
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr ""
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
-
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:517
+#: methods/server.cc:589
 #, c-format
-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] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-
-#: apt-private/private-install.cc:638
 msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr ""
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr ""
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr ""
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr ""
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
 
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
+#: methods/server.cc:712
+msgid "Internal error"
 msgstr ""
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1255,31 +1012,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr ""
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr ""
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr ""
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr ""
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr ""
 
@@ -1438,7 +1195,7 @@ msgstr ""
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
@@ -1447,7 +1204,7 @@ msgstr ""
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1455,10 +1212,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1479,76 +1240,321 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#. 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
+#: apt-private/private-install.cc:154
 #, c-format
-msgid "Failed to fetch %s  %s\n"
+msgid "Need to get %sB/%sB of archives.\n"
 msgstr ""
 
-#: apt-private/private-sources.cc:58
+#. 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:159
 #, c-format
-msgid "Failed to parse %s. Edit again? "
+msgid "Need to get %sB of archives.\n"
 msgstr ""
 
-#: apt-private/private-sources.cc:70
+#. 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:166
 #, c-format
-msgid "Your '%s' file changed, please run 'apt-get update'."
+msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 
-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
+#. 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 ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr ""
+
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr ""
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr ""
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr ""
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr ""
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr ""
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr ""
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr ""
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr ""
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: 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 ""
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:492
+#, c-format
+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] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr ""
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr ""
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr ""
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr ""
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr ""
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr ""
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+
+#: apt-private/private-install.cc:945
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr ""
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr ""
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr ""
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr ""
+
+#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr ""
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr ""
+
+#: apt-private/private-sources.cc:58
+#, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr ""
+
+#: apt-private/private-sources.cc:70
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""
+
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr ""
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr ""
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr ""
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr ""
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr ""
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1558,18 +1564,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1641,205 +1647,381 @@ msgstr ""
 msgid "Merging available information"
 msgstr ""
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr ""
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr ""
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, c-format
+msgid "Unable to mkstemp %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:477
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgid "Unable to write to %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
 msgstr ""
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: 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 "The path %s is too long"
+msgid "Error processing directory %s"
 msgstr ""
 
-#: apt-inst/extract.cc:132
-#, c-format
-msgid "Unpacking %s more than once"
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
 msgstr ""
 
-#: apt-inst/extract.cc:142
-#, c-format
-msgid "The directory %s is diverted"
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
 msgstr ""
 
-#: apt-inst/extract.cc:152
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
+msgid "Error processing contents %s"
 msgstr ""
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:906
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr ""
+
+#: ftparchive/cachedb.cc:67
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr ""
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr ""
+
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
 msgstr ""
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr ""
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+msgid "Failed to read .dsc"
+msgstr ""
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr ""
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr ""
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
+msgid "W: Unable to read directory %s\n"
 msgstr ""
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
+msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
+#: ftparchive/writer.cc:165
+msgid "E: "
 msgstr ""
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
+#: ftparchive/writer.cc:167
+msgid "W: "
 msgstr ""
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr ""
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
+msgid "Failed to resolve %s"
 msgstr ""
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr ""
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
+msgid "Failed to open %s"
 msgstr ""
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
+msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
+msgid "Failed to readlink %s"
 msgstr ""
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
+msgid "Failed to unlink %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "*** Failed to link %s to %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
+msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
+#, c-format
+msgid "  %s has no override entry\n"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:712
 #, c-format
-msgid "Invalid archive member header %s"
+msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/override.cc:191
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
+msgid "Malformed override %s line %llu #3"
+msgstr ""
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr ""
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr ""
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr ""
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr ""
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr ""
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr ""
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr ""
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:57
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr ""
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr ""
+
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr ""
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -1854,6 +2036,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 ""
@@ -1866,215 +2068,178 @@ msgstr ""
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168
 msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: apt-pkg/pkgcache.cc:185
+#, c-format
+msgid "The package cache was built for different architectures: %s vs %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Is the package %s installed?"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/sourcelist.cc:127
 #, c-format
-msgid "Method %s did not start correctly"
+msgid "Malformed stanza %u in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/sourcelist.cc:170
 #, 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] unparseable)"
 msgstr ""
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr ""
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr ""
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr ""
-
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
+msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "Failed to open StateFile %s"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:190
 #, c-format
-msgid "Failed to write temporary StateFile %s"
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
+msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid ""
-"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"
+msgid "Opening %s"
 msgstr ""
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "GPG error: %s: %s"
+msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371
 #, 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)"
+msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:416
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
 #, c-format
 msgid "Clean of %s is not supported"
 msgstr ""
@@ -2084,107 +2249,228 @@ msgstr ""
 msgid "Unable to stat %s."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:93
+#: 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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: 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:257
+#: apt-pkg/pkgcachegen.cc:273
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:276
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:263
+#: apt-pkg/pkgcachegen.cc:279
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:282
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+#: 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:1316
+#: apt-pkg/pkgcachegen.cc:1301
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: 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:215 apt-pkg/contrib/fileutl.cc:2108
 #, c-format
-msgid "Unable to write to %s"
+msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+#: apt-pkg/acquire-item.cc:240
+msgid "Hash Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:245
+msgid "Size mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:250
+msgid "Invalid file format"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:255
+msgid "Signature error"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1975
+#, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr ""
+
+#: 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: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:2059
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: 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: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:2315
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2351
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
 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:87 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:91
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/acquire.cc:162
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2210,19 +2496,19 @@ msgstr ""
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2230,9 +2516,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
@@ -2298,11 +2585,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 ""
 
@@ -2312,332 +2599,263 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1088
+#: 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"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
 msgstr ""
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/depcache.cc:258
 #, c-format
-msgid "Unable to parse package file %s (%d)"
+msgid "Failed to write temporary StateFile %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
 #, c-format
-msgid "Unable to parse Release file %s"
+msgid "Unable to parse package file %s (%d)"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:86
+#: apt-pkg/cacheset.cc:501
 #, c-format
-msgid "No sections in Release file %s"
+msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:117
+#: apt-pkg/cacheset.cc:504
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:130
+#: apt-pkg/cacheset.cc:629
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgid "Couldn't find task '%s'"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:149
+#: apt-pkg/cacheset.cc:635
 #, c-format
-msgid "Invalid 'Date' entry in Release file %s"
+msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:127
+#: apt-pkg/cacheset.cc:641
 #, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
+msgid "Couldn't find any package by glob '%s'"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/cacheset.cc:680
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/cacheset.cc:719
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:184
+#: apt-pkg/cacheset.cc:727
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/cacheset.cc:735
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 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 ""
-
-#: 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:489
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:492
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:603
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:609
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/indexrecords.cc:83
 #, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+msgid "Unable to parse Release file %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#: apt-pkg/indexrecords.cc:91
 #, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+msgid "No sections in Release file %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/indexrecords.cc:132
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/indexrecords.cc:145
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/indexrecords.cc:164
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+msgid "Invalid 'Date' entry in Release file %s"
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr ""
 
@@ -2720,109 +2938,103 @@ msgstr ""
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:801
+#: apt-pkg/contrib/configuration.cc:804
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:837
+#: apt-pkg/contrib/configuration.cc:840
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:877
+#: 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:884
+#: apt-pkg/contrib/configuration.cc:887
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-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 ""
@@ -2832,12 +3044,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr ""
@@ -2858,103 +3070,103 @@ msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -2983,326 +3195,156 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:254
-#, c-format
-msgid "Unable to mkstemp %s"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
 msgstr ""
 
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
 msgstr ""
 
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
 msgstr ""
 
-#: ftparchive/cachedb.cc:99
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr ""
-
-#: ftparchive/cachedb.cc:332
-msgid "Failed to read .dsc"
-msgstr ""
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr ""
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: ftparchive/writer.cc:91
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "W: Unable to read directory %s\n"
+msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: ftparchive/writer.cc:96
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr ""
-
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr ""
-
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
+msgid "Duplicate conf file %s/%s"
 msgstr ""
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to resolve %s"
-msgstr ""
-
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
+msgid "The path %s is too long"
 msgstr ""
 
-#: ftparchive/writer.cc:219
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to open %s"
+msgid "Unpacking %s more than once"
 msgstr ""
 
-#: ftparchive/writer.cc:278
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink %s [%s]\n"
+msgid "The directory %s is diverted"
 msgstr ""
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "Failed to readlink %s"
+msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
-#: ftparchive/writer.cc:290
-#, c-format
-msgid "Failed to unlink %s"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
 msgstr ""
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "*** Failed to link %s to %s"
+msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: ftparchive/writer.cc:308
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
 msgstr ""
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s has no override entry\n"
+msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
+msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no source override entry\n"
+msgid "Unable to stat %s"
 msgstr ""
 
-#: ftparchive/writer.cc:702
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr ""
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
+msgid "Failed to write file %s"
 msgstr ""
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Unable to open %s"
+msgid "Failed to close file %s"
 msgstr ""
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
+msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to read the override file %s"
+msgid "Internal error, could not locate member %s"
 msgstr ""
 
-#: ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %llu #1"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
 msgstr ""
 
-#: ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %llu #2"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
 msgstr ""
 
-#: ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %llu #3"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
 msgstr ""
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Unknown compression algorithm '%s'"
+msgid "Invalid archive member header %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
 msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
 msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
 msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
 msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
 msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
 msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
 msgstr ""
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr ""
-
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr ""
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgid "Unknown TAR header type %u, member %s"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 1a64f4606..e2b179d0e 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: 2015-01-16 04:37-0500\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,152 +24,148 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "الحزمة %s النسخة %s لها معتمد غير مستوفى:\n"
 
-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "أسماء الحزم الكلية :"
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "أسماء الحزم الكلية :"
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr " الحزم العادية:"
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "الحزمة الوهمية تماماً:"
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr " الحزمة الوهمية المفردة:"
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr " الحزم الوهمية المختلطة:"
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr " مفقودة:"
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "مجموع النسخ الفريدة:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "مجموع النسخ الفريدة:"
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "مجموع المعتمدات:"
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "مجموع علاقات النسخ/الملفات:"
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "مجموع علاقات النسخ/الملفات:"
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "مجموع علاقات النسخ/الملفات:"
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "مجموع المساحة المحسوب حسابها:"
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "ملفات الحزم:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "الحزم المُدبّسة:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(غير موجود)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr " مُثبّت:"
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  مرشّح: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(لاشيء)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr " جدول النسخ:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -206,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"
@@ -228,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 "كرر هذه العملية لباقي الأقراص المدمجة في المجموعة."
 
@@ -252,78 +248,78 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-get.cc:367
+#: cmdline/apt-get.cc:358
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "تعذر قَفْل دليل التنزيل"
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -331,151 +327,150 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "تعذر حساب المساحة الحرة في %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "ليس هناك مساحة كافية في %s"
-
 #. 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:895
+#: 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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "إحضار المصدر %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "فشل إحضار بعض الأرشيفات."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "أمر فك الحزمة '%s' فشل.\n"
 
-#: cmdline/apt-get.cc:968
+#: cmdline/apt-get.cc:943
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "أمر البناء '%s' فشل.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: 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:1385
+#: cmdline/apt-get.cc:1388
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "الاتصال بـ%s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "الوحدات المدعومة:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -530,11 +525,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -548,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -673,12 +668,12 @@ msgstr "لم يُعثر على القرص."
 msgid "File not found"
 msgstr "لم يُعثر على الملف"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "فشيل تنفيذ stat"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "فشل تعيين وقت التعديل"
 
@@ -687,34 +682,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "تسجيل الدخول"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr ""
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr ""
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "رفض الخادم اتصالنا بالرد: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "فشل USER، ردّ الخادم: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "فشل PASS، ردّ الخادم: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -722,123 +717,123 @@ msgstr ""
 "تم تحديد خادم بروكسي ولكن دون نص تسجيل دخول برمجي،  Acquire::ftp::ProxyLogin "
 "فارغ."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "فشل أمر نص تسجيل الدخول البرمجي '%s'، ردّ الخادم: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "فشل TYPE، ردّ الخادم: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "انتهى وقت الاتصال"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "أغلق الخادم الاتصال"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "خطأ في القراءة"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr ""
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "خطأ في الكتابة"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "فشل"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "تعذر إرسال الأمر PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "فشل EPRT، ردّ الخادم: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "تعذر قبول الاتصال"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "تعذر إحضار الملف، ردّ الخادم '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "فشل نقل البيانات، ردّ الخادم '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "استعلام"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr ""
 
@@ -904,70 +899,70 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr "تعذر الاتصال بـ%s %s:"
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:174
+#: 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr ""
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr ""
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "خطأ في الكتابة إلى الملف"
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال"
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "خطأ في القراءة من الخادم"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "خطأ في الكتابة إلى الملف"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "فشل التحديد"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "انتهى وقت الاتصال"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "خطأ في الكتابة إلى ملف المُخرجات"
 
@@ -999,276 +994,30 @@ msgstr "خادم http له دعم مدى معطوب"
 msgid "Unknown date format"
 msgstr "نسق تاريخ مجهول"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "بيانات ترويسة سيئة"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "فشل الاتصال"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "خطأ داخلي"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة."
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "خطأ داخلي، لم تنته عملية الترتيب"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr "يا للغرابة... لم تتطابق الأحجام، الرجاء مراسلة 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of 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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "بحاجة إلى جلب %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
-#: apt-private/private-install.cc:167
-#, fuzzy, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "بعد الاستخراج %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
-#: apt-private/private-install.cc:172
-#, fuzzy, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "ليس هناك مساحة كافية في %s."
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "هناك مشاكل وتم استخدام -y دون --force-yes"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "نعم، افعل ما أقوله!"
-
-#: apt-private/private-install.cc:222
+#: methods/server.cc:589
 #, c-format
 msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"أنت على وشك أن تقوم بشيء ضارّ جداً\n"
-"كي تستمر اكتب العبارة '%s'\n"
-" ؟] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "إجهاض."
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "هل تريد الاستمرار؟"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "فشل تنزيل بعض الملفات"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --"
-"fix-missing؟"
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "تعذر تصحيح الحزم المفقودة."
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "إجهاض التثبيت."
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "قد تساعد المعلومات التالية في حل المشكلة:"
-
-#: apt-private/private-install.cc:506
-#, fuzzy
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
-
-#: apt-private/private-install.cc:513
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
-msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
-
-#: apt-private/private-install.cc:517
-#, fuzzy, c-format
-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] "سيتم تثبيت الحزم الجديدة التالية:"
-msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "قد ترغب بتشغيل 'apt-get -f install' لتصحيح هذه:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
 
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "حزم معطوبة"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "الحزم المقترحة:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "الحزم المستحسنة:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
-
-#: apt-private/private-install.cc:829
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "إعادة تثبيت  %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s هي النسخة الأحدث.\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "خطأ داخلي"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1276,31 +1025,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "تصحيح المعتمدات..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " فشل."
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "لم يمكن تصحيح المعتمدات"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr "لم يمكن تقليص مجموعة الترقية"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " تم"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f."
 
@@ -1464,7 +1213,7 @@ msgstr "Y"
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
@@ -1473,7 +1222,7 @@ msgstr ""
 msgid "The update command takes no arguments"
 msgstr "لا يقبل الأمر update أية مُعطيات"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1481,10 +1230,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1505,27 +1258,288 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "تحذير: تعذرت المصادقة على الحزم التالية!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "تم غض النظر عن تحذير المصادقة.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة."
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "تعذرت المصادقة على بعض الحزم"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "خطأ داخلي، لم تنته عملية الترتيب"
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr "يا للغرابة... لم تتطابق الأحجام، الرجاء مراسلة 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of 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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "بحاجة إلى جلب %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
+#: apt-private/private-install.cc:166
+#, fuzzy, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "بعد الاستخراج %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
+#: apt-private/private-install.cc:171
+#, fuzzy, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "هناك مشاكل وتم استخدام -y دون --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 ""
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "نعم، افعل ما أقوله!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"أنت على وشك أن تقوم بشيء ضارّ جداً\n"
+"كي تستمر اكتب العبارة '%s'\n"
+" ؟] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "إجهاض."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "هل تريد الاستمرار؟"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "فشل تنزيل بعض الملفات"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --"
+"fix-missing؟"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "تعذر تصحيح الحزم المفقودة."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "إجهاض التثبيت."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: 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 ""
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "قد تساعد المعلومات التالية في حل المشكلة:"
+
+#: apt-private/private-install.cc:481
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
+
+#: apt-private/private-install.cc:488
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
+msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+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] "سيتم تثبيت الحزم الجديدة التالية:"
+msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "قد ترغب بتشغيل 'apt-get -f install' لتصحيح هذه:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "حزم معطوبة"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "الحزم المقترحة:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "الحزم المستحسنة:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
+
+#: apt-private/private-install.cc:827
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "إعادة تثبيت  %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s هي النسخة الأحدث.\n"
+
+#: apt-private/private-install.cc:892
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
+
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "النسخة المحددة %s (%s) للإصدارة %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 "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "تحذير: تعذرت المصادقة على الحزم التالية!"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "تم غض النظر عن تحذير المصادقة.\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "تعذرت المصادقة على بعض الحزم"
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
 msgstr "تثبيت هذه الحزم دون التحقق منها؟"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "فشل إحضار %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 "تعذر حساب المساحة الحرة في %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "ليس هناك مساحة كافية في %s."
+
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1540,41 +1554,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "حساب الترقية"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "تمّ"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr ""
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "جلب:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "تجاهل"
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "خطأ"
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "جلب %sب في %s (%sب/ث)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [يعمل]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1587,18 +1593,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1672,443 +1678,600 @@ msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها 
 msgid "Merging available information"
 msgstr "دمج المعلومات المتوفرة"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr ""
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "تعذر إنشاء %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr ""
+#: 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"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "خطأ داخلي في AddDiversion"
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr ""
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "قائمة توسيعات الحزمة طويلة جداً"
 
-#: apt-inst/filelist.cc:506
+#: 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 "Double add of diversion %s -> %s"
-msgstr ""
+msgid "Error processing directory %s"
+msgstr "خطأ في معالجة الدليل %s"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "قائمة توسيعات المصدر طويلة جداً"
+
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "ملف تهيئة مُزدوج %s/%s"
+msgid "Error processing contents %s"
+msgstr "خطأ في معالجة المحتويات %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "لم تُطابق أية تحديدات"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "The path %s is too long"
-msgstr "المسار %s طويل جداً"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "فكّ تحزيم %s أكثر من مرّة"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The directory %s is diverted"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "قاعدة البيانات قديمة، محاولة ترقية %s"
+
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
 msgstr ""
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:101
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
+msgid "Unable to open DB file %s: %s"
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
 msgstr ""
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "تعذرت إزالة %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
 msgstr ""
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, c-format
-msgid "Failed to stat %s"
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
 msgstr ""
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "فشل تغيير اسم %s إلى %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: تعذرت قراءة الدليل %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
+msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr ""
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "المسار طويل جداً"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "W: "
 
-#: apt-inst/extract.cc:421
-#, c-format
-msgid "Overwrite package match with no version for %s"
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
 msgstr ""
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
+msgid "Failed to resolve %s"
 msgstr ""
 
-#: apt-inst/extract.cc:498
-#, c-format
-msgid "Unable to stat %s"
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
 msgstr ""
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "Failed to write file %s"
-msgstr "فشلت كتابة الملف %s"
+msgid "Failed to open %s"
+msgstr "فشل فتح %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Failed to close file %s"
-msgstr "فشل إغلاق الملف %s"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "Failed to readlink %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "خطأ داخلي، تعذر العثور على العضو %s"
-
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
+msgid "Failed to unlink %s"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "توقيع الأرشيف غير صالح"
+#: ftparchive/writer.cc:311
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** فشل ربط %s بـ%s"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
+#: ftparchive/writer.cc:321
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:96
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "توقيع الأرشيف غير صالح"
-
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "الأرشيف قصير جداً"
-
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "فشلت قراءة ترويسات الأرشيف"
-
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
+#, c-format
+msgid "  %s has no override entry\n"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "فشل تنفيذ gzip"
-
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "أرشيف فاسد"
-
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد"
-
-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
+msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:57
+#: ftparchive/writer.cc:712
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
 msgstr ""
 
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "نظام الحزم '%s' غير مدعوم"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - فشل تعيين الذاكرة"
 
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr ""
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "تعذر فتح %s"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
 #, c-format
-msgid "Wrote %i records.\n"
+msgid "Malformed override %s line %llu (%s)"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
-msgid "Wrote %i records with %i missing files.\n"
+msgid "Failed to read the override file %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: ftparchive/override.cc:166
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: ftparchive/override.cc:178
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgid "Malformed override %s line %llu #2"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:515
+#: ftparchive/override.cc:191
 #, c-format
-msgid "Can't find authentication record for: %s"
+msgid "Malformed override %s line %llu #3"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:521
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "MD5Sum غير متطابقة"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل"
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "تعذرت قراءة قائمة المصادر."
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:169
-msgid "The package cache file is corrupted, it is too small"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:174
+#: ftparchive/multicompress.cc:232
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr ""
+msgid "Internal error, failed to create %s"
+msgstr "خطأ داخلي، تعذر إنشاء %s"
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr ""
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr ""
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "فشل تغيير اسم %s إلى %s"
+
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "سجل حزمة مجهول!"
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:59
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/init.cc:156
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "نظام الحزم '%s' غير مدعوم"
+
+#: apt-pkg/init.cc:172
+msgid "Unable to determine a suitable packaging system type"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""
+
+#: 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 ""
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+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 ""
+
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل"
+
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "تعذرت قراءة قائمة المصادر."
+
+#: apt-pkg/pkgcache.cc:154
+msgid "Empty package cache"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
+msgid "The package cache file is corrupted"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:165
+msgid "The package cache file is an incompatible version"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:168
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:175
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:185
+#, c-format
+msgid "The package cache was built for different architectures: %s vs %s"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Depends"
 msgstr "يعتمد"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "يعتمد مسبقاً"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "يستحسن"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "يقترح"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "يعارض"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "يستبدل"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "يُلغي"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "مهم"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "مطلوب"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "قياسي"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "اختياري"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "إضافي"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "حساب الترقية"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Is the package %s installed?"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/sourcelist.cc:127
 #, c-format
-msgid "Method %s did not start correctly"
+msgid "Malformed stanza %u in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/sourcelist.cc:170
 #, 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] unparseable)"
+msgstr ""
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: 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:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "دمج المعلومات المتوفرة"
-
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "فشل فتح %s"
-
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "فشلت كتابة الملف %s"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-#, fuzzy
-msgid "Hash Sum mismatch"
-msgstr "MD5Sum غير متطابقة"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "الحجم غير متطابق"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "عمليّة غير صالحة %s"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1656
-#, fuzzy, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-
-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid ""
-"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"
-msgstr ""
+msgid "Opening %s"
+msgstr "فتح %s"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "GPG error: %s: %s"
+msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371
 #, 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)"
+msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:416
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
 #, fuzzy, c-format
 msgid "Clean of %s is not supported"
 msgstr "نظام الحزم '%s' غير مدعوم"
@@ -2118,107 +2281,231 @@ msgstr "نظام الحزم '%s' غير مدعوم"
 msgid "Unable to stat %s."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:93
+#: 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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: 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:257
+#: apt-pkg/pkgcachegen.cc:273
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:276
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:263
+#: apt-pkg/pkgcachegen.cc:279
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:282
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+#: 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:1316
+#: apt-pkg/pkgcachegen.cc:1301
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "تعذرت الكتابة إلى %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
 msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/vendorlist.cc:85
+#: 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:215 apt-pkg/contrib/fileutl.cc:2108
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:240
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "MD5Sum غير متطابقة"
+
+#: apt-pkg/acquire-item.cc:245
+msgid "Size mismatch"
+msgstr "الحجم غير متطابق"
+
+#: apt-pkg/acquire-item.cc:250
+#, fuzzy
+msgid "Invalid file format"
+msgstr "عمليّة غير صالحة %s"
+
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "خطأ في الكتابة"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "المسار %s طويل جداً"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1975
+#, fuzzy, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
+
+#: 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: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:2059
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: 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: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:2315
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2351
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+
+#: apt-pkg/vendorlist.cc:83
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/acquire.cc:87 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:91
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/acquire.cc:162
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "تعذر قفل دليل القائمة"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2244,19 +2531,19 @@ msgstr ""
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "فشل إغلاق الملف %s"
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2264,9 +2551,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
@@ -2334,11 +2622,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 ""
 
@@ -2348,332 +2636,264 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1088
+#: 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"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "دمج المعلومات المتوفرة"
+
+#: apt-pkg/depcache.cc:252
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "فشل فتح %s"
+
+#: apt-pkg/depcache.cc:258
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "فشلت كتابة الملف %s"
+
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
 msgstr ""
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
+#: apt-pkg/cacheset.cc:501
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
+
+#: apt-pkg/cacheset.cc:504
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
+
+#: apt-pkg/cacheset.cc:629
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "تعذر العثور على الحزمة %s"
+
+#: apt-pkg/cacheset.cc:635
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "تعذر العثور على الحزمة %s"
+
+#: apt-pkg/cacheset.cc:641
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "تعذر العثور على الحزمة %s"
+
+#: apt-pkg/cacheset.cc:680
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/cacheset.cc:719
 #, c-format
-msgid "Unable to parse package file %s (%d)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: 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:735
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
+#: 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/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:83
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
 
-#: apt-pkg/indexrecords.cc:86
+#: apt-pkg/indexrecords.cc:91
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "لاحظ، تحديد %s بدلاً من %s\n"
 
-#: apt-pkg/indexrecords.cc:117
+#: apt-pkg/indexrecords.cc:132
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:130
+#: apt-pkg/indexrecords.cc:145
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "لاحظ، تحديد %s بدلاً من %s\n"
 
-#: apt-pkg/indexrecords.cc:149
+#: apt-pkg/indexrecords.cc:164
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
 
-#: apt-pkg/sourcelist.cc:127
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:170
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:173
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:184
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
+msgid "Selection %s not found"
+msgstr "تعذر العثور على التحديد %s"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
+msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
+msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
+msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/contrib/fileutl.cc:366 apt-pkg/contrib/fileutl.cc:480
 #, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
+msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
-msgid "Opening %s"
-msgstr "فتح %s"
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
+msgid "Sub-process %s returned an error code (%u)"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
+msgid "Sub-process %s exited unexpectedly"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/contrib/fileutl.cc:952
 #, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "تعذر العثور على الحزمة %s"
+msgid "Problem closing the gzip file %s"
+msgstr "مشكلة في إغلاق الملف"
 
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "تعذر العثور على الحزمة %s"
+#: apt-pkg/contrib/fileutl.cc:1140
+#, c-format
+msgid "Could not open file %s"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "تعذر العثور على الحزمة %s"
-
-#: apt-pkg/cacheset.cc:626
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:655
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:663
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1258
-#, c-format
-msgid "Selection %s not found"
-msgstr "تعذر العثور على التحديد %s"
-
-#: apt-pkg/contrib/fileutl.cc:190
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:195
-#, c-format
-msgid "Could not open lock file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:218
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:223
-#, c-format
-msgid "Could not get lock %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:394
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:412
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:421
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:824
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:826
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:913
-#, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "مشكلة في إغلاق الملف"
-
-#: apt-pkg/contrib/fileutl.cc:1101
-#, c-format
-msgid "Could not open file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "فشل إغلاق الملف %s"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "مشكلة في إغلاق الملف"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "مشكلة في مزامنة الملف"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "مشكلة في إغلاق الملف"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "مشكلة في مزامنة الملف"
 
@@ -2759,109 +2979,103 @@ msgstr ""
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "اختصار نوع مجهول: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "فتح ملف التهيئة %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: apt-pkg/contrib/configuration.cc:804
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:837
+#: apt-pkg/contrib/configuration.cc:840
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:877
+#: 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:884
+#: apt-pkg/contrib/configuration.cc:887
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-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"
@@ -2871,12 +3085,12 @@ msgstr "عمليّة غير صالحة %s"
 msgid "Installing %s"
 msgstr "تم تثبيت %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "إزالة %s"
@@ -2897,103 +3111,103 @@ msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "تحضير %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "فتح %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "التحضير لتهيئة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "تم تثبيت %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "التحضير لإزالة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "تم إزالة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "التحضير لإزالة %s بالكامل"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "تمت إزالة %s بالكامل"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3022,330 +3236,169 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "تعذر إنشاء %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟"
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "خطأ في معالجة الدليل %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "قائمة توسيعات المصدر طويلة جداً"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "خطأ في معالجة المحتويات %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "لم تُطابق أية تحديدات"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "قاعدة البيانات قديمة، محاولة ترقية %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
 msgstr ""
 
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "تعذرت إزالة %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
 msgstr ""
 
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: تعذرت قراءة الدليل %s\n"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "خطأ داخلي في AddDiversion"
 
-#: ftparchive/writer.cc:96
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to resolve %s"
+msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr ""
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "ملف تهيئة مُزدوج %s/%s"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to open %s"
-msgstr "فشل فتح %s"
+msgid "The path %s is too long"
+msgstr "المسار %s طويل جداً"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/extract.cc:132
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Unpacking %s more than once"
+msgstr "فكّ تحزيم %s أكثر من مرّة"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "Failed to readlink %s"
+msgid "The directory %s is diverted"
 msgstr ""
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "Failed to unlink %s"
+msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
-#: ftparchive/writer.cc:298
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** فشل ربط %s بـ%s"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr ""
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:249
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
+msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr ""
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "المسار طويل جداً"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
+msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no source override entry\n"
+msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no binary override entry either\n"
+msgid "Unable to stat %s"
 msgstr ""
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - فشل تعيين الذاكرة"
-
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Unable to open %s"
-msgstr "تعذر فتح %s"
+msgid "Failed to write file %s"
+msgstr "فشلت كتابة الملف %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr ""
+msgid "Failed to close file %s"
+msgstr "فشل إغلاق الملف %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Failed to read the override file %s"
+msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
-#: ftparchive/override.cc:166
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgid "Internal error, could not locate member %s"
+msgstr "خطأ داخلي، تعذر العثور على العضو %s"
 
-#: ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %llu #2"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
 msgstr ""
 
-#: ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr ""
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "توقيع الأرشيف غير صالح"
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
 msgstr ""
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr ""
+#: apt-inst/contrib/arfile.cc:96
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "توقيع الأرشيف غير صالح"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
 msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr ""
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "الأرشيف قصير جداً"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "فشلت قراءة ترويسات الأرشيف"
+
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
 msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "خطأ داخلي، تعذر إنشاء %s"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "فشل تنفيذ gzip"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "أرشيف فاسد"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
+msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "ليس هناك مساحة كافية في %s"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "سجل حزمة مجهول!"
+#~ msgid "Done"
+#~ msgstr "تمّ"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "إجهاض التثبيت."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/ast.po b/po/ast.po
index 1da4e6eba..1efbbc1d2 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: 2015-01-16 04:37-0500\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,149 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Total de nomes de paquetes: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Total de cadarmes de paquetes: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Paquetes normales: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Paquetes virtuales puros: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Paquetes virtuales cenciellos: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Paquetes virtuales amestaos: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Falten: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Versiones distintes en total: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Descripciones distintes en total: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Dependencies totales: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Rellaciones versión/ficheru en total: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Rellaciones descripción/ficheru en total: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Mapes de provisiones en total: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Cadenes globalizaes en total: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Espaciu de dependencies de versión en total: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Espaciu ociosu en total: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Informe del total d'espaciu: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Ficheros de paquete:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Paquetes na chincheta:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(nun s'alcontró)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Instaláu: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Candidatu: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(dengún)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Chincheta de paquetes: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Tabla de versiones:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -238,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"
@@ -259,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."
 
@@ -295,71 +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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: 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:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nun pudo alcontrase'l paquete %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Nun pue bloquiase'l direutoriu de descarga"
 
-#: cmdline/apt-get.cc:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -368,7 +364,7 @@ msgstr ""
 "AVISU: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
@@ -380,97 +376,96 @@ msgstr ""
 "pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal "
 "paquete.\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Saltando'l ficheru yá descargáu '%s'\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Nun pue determinase l'espaciu llibre de %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Nun hai espaciu llibre bastante en %s"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fonte descargada %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Falló la descarga de dellos archivos."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: 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:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Falló la orde build '%s'.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Falló el procesu fíu"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -513,30 +508,30 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
 "paquete %s"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Fallu al procesar les dependencies de construcción"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Coneutando a %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Módulos sofitaos:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -654,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -779,12 +774,12 @@ msgstr "Nun s'atopa'l discu."
 msgid "File not found"
 msgstr "Nun s'atopa'l ficheru."
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Falló al lleer"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Nun se pudo afitar la hora de modificación"
 
@@ -793,34 +788,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI malu, los URIS llocales nun pueden entamar por //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Entrando"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Nun se pudo determinar el nome del par"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Nun se pudo determinar el nome llocal"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "El sirvidor refugó la conexón, y dixo: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "L'usuariu (USER) falló; el sirvidor dixo: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "La contraseña (PASS) falló; el sirvidor dixo: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -828,123 +823,123 @@ msgstr ""
 "Especificóse un sirvidor proxy pero non un script d'entrada, Acquire::ftp::"
 "ProxyLogin ta baleru."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Falló la orde '%s' del guión d'entrada; el sirvidor dixo: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "La triba (TYPE) falló; el sirvidor dixo: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Gandió'l tiempu de conexón"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "El sirvidor zarró la conexón"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Fallu de llectura"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Una rempuesta revirtió'l buffer."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Corrupción del protocolu"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Fallu d'escritura"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Nun se pudo crear un socket"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nun se pudo coneutar el zócalu de datos; gandió'l tiempu de conexón"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Falló"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Nun se pudo coneutar un socket pasivu."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo nun pudo obtener un zócalu oyente"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Nun se pudo enllazar con un socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Nun se pudo escuchar nel socket"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Nun se pudo determinar el nome del socket"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Nun se pudo mandar la orde PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Direición de familia %u desconocida (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT falló; el sirvidor dixo: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Gandió'l tiempu de conexón col zócalu de datos"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Nun se pudo aceptar la conexón"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nun se pudo descargar el ficheru; el sirvidor dixo '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Gandió'l tiempu del zócalu de datos"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Falló la tresferencia de datos; el sirvidor dixo '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Consulta"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Nun se pudo invocar "
 
@@ -1010,37 +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:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Atopóse polo menos una robla mala."
 
-#: methods/gpgv.cc:174
+#: 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?)"
+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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Fallu desconocíu al executar apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1048,35 +1044,35 @@ msgstr ""
 "Les robles siguientes nun pudieron verificase porque la to llave pública nun "
 "ta a mano:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Fallu al escribir nel ficheru"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Fallu al lleer nel sirvidor"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Fallu al escribir nel ficheru"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Falló la escoyeta"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Gandió'l tiempu de conexón"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Fallu al escribir nel ficheru de salida"
 
@@ -1108,290 +1104,30 @@ msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance"
 msgid "Unknown date format"
 msgstr "Formatu de data desconocíu"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Datos de testera incorreutos"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Fallo la conexón"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "Fallu internu"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgáu."
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Error internu, ordenar nun finó"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Que raro... Los tamaños nun concasen, escribe 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Hai que descargar %sB/%sB d'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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Hai que descargar %sB d'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
-#: apt-private/private-install.cc:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Tres d'esta operación, van usase %sB d'espaciu de discu adicional.\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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Tres d'esta operación, van lliberase %sB d'espaciu de discu.\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Nun tienes espaciu libre bastante en %s."
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Hai problemes y utilizose -y ensin --force-yes"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Conseñose Trivial Only pero ésta nun ye 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Sí, ¡facer lo que digo!"
-
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Tas a piques de facer daqué potencialmente dañible.\n"
-"Pa continuar escribe la frase '%s'\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Encaboxar."
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "¿Quies continuar?"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Dellos ficheros nun pudieron descargase"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Nun pudieron algamase dellos archivos, ¿seique executando apt-get update o "
-"tentando --fix-missing?"
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing y cambéu de mediu nun ta sofitao actualmente"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Nun pudieron iguase los paquetes que falten."
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Encaboxando la instalación."
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"El siguiente paquete desapareció del sistema como\n"
-"tolos ficheros fueron sobroescritos por otros paquetes:"
-msgstr[1] ""
-"Los siguientes paquetes desaparecieron del sistema como\n"
-"tolos ficheros fueron sobroescritos por otros paquetes:"
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Nota: Esto faise automáticamente y baxo demanda por dpkg."
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover"
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Hmm, paez que AutoRemover destruyó daqué, lo que nun tendría\n"
-"por qué pasar. Por favor, unvía un informe de fallu escontra apt."
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "La siguiente información pue aidar a resolver la situación:"
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Error internu, AutoRemover rompió coses"
-
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "El siguiente paquete instalóse mou automáticu y yá nun se necesita:"
-msgstr[1] ""
-"Los siguientes paquetes instaláronse de manera automática y ya nun se "
-"necesiten:"
-
-#: apt-private/private-install.cc:517
+#: methods/server.cc:589
 #, c-format
-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] "El paquete %lu instalóse de mou automáticu y yá nun se necesita.\n"
-msgstr[1] ""
-"Los paquetes %lu instaláronse de manera automática y ya nun se necesiten\n"
-
-#: apt-private/private-install.cc:519
-#, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Usa 'apt-get autoremove' pa desinstalalos."
-msgstr[1] "Usa 'apt-get autoremove' pa desinstalalos."
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Habríes d'executar 'apt-get -f install' para iguar estos:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o "
-"conseña una solución)."
-
-#: apt-private/private-install.cc:638
 msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"Dellos paquetes nun pudieron instalase. Esto puede significar que\n"
-"conseñaste una situación imposible o, si tas usando la distribución\n"
-"inestable, que dellos paquetes necesarios nun se crearon o que\n"
-"s'allugaron fuera d'Incoming."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Paquetes frañaos"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Instalaránse los siguientes paquetes extra:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Paquetes afalaos:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Paquetes encamentaos"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Saltando %s, ya ta instalau y la actualización nun ta activada.\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Saltando %s, nun ta instaláu y namái se requieren anovamientos.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "La reinstalación de %s nun ye dable, nun pue descargase.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s yá ta na versión más nueva.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Esbillada la versión %s (%s) pa %s\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Esbillada la versión %s (%s) pa %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "Fallu internu"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1399,31 +1135,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "Iguando dependencies..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " falló."
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "Nun pudieron iguase les dependencies"
 
-#: apt-private/private-cachefile.cc:102
+#: 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:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " Fecho"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependencies incumplíes. Téntalo usando -f."
 
@@ -1587,7 +1323,7 @@ msgstr "S"
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: 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"
@@ -1596,7 +1332,7 @@ msgstr "Error de compilación d'espresión regular - %s"
 msgid "The update command takes no arguments"
 msgstr "La orde update nun lleva argumentos"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1604,13 +1340,17 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
+#: 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] ""
@@ -1633,27 +1373,302 @@ msgstr ""
 "       asina que nun dependen de la pertinencia de la verdadera situación "
 "actual!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!"
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgáu."
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Error internu, ordenar nun finó"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Que raro... Los tamaños nun concasen, escribe 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Hai que descargar %sB/%sB d'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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Hai que descargar %sB d'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
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Tres d'esta operación, van usase %sB d'espaciu de discu adicional.\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 "Tres d'esta operación, van lliberase %sB d'espaciu de discu.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Hai problemes y utilizose -y ensin --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 "Conseñose Trivial Only pero ésta nun ye 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Sí, ¡facer lo que digo!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Tas a piques de facer daqué potencialmente dañible.\n"
+"Pa continuar escribe la frase '%s'\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Encaboxar."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "¿Quies continuar?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Dellos ficheros nun pudieron descargase"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Nun pudieron algamase dellos archivos, ¿seique executando apt-get update o "
+"tentando --fix-missing?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing y cambéu de mediu nun ta sofitao actualmente"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Nun pudieron iguase los paquetes que falten."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Encaboxando la instalación."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"El siguiente paquete desapareció del sistema como\n"
+"tolos ficheros fueron sobroescritos por otros paquetes:"
+msgstr[1] ""
+"Los siguientes paquetes desaparecieron del sistema como\n"
+"tolos ficheros fueron sobroescritos por otros paquetes:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Nota: Esto faise automáticamente y baxo demanda por dpkg."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Suponse que nun vamos esborrar coses; nun pue entamase 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 ""
+"Hmm, paez que AutoRemover destruyó daqué, lo que nun tendría\n"
+"por qué pasar. Por favor, unvía un informe de fallu escontra apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "La siguiente información pue aidar a resolver la situación:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Error internu, AutoRemover rompió coses"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "El siguiente paquete instalóse mou automáticu y yá nun se necesita:"
+msgstr[1] ""
+"Los siguientes paquetes instaláronse de manera automática y ya nun se "
+"necesiten:"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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] "El paquete %lu instalóse de mou automáticu y yá nun se necesita.\n"
+msgstr[1] ""
+"Los paquetes %lu instaláronse de manera automática y ya nun se necesiten\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] "Usa 'apt-get autoremove' pa desinstalalos."
+msgstr[1] "Usa 'apt-get autoremove' pa desinstalalos."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Habríes d'executar 'apt-get -f install' para iguar estos:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o "
+"conseña una solución)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Dellos paquetes nun pudieron instalase. Esto puede significar que\n"
+"conseñaste una situación imposible o, si tas usando la distribución\n"
+"inestable, que dellos paquetes necesarios nun se crearon o que\n"
+"s'allugaron fuera d'Incoming."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Paquetes frañaos"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Instalaránse los siguientes paquetes extra:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Paquetes afalaos:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Paquetes encamentaos"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Saltando %s, ya ta instalau y la actualización nun ta activada.\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Saltando %s, nun ta instaláu y namái se requieren anovamientos.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "La reinstalación de %s nun ye dable, nun pue descargase.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s yá ta na versión más nueva.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Esbillada la versión %s (%s) pa %s\n"
+
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Esbillada la versión %s (%s) pa %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 nun ta instalau, nun va desaniciase\n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISU: ¡Nun pudieron autenticase los siguientes paquetes!"
 
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:98
 msgid "Authentication warning overridden.\n"
 msgstr "Avisu d'autenticación saltáu.\n"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
 msgid "Some packages could not be authenticated"
 msgstr "Dellos paquetes nun pudieron autenticase"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 msgid "Install these packages without verification?"
 msgstr "¿Instalar esos paquetes ensin verificación?"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falló algamar %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 "Nun pue determinase l'espaciu llibre de %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Nun tienes espaciu libre bastante en %s."
+
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1668,41 +1683,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Calculando l'anovamientu"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Fecho"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Oxe "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Des:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Descargaos %sB en %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Tresnando]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1715,18 +1722,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1803,205 +1810,457 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Fusionando información disponible"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Llamóse a DropNode nun nodu que ta entá enllazáu"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "¡Fallu al atopar l'elementu enllazáu!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Falló al allugar una desvíu"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Fallu internu en AddDiversion"
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Intentando sobrescribir un desvíu, %s -> %s and %s/%s"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n"
+"\n"
+"apt-extracttemplates ye un preséu pa sacar información de\n"
+"configuración y plantíes de paquetes de debian.\n"
+"\n"
+"Opciones:\n"
+"-h Esti testu d'aida.\n"
+"-t Define'l direutoriu temporal\n"
+"-c=? Llei esti ficheru de configuración\n"
+"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/"
+"tmp\n"
 
-#: apt-inst/filelist.cc:506
+#: 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:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Doble suma de desvíu %s -> %s"
+msgid "Unable to write to %s"
+msgstr "Nun se pue escribir en %s"
 
-#: apt-inst/filelist.cc:549
+#: 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: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: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 "Duplicate conf file %s/%s"
-msgstr "Ficheru de configuración duplicáu %s/%s"
+msgid "Error processing directory %s"
+msgstr "Error al procesar el direutoriu %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: 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:400
+msgid "Error writing header to contents file"
+msgstr "Error al escribir la cabecera al ficheru de conteníos"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "La trayeutoria %s ye enforma llarga"
+msgid "Error processing contents %s"
+msgstr "Error al procesar conteníos %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Uso: apt-ftparchive [escoyetes] orde\n"
+"Ordes: packages camin-binariu [ficheru-disvíos [prefixu-camin]]\n"
+"          sources camin-fonte [ficheru-disvíos [prefixu-camin]]\n"
+"          contents camin\n"
+"          release camin\n"
+"          generate config [grupos]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive xenera índices p'archivos de Debian. Sofita dellos\n"
+"estilos de xeneración de reemplazos pa dpkg-scanpackages y\n"
+"dpkg-scansources, dende los automatizáos dafechu a los funcionales .\n"
+"\n"
+"apt-ftparchive xenera ficheros Package d'un árbol de .debs. El ficheru\n"
+"Package tien los conteníos de tolos campos de control de cada paquete,\n"
+"neto que la suma MD5 y el tamañu del ficheru. Puede usase un ficheru\n"
+"de disvíos pa forzar el valor de Priority y Section.\n"
+"\n"
+"De mou asemeyáu, apt-ftparchive xenera ficheros Sources pa un árbol\n"
+"de .dscs. Puede utilizase la opción --source-override pa conseñar un\n"
+"ficheru de disvíu de fonte.\n"
+"\n"
+"Les ordes «packages» y «sources» han d'executase na raiz de l'árbol.\n"
+"BinaryPath tien qu'apuntar a la base de la gueta recursiva, y el ficheru\n"
+"de disvíos tien que contener les marques de los disvíos. El prefixu de\n"
+"camín, si esiste, améstase a los campos de nome de ficheru. Darréu,\n"
+"un exemplu d'usu basáu nos archivos de Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Escoyetes:\n"
+"  -h    Esti testu d'aida\n"
+"  --md5 Xenerar control MD5 \n"
+"  -s=?  Ficheru de desvíu de fontes\n"
+"  -q    Sele\n"
+"  -d=?  Seleiciona la base de datos de caché opcional \n"
+"  --no-delink Activa'l mou de depuración de desenllaces\n"
+"  --contents  Xenerar ficheru de conteníos de control\n"
+"  -c=?  Lleer esti ficheru de configuración\n"
+"  -o=?  Afita una escoyeta de configuración propia"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Nun concasó denguna seleición"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Desempaquetando %s más d'una vegada"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Falten dellos ficheros nel grupu de ficheros de paquete `%s'"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "El direutorio %s ta desviáu"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "La BD corrompiose, ficheru renomáu como %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "El paquete ta tentando escribir nel oxetivu desviáu %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "La DB ye antigua, tentando actualizar %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "La trayeutoria de desviación ye enforma llarga"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"El formatu de la base de datos nun ye válidu. Si anovaste dende una versión "
+"anterior d'apt, desanicia y recrea la base de datos."
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nun pudo abrise'l ficheru de BD %s: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Nun pudo lleese %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Nun pudo lleese l'enllaz %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "L'archivu nun tien rexistru de control"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Nun pudo algamase un cursor"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Nun pudo renomase %s como %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "A: Nun pudo lleese'l direutoriu %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "El direutoriu %s ta reemplazándose por un non-direutoriu"
+msgid "W: Unable to stat %s\n"
+msgstr "A: Nun pudo lleese %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Fallu al atopar el nodu nel so bote d'enllaz"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "La trayeutoria ye perllarga"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "A: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: Errores aplicables al ficheru "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Sobreescribiendo concordancia del paquete ensin versión pa %s"
+msgid "Failed to resolve %s"
+msgstr "Nun pudo resolvese %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Falló'l percorríu pol árbol"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s"
+msgid "Failed to open %s"
+msgstr "Nun pudo abrise %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Nun ye a lleer %s"
+msgid " DeLink %s [%s]\n"
+msgstr " Desenllazar %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Falló la escritura nel ficheru %s"
+msgid "Failed to readlink %s"
+msgstr "Nun pudo lleese l'enllaz %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Falló al pesllar el ficheru %s"
+msgid "Failed to unlink %s"
+msgstr "Nun pudo desenllazase %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Esti nun ye un ficheru DEB válidu, falta'l miembru '%s'"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Falló enllazar enllazr %s a %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Error internu, nun se pue atopar el miembru %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Alcanzose'l llímite of %sB de desenllaz.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Ficheru de control inanalizable"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "L'archivu nun tien el campu paquetes"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Robla del ficheru inválida"
+#: 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: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:712
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s nun tien la entrada saltos de fonte\n"
+
+#: 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"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Nun pudo allugase memoria"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Nun pudo abrise %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Saltu mal formáu %s llinia %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Nun pudo lleese'l ficheru de saltos %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Saltu mal formáu %s llinia %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Saltu mal formáu %s llinia %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Saltu mal formáu %s llinia %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algoritmu de compresión desconocíu '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "La salida comprimida %s necesita un xuegu de compresión"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Nun pudo criase FICHERU*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Nun pudo biforcase"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Fallu al lleer la testera de miembru del ficheru"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Comprimir fíu"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/multicompress.cc:232
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "Testera de miembru del archivu %s inválida"
-
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Testera de miembru del ficheru inválida"
+msgid "Internal error, failed to create %s"
+msgstr "Error internu, nun pudo criase %s"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "El ficheru ye perpequeñu"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Fallu na ES al soprocesu/ficheru"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Falló al lleer les testeres del ficheru"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Nun pudo lleese al computar MD5"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Fallu al crear les tuberíes"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problema al desenllazar %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Fallu al executar gzip "
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Nun pudo renomase %s como %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Ficheru tollíu"
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n"
+"\n"
+"apt-extracttemplates ye un preséu pa sacar información de\n"
+"configuración y plantíes de paquetes de debian.\n"
+"\n"
+"Opciones:\n"
+"-h Esti testu d'aida.\n"
+"-t Define'l direutoriu temporal\n"
+"-c=? Llei esti ficheru de configuración\n"
+"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/"
+"tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Falló la suma de control de tar, ficheru tollíu"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "¡Rexistru de paquetes desconocíu!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Testera  del TAR triba %u desconocida, miembru %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Usu: apt-sortpkgs [opciones] ficheru1 [ficheru2 ...]\n"
+"\n"
+"apt-sortpkgs ye un preséu cenciellu pa tresnar ficheros de paquetes.\n"
+"La opción -s úsase pa indicar qué triba de ficheru ye.\n"
+"\n"
+"Opciones:\n"
+"-h   Esti testu d'aida.\n"
+"-s   Usa ordenamientu de ficheros fonte\n"
+"-c=? Llei esti ficheru de configuración\n"
+"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::\n"
+"cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "Executando dpkt"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "El sistema d'empaquetáu '%s' nun ta sofitáu"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Nun pudo determinase una triba de sistema d'empaquetáu afayadiza"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i rexistros escritos.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i rexistros escritos con %i ficheros de menos.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2018,6 +2277,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 ""
@@ -2031,201 +2310,369 @@ 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:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Caché de paquetes balera."
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Depende de"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Predepende de"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Suxer"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Recomienda"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "En conflictu con"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Sustituye a"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Fai obsoletu a"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Ruempe"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Aumenta"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "requeríu"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "estándar"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Calculando l'anovamientu"
+
+#: 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:118
+#: 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:169
+#: 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/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/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/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nun pudo lleese %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/acquire-worker.cc:455
+#: apt-pkg/pkgcachegen.cc:591
 #, 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 "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/pkgrecords.cc:38
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada"
+msgid "Couldn't stat source package list %s"
+msgstr "Nun se puede lleer la llista de paquetes d'oríxenes %s"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Creando árbol de dependencies"
+#: 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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versiones candidates"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Recoyendo ficheros qu'apurren"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Xeneración de dependencies"
+#: 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/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/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nun se pudo abrir el ficheru d'estáu %s"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falló la escritura del ficheru temporal d'estáu %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "La suma hash nun concasa"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "El tamañu nun concasa"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Operación incorreuta: %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Fallu d'escritura"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Hebo un fallu durante la verificación de la robla. El repositoriu nun ta "
+"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:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Fallu GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "El direutorio %s ta desviáu"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Hebo un fallu durante la verificación de la robla. El repositoriu nun ta "
-"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:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Fallu GPG: %s: %s"
-
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2234,12 +2681,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:1992
+#: 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:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2247,121 +2694,38 @@ msgstr ""
 "Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal "
 "paquete %s."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nun pudo lleese %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Hebo un error al procesar %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Lleendo llista de paquetes"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Recoyendo ficheros qu'apurren"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nun se pue escribir en %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list"
@@ -2388,7 +2752,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2397,12 +2761,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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2413,10 +2777,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"
@@ -2487,11 +2855,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"
 
@@ -2502,7 +2870,7 @@ msgid ""
 msgstr ""
 "El paquete %s necesita reinstalase, pero nun s'alcuentra un archivu pa el."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2510,337 +2878,265 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve xeneró frañadures, esto puede ser pola "
 "mor de paquetes reteníos."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Nun se pudo tratar el ficheru de paquetes %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nun se pudo parchear el ficheru release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Ensin seiciones nel ficheru release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ensin entrada Hash nel ficheru release %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Nun s'alcontró la distribución '%s' pa '%s'"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Nun s'alcontró la versión '%s' pa '%s'"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Nun pudo alcontrase la xera '%s'"
 
-#: apt-pkg/cacheset.cc:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Nun puede seleicionase l'instalador o versión candidata pal paquete '%s' "
-"como non tien nengún d'ellos"
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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 ""
+"Nun puede seleicionase l'instalador o versión candidata pal paquete '%s' "
+"como non tien nengún d'ellos"
+
+#: 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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Ensin entrada Hash nel ficheru release %s"
+
+#: apt-pkg/indexrecords.cc:145
+#, 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:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Entrada inválida pa 'Date' nel ficheru release %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Escoyeta %s que nun s'atopa"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Nun ta usándose bloquéu pal ficheru de bloquéu de sólo llectura %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nun puede abrise'l ficheru de bloquéu %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Nun ta usándose bloquéu pal ficheru de bloquéu %s montáu per nfs"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nun se pudo torgar %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "El subprocesu %s recibió un fallu de segmentación."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "El subprocesu %s recibió una señal %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "El subprocesu %s devolvió un códigu d'error (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "El subprocesu %s terminó de manera inesperada"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problemes zarrando'l ficheru gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nun se pudo abrir el ficheru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nun pudo abrise un ficheru descriptor %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Nun pudo criase'l soprocesu IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Nun pudo executase'l compresor "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lleíos, entá tenía de lleer %lu pero nun queda nada"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "escritos, entá tenía d'escribir %lu pero nun pudo facerse"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problemes zarrando'l ficheru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Hai problemes al renomar el ficheru %s a %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Hai problemes desvenceyando'l ficheru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Hai problemes al sincronizar el ficheru"
 
@@ -2928,112 +3224,106 @@ 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:519
+#: 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:633
+#: 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:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "L'aniellu de claves nun s'instaló en %s."
-
-#: 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"
@@ -3043,12 +3333,12 @@ msgstr "Operación incorreuta: %s"
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Desinstalando %s"
@@ -3069,79 +3359,79 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta'l direutoriu '%s'."
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparándose pa configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "%s instaláu"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "%s desinstaláu"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "Desinstalóse dafechu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemes de dependencies - déxase ensin configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3149,7 +3439,7 @@ 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:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3157,7 +3447,7 @@ msgstr ""
 "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
 "discu llenu"
 
-#: apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3165,7 +3455,7 @@ msgstr ""
 "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
 "memoria"
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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 "
@@ -3174,7 +3464,7 @@ msgstr ""
 "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
 "discu llenu"
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3195,419 +3485,185 @@ msgstr ""
 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"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n"
-"\n"
-"apt-extracttemplates ye un preséu pa sacar información de\n"
-"configuración y plantíes de paquetes de debian.\n"
-"\n"
-"Opciones:\n"
-"-h Esti testu d'aida.\n"
-"-t Define'l direutoriu temporal\n"
-"-c=? Llei esti ficheru de configuración\n"
-"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/"
-"tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Nun ye a lleer %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Error al procesar el direutoriu %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "La llista d'estensión de fontes ye enforma llarga"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Error al escribir la cabecera al ficheru de conteníos"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Error al procesar conteníos %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Uso: apt-ftparchive [escoyetes] orde\n"
-"Ordes: packages camin-binariu [ficheru-disvíos [prefixu-camin]]\n"
-"          sources camin-fonte [ficheru-disvíos [prefixu-camin]]\n"
-"          contents camin\n"
-"          release camin\n"
-"          generate config [grupos]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive xenera índices p'archivos de Debian. Sofita dellos\n"
-"estilos de xeneración de reemplazos pa dpkg-scanpackages y\n"
-"dpkg-scansources, dende los automatizáos dafechu a los funcionales .\n"
-"\n"
-"apt-ftparchive xenera ficheros Package d'un árbol de .debs. El ficheru\n"
-"Package tien los conteníos de tolos campos de control de cada paquete,\n"
-"neto que la suma MD5 y el tamañu del ficheru. Puede usase un ficheru\n"
-"de disvíos pa forzar el valor de Priority y Section.\n"
-"\n"
-"De mou asemeyáu, apt-ftparchive xenera ficheros Sources pa un árbol\n"
-"de .dscs. Puede utilizase la opción --source-override pa conseñar un\n"
-"ficheru de disvíu de fonte.\n"
-"\n"
-"Les ordes «packages» y «sources» han d'executase na raiz de l'árbol.\n"
-"BinaryPath tien qu'apuntar a la base de la gueta recursiva, y el ficheru\n"
-"de disvíos tien que contener les marques de los disvíos. El prefixu de\n"
-"camín, si esiste, améstase a los campos de nome de ficheru. Darréu,\n"
-"un exemplu d'usu basáu nos archivos de Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Escoyetes:\n"
-"  -h    Esti testu d'aida\n"
-"  --md5 Xenerar control MD5 \n"
-"  -s=?  Ficheru de desvíu de fontes\n"
-"  -q    Sele\n"
-"  -d=?  Seleiciona la base de datos de caché opcional \n"
-"  --no-delink Activa'l mou de depuración de desenllaces\n"
-"  --contents  Xenerar ficheru de conteníos de control\n"
-"  -c=?  Lleer esti ficheru de configuración\n"
-"  -o=?  Afita una escoyeta de configuración propia"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Nun concasó denguna seleición"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Falten dellos ficheros nel grupu de ficheros de paquete `%s'"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "La BD corrompiose, ficheru renomáu como %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "La DB ye antigua, tentando actualizar %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"El formatu de la base de datos nun ye válidu. Si anovaste dende una versión "
-"anterior d'apt, desanicia y recrea la base de datos."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nun pudo abrise'l ficheru de BD %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Nun pudo lleese l'enllaz %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "L'archivu nun tien rexistru de control"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Nun pudo algamase un cursor"
-
-#: ftparchive/writer.cc:91
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: Nun pudo lleese'l direutoriu %s\n"
+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. "
 
-#: ftparchive/writer.cc:96
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A: Nun pudo lleese %s\n"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Non bloquiáu"
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Llamóse a DropNode nun nodu que ta entá enllazáu"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "A: "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "¡Fallu al atopar l'elementu enllazáu!"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: Errores aplicables al ficheru "
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Falló al allugar una desvíu"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Nun pudo resolvese %s"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Fallu internu en AddDiversion"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Falló'l percorríu pol árbol"
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Intentando sobrescribir un desvíu, %s -> %s and %s/%s"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to open %s"
-msgstr "Nun pudo abrise %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Doble suma de desvíu %s -> %s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Desenllazar %s [%s]\n"
+msgid "Duplicate conf file %s/%s"
+msgstr "Ficheru de configuración duplicáu %s/%s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Nun pudo lleese l'enllaz %s"
+msgid "The path %s is too long"
+msgstr "La trayeutoria %s ye enforma llarga"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Nun pudo desenllazase %s"
+msgid "Unpacking %s more than once"
+msgstr "Desempaquetando %s más d'una vegada"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Falló enllazar enllazr %s a %s"
+msgid "The directory %s is diverted"
+msgstr "El direutorio %s ta desviáu"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:152
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Alcanzose'l llímite of %sB de desenllaz.\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "El paquete ta tentando escribir nel oxetivu desviáu %s/%s"
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "L'archivu nun tien el campu paquetes"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "La trayeutoria de desviación ye enforma llarga"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nun tien la entrada saltos\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "El direutoriu %s ta reemplazándose por un non-direutoriu"
+
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Fallu al atopar el nodu nel so bote d'enllaz"
+
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "La trayeutoria ye perllarga"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  el curiador de %s ye %s y non %s\n"
+msgid "Overwrite package match with no version for %s"
+msgstr "Sobreescribiendo concordancia del paquete ensin versión pa %s"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nun tien la entrada saltos de fonte\n"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s"
 
-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s tampoco nun tiene una entrada binaria de saltos\n"
+msgid "Unable to stat %s"
+msgstr "Nun ye a lleer %s"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Nun pudo allugase memoria"
+#: 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 nel ficheru %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Unable to open %s"
-msgstr "Nun pudo abrise %s"
+msgid "Failed to close file %s"
+msgstr "Falló al pesllar el ficheru %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Saltu mal formáu %s llinia %lu #1"
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Esti nun ye un ficheru DEB válidu, falta'l miembru '%s'"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Nun pudo lleese'l ficheru de saltos %s"
+msgid "Internal error, could not locate member %s"
+msgstr "Error internu, nun se pue atopar el miembru %s"
 
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Saltu mal formáu %s llinia %lu #1"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Ficheru de control inanalizable"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Saltu mal formáu %s llinia %lu #2"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Robla del ficheru inválida"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Saltu mal formáu %s llinia %lu #3"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Fallu al lleer la testera de miembru del ficheru"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritmu de compresión desconocíu '%s'"
+msgid "Invalid archive member header %s"
+msgstr "Testera de miembru del archivu %s inválida"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "La salida comprimida %s necesita un xuegu de compresión"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Testera de miembru del ficheru inválida"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Nun pudo criase FICHERU*"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "El ficheru ye perpequeñu"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Nun pudo biforcase"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Falló al lleer les testeres del ficheru"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Comprimir fíu"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Fallu al crear les tuberíes"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Error internu, nun pudo criase %s"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Fallu al executar gzip "
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Fallu na ES al soprocesu/ficheru"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Ficheru tollíu"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Nun pudo lleese al computar MD5"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Falló la suma de control de tar, ficheru tollíu"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Problema al desenllazar %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Testera  del TAR triba %u desconocida, miembru %s"
 
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n"
-"\n"
-"apt-extracttemplates ye un preséu pa sacar información de\n"
-"configuración y plantíes de paquetes de debian.\n"
-"\n"
-"Opciones:\n"
-"-h Esti testu d'aida.\n"
-"-t Define'l direutoriu temporal\n"
-"-c=? Llei esti ficheru de configuración\n"
-"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/"
-"tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Espaciu de dependencies de versión en total: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "¡Rexistru de paquetes desconocíu!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Nun hai espaciu llibre bastante en %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Usu: apt-sortpkgs [opciones] ficheru1 [ficheru2 ...]\n"
-"\n"
-"apt-sortpkgs ye un preséu cenciellu pa tresnar ficheros de paquetes.\n"
-"La opción -s úsase pa indicar qué triba de ficheru ye.\n"
-"\n"
-"Opciones:\n"
-"-h   Esti testu d'aida.\n"
-"-s   Usa ordenamientu de ficheros fonte\n"
-"-c=? Llei esti ficheru de configuración\n"
-"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::\n"
-"cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Fecho"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "L'aniellu de claves nun s'instaló en %s."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/bg.po b/po/bg.po
index 4b6c30793..bbe6df3ae 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: 2015-01-16 04:37-0500\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,149 +26,145 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Пакетът %s версия %s има неудовлетворена зависимост:\n"
 
-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Общо имена на пакети : "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Общо пакетни структури: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Нормални пакети: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Чисти виртуални пакети: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Единични виртуални пакети: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Смесени виртуални пакети: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Липсващи: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Общо уникални версии: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Общо уникални описания: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Общо зависимости: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Общо отношения версия/файл: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Общо отношения описание/файл: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Общо отношения „Осигурява“: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Общо разгърнати низове: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Общо пространство за зависимости по версии: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Общо празно пространство: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Общо отчетено пространство: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Тази командата е остаряла. Използвайте „apt-mark showauto“ вместо нея."
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Пакетът %s не може да бъде намерен"
 
-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Пакетни файлове:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Отбити пакети:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(не са намерени)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Инсталирана: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(няма)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Отбиване на пакета: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Таблица с версиите:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -239,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"
@@ -260,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 "Повторете този процес за останалите дискове от комплекта."
 
@@ -297,48 +293,48 @@ msgstr ""
 "  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
 
-#: cmdline/apt-get.cc:367
+#: 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:423
+#: cmdline/apt-get.cc:414
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Игнориране на несъществуваща версия „%s“ на пакета „%s“"
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Неуспех при намирането на пакет %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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,24 +342,24 @@ msgstr ""
 "Тази команда е остаряла. Вместо нея използвайте „apt-mark auto“ и „apt-mark "
 "manual“."
 
-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Неуспех при заключването на директорията за изтегляне"
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -373,7 +369,7 @@ msgstr ""
 "адрес:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -385,80 +381,69 @@ msgstr ""
 "за да изтеглите последните промени в пакета (евентуално в процес на "
 "разработка).\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускане на вече изтегления файл „%s“\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Неуспех при определянето на свободното пространство в %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Нямате достатъчно свободно пространство в %s"
-
 #. 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:895
+#: 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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Изтегляне на изходен код %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Неуспех при изтеглянето на някои архиви."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr "Изтеглянето завърши в режим само на изтегляне"
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Командата за разпакетиране „%s“ пропадна.\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Командата за компилиране „%s“ пропадна.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Процесът-потомък пропадна"
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
 
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -467,18 +452,28 @@ msgstr ""
 "Липсва информация за архитектурата %s. Прегледайте информацията за APT::"
 "Architectures в apt.conf(5)."
 
-#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Неуспех при обработката на зависимостите за компилиране"
+
+#: 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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s няма зависимости за компилиране.\n"
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -521,30 +516,30 @@ msgstr ""
 "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
 "няма подходящи версии"
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1388
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Неуспех при обработката на зависимостите за компилиране"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Журнал на промените в %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Поддържани модули:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -643,11 +638,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -661,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -806,12 +801,12 @@ msgstr "Дискът не е намерен."
 msgid "File not found"
 msgstr "Файлът не е намерен"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Неуспех при получаването на атрибути"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Неуспех при задаването на време на промяна"
 
@@ -820,34 +815,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Невалиден адрес-URI, локалните адреси-URI не трябва да започват с „//“"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Влизане"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Неуспех при установяването на името на отдалечения сървър"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Неуспех при установяването на локалното име"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Сървърът отказа свързване и съобщи: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER се провали, сървърът съобщи: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS се провали, сървърът съобщи: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -855,125 +850,125 @@ msgstr ""
 "Беше указан сървър-посредник, но няма скрипт за влизане, Acquire::ftp::"
 "ProxyLogin е празен."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Командата „%s“ на скрипта за влизане се провали, сървърът съобщи: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE се провали, сървърът съобщи: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Допустимото време за свързването изтече"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Сървърът разпадна връзката"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Грешка при четене"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Отговорът препълни буфера."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Развален протокол"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Грешка при запис"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Неуспех при създаването на гнездо"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Неуспех при свързването на гнездо за данни, допустимото време за свързване "
 "изтече"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Неуспех"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Неуспех при свързването на пасивно гнездо."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo не успя да се добере до слушащо гнездо"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Неуспех при свързването на гнездо"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Неуспех при слушането на гнездото"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Неуспех при определянето на името на гнездото"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Неуспех при изпращането на командата PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Неизвестно семейство адреси %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT се провали, сървърът съобщи: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Времето за установяване на връзка с гнездо за данни изтече"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Невъзможно е да се приеме свързването"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Проблем при хеширане на файла"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Неуспех при изтеглянето на файла, сървърът съобщи „%s“"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Времето за връзка с гнездо за данни изтече"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Неуспех при прехвърлянето на данни, сървърът съобщи: „%s“"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Запитване"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Неуспех при извикването на "
 
@@ -1039,40 +1034,40 @@ msgstr "Нещо лошо се случи при намирането на IP а
 msgid "Unable to connect to %s:%s:"
 msgstr "Неуспех при свързване с %s:%s:"
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на "
 "ключа?!"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Намерен е поне един невалиден подпис."
 
-#: methods/gpgv.cc:174
+#: 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Неизвестна грешка при изпълнението на apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr "Следните подписи са невалидни:\n"
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1080,35 +1075,35 @@ msgstr ""
 "Следните подписи не можаха да бъдат проверени, защото публичния ключ не е "
 "наличен:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "Празни файлове не могат да бъдат валидни архиви"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Грешка при записа на файла"
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката"
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Грешка при четене от сървъра"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Грешка при записа на файл"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Неуспех на избора"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Допустимото време за свързване изтече"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Грешка при записа на изходен файл"
 
@@ -1140,294 +1135,30 @@ msgstr "HTTP сървърът няма поддръжка за прехвърл
 msgid "Unknown date format"
 msgstr "Неизвестен формат на дата"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Невалидни данни на заглавната част"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Неуспех при свързването"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "Вътрешна грешка"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено."
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Вътрешна грешка, „Ordering“ не завърши"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Странно... Размерите не съвпадат, изпратете е-поща на 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of 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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Необходимо е да се изтеглят %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
-#: apt-private/private-install.cc:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr ""
-"След тази операция ще бъде използвано %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
-#: apt-private/private-install.cc:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Нямате достатъчно свободно пространство в %s."
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Има проблеми и „-y“ е използвано без „--force-yes“"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Указано е „Trivial Only“, но това не е тривиална операция."
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Да, прави каквото казвам!"
-
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"На път сте да направите нещо потенциално опасно.\n"
-"За да продължите, въведете фразата „%s“\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Прекъсване."
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Искате ли да продължите?"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Някои файлове не можаха да бъдат изтеглени"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ "
-"или да опитате с „--fix-missing“?"
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "„--fix-missing“ и превключване на носители не се поддържа все още"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Неуспех при коригирането на липсващите пакети."
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Прекъсване на инсталирането."
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"Следният пакет е отстранен от системата поради препокриване на всичките му "
-"файлове от други пакети:"
-msgstr[1] ""
-"Следните пакети са отстранени от системата поради препокриване на всичките "
-"им файлове от други пакети:"
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Това се прави автоматично от dpkg."
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран"
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Хм, изглежда AutoRemover скапа нещо, а това не би трябвало\n"
-"да се случва. Съобщете за грешка в пакета apt."
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-"Следната информация може да помогне за намиране на изход от ситуацията:"
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата"
-
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "Следният пакет е бил инсталиран автоматично и вече не е необходим:"
-msgstr[1] ""
-"Следните пакети са били инсталирани автоматично и вече не са необходими:"
-
-#: apt-private/private-install.cc:517
+#: methods/server.cc:589
 #, c-format
-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 пакет е бил инсталиран автоматично и вече не е необходим:\n"
-msgstr[1] ""
-"%lu пакета са били инсталирани автоматично и вече не са необходими:\n"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Използвайте „apt-get autoremove“ за да го премахнете."
-msgstr[1] "Използвайте „apt-get autoremove“ за да ги премахнете."
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
-"укажете разрешение)."
-
-#: apt-private/private-install.cc:638
 msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Някои пакети не можаха да бъдат инсталирани. Това може да означава,\n"
-"че сте изискали невъзможна ситуация или ако използвате нестабилната\n"
-"дистрибуция, че някои необходими пакети още не са създадени или пък\n"
-"са били преместени от Incoming."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Счупени пакети"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Предложени пакети:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Препоръчвани пакети:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Пропускане на %s, който не е инсталиран при заявени само обновявания.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s вече е най-новата версия.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Избрана е версия %s (%s) за %s\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Избрана е версия „%s“ (%s) за „%s“ заради „%s“\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"Пакетът „%s“ не е инсталиран, така че не е премахнат. Може би имахте предвид "
-"„%s“?\n"
 
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Пакетът „%s“ не е инсталиран, така че не е премахнат\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "Вътрешна грешка"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1435,33 +1166,33 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "Коригиране на зависимостите..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " пропадна."
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "Неуспех при коригирането на зависимостите"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr "Неуспех при минимизирането на набора актуализации"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " Готово"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "Неудовлетворени зависимости. Опитайте с „-f“."
 
@@ -1625,7 +1356,7 @@ msgstr "Y"
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Грешка при компилирането на регулярния израз - %s"
@@ -1634,7 +1365,7 @@ msgstr "Грешка при компилирането на регулярния
 msgid "The update command takes no arguments"
 msgstr "Командата „update“ не възприема аргументи"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1642,10 +1373,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1670,27 +1405,306 @@ msgstr ""
 "           Заключването е деактивирано, така че не разчитайте\n"
 "           на повтаряемост в реална ситуация."
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!"
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено."
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Вътрешна грешка, „Ordering“ не завърши"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Странно... Размерите не съвпадат, изпратете е-поща на 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of 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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Необходимо е да се изтеглят %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
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr ""
+"След тази операция ще бъде използвано %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
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Има проблеми и „-y“ е използвано без „--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“, но това не е тривиална операция."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Да, прави каквото казвам!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"На път сте да направите нещо потенциално опасно.\n"
+"За да продължите, въведете фразата „%s“\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Прекъсване."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Искате ли да продължите?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Някои файлове не можаха да бъдат изтеглени"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ "
+"или да опитате с „--fix-missing“?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "„--fix-missing“ и превключване на носители не се поддържа все още"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Неуспех при коригирането на липсващите пакети."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Прекъсване на инсталирането."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"Следният пакет е отстранен от системата поради препокриване на всичките му "
+"файлове от други пакети:"
+msgstr[1] ""
+"Следните пакети са отстранени от системата поради препокриване на всичките "
+"им файлове от други пакети:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Това се прави автоматично от dpkg."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Не би трябвало да се изтрива. 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 ""
+"Хм, изглежда AutoRemover скапа нещо, а това не би трябвало\n"
+"да се случва. Съобщете за грешка в пакета apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+"Следната информация може да помогне за намиране на изход от ситуацията:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "Следният пакет е бил инсталиран автоматично и вече не е необходим:"
+msgstr[1] ""
+"Следните пакети са били инсталирани автоматично и вече не са необходими:"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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 пакет е бил инсталиран автоматично и вече не е необходим:\n"
+msgstr[1] ""
+"%lu пакета са били инсталирани автоматично и вече не са необходими:\n"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "Използвайте „apt-get autoremove“ за да го премахнете."
+msgstr[1] "Използвайте „apt-get autoremove“ за да ги премахнете."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
+"укажете разрешение)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Някои пакети не можаха да бъдат инсталирани. Това може да означава,\n"
+"че сте изискали невъзможна ситуация или ако използвате нестабилната\n"
+"дистрибуция, че някои необходими пакети още не са създадени или пък\n"
+"са били преместени от Incoming."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Счупени пакети"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Предложени пакети:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Препоръчвани пакети:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Пропускане на %s, който не е инсталиран при заявени само обновявания.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s вече е най-новата версия.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Избрана е версия %s (%s) за %s\n"
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Избрана е версия „%s“ (%s) за „%s“ заради „%s“\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+"Пакетът „%s“ не е инсталиран, така че не е премахнат. Може би имахте предвид "
+"„%s“?\n"
+
+#: apt-private/private-install.cc:945
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Пакетът „%s“ не е инсталиран, така че не е премахнат\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!"
 
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:98
 msgid "Authentication warning overridden.\n"
 msgstr "Предупреждението за удостоверяването е пренебрегнато.\n"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
 msgid "Some packages could not be authenticated"
 msgstr "Някои пакети не можаха да бъдат удостоверени"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 msgid "Install these packages without verification?"
 msgstr "Инсталиране на тези пакети без проверка?"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Неуспех при изтеглянето на %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 "Неуспех при определянето на свободното пространство в %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Нямате достатъчно свободно пространство в %s."
+
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1705,41 +1719,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Изчисляване на актуализацията"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Готово"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Поп "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Изт:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Игн "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Грш "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Изтеглени %sB за %s (%sB/сек)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [В процес на работа]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1752,18 +1758,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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,205 +1843,460 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Смесване на наличната информация"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Извикан е DropNode за все още използван възел"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Грешка при намирането на хеш-елемента!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Неуспех при установяване на отклонението"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Вътрешна грешка в AddDiversion"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Употреба: apt-extracttemplates файл1 [файл2 ...]\n"
+"\n"
+"apt-extracttemplates е инструмент за извличане на конфигурационна "
+"информация\n"
+"и шаблони от дебиански пакети\n"
+"\n"
+"Опции:\n"
+"  -h   Този помощен текст.\n"
+"  -t   Настройване на временна директория\n"
+"  -c=? Четене на този конфигурационен файл.\n"
+"  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
+"tmp\n"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Опит за изменение на отклонение, %s -> %s и %s/%s"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Неуспех при получаването на атрибути за %s"
 
-#: apt-inst/filelist.cc:506
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Двойно добавяне на отклонение %s -> %s"
+msgid "Unable to write to %s"
+msgstr "Неуспех при записа на %s"
 
-#: apt-inst/filelist.cc:549
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?"
+
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "Списъкът с разширения на пакети и твърде дълъг"
+
+#: 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 "Duplicate conf file %s/%s"
-msgstr "Дублиран конфигурационен файл %s/%s"
+msgid "Error processing directory %s"
+msgstr "Грешка при обработката на директория %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Списъкът с разширения на източници е твърде дълъг"
+
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "Грешка при запазването на заглавната част във файла със съдържание"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "Пътят %s е твърде дълъг"
+msgid "Error processing contents %s"
+msgstr "Грешка при обработката на съдържание %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Употреба: apt-ftparchive [опции] команда\n"
+"Команди:  packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents път\n"
+"          release път\n"
+"          generate config [групи]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive генерира индексни файлове за архиви на Дебиан. Поддържа\n"
+"много стилове на генериране от напълно автоматично до функционални\n"
+"замени на dpkg-scanpackages и dpkg-scansources.\n"
+"\n"
+"apt-ftparchive генерира „Package“ файлове от дърво с .deb файлове. Файлът\n"
+"„Package“ представлява съдържанието на всички контролни полета на всеки\n"
+"пакет, както и MD5 хеш и размер на файла. Стойностите на полетата \n"
+"„Priority“ и „Section“ могат да бъдат изменени с файл „override“.\n"
+"\n"
+"По подобен начин apt-ftparchive генерира „Sources“ файлове от дърво с .dsc \n"
+"файлове. Опцията --source-override може да се използва за указване на файл\n"
+"„override“ за пакети с изходен код.\n"
+"\n"
+"Командите „packages“ и „sources“ трябва да се изпълняват в корена на "
+"дървото.\n"
+"BinaryPath трябва да сочи към основата, където започва рекурсивното търсене "
+"и\n"
+"файла „override“ трябва да съдържа всички флагове за преназначаване. "
+"Pathprefix\n"
+"се прибавя към полетата на файловите имена, ако съществува. Пример за "
+"употреба\n"
+"от архива на Дебиан:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Опции:\n"
+"  -h    Този помощен текст.\n"
+"  --md5 Управление на генерирането на MD5.\n"
+"  -s=?  Файл „override“ за пакети с изходен код.\n"
+"  -q    Без показване на съобщения.\n"
+"  -d=?  Избор на допълнителна база от данни за кеширане.\n"
+"  --no-delink Включване на режим за премахване на връзки.\n"
+"  --contents  Управление на генерирането на файлове със съдържание.\n"
+"  -c=?  Четене на този конфигурационен файл.\n"
+"  -o=?  Настройване на произволна конфигурационна опция"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Няма съвпадения на избора"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Разпакетиране на %s повече от веднъж"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Липсват някои файлове от групата с файлови пакети „%s“"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Директорията %s е отклонена"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "БД е повредена, файлът е преименуван на %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Пакетът се опитва да пише в целта за отклонение %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "БД е стара, опит за актуализиране на %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Пътят за отклонение е твърде дълъг"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Невалиден формат на БД.  Ако сте обновили от по-стара версия на apt, "
+"премахнете базата от данни и я създайте наново."
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Неуспех при отварянето на файл %s от БД: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Грешка при получаването на атрибути за %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Неуспех при прочитането на връзка %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "В архива няма поле „control“"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Неуспех при получаването на курсор"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Неуспех при преименуването на %s на %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Неуспех при четенето на директория %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Директорията %s се заменя с не-директория"
+msgid "W: Unable to stat %s\n"
+msgstr "W: Неуспех при четенето на %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Неуспех при намирането на възел в неговия хеш"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Пътят е твърде дълъг"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "W: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: Грешките се отнасят за файла "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Файловете се заменят със съдържанието на пакета %s без версия"
+msgid "Failed to resolve %s"
+msgstr "Неуспех при превръщането на %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Неуспех при обхода на дървото"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Файл %s/%s заменя този в пакет %s"
+msgid "Failed to open %s"
+msgstr "Неуспех при отварянето на %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Неуспех при получаването на атрибути за %s"
+msgid " DeLink %s [%s]\n"
+msgstr "DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Неуспех при запис на файл %s"
+msgid "Failed to readlink %s"
+msgstr "Неуспех при прочитането на връзка %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Неуспех при затварянето на файл %s"
+msgid "Failed to unlink %s"
+msgstr "Неуспех при премахването на връзка %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Това не е валиден DEB архив, липсва елемент „%s“"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Неуспех при създаването на връзка %s към %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Вътрешна грешка, неуспех при намирането на съставна част %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr "Превишен лимит на DeLink от %sB.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Контролен файл, невъзможен за анализ"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Архивът няма поле „package“"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Невалиден подпис на архива"
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s няма запис „override“\n"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Грешка при четене на заглавната част на елемента на архива"
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  поддържащия пакета %s е %s, а не %s\n"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:712
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "Невалидна заглавна част %s на елемента на архива"
+msgid "  %s has no source override entry\n"
+msgstr "  %s няма запис „source override“\n"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Невалидна заглавна част на елемента на архива"
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s няма също и запис „binary override“\n"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Архивът е твърде кратък"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Неуспех при заделянето на памет"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Неуспех при четенето на заглавните части на архива"
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Неуспех при отварянето на %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Неправилно форматиран override %s, ред %llu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Неуспех при четенето на override файл %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Неправилно форматиран override %s, ред %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Неправилно форматиран override %s, ред %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Неправилно форматиран override %s, ред %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Непознат алгоритъм за компресия „%s“"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Компресираният изход %s изисква настройка за компресирането"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Неуспех при създаването на FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Неуспех при пускането на подпроцес"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Процес-потомък за компресиране"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Вътрешна грешка, неуспех при създаването на %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "В/И към подпроцеса/файла пропадна"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Неуспех при четене докато се изчислява MD5"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Неуспех при създаването на програмни канали"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Неуспех при премахването на връзка на %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Неуспех при изпълнението на gzip"
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Неуспех при преименуването на %s на %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Развален архив"
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Употреба: apt-internal-solver\n"
+"\n"
+"apt-internal-solver е интерфейс към вградения в APT механизъм за "
+"удовлетворяване на зависимости\n"
+"\n"
+"Опции:\n"
+"  -h  Този помощен текст\n"
+"  -q  Изход, подходящ за журнал — без индикатор на напредъка\n"
+"  -c=? Указване на файл с настройки\n"
+"  -o=? Указване на произволна настройка, напр. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Невярна контролна сума на tar, развален архив"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Непознат запис за пакет!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Непозната заглавна част на TAR тип %u, елемент %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Употреба: apt-sortpkgs [опции] файл1 [файл2 ...]\n"
+"\n"
+"apt-sortpkgs е опростен инструмент за сортиране на пакетни файлове. Опцията\n"
+"„-s“ се използва, за да покаже типа на файла.\n"
+"\n"
+"Опции:\n"
+"  -h   Този помощен текст.\n"
+"  -s   Използване на сортиране по изходен код.\n"
+"  -c=? Четене на този конфигурационен файл.\n"
+"  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
+"tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "Изпълняване на dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Пакетната система „%s“ не е поддържана"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Неуспех при определянето на подходяща пакетна система"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Записани са %i записа.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Записани са %i записа с %i липсващи файла.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Записани са %i записа с %i несъответстващи файла\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 записа с %i липсващи и %i несъответстващи файла\n"
@@ -2050,6 +2311,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 ""
@@ -2065,157 +2346,344 @@ msgstr ""
 msgid "The list of sources could not be read."
 msgstr "Списъкът с източници не можа да бъде прочетен."
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Празен кеш на пакети"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr "Файлът за кеш на пакети е повреден"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr "Файлът за кеш на пакети е несъвместима версия"
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Файлът за кеш на пакети е повреден, твърде малък е"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Тази версия на APT не поддържа система за версии „%s“"
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Зависи от"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Предварително зависи от"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Предлага се"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Препоръчва се"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "В конфликт с"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Заменя"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Изважда от употреба"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Чупи"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Подобрява"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "важен"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "изискван"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "стандартен"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "незадължителен"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "допълнителен"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Изчисляване на актуализацията"
+
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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 "Кешът има несъвместима система за версии"
+
+#. 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 "Изпращане на сценарий към програмата за удовлетворяване на зависимости"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Генериране на зависимости"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Четене на информацията за състоянието"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Подготовка за приемане на решение"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Неуспех при отварянето на StateFile %s"
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Външната програма за удовлетворяване на зависимости се провали без да изведе "
+"съобщение за грешка"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Неуспех при запис на временен StateFile %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Несъответствие на контролната сума"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Несъответствие на размера"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Невалидна операция %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Грешка при запис"
+
+#: apt-pkg/acquire-item.cc:259
+#, fuzzy
+msgid "Does not start with a cleartext signature"
+msgstr "Файлът %s не започва с информация за подписване в обикновен текст."
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Грешка при проверка на цифровия подпис. Хранилището не е обновено и ще се "
+"използват старите индексни файлове. Грешка от GPG: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Грешка от GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Директорията %s е отклонена"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2224,16 +2692,16 @@ msgstr ""
 "Не може да се открие елемент „%s“ във файла Release (объркан ред в sources."
 "list или повреден файл)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2242,27 +2710,19 @@ msgstr ""
 "Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се "
 "прилагат обновявания от това хранилище."
 
-#: apt-pkg/acquire-item.cc:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Грешка при проверка на цифровия подпис. Хранилището не е обновено и ще се "
-"използват старите индексни файлове. Грешка от GPG: %s: %s\n"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Грешка от GPG: %s: %s"
-
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2271,136 +2731,50 @@ msgstr ""
 "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
 "ръчно да оправите този пакет (поради пропусната архитектура)."
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Възникна грешка при обработката на %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на "
-"APT."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Еха, надхвърлихте броя описания, на който е способна тази версия на APT."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Четене на списъците с пакети"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Събиране на информация за „Осигурява“"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Неуспех при записа на %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Директорията за архиви %spartial липсва."
 
-#: apt-pkg/acquire.cc:99
+#: 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:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Изтегляне на файл %li от %li (остават %s)"
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list"
@@ -2428,7 +2802,7 @@ msgstr "Неизвестен тип за отбиване %s"
 msgid "No priority (or zero) specified for pin"
 msgstr "Няма указан приоритет (или е нула) на отбиването"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2437,12 +2811,12 @@ msgstr ""
 "Неуспех при незабавната настройка на „%s“. За повече информация вижте "
 "информацията за APT::Immediate-Configure в „man 5 apt.conf“. (%d)"
 
-#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "Неуспех при конфигуриране на „%s“. "
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2454,10 +2828,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"
@@ -2528,11 +2905,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"
 
@@ -2544,7 +2921,7 @@ msgstr ""
 "Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за "
 "него."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2552,348 +2929,270 @@ msgstr ""
 "Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е "
 "причинено от задържани пакети."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Подготовка за приемане на решение"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Външната програма за удовлетворяване на зависимости се провали без да изведе "
-"съобщение за грешка"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Неуспех при анализирането на пакетен файл %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Неуспех при анализиране на файл Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Във файла Release %s липсват раздели"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Във файла Release %s липсва контролна сума"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Неправилна стойност за „Valid-Until“ във файла Release %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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 (неограничена дистрибуция)"
+#: 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 (анализ на дистрибуция)"
+#: 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 "Неуспех при отварянето на 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 "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
+msgid "Failed to write temporary StateFile %s"
+msgstr "Неуспех при запис на временен StateFile %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/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "Неуспех при анализирането на пакетен файл %s (%d)"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Не е намерено издание „%s“ на „%s“"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Не е намерена версия „%s“ на „%s“"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Неуспех при намиране на задача „%s“"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/cacheset.cc:635
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/cacheset.cc:641
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
 
-#: apt-pkg/cacheset.cc:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Не е възможно избиране на инсталирана или кандидат версия за пакета „%s“ "
-"понеже той няма нито едната"
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Във файла Release %s липсва контролна сума"
+
+#: apt-pkg/indexrecords.cc:145
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Неправилна стойност за „Valid-Until“ във файла Release %s"
+
+#: apt-pkg/indexrecords.cc:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Неправилна стойност за „Date“ във файла Release %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%liм %liс"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%liс"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Изборът %s не е намерен"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Не се използва заключване за файл за заключване %s, който е само за четене"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Неуспех при отварянето на файл за заключване %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Не се използва заключване за файл за заключване %s, който е монтиран по NFS"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Неуспех при достъпа до заключване %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 "Не може да се създаде списък от файлове, защото „%s“ не е директория"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Пропускане на „%s“ в директорията „%s“, понеже не е обикновен файл"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "Пропускане на файла „%s“ в директорията „%s“, понеже няма разширение"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 "Пропускане на файла „%s“ в директорията „%s“, понеже разширението му е грешно"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Под-процесът %s получи сигнал %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Подпроцесът %s върна код за грешка (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Подпроцесът %s завърши неочаквано"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Проблем при затваряне на компресираният файл %s (gzip)"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Неуспех при отварянето на файла %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Неуспех при отварянето на файлов манипулатор %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Неуспех при създаването на подпроцес IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Неуспех при изпълнението на компресиращата програма "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 "грешка при четене, все още има %llu за четене, но няма нито един останал"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "грешка при запис, все още име %llu за запис, но не успя"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Проблем при затваряне на файла %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Проблем при преименуване на файла %s на %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Проблем при изтриване на файла %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Проблем при синхронизиране на файла"
 
@@ -2982,112 +3281,106 @@ msgstr "Неуспех при намирането на атрибутите н
 msgid "Failed to stat the cdrom"
 msgstr "Неуспех при намирането на атрибутите на cdrom"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Неизвестен тип на абревиатура: „%c“"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Отваряне на конфигурационен файл %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Синтактична грешка %s:%u: Лошо форматиран таг"
 
-#: apt-pkg/contrib/configuration.cc:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "В %s няма инсталиран ключодържател."
-
-#: 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"
@@ -3097,12 +3390,12 @@ msgstr "Невалидна операция %s"
 msgid "Installing %s"
 msgstr "Инсталиране на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Премахване на %s"
@@ -3123,81 +3416,81 @@ msgid "Running post-installation trigger %s"
 msgstr "Изпълнение на тригер след инсталиране %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Директорията „%s“ липсва"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Подготвяне на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Разпакетиране на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Подготвяне на %s за конфигуриране"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "%s е инсталиран"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Подготвяне за премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "%s е премахнат"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Подготовка за пълно премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s е напълно премахнат"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr "Операцията е прекъсната"
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "отлагане на настройката поради неудовлетворени зависимости"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3205,7 +3498,7 @@ msgstr ""
 "Доклад за зависимостите не е записан защото съобщението за грешка е породено "
 "от друга грешка."
 
-#: apt-pkg/deb/dpkgpm.cc:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3213,7 +3506,7 @@ msgstr ""
 "Доклад за зависимостите не е записан защото грешката е причинена от "
 "недостатъчно дисково пространство"
 
-#: apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3221,7 +3514,7 @@ msgstr ""
 "Доклад за зависимостите не е записан защото грешката е причинена от "
 "недостатъчна оперативна памет"
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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 "
@@ -3230,7 +3523,7 @@ msgstr ""
 "Доклад за зависимостите не е записан защото грешката е причинена от "
 "недостатъчно дисково пространство"
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3246,428 +3539,191 @@ msgstr ""
 "използва от друг процес?"
 
 #: 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 "Без заключване"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Употреба: apt-extracttemplates файл1 [файл2 ...]\n"
-"\n"
-"apt-extracttemplates е инструмент за извличане на конфигурационна "
-"информация\n"
-"и шаблони от дебиански пакети\n"
-"\n"
-"Опции:\n"
-"  -h   Този помощен текст.\n"
-"  -t   Настройване на временна директория\n"
-"  -c=? Четене на този конфигурационен файл.\n"
-"  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
-"tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Неуспех при получаването на атрибути за %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?"
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Грешка при обработката на директория %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Списъкът с разширения на източници е твърде дълъг"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Грешка при запазването на заглавната част във файла със съдържание"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Грешка при обработката на съдържание %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Употреба: apt-ftparchive [опции] команда\n"
-"Команди:  packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents път\n"
-"          release път\n"
-"          generate config [групи]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive генерира индексни файлове за архиви на Дебиан. Поддържа\n"
-"много стилове на генериране от напълно автоматично до функционални\n"
-"замени на dpkg-scanpackages и dpkg-scansources.\n"
-"\n"
-"apt-ftparchive генерира „Package“ файлове от дърво с .deb файлове. Файлът\n"
-"„Package“ представлява съдържанието на всички контролни полета на всеки\n"
-"пакет, както и MD5 хеш и размер на файла. Стойностите на полетата \n"
-"„Priority“ и „Section“ могат да бъдат изменени с файл „override“.\n"
-"\n"
-"По подобен начин apt-ftparchive генерира „Sources“ файлове от дърво с .dsc \n"
-"файлове. Опцията --source-override може да се използва за указване на файл\n"
-"„override“ за пакети с изходен код.\n"
-"\n"
-"Командите „packages“ и „sources“ трябва да се изпълняват в корена на "
-"дървото.\n"
-"BinaryPath трябва да сочи към основата, където започва рекурсивното търсене "
-"и\n"
-"файла „override“ трябва да съдържа всички флагове за преназначаване. "
-"Pathprefix\n"
-"се прибавя към полетата на файловите имена, ако съществува. Пример за "
-"употреба\n"
-"от архива на Дебиан:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Опции:\n"
-"  -h    Този помощен текст.\n"
-"  --md5 Управление на генерирането на MD5.\n"
-"  -s=?  Файл „override“ за пакети с изходен код.\n"
-"  -q    Без показване на съобщения.\n"
-"  -d=?  Избор на допълнителна база от данни за кеширане.\n"
-"  --no-delink Включване на режим за премахване на връзки.\n"
-"  --contents  Управление на генерирането на файлове със съдържание.\n"
-"  -c=?  Четене на този конфигурационен файл.\n"
-"  -o=?  Настройване на произволна конфигурационна опция"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Няма съвпадения на избора"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Липсват някои файлове от групата с файлови пакети „%s“"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "БД е повредена, файлът е преименуван на %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "БД е стара, опит за актуализиране на %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Невалиден формат на БД.  Ако сте обновили от по-стара версия на apt, "
-"премахнете базата от данни и я създайте наново."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Неуспех при отварянето на файл %s от БД: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Неуспех при прочитането на връзка %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "В архива няма поле „control“"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Неуспех при получаването на курсор"
-
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Неуспех при четенето на директория %s\n"
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"Неуспех при заключване на административната директория (%s). Може би липсват "
+"административни права?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Неуспех при четенето на %s\n"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"Процесът dpkg е беше прекъснат. Проблемът трябва да се коригира чрез ръчно "
+"изпълнение на „%s“."
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Без заключване"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "W: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Извикан е DropNode за все още използван възел"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: Грешките се отнасят за файла "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Грешка при намирането на хеш-елемента!"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Неуспех при превръщането на %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Неуспех при установяване на отклонението"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Неуспех при обхода на дървото"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Вътрешна грешка в AddDiversion"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "Неуспех при отварянето на %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Опит за изменение на отклонение, %s -> %s и %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "DeLink %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Двойно добавяне на отклонение %s -> %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Неуспех при прочитането на връзка %s"
+msgid "Duplicate conf file %s/%s"
+msgstr "Дублиран конфигурационен файл %s/%s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Неуспех при премахването на връзка %s"
+msgid "The path %s is too long"
+msgstr "Пътят %s е твърде дълъг"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Неуспех при създаването на връзка %s към %s"
+msgid "Unpacking %s more than once"
+msgstr "Разпакетиране на %s повече от веднъж"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "Превишен лимит на DeLink от %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Архивът няма поле „package“"
+msgid "The directory %s is diverted"
+msgstr "Директорията %s е отклонена"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s няма запис „override“\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Пакетът се опитва да пише в целта за отклонение %s/%s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  поддържащия пакета %s е %s, а не %s\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Пътят за отклонение е твърде дълъг"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s няма запис „source override“\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Директорията %s се заменя с не-директория"
 
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s няма също и запис „binary override“\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Неуспех при намирането на възел в неговия хеш"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Неуспех при заделянето на памет"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Пътят е твърде дълъг"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "Неуспех при отварянето на %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Неправилно форматиран override %s, ред %llu #1"
+msgid "Overwrite package match with no version for %s"
+msgstr "Файловете се заменят със съдържанието на пакета %s без версия"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Неуспех при четенето на override файл %s"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Файл %s/%s заменя този в пакет %s"
 
-#: ftparchive/override.cc:166
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Неправилно форматиран override %s, ред %llu #1"
+msgid "Unable to stat %s"
+msgstr "Неуспех при получаването на атрибути за %s"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Неправилно форматиран override %s, ред %llu #2"
+msgid "Failed to write file %s"
+msgstr "Неуспех при запис на файл %s"
 
-#: ftparchive/override.cc:191
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Неправилно форматиран override %s, ред %llu #3"
+msgid "Failed to close file %s"
+msgstr "Неуспех при затварянето на файл %s"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Непознат алгоритъм за компресия „%s“"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Това не е валиден DEB архив, липсва елемент „%s“"
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Компресираният изход %s изисква настройка за компресирането"
+msgid "Internal error, could not locate member %s"
+msgstr "Вътрешна грешка, неуспех при намирането на съставна част %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Неуспех при създаването на FILE*"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Контролен файл, невъзможен за анализ"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Неуспех при пускането на подпроцес"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Невалиден подпис на архива"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Процес-потомък за компресиране"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Грешка при четене на заглавната част на елемента на архива"
 
-#: ftparchive/multicompress.cc:232
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Вътрешна грешка, неуспех при създаването на %s"
+msgid "Invalid archive member header %s"
+msgstr "Невалидна заглавна част %s на елемента на архива"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "В/И към подпроцеса/файла пропадна"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Невалидна заглавна част на елемента на архива"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Неуспех при четене докато се изчислява MD5"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Архивът е твърде кратък"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Неуспех при четенето на заглавните части на архива"
+
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Неуспех при създаването на програмни канали"
+
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Неуспех при изпълнението на gzip"
+
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Развален архив"
+
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Невярна контролна сума на tar, развален архив"
+
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Неуспех при премахването на връзка на %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Непозната заглавна част на TAR тип %u, елемент %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Употреба: apt-internal-solver\n"
-"\n"
-"apt-internal-solver е интерфейс към вградения в APT механизъм за "
-"удовлетворяване на зависимости\n"
-"\n"
-"Опции:\n"
-"  -h  Този помощен текст\n"
-"  -q  Изход, подходящ за журнал — без индикатор на напредъка\n"
-"  -c=? Указване на файл с настройки\n"
-"  -o=? Указване на произволна настройка, напр. -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Общо пространство за зависимости по версии: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Непознат запис за пакет!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Нямате достатъчно свободно пространство в %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Употреба: apt-sortpkgs [опции] файл1 [файл2 ...]\n"
-"\n"
-"apt-sortpkgs е опростен инструмент за сортиране на пакетни файлове. Опцията\n"
-"„-s“ се използва, за да покаже типа на файла.\n"
-"\n"
-"Опции:\n"
-"  -h   Този помощен текст.\n"
-"  -s   Използване на сортиране по изходен код.\n"
-"  -c=? Четене на този конфигурационен файл.\n"
-"  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
-"tmp\n"
+#~ msgid "Done"
+#~ msgstr "Готово"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "В %s няма инсталиран ключодържател."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
@@ -3757,9 +3813,6 @@ msgstr ""
 #~ "Неуспех при запис в журнала, openpty() се провали (дали /dev/pts е "
 #~ "монтирана?)\n"
 
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Файлът %s не започва с информация за подписване в обикновен текст."
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Пропускане на несъществуващ файл %s"
 
diff --git a/po/bs.po b/po/bs.po
index e32f2353f..9cd1adc85 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: 2015-01-16 04:37-0500\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,151 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Ukupno naziva paketa:"
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Ukupno naziva paketa:"
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Normalni paketi:"
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Čisto virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Pojedinačni virutuelni paketi:"
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Miješani virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Nedostajući:"
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Ukupno zavisnosti:"
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Datoteke paketa:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Instalirano:"
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -203,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"
@@ -224,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 ""
 
@@ -260,78 +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:245
+#: cmdline/apt-get.cc:224
 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:367
+#: cmdline/apt-get.cc:358
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -339,151 +335,150 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-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:895
+#: 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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:968
+#: cmdline/apt-get.cc:943
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: 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:1385
+#: cmdline/apt-get.cc:1388
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr ""
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -537,11 +532,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -555,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -680,12 +675,12 @@ msgstr "Datoteka nije pronađena"
 msgid "File not found"
 msgstr "Datoteka nije pronađena"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr ""
 
@@ -694,157 +689,157 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Prijavljujem se"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr ""
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr ""
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr ""
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Server je zatvorio vezu"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Greška pri čitanju"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr ""
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 #, fuzzy
 msgid "Protocol corruption"
 msgstr "Oštećenje protokola"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Greška pri pisanju"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Neuspješno"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr ""
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr ""
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr ""
 
@@ -910,71 +905,71 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr "Ne mogu se povezati sa %s %s:"
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:174
+#: 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr ""
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr ""
 
@@ -1006,269 +1001,30 @@ msgstr ""
 msgid "Unknown date format"
 msgstr "Nepoznat oblik datuma"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "Unutrašnja greška"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr ""
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of 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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of 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
-#: apt-private/private-install.cc:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\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
-#: apt-private/private-install.cc:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr ""
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr ""
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Da, uradi kako kažem!"
-
-#: apt-private/private-install.cc:222
+#: methods/server.cc:589
 #, c-format
 msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Odustani."
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Da li želite nastaviti?"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr ""
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr ""
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Odustajem od instalacije."
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
-
-#: apt-private/private-install.cc:513
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
-msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
-
-#: apt-private/private-install.cc:517
-#, fuzzy, c-format
-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] "Slijedeći NOVI paketi će biti instalirani:"
-msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Oštećeni paketi"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Slijedeći dodatni paketi će biti instalirani:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Predloženi paketi:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Preporučeni paketi:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
 
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "Unutrašnja greška"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1276,31 +1032,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "Ispravljam zavisnosti..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr ""
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "Ne mogu ispraviti zavisnosti"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " Urađeno"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
 
@@ -1463,7 +1219,7 @@ msgstr ""
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
@@ -1472,7 +1228,7 @@ msgstr ""
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1480,10 +1236,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1504,32 +1264,286 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
-#, fuzzy
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "Slijedeći paketi će biti nadograđeni:"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#. 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
+#: apt-private/private-install.cc:154
 #, c-format
-msgid "Failed to fetch %s  %s\n"
+msgid "Need to get %sB/%sB of archives.\n"
 msgstr ""
 
-#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "Ne mogu otvoriti %s"
+#. 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:159
+#, c-format
+msgid "Need to get %sB of 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
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\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
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr ""
+
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr ""
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Da, uradi kako kažem!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Odustani."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Da li želite nastaviti?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr ""
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr ""
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr ""
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Odustajem od instalacije."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: 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 ""
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+
+#: apt-private/private-install.cc:488
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
+msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+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] "Slijedeći NOVI paketi će biti instalirani:"
+msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr ""
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Oštećeni paketi"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Slijedeći dodatni paketi će biti instalirani:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Predloženi paketi:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Preporučeni paketi:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr ""
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr ""
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+
+#: apt-private/private-install.cc:945
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr ""
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Slijedeći paketi će biti nadograđeni:"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr ""
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr ""
+
+#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr ""
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr ""
+
+#: apt-private/private-sources.cc:58
+#, fuzzy, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "Ne mogu otvoriti %s"
 
 #: apt-private/private-sources.cc:70
 #, c-format
@@ -1540,41 +1554,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Računam nadogradnju"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Urađeno"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr ""
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr ""
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr ""
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr ""
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr ""
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1584,18 +1590,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1667,205 +1673,383 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Sastavljam dostupne informacije"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr ""
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ne mogu kreirati %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
+#: 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:305
+msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
+"Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
 msgstr ""
 
-#: apt-inst/filelist.cc:477
+#: 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 "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgid "Error processing directory %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
 msgstr ""
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
 msgstr ""
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
+msgid "Error processing contents %s"
 msgstr ""
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
+msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB je bila oštećena, datoteka preimenovana u %s.old"
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB je stara, pokušavam nadogradnju %s"
+
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
 msgstr ""
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:101
+#, fuzzy, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
+msgid "Failed to stat %s"
 msgstr ""
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Ne mogu ukloniti %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Arhiva nema kontrolnog zapisa"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
 msgstr ""
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to stat %s"
+msgid "W: Unable to read directory %s\n"
 msgstr ""
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "Failed to rename %s to %s"
+msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr ""
+
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr ""
+
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr ""
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
+msgid "Failed to resolve %s"
 msgstr ""
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
 msgstr ""
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Putanja je preduga"
+#: ftparchive/writer.cc:232
+#, c-format
+msgid "Failed to open %s"
+msgstr "Ne mogu otvoriti %s"
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Overwrite package match with no version for %s"
+msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
+msgid "Failed to readlink %s"
 msgstr ""
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Unable to stat %s"
+msgid "Failed to unlink %s"
 msgstr ""
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
-#, fuzzy, c-format
-msgid "Failed to write file %s"
-msgstr "Ne mogu ukloniti %s"
+#: ftparchive/writer.cc:311
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr ""
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Failed to close file %s"
+msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr ""
+
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "  %s has no override entry\n"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
 #, c-format
-msgid "Internal error, could not locate member %s"
+msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
+#: ftparchive/writer.cc:712
+#, c-format
+msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
 #, c-format
-msgid "Invalid archive member header %s"
+msgid "Unable to open %s"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Arhiva je prekratka"
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr ""
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Ne mogu izvršiti gzip"
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Oštećena arhiva"
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr ""
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr ""
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr ""
+
+#: ftparchive/multicompress.cc:232
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
+msgid "Internal error, failed to create %s"
+msgstr ""
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr ""
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr ""
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr ""
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr ""
+
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Nepoznat zapis paketa\""
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -1880,229 +2064,211 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-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 ""
+
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr ""
 
 #: apt-pkg/cachefile.cc:116
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168
 msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: apt-pkg/pkgcache.cc:185
+#, c-format
+msgid "The package cache was built for different architectures: %s vs %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Zavisi"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Unaprijed zavisi"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Predlaže"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Preporučuje"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 #, fuzzy
 msgid "Conflicts"
 msgstr "Sukobljava se sa"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Zamjenjuje"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Zastarijeva"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "važno"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "zahtijevano"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "standardno"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "opcionalno"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
+#: 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:118
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Is the package %s installed?"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/sourcelist.cc:127
 #, c-format
-msgid "Method %s did not start correctly"
+msgid "Malformed stanza %u in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/sourcelist.cc:170
 #, 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] unparseable)"
 msgstr ""
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Gradim stablo zavisnosti"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Verzije kandidata"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Stvaranje zavisnosti"
-
-#: 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/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Ne mogu otvoriti %s"
-
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Ne mogu ukloniti %s"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1656
-#, 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:1698
-msgid "There is no public key available for the following key IDs:\n"
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid ""
-"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"
-msgstr ""
+msgid "Opening %s"
+msgstr "Otvaram %s"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "GPG error: %s: %s"
+msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371
 #, 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)"
+msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:416
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
 #, c-format
 msgid "Clean of %s is not supported"
 msgstr ""
@@ -2112,107 +2278,229 @@ msgstr ""
 msgid "Unable to stat %s."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:93
+#: 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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: 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:257
+#: apt-pkg/pkgcachegen.cc:273
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:276
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:263
+#: apt-pkg/pkgcachegen.cc:279
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:282
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+#: 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:1316
+#: apt-pkg/pkgcachegen.cc:1301
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: 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:215 apt-pkg/contrib/fileutl.cc:2108
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Ne mogu zapisati na %s"
+msgid "rename failed, %s (%s -> %s)."
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+#: apt-pkg/acquire-item.cc:240
+msgid "Hash Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:245
+msgid "Size mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:250
+msgid "Invalid file format"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Greška pri pisanju"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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: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:1999
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+
+#: 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:2059
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: 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/vendorlist.cc:85
+#: 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:2315
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2351
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+
+#: apt-pkg/vendorlist.cc:83
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/acquire.cc:87 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:91
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:99
+#: 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:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2238,19 +2526,19 @@ msgstr ""
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2258,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
@@ -2329,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 ""
 
@@ -2343,332 +2632,264 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Gradim stablo zavisnosti"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Verzije kandidata"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Stvaranje zavisnosti"
 
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-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:78
+#: 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:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
+#: 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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/cacheset.cc:635
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
+#: 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:727
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: 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: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/cacheset.cc:647
+#: apt-pkg/indexrecords.cc:83
+#, 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 "Can't select newest version from package '%s' as it is purely virtual"
+msgid "No sections in Release file %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/indexrecords.cc:132
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/indexrecords.cc:145
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:164
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr ""
 
@@ -2754,109 +2975,103 @@ msgstr ""
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:801
+#: apt-pkg/contrib/configuration.cc:804
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:837
+#: apt-pkg/contrib/configuration.cc:840
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:877
+#: 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:884
+#: apt-pkg/contrib/configuration.cc:887
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Odustajem od instalacije."
-
-#: 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 ""
@@ -2866,12 +3081,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Otvaram %s"
@@ -2892,103 +3107,103 @@ msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Preporučuje"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3017,331 +3232,166 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Ne mogu kreirati %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
 msgstr ""
 
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB je bila oštećena, datoteka preimenovana u %s.old"
-
-#: ftparchive/cachedb.cc:83
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB je stara, pokušavam nadogradnju %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-
-#: ftparchive/cachedb.cc:99
-#, fuzzy, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Ne mogu ukloniti %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arhiva nema kontrolnog zapisa"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: ftparchive/writer.cc:91
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "W: Unable to read directory %s\n"
+msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: ftparchive/writer.cc:96
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr ""
-
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr ""
-
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
+msgid "Duplicate conf file %s/%s"
 msgstr ""
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to resolve %s"
-msgstr ""
-
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
+msgid "The path %s is too long"
 msgstr ""
 
-#: ftparchive/writer.cc:219
-#, c-format
-msgid "Failed to open %s"
-msgstr "Ne mogu otvoriti %s"
-
-#: ftparchive/writer.cc:278
+#: apt-inst/extract.cc:132
 #, c-format
-msgid " DeLink %s [%s]\n"
+msgid "Unpacking %s more than once"
 msgstr ""
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "Failed to readlink %s"
+msgid "The directory %s is diverted"
 msgstr ""
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "Failed to unlink %s"
+msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
-#: ftparchive/writer.cc:298
-#, c-format
-msgid "*** Failed to link %s to %s"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
 msgstr ""
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:249
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
+msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr ""
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Putanja je preduga"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
+msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no source override entry\n"
+msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no binary override entry either\n"
+msgid "Unable to stat %s"
 msgstr ""
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr ""
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, fuzzy, c-format
+msgid "Failed to write file %s"
+msgstr "Ne mogu ukloniti %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Unable to open %s"
+msgid "Failed to close file %s"
 msgstr ""
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
+msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to read the override file %s"
+msgid "Internal error, could not locate member %s"
 msgstr ""
 
-#: ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %llu #1"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
 msgstr ""
 
-#: ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %llu #2"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
 msgstr ""
 
-#: ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %llu #3"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
 msgstr ""
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Unknown compression algorithm '%s'"
+msgid "Invalid archive member header %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
 msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr ""
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arhiva je prekratka"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
 msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
 msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Ne mogu izvršiti gzip"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Oštećena arhiva"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr ""
-
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Nepoznat zapis paketa\""
+#~ msgid "Done"
+#~ msgstr "Urađeno"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Odustajem od instalacije."
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s nije ispravan DEB paket."
diff --git a/po/ca.po b/po/ca.po
index ea0f2fe35..cdb3ceeb8 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: 2015-01-16 04:37-0500\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,150 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Nombre total de paquets: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Nombre total d'estructures de paquets: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Paquets normals: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Paquets virtuals purs: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Paquets virtuals únics: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Paquets virtuals mixtes: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Falten: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Nombre total de versions diferents: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Nombre total de descripcions diferents: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Nombre total de dependències: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Nombre total de relacions versió/fitxer: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Nombre total de relacions descripció/fitxer: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Nombre total dels mapes aportats: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Nombre total de cadenes globals: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Nombre total de l'espai per a dependències de versió: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Nombre total de l'espai desaprofitat: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Nombre total de l'espai atribuït a: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: 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:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Fitxers de paquets:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Paquets etiquetats:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(no trobat)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Instaŀlat: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Candidat: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(cap)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Etiqueta del paquet: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Taula de versió:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -240,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"
@@ -261,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."
 
@@ -297,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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: 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:454
+#: 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:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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,25 +342,25 @@ msgstr ""
 "Aquesta ordre és desaconsellada. Empreu «apt-mark auto» i «apt-mark manual» "
 "en el seu lloc."
 
-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: 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:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -374,7 +370,7 @@ msgstr ""
 "versions «%s» a:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -386,81 +382,70 @@ msgstr ""
 "per obtenir les últimes actualitzacions (possiblement no publicades) del "
 "paquet.\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "S'està ometent el fitxer ja baixat «%s»\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "No s'ha pogut determinar l'espai lliure en %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "No teniu prou espai lliure en %s"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obtén el font %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "No s'ha pogut baixar alguns arxius."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: 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:968
+#: 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:996
+#: 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:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Ha fallat el procés fill"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -469,18 +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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -523,30 +518,30 @@ msgstr ""
 "La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió "
 "candidata"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "No es poden processar les dependències de construcció"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Registre de canvis per a %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Mòduls suportats:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -665,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -790,12 +785,12 @@ msgstr "No s'ha trobat el disc"
 msgid "File not found"
 msgstr "Fitxer no trobat"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "L'estat ha fallat"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "No s'ha pogut establir el temps de modificació"
 
@@ -804,34 +799,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI no vàlid, els URI locals no han de començar per //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "S'està accedint a"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "No es pot determinar el nom de la màquina distant"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "No es pot determinar el nom local"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "El servidor ha rebutjat la nostra connexió i ha dit: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER ha fallat, el servidor ha dit: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS ha fallat, el servidor ha dit: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -839,124 +834,124 @@ msgstr ""
 "S'ha especificat un servidor intermediari però no un script d'accés, "
 "Acquire::ftp::ProxyLogin està buit."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "L'ordre «%s» de l'script d'accés ha fallat, el servidor ha dit: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE ha fallat, el servidor ha dit: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Temps de connexió finalitzat"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "El servidor ha tancat la connexió"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Una resposta ha desbordat la memòria intermèdia."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Protocol corromput"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Error d'escriptura"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "No s'ha pogut crear un sòcol"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "No s'ha pogut connectar amb el sòcol de dades, connexió finalitzada"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Ha fallat"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "No s'ha pogut connectar amb el sòcol passiu."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "gettaddrinfo no es pot obtenir un sòcol que escolte"
 
 # abastar? huh? jm
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "No s'ha pogut vincular a un connector"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "No s'ha pogut escoltar sobre el sòcol"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "No s'ha pogut determinar el nom del sòcol"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "No es pot enviar l'ordre PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "La família d'adreces %u és desconeguda (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT ha fallat, el servidor ha dit: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "S'ha esgotat el temps de connexió al sòcol de dades"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "No es pot acceptar la connexió"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "No és possible obtenir el fitxer, el servidor ha dit '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "S'ha esgotat el temps d'espera per al sòcol de dades"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Ha fallat la transferència de dades, el servidor ha dit '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Consulta"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "No es pot invocar"
 
@@ -1022,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:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "S'ha trobat almenys una signatura invàlida."
 
-#: methods/gpgv.cc:174
+#: 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: 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:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1063,36 +1058,36 @@ msgstr ""
 "Les signatures següents no s'han pogut verificar perquè la clau pública no "
 "està disponible:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "Els fitxers buits no poden ser arxius vàlids"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "S'ha produït un error en escriure al fitxer"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "S'ha produït un error en llegir des del servidor"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "S'ha produït un error en escriure al fitxer"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Ha fallat la selecció"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Connexió finalitzada"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "S'ha produït un error en escriure al fitxer de sortida"
 
@@ -1124,195 +1119,442 @@ msgstr "Aquest servidor HTTP té el suport d'abast trencat"
 msgid "Unknown date format"
 msgstr "Format de la data desconegut"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Capçalera de dades no vàlida"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Ha fallat la connexió"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Error intern"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
+#: apt-private/private-list.cc:121
+msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-"S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets "
-"trencats!"
+#: 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-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
+#: 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 ""
-"Els paquets necessiten ser suprimits però s'ha inhabilitat la supressió."
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instaŀlat]"
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instaŀlat]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
 msgstr ""
-"Què estrany… les mides no coincideixen, informeu 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "S'ha d'obtenir %sB/%sB d'arxius.\n"
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instaŀlat]"
 
-#. 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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "S'ha d'obtenir %sB d'arxius.\n"
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instaŀlat]"
 
-#. 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:167
+#: apt-private/private-output.cc:277
 #, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
+msgid "[upgradable from: %s]"
 msgstr ""
-"Després d'aquesta operació s'empraran %sB d'espai en disc addicional.\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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n"
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
 
-#: apt-private/private-install.cc:200
+#: apt-private/private-output.cc:455
 #, c-format
-msgid "You don't have enough free space in %s."
-msgstr "No teniu prou espai lliure en %s."
+msgid "but %s is installed"
+msgstr "però està instaŀlat %s"
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes"
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "però s'instaŀlarà %s"
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "S'ha especificat «Trivial Only» però aquesta operació no és trivial."
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "però no és instaŀlable"
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Sí, fes el que et dic!"
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "però és un paquet virtual"
 
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Esteu a punt de fer quelcom potencialment nociu.\n"
-"Per continuar escriviu la frase «%s»\n"
-" ?] "
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "però no està instaŀlat"
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Avortat."
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "però no serà instaŀlat"
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Voleu continuar?"
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " o"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Alguns fitxers no s'han pogut baixar"
+#: 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-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"No es poden baixar alguns arxius, proveu a executar apt-get update o "
-"intenteu-ho amb --fix-missing."
+#: 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-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing i els medi intercanviables actualment no estan suportats"
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Es SUPRIMIRAN els paquets següents:"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "No es poden corregir els paquets que falten."
+#: 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-install.cc:330
-msgid "Aborting install."
-msgstr "S'està avortant la instaŀlació."
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "S'actualitzaran els paquets següents:"
 
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"El següent paquet ha desaparegut del vostre sistema ja\n"
-"que tots els fitxers s'han sobreescrit per altres paquets:"
-msgstr[1] ""
-"Els següents paquets han desaparegut del vostre sistema ja\n"
-"que tots els fitxers s'han sobreescrit per altres paquets:"
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Es DESACTUALITZARAN els paquets següents:"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Nota: Això ho fa el dpkg automàticament i a propòsit."
+#: 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-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-"Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor "
-"automàtic"
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (per %s) "
 
-#: apt-private/private-install.cc:499
+#: apt-private/private-output.cc:696
 msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
-"Sembla que el supressor automàtic ha destruït alguna cosa que no deuria. Si "
-"us plau, envieu un informe d'error per a l'apt."
+"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!"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "La informació següent pot ajudar-vos a resoldre la situació:"
+#: 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-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses"
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstaŀlats, "
 
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
+#: 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 ""
+"S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets "
+"trencats!"
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr ""
+"Els paquets necessiten ser suprimits però s'ha inhabilitat la supressió."
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Què estrany… les mides no coincideixen, informeu a apt@packages.debian.org"
+
+#. 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "S'ha d'obtenir %sB/%sB d'arxius.\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:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "S'ha d'obtenir %sB d'arxius.\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:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr ""
+"Després d'aquesta operació s'empraran %sB d'espai en disc addicional.\n"
+
+#. 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 "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Hi ha problemes i s'ha emprat -y sense --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 "S'ha especificat «Trivial Only» però aquesta operació no és 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Sí, fes el que et dic!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Esteu a punt de fer quelcom potencialment nociu.\n"
+"Per continuar escriviu la frase «%s»\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Avortat."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Voleu continuar?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Alguns fitxers no s'han pogut baixar"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"No es poden baixar alguns arxius, proveu a executar apt-get update o "
+"intenteu-ho amb --fix-missing."
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing i els medi intercanviables actualment no estan suportats"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "No es poden corregir els paquets que falten."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "S'està avortant la instaŀlació."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"El següent paquet ha desaparegut del vostre sistema ja\n"
+"que tots els fitxers s'han sobreescrit per altres paquets:"
+msgstr[1] ""
+"Els següents paquets han desaparegut del vostre sistema ja\n"
+"que tots els fitxers s'han sobreescrit per altres paquets:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Nota: Això ho fa el dpkg automàticament i a propòsit."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+"Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor "
+"automàtic"
+
+#: 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 ""
+"Sembla que el supressor automàtic ha destruït alguna cosa que no deuria. Si "
+"us plau, envieu un informe d'error per a l'apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "La informació següent pot ajudar-vos a resoldre la situació:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
 "El paquet següent s'ha instaŀlat automàticament i ja no serà necessari:"
 msgstr[1] ""
 "Els paquets següents s'han instaŀlat automàticament i ja no són necessaris:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:492
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1322,17 +1564,17 @@ msgstr[0] ""
 msgstr[1] ""
 "Els paquets %lu es van s'instaŀlar automàticament i ja no són necessaris:\n"
 
-#: apt-private/private-install.cc:519
+#: apt-private/private-install.cc:494
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Empreu «apt-get autoremove» per a suprimir-lo."
 msgstr[1] "Empreu «apt-get autoremove» per a suprimir-los."
 
-#: apt-private/private-install.cc:612
+#: apt-private/private-install.cc:587
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Potser voldreu executar «apt-get -f install» per corregir-ho:"
 
-#: apt-private/private-install.cc:614
+#: apt-private/private-install.cc:589
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1340,7 +1582,7 @@ msgstr ""
 "Dependències insatisfetes. Proveu amb «apt-get -f install» sense paquets (o "
 "especifiqueu una solució)."
 
-#: apt-private/private-install.cc:638
+#: apt-private/private-install.cc:612
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1352,332 +1594,104 @@ msgstr ""
 "«unstable» i alguns paquets requerits encara no han estat creats o bé\n"
 "encara no els hi han introduït des d'«Incoming»."
 
-#: apt-private/private-install.cc:659
+#: apt-private/private-install.cc:633
 msgid "Broken packages"
 msgstr "Paquets trencats"
 
-#: apt-private/private-install.cc:712
+#: apt-private/private-install.cc:710
 msgid "The following extra packages will be installed:"
 msgstr "S'instaŀlaran els següents paquets extres:"
 
-#: apt-private/private-install.cc:802
+#: apt-private/private-install.cc:800
 msgid "Suggested packages:"
 msgstr "Paquets suggerits:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:801
 msgid "Recommended packages:"
 msgstr "Paquets recomanats:"
 
-#: apt-private/private-install.cc:825
+#: apt-private/private-install.cc:823
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "S'està ometent %s, ja està instaŀlat i l'actualització no està establerta.\n"
 
-#: apt-private/private-install.cc:829
+#: apt-private/private-install.cc:827
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "S'està ometent '%s', no està instaŀlat i només es demana l'actualització.\n"
 
-#: apt-private/private-install.cc:841
+#: apt-private/private-install.cc:839
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "No es possible la reinstaŀlació del paquet %s, no es pot baixar.\n"
 
-#: apt-private/private-install.cc:846
+#: apt-private/private-install.cc:844
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ja es troba en la versió més recent.\n"
 
-#: apt-private/private-install.cc:894
+#: apt-private/private-install.cc:892
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versió seleccionada «%s» (%s) per a «%s»\n"
 
-#: apt-private/private-install.cc:899
+#: apt-private/private-install.cc:897
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versió seleccionada «%s» (%s) per a «%s» degut a «%s»\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
+#: apt-private/private-install.cc:939
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "El paquet «%s» no està instaŀlat, així doncs no es suprimirà. Volíeu dir "
 "«%s»?\n"
 
-#: apt-private/private-install.cc:947
+#: apt-private/private-install.cc:945
 #, c-format
 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:129
-msgid "Listing"
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
 msgstr ""
 
-#: apt-private/private-list.cc:159
-#, 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-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVÍS: No es poden autenticar els següents paquets!"
 
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "S'estan corregint les dependències…"
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "S'ha descartat l'avís d'autenticació.\n"
 
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " ha fallat."
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "No s'ha pogut autenticar alguns paquets"
 
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "No es poden corregir les dependències"
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Voleu instaŀlar aquests paquets sense verificar-los?"
 
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "No es pot minimitzar el joc de versions revisades"
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "No s'ha pogut obtenir %s  %s\n"
 
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fet"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
+#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
 #, 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVÍS: No es poden autenticar els següents paquets!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "S'ha descartat l'avís d'autenticació.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "No s'ha pogut autenticar alguns paquets"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Voleu instaŀlar aquests paquets sense verificar-los?"
+msgid "Couldn't determine free space in %s"
+msgstr "No s'ha pogut determinar l'espai lliure en %s"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:188
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "No s'ha pogut obtenir %s  %s\n"
+msgid "You don't have enough free space in %s."
+msgstr "No teniu prou espai lliure en %s."
 
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
@@ -1693,41 +1707,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "S'està calculant l'actualització"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Fet"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Obj "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Bai:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "S'ha baixat %sB en %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Treballant]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1740,18 +1746,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1828,205 +1834,454 @@ msgstr ""
 msgid "Merging available information"
 msgstr "S'està fusionant la informació disponible"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode crida a un node que encara està enllaçat"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n"
+"\n"
+"apt-extracttemplates és una eina per a extreure informació de\n"
+"configuració i plantilles dels paquets debian\n"
+"\n"
+"Opcions:\n"
+"  -h   Aquest text d'ajuda.\n"
+"  -t   Estableix el directori temporal\n"
+"  -c=? Llegeix aquest fitxer de configuració\n"
+"  -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "No s'ha trobat l'element diseminat!"
+#: 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"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "No s'ha pogut assignar la desviació"
+#: 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"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "S'ha produït un error intern en AddDiversion"
+#: 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?"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "S'està intentant sobreescriure una desviació, %s -> %s i %s/%s"
+#: 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"
 
-#: apt-inst/filelist.cc:506
+#: 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 "Double add of diversion %s -> %s"
-msgstr "Afegit doble d'una desviació %s -> %s"
+msgid "Error processing directory %s"
+msgstr "S'ha produït un error en processar el directori %s"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Fitxer de conf. duplicat %s/%s"
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "La llista d'extensions de les fonts és massa llarga"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: 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:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "La ruta %s és massa llarga"
+msgid "Error processing contents %s"
+msgstr "S'ha produït un error en processar el fitxer de continguts %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Forma d'ús: apt-ftparchive [opcions] ordre\n"
+"Ordres:   packages camí_binaris [fitxer_substitucions prefix_camí]]\n"
+"          sources camí_fonts [fitxer_substitucions [prefix_camí]]\n"
+"          contents camí\n"
+"          release camí\n"
+"          generate config [grups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive genera fitxers d'índex per als arxius de Debian.\n"
+"Gestiona molts estils per a generar-los, des dels completament automàtics\n"
+"als substituts funcionals per dpkg-scanpackages i dpkg-scansources.\n"
+"\n"
+"apt-ftparchive genera fitxers Package des d'un arbre de .deb. El\n"
+"fitxer Package conté tots els camps de control de cada paquet així com\n"
+"la suma MD5 i la mida del fitxer. Es suporten els fitxers de substitució\n"
+"per a forçar el valor de Prioritat i Secció.\n"
+"\n"
+"D'un mode semblant, apt-ftparchive genera fitxers Sources des d'un arbre\n"
+"de .dsc. Es pot utilitzar l'opció --source-override per a especificar un\n"
+"fitxer de substitucions de src.\n"
+"\n"
+"L'ordre «packages» i «sources» hauria d'executar-se en l'arrel de\n"
+"l'arbre. CamíBinaris hauria de ser el punt base de la recerca recursiva\n"
+"i el fitxer de substitucions hauria de contenir senyaladors de substitució.\n"
+"Prefixcamí s'afegeix als camps del nom de fitxer si està present.\n"
+"Exemple d'ús a l'arxiu de Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opcions:\n"
+"  -h    Aquest text d'ajuda\n"
+"  --md5 Generació del control MD5\n"
+"  -s=?  Fitxer de substitucions per a fonts\n"
+"  -q    Silenciós\n"
+"  -d=?  Selecciona la base de dades de memòria cau opcional\n"
+"  --no-delink Habilita el mode de depuració delink\n"
+"  --contents  Genera el fitxer amb els continguts de control\n"
+"  -c=?  Llegeix aquest fitxer de configuració\n"
+"  -o=?  Estableix una opció de configuració arbitrària"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "No s'ha trobat cap selecció"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "S'està desempaquetant %s més d'una vegada"
+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'"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "El directori %s està desviat"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "La base de dades està corrompuda, fitxer renomenat a %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "El paquet està intentant escriure en l'objectiu desviat %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "La BD és vella, s'està intentant actualitzar %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "La ruta de desviació és massa llarga"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"El format de la base de dades és invàlid. Si heu actualitzat des d'una "
+"versió més antiga de l'apt, suprimiu i torneu a crear la base de dades."
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "No es pot obrir el fitxer de DB %s: %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "No es pot determinar l'estat de %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "No s'ha pogut llegir l'enllaç %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Arxiu sense registre de control"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "No es pot aconseguir un cursor"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "No s'ha pogut canviar el nom de %s a %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "A: No es pot llegir el directori %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "El directori %s està sent reemplaçat per un no-directori"
+msgid "W: Unable to stat %s\n"
+msgstr "A: No es pot veure l'estat %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "No s'ha trobat el node dins de la taula"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "La ruta és massa llarga"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "A: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: Els errors s'apliquen al fitxer "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "S'està sobreescrivint el corresponent paquet sense versió per a %s"
+msgid "Failed to resolve %s"
+msgstr "No s'ha pogut resoldre %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "L'arbre està fallant"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s"
+msgid "Failed to open %s"
+msgstr "No s'ha pogut obrir %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "No es pot veure l'estat de %s"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "No s'ha pogut escriure el fitxer %s"
+msgid "Failed to readlink %s"
+msgstr "No s'ha pogut llegir l'enllaç %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Ha fallat el tancament del fitxer %s"
+msgid "Failed to unlink %s"
+msgstr "No s'ha pogut alliberar %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Aquest no és un arxiu DEB vàlid, falta el membre «%s»"
+msgid "*** Failed to link %s to %s"
+msgstr "*** No s'ha pogut enllaçar %s a %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Error intern, no s'ha pogut localitzar al membre %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink s'ha arribat al límit de %sB.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "El fitxer de control no es pot analitzar"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Arxiu sense el camp paquet"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Signatura de l'arxiu no vàlida"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "S'ha produït un error en llegir la capçalera del membre de l'arxiu"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:712
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "La capçalera %s del membre de l'arxiu no és vàlida"
+msgid "  %s has no source override entry\n"
+msgstr "  %s no té una entrada dominant de font\n"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "La capçalera del membre de l'arxiu no és vàlida"
+#: 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"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - No s'ha pogut assignar espai en memòria"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "No es pot obrir %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Línia predominant %s malformada %llu núm 1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "No s'ha pogut llegir la línia predominant del fitxer %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Línia predominant %s malformada %llu núm 1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Línia predominant %s malformada %llu núm 2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Línia predominant %s malformada %llu núm 3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algorisme de compressió desconegut '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "La sortida comprimida %s necessita un joc de compressió"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "No s'ha pogut crear FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "No s'ha pogut bifurcar"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Comprimeix el fil"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "S'ha produït un error intern, no s'ha pogut crear %s"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "L'arxiu és massa petit"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Ha fallat l'E/S del subprocés sobre el fitxer"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Ha fallat la lectura de les capçaleres de l'arxiu"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "No s'ha pogut llegir mentre es calculava la suma MD5"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "No es poden crear els conductes"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "S'ha trobat un problema treient l'enllaç %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "No es pot executar el gzip "
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "No s'ha pogut canviar el nom de %s a %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Arxiu corromput"
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n"
+"\n"
+"apt-extracttemplates és una eina per a extreure informació de\n"
+"configuració i plantilles dels paquets debian\n"
+"\n"
+"Opcions:\n"
+"  -h   Aquest text d'ajuda.\n"
+"  -t   Estableix el directori temporal\n"
+"  -c=? Llegeix aquest fitxer de configuració\n"
+"  -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "La suma de comprovació de tar ha fallat, arxiu corromput"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Registre del paquet desconegut!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Capçalera TAR desconeguda del tipus %u, membre %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Forma d'ús: apt-sortpkgs [opcions] fitxer1 [fitxer2 …]\n"
+"\n"
+"apt-sortpkgs és una eina simple per ordenar fitxers de paquets.\n"
+"L'opció -s s'usa per a indicar quin tipus de fitxer és.\n"
+"\n"
+"Opcions:\n"
+"  -h   Aquest text d'ajuda.\n"
+"  -s   Empra l'ordenació de fitxers font\n"
+"  -c=? Llegeix aquest fitxer de configuració\n"
+"  -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "S'està executant dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "El sistema d'empaquetament «%s» no està suportat"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat."
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "S'han escrit %i registres.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "S'han escrit %i registres, on falten %i fitxers.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2043,6 +2298,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 ""
@@ -2057,157 +2332,341 @@ 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:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Memòria cau de paquets és buida"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Depèn"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Predepèn"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Suggereix"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Recomana"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Entra en conflicte"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Reemplaça"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Fa obsolet"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Trenca"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Millora"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "requerit"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "estàndard"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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/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:118
+#: 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:169
+#: 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:455
+#: 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/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/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/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "No es pot veure l'estat de %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:1196
+#, 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: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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "El tipus de fitxer índex «%s» no està suportat"
+#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "S'està construint l'arbre de dependències"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Envia l'escenari al resoledor"
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versions candidates"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Envia la petició al resoledor"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Dependències que genera"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Prepara per a rebre una solució"
 
-#: 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/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/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "No s'ha pogut obrir el fitxer d'estat %s"
+#: 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/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "La suma resum no concorda"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "La mida no concorda"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Operació no vàlida %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Error d'escriptura"
+
+#: 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:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"S'ha produït un error durant la verificació de la signatura. El dipòsit no "
+"està actualitzat i s'emprarà el fitxer d'índex anterior. Error del GPG: %s: "
+"%s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: 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"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "El directori %s està desviat"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2216,16 +2675,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:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2234,28 +2693,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:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"S'ha produït un error durant la verificació de la signatura. El dipòsit no "
-"està actualitzat i s'emprarà el fitxer d'índex anterior. Error del GPG: %s: "
-"%s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "S'ha produït un error amb el GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2265,12 +2715,12 @@ msgstr ""
 "significar que haureu d'arreglar aquest paquet manualment (segons "
 "arquitectura)."
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2278,126 +2728,38 @@ msgstr ""
 "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
 "per al paquet %s."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "El tipus de fitxer índex «%s» no està suportat"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "No es pot veure l'estat de %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, 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:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "S'està llegint la llista de paquets"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "S'estan recollint els fitxers que proveeixen"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "No es pot escriure en %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Heu de posar algunes URI 'font' en el vostre sources.list"
@@ -2425,7 +2787,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2434,12 +2796,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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2451,10 +2813,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"
@@ -2525,11 +2890,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"
 
@@ -2540,7 +2905,7 @@ msgid ""
 msgstr ""
 "El paquet %s necessita ser reinstaŀlat, però no se li pot trobar un arxiu."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2548,270 +2913,198 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat "
 "causat per paquets retinguts."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr "Envia la petició al resoledor"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Prepara per a rebre una solució"
-
-#: apt-pkg/edsp.cc:327
-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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Executa un resoledor extern"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "No es pot analitzar el fitxer del paquet %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "No es pot analitzar el fitxer Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "No hi ha seccions al fitxer Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, 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/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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "S'està construint l'arbre de dependències"
 
-#: 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:139
+msgid "Candidate versions"
+msgstr "Versions candidates"
 
-#: 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:168
+msgid "Dependency generation"
+msgstr "Dependències que genera"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "S'està obrint %s"
+#: 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:371
+#: apt-pkg/depcache.cc:252
 #, 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 open StateFile %s"
+msgstr "No s'ha pogut obrir el fitxer d'estat %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 "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
+msgid "Failed to write temporary StateFile %s"
+msgstr "No s'ha pogut escriure el fitxer d'estat temporal %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/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "No es pot analitzar el fitxer del paquet %s (%d)"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "No s'ha trobat la versió puntual «%s» per a «%s»"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "No s'ha trobat la versió «%s» per a «%s»"
 
-#: apt-pkg/cacheset.cc:603
+#: 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:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-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/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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 ""
+"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/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:132
+#, 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:145
+#, 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:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "El camp «Date» al fitxer Release %s és invàlid"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "No s'ha trobat la selecció %s"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "No es pot resoldre el fitxer de blocat %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "No s'empren blocats per al fitxer de blocat %s de muntar nfs"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "No s'ha pogut blocar %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 "No es pot crear la llista de fitxers perquè «%s» no és un directori"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "S'està descartant «%s» al directori «%s» perquè no és un fitxer normal"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "S'està descartant «%s» al directori «%s» perquè no té extensió del nom de "
 "fitxer"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2819,75 +3112,75 @@ msgstr ""
 "S'està descartant «%s» al directori «%s» perquè té una extensió del nom de "
 "fitxer invàlida"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "El sub-procés %s ha rebut una violació de segment."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "El sub-procés %s ha rebut un senyal %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "El sub-procés %s ha retornat un codi d'error (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "El sub-procés %s ha sortit inesperadament"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Ha hagut un problema en tancar el fitxer gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "No s'ha pogut obrir el fitxer %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "No s'ha pogut obrir el descriptor del fitxer %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "No s'ha pogut crear el subprocés IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "No s'ha pogut executar el compressor "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "llegits, falten %llu per llegir, però no queda res"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "escrits, falten %llu per escriure però no s'ha pogut"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Ha hagut un problema en tancar el fitxer %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Ha hagut un problema en reanomenar el fitxer %s a %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Ha hagut un problema en desenllaçar el fitxer %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Ha hagut un problema en sincronitzar el fitxer"
 
@@ -2976,111 +3269,105 @@ 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:519
+#: 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:633
+#: 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:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "No s'ha instaŀlat cap clauer a %s."
-
-#: 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"
@@ -3090,12 +3377,12 @@ msgstr "Operació no vàlida %s"
 msgid "Installing %s"
 msgstr "S'està instaŀlant %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "S'està suprimint el paquet %s"
@@ -3116,79 +3403,79 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Manca el directori «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "S'està preparant el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "S'està desempaquetant %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: 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:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "S'ha instaŀlat el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "S'ha suprimit el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: 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:1732
+#: 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:1737
+#: 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:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3196,7 +3483,7 @@ 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:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3204,7 +3491,7 @@ msgstr ""
 "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
 "disc ple"
 
-#: apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3212,7 +3499,7 @@ 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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 "
@@ -3221,7 +3508,7 @@ msgstr ""
 "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
 "disc ple"
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3237,421 +3524,190 @@ 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"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n"
-"\n"
-"apt-extracttemplates és una eina per a extreure informació de\n"
-"configuració i plantilles dels paquets debian\n"
-"\n"
-"Opcions:\n"
-"  -h   Aquest text d'ajuda.\n"
-"  -t   Estableix el directori temporal\n"
-"  -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:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "No es pot veure l'estat de %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "S'ha produït un error en processar el directori %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "La llista d'extensions de les fonts és massa llarga"
-
-#: ftparchive/apt-ftparchive.cc:401
-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
-#, 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
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Forma d'ús: apt-ftparchive [opcions] ordre\n"
-"Ordres:   packages camí_binaris [fitxer_substitucions prefix_camí]]\n"
-"          sources camí_fonts [fitxer_substitucions [prefix_camí]]\n"
-"          contents camí\n"
-"          release camí\n"
-"          generate config [grups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive genera fitxers d'índex per als arxius de Debian.\n"
-"Gestiona molts estils per a generar-los, des dels completament automàtics\n"
-"als substituts funcionals per dpkg-scanpackages i dpkg-scansources.\n"
-"\n"
-"apt-ftparchive genera fitxers Package des d'un arbre de .deb. El\n"
-"fitxer Package conté tots els camps de control de cada paquet així com\n"
-"la suma MD5 i la mida del fitxer. Es suporten els fitxers de substitució\n"
-"per a forçar el valor de Prioritat i Secció.\n"
-"\n"
-"D'un mode semblant, apt-ftparchive genera fitxers Sources des d'un arbre\n"
-"de .dsc. Es pot utilitzar l'opció --source-override per a especificar un\n"
-"fitxer de substitucions de src.\n"
-"\n"
-"L'ordre «packages» i «sources» hauria d'executar-se en l'arrel de\n"
-"l'arbre. CamíBinaris hauria de ser el punt base de la recerca recursiva\n"
-"i el fitxer de substitucions hauria de contenir senyaladors de substitució.\n"
-"Prefixcamí s'afegeix als camps del nom de fitxer si està present.\n"
-"Exemple d'ús a l'arxiu de Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opcions:\n"
-"  -h    Aquest text d'ajuda\n"
-"  --md5 Generació del control MD5\n"
-"  -s=?  Fitxer de substitucions per a fonts\n"
-"  -q    Silenciós\n"
-"  -d=?  Selecciona la base de dades de memòria cau opcional\n"
-"  --no-delink Habilita el mode de depuració delink\n"
-"  --contents  Genera el fitxer amb els continguts de control\n"
-"  -c=?  Llegeix aquest fitxer de configuració\n"
-"  -o=?  Estableix una opció de configuració arbitrària"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "No s'ha trobat cap selecció"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "No es troben alguns fitxers dins del grup de fitxers del paquet `%s'"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "La base de dades està corrompuda, fitxer renomenat a %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "La BD és vella, s'està intentant actualitzar %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"El format de la base de dades és invàlid. Si heu actualitzat des d'una "
-"versió més antiga de l'apt, suprimiu i torneu a crear la base de dades."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "No es pot obrir el fitxer de DB %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "No s'ha pogut llegir l'enllaç %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arxiu sense registre de control"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "No es pot aconseguir un cursor"
-
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: No es pot llegir el directori %s\n"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "No es pot blocar el directori d'administració (%s), sou root?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A: No es pot veure l'estat %s\n"
+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."
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "No blocat"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "A: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode crida a un node que encara està enllaçat"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: Els errors s'apliquen al fitxer "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "No s'ha trobat l'element diseminat!"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "No s'ha pogut resoldre %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "No s'ha pogut assignar la desviació"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "L'arbre està fallant"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "S'ha produït un error intern en AddDiversion"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "No s'ha pogut obrir %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "S'està intentant sobreescriure una desviació, %s -> %s i %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Afegit doble d'una desviació %s -> %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "No s'ha pogut llegir l'enllaç %s"
+msgid "Duplicate conf file %s/%s"
+msgstr "Fitxer de conf. duplicat %s/%s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "No s'ha pogut alliberar %s"
+msgid "The path %s is too long"
+msgstr "La ruta %s és massa llarga"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** No s'ha pogut enllaçar %s a %s"
+msgid "Unpacking %s more than once"
+msgstr "S'està desempaquetant %s més d'una vegada"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink s'ha arribat al límit de %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arxiu sense el camp paquet"
+msgid "The directory %s is diverted"
+msgstr "El directori %s està desviat"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s no té una entrada dominant\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "El paquet està intentant escriure en l'objectiu desviat %s/%s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  el mantenidor de %s és %s, no %s\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "La ruta de desviació és massa llarga"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s no té una entrada dominant de font\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "El directori %s està sent reemplaçat per un no-directori"
 
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s no té una entrada dominant de binari\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "No s'ha trobat el node dins de la taula"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - No s'ha pogut assignar espai en memòria"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "La ruta és massa llarga"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "No es pot obrir %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Línia predominant %s malformada %llu núm 1"
+msgid "Overwrite package match with no version for %s"
+msgstr "S'està sobreescrivint el corresponent paquet sense versió per a %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "No s'ha pogut llegir la línia predominant del fitxer %s"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s"
 
-#: ftparchive/override.cc:166
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Línia predominant %s malformada %llu núm 1"
+msgid "Unable to stat %s"
+msgstr "No es pot veure l'estat de %s"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Línia predominant %s malformada %llu núm 2"
+msgid "Failed to write file %s"
+msgstr "No s'ha pogut escriure el fitxer %s"
 
-#: ftparchive/override.cc:191
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Línia predominant %s malformada %llu núm 3"
+msgid "Failed to close file %s"
+msgstr "Ha fallat el tancament del fitxer %s"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algorisme de compressió desconegut '%s'"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Aquest no és un arxiu DEB vàlid, falta el membre «%s»"
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "La sortida comprimida %s necessita un joc de compressió"
+msgid "Internal error, could not locate member %s"
+msgstr "Error intern, no s'ha pogut localitzar al membre %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "No s'ha pogut crear FILE*"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "El fitxer de control no es pot analitzar"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "No s'ha pogut bifurcar"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Signatura de l'arxiu no vàlida"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Comprimeix el fil"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "S'ha produït un error en llegir la capçalera del membre de l'arxiu"
 
-#: ftparchive/multicompress.cc:232
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Internal error, failed to create %s"
-msgstr "S'ha produït un error intern, no s'ha pogut crear %s"
+msgid "Invalid archive member header %s"
+msgstr "La capçalera %s del membre de l'arxiu no és vàlida"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Ha fallat l'E/S del subprocés sobre el fitxer"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "La capçalera del membre de l'arxiu no és vàlida"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "No s'ha pogut llegir mentre es calculava la suma MD5"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "L'arxiu és massa petit"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Ha fallat la lectura de les capçaleres de l'arxiu"
+
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "No es poden crear els conductes"
+
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "No es pot executar el gzip "
+
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Arxiu corromput"
+
+#: 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:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "S'ha trobat un problema treient l'enllaç %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Capçalera TAR desconeguda del tipus %u, membre %s"
 
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n"
-"\n"
-"apt-extracttemplates és una eina per a extreure informació de\n"
-"configuració i plantilles dels paquets debian\n"
-"\n"
-"Opcions:\n"
-"  -h   Aquest text d'ajuda.\n"
-"  -t   Estableix el directori temporal\n"
-"  -c=? Llegeix aquest fitxer de configuració\n"
-"  -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Nombre total de l'espai per a dependències de versió: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Registre del paquet desconegut!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "No teniu prou espai lliure en %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Forma d'ús: apt-sortpkgs [opcions] fitxer1 [fitxer2 …]\n"
-"\n"
-"apt-sortpkgs és una eina simple per ordenar fitxers de paquets.\n"
-"L'opció -s s'usa per a indicar quin tipus de fitxer és.\n"
-"\n"
-"Opcions:\n"
-"  -h   Aquest text d'ajuda.\n"
-"  -s   Empra l'ordenació de fitxers font\n"
-"  -c=? Llegeix aquest fitxer de configuració\n"
-"  -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Fet"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "No s'ha instaŀlat cap clauer a %s."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
@@ -3742,9 +3798,6 @@ msgstr ""
 #~ "No es pot escriure el registre, ha fallat openpty() (no s'ha muntat /dev/"
 #~ "pts?)\n"
 
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "El fitxer %s no comença amb un missatge signat en clar"
-
 #~ msgid "decompressor"
 #~ msgstr "decompressor"
 
diff --git a/po/cs.po b/po/cs.po
index 05d07af63..76fc37b6b 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: 2015-01-16 04:37-0500\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,148 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Celkem názvů balíků: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Celkem struktur balíků: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Normálních balíků: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Čistě virtuálních balíků: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Jednoduchých virtuálních balíků: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Smíšených virtuálních balíků: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Chybějících: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Celkem různých verzí: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Celkem různých popisů: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Celkem závislostí: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Celkem vztahů ver/soubor: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Celkem vztahů popis/soubor: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Celkem poskytnutých mapování: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Celkem globovaných řetězců: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Celkem místa závislých verzí: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Celkem jalového místa: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Celkem přiřazeného místa: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: 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:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Soubory balíku:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Vypíchnuté balíky:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(nenalezeno)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Instalovaná verze: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Kandidát: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(žádná)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Vypíchnutý balík: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Tabulka verzí:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -232,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"
@@ -256,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."
 
@@ -292,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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: 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:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nelze najít balík %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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,24 +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:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Nelze zamknout adresář pro stahování"
 
-#: cmdline/apt-get.cc:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -367,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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -378,80 +374,69 @@ msgstr ""
 "použijte:\n"
 "bzr branch %s\n"
 
-#: cmdline/apt-get.cc:839
+#: 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"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Nelze určit volné místo v %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Na %s nemáte dostatek volného místa"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stažení zdroje %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Stažení některých archivů selhalo."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: 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:968
+#: 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:996
+#: 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:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Synovský proces selhal"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -460,17 +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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -510,30 +505,30 @@ 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:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Chyba při zpracování závislostí pro sestavení"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Seznam změn %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr "Stažení selhalo"
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -656,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -821,12 +816,12 @@ msgstr "Disk nebyl nalezen."
 msgid "File not found"
 msgstr "Soubor nebyl nalezen"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Selhalo vyhodnocení"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Nelze nastavit čas modifikace"
 
@@ -835,34 +830,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Neplatné URI, lokální URI nesmí začínat na //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Přihlašování"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Nelze určit jméno druhé strany"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Nelze určit lokální jméno"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Server zamítl naše spojení a řekl: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER selhal, server řekl: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS selhal, server řekl: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -870,123 +865,123 @@ msgstr ""
 "Byl zadán proxy server, ale ne přihlašovací skript. Acquire::ftp::ProxyLogin "
 "je prázdný."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Příkaz „%s“ přihlašovacího skriptu selhal, server řekl: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE selhal, server řekl: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Čas spojení vypršel"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Server uzavřel spojení"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Chyba čtení"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Odpověď přeplnila buffer."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Porušení protokolu"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Chyba zápisu"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Nelze vytvořit socket"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nelze připojit datový socket, čas spojení vypršel"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Selhalo"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Nelze připojit pasivní socket."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo nezískal naslouchající socket"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Nelze navázat socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Nelze naslouchat na socketu"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Nelze určit jméno socketu"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Nelze odeslat příkaz PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Neznámá rodina adres %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT selhal, server řekl: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Spojení datového socketu vypršelo"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Nelze přijmout spojení"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nelze stáhnout soubor, server řekl „%s“"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Datový socket vypršel"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Přenos dat selhal, server řekl „%s“"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Dotaz"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Nelze vyvolat "
 
@@ -1052,21 +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:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
 
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:164
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1075,15 +1070,15 @@ msgstr ""
 "Podepsaný soubor není platný, obdrženo „%s“ (vyžaduje přístup na síť "
 "ověření?)"
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Neznámá chyba při spouštění apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1091,35 +1086,35 @@ msgstr ""
 "Následující podpisy nemohly být ověřeny, protože není dostupný veřejný "
 "klíč:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "Prázdné soubory nejsou platnými archivy"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Chyba čtení ze serveru"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Výběr selhal"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Čas spojení vypršel"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupního souboru"
 
@@ -1151,429 +1146,163 @@ msgstr "Tento HTTP server má porouchanou podporu rozsahů"
 msgid "Unknown date format"
 msgstr "Neznámý formát data"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Špatné datové záhlaví"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr "Řadí se"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Vypisuje se"
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!"
+#: 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-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Opravují se závislosti…"
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " selhalo."
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Jak podivné… velikosti nesouhlasí, ohlaste to na apt@packages.debian.org"
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Nelze opravit závislosti"
 
-#. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Nutno stáhnout %sB/%sB archivů.\n"
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Nelze minimalizovat sadu pro aktualizaci"
 
-#. 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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Nutno stáhnout %sB archivů.\n"
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Hotovo"
 
-#. 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:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Po této operaci bude na disku použito dalších %sB.\n"
+#: 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“."
 
-#. 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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Po této operaci bude na disku uvolněno %sB.\n"
+#: 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-install.cc:200
+#: apt-private/private-output.cc:265
 #, c-format
-msgid "You don't have enough free space in %s."
-msgstr "V %s nemáte dostatek volného místa."
+msgid "[installed,upgradable to: %s]"
+msgstr "[instalovaný,aktualizovatelný na: %s]"
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes"
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr "[instalovaný,lokální]"
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Udáno „pouze triviální“, ovšem toto není triviální operace."
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[instalovaný,automaticky-odstranitelný]"
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Ano, udělej to tak, jak říkám!"
+#: 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-install.cc:222
+#: apt-private/private-output.cc:277
 #, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Chystáte se vykonat něco potenciálně škodlivého.\n"
-"Pro pokračování opište frázi „%s“\n"
-" ?] "
+msgid "[upgradable from: %s]"
+msgstr "[aktualizovatelný z: %s]"
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Přerušeno."
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[zbytkové-konfigurační-coubory]"
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Chcete pokračovat?"
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "ale %s je nainstalován"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Některé soubory nemohly být staženy"
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ale %s se bude instalovat"
 
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Nelze stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --"
-"fix-missing?"
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ale nedá se nainstalovat"
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing a výměna média nejsou momentálně podporovány"
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ale je to virtuální balík"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Nelze opravit chybějící balíky."
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ale není nainstalovaný"
 
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Instalace se přerušuje."
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "ale nebude se instalovat"
 
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"Následující balík z tohoto systému zmizel, protože\n"
-"všechny jeho soubory byly přepsány jinými balíky:"
-msgstr[1] ""
-"Následující balíky z tohoto systému zmizely, protože\n"
-"všechny jejich soubory byly přepsány jinými balíky:"
-msgstr[2] ""
-"Následující balíky z tohoto systému zmizely, protože\n"
-"všechny jejich soubory byly přepsány jinými balíky:"
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " nebo"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Poznámka: Toto má svůj důvod a děje se automaticky v dpkg."
+#: 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-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Neměli bychom mazat věci, nelze spustit AutoRemover"
+#: 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-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Hmm, zdá se, že AutoRemover zničil něco, co neměl.\n"
-"Nahlaste prosím chybu v apt."
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Následující balíky budou ODSTRANĚNY:"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
+#: 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-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Vnitřní chyba, AutoRemover pokazil věci"
+#: 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-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "Následující balík byl nainstalován automaticky a již není potřeba:"
-msgstr[1] ""
-"Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
-msgstr[2] ""
-"Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
+#: 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-install.cc:517
+#: apt-private/private-output.cc:688
 #, c-format
-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 balík byl nainstalován automaticky a již není potřeba.\n"
-msgstr[1] "%lu balíky byly nainstalovány automaticky a již nejsou potřeba.\n"
-msgstr[2] "%lu balíků bylo nainstalováno automaticky a již nejsou potřeba.\n"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Pro jeho odstranění použijte „apt-get autoremove“."
-msgstr[1] "Pro jejich odstranění použijte „apt-get autoremove“."
-msgstr[2] "Pro jejich odstranění použijte „apt-get autoremove“."
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Pro opravení následujících můžete spustit „apt-get -f install“:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo "
-"navrhněte řešení)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Některé balíky nemohly být instalovány. To může znamenat, že požadujete\n"
-"nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n"
-"vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Poškozené balíky"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Následující extra balíky budou instalovány:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Navrhované balíky:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Doporučované balíky:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "%s bude přeskočen, protože je již nainstalován.\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"%s bude přeskočen, protože není nainstalován a vyžadovány jsou pouze "
-"aktualizace.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Přeinstalace %s není možná, protože nelze stáhnout.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s je již nejnovější verze.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Vybraná verze „%s“ (%s) pro „%s“\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Vybraná verze „%s“ (%s) pro „%s“ kvůli „%s“\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
-"Balík „%s“ není nainstalován, nelze tedy odstranit. Mysleli jste „%s“?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-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:129
-msgid "Listing"
-msgstr "Vypisuje se"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Opravují se závislosti…"
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " selhalo."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nelze opravit závislosti"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nelze minimalizovat sadu pro aktualizaci"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Hotovo"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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) "
+msgid "%s (due to %s) "
+msgstr "%s (kvůli %s) "
 
 #: apt-private/private-output.cc:696
 msgid ""
@@ -1634,7 +1363,7 @@ msgstr "Y"
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: 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"
@@ -1643,7 +1372,7 @@ msgstr "Chyba při kompilaci regulárního výrazu - %s"
 msgid "The update command takes no arguments"
 msgstr "Příkaz update neakceptuje žádné argumenty"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1655,10 +1384,14 @@ msgstr[1] ""
 msgstr[2] ""
 "%i balíků může být aktualizováno. Zobrazíte je „apt list --upgradable“.\n"
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1684,76 +1417,349 @@ msgstr ""
 "      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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!"
+#: 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!"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Autentizační varování potlačeno.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Některé balíky nemohly být autentizovány"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Instalovat tyto balíky bez ověření?"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Jak podivné… velikosti nesouhlasí, ohlaste to na apt@packages.debian.org"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#. 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
+#: apt-private/private-install.cc:154
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Selhalo stažení %s  %s\n"
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Nutno stáhnout %sB/%sB archivů.\n"
 
-#: apt-private/private-sources.cc:58
+#. 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:159
 #, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "Nepodařilo se zpracovat %s. Zkusit znovu upravit?"
+msgid "Need to get %sB of archives.\n"
+msgstr "Nutno stáhnout %sB archivů.\n"
 
-#: apt-private/private-sources.cc:70
+#. 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:166
 #, c-format
-msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr "Soubor „%s“ se změnil, spusťte prosím „apt-get update“."
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Po této operaci bude na disku použito dalších %sB.\n"
 
-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
-msgstr "Fulltextové hledá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 "Po této operaci bude na disku uvolněno %sB.\n"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Propočítává se aktualizace"
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes"
 
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Hotovo"
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "Udáno „pouze triviální“, ovšem toto není triviální operace."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Ano, udělej to tak, jak říkám!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Chystáte se vykonat něco potenciálně škodlivého.\n"
+"Pro pokračování opište frázi „%s“\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Přerušeno."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Chcete pokračovat?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Některé soubory nemohly být staženy"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Nelze stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --"
+"fix-missing?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing a výměna média nejsou momentálně podporovány"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Nelze opravit chybějící balíky."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Instalace se přerušuje."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"Následující balík z tohoto systému zmizel, protože\n"
+"všechny jeho soubory byly přepsány jinými balíky:"
+msgstr[1] ""
+"Následující balíky z tohoto systému zmizely, protože\n"
+"všechny jejich soubory byly přepsány jinými balíky:"
+msgstr[2] ""
+"Následující balíky z tohoto systému zmizely, protože\n"
+"všechny jejich soubory byly přepsány jinými balíky:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Poznámka: Toto má svůj důvod a děje se automaticky v dpkg."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Neměli bychom mazat věci, nelze spustit 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 ""
+"Hmm, zdá se, že AutoRemover zničil něco, co neměl.\n"
+"Nahlaste prosím chybu v apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Vnitřní chyba, AutoRemover pokazil věci"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "Následující balík byl nainstalován automaticky a již není potřeba:"
+msgstr[1] ""
+"Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
+msgstr[2] ""
+"Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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 balík byl nainstalován automaticky a již není potřeba.\n"
+msgstr[1] "%lu balíky byly nainstalovány automaticky a již nejsou potřeba.\n"
+msgstr[2] "%lu balíků bylo nainstalováno automaticky a již nejsou potřeba.\n"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "Pro jeho odstranění použijte „apt-get autoremove“."
+msgstr[1] "Pro jejich odstranění použijte „apt-get autoremove“."
+msgstr[2] "Pro jejich odstranění použijte „apt-get autoremove“."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Pro opravení následujících můžete spustit „apt-get -f install“:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo "
+"navrhněte řešení)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Některé balíky nemohly být instalovány. To může znamenat, že požadujete\n"
+"nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n"
+"vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Poškozené balíky"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Následující extra balíky budou instalovány:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Navrhované balíky:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Doporučované balíky:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "%s bude přeskočen, protože je již nainstalován.\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"%s bude přeskočen, protože není nainstalován a vyžadovány jsou pouze "
+"aktualizace.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Přeinstalace %s není možná, protože nelze stáhnout.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s je již nejnovější verze.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Vybraná verze „%s“ (%s) pro „%s“\n"
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Vybraná verze „%s“ (%s) pro „%s“ kvůli „%s“\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+"Balík „%s“ není nainstalován, nelze tedy odstranit. Mysleli jste „%s“?\n"
+
+#: apt-private/private-install.cc:945
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Balík „%s“ není nainstalován, nelze tedy odstranit\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "Autentizační varování potlačeno.\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Některé balíky nemohly být autentizovány"
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Instalovat tyto balíky bez ověření?"
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Selhalo stažení %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 "Nelze určit volné místo v %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "V %s nemáte dostatek volného místa."
+
+#: apt-private/private-sources.cc:58
+#, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "Nepodařilo se zpracovat %s. Zkusit znovu upravit?"
+
+#: apt-private/private-sources.cc:70
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr "Soubor „%s“ se změnil, spusťte prosím „apt-get update“."
+
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr "Fulltextové hledání"
 
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Cíl "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Mám:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Staženo %sB za %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Pracuji]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1766,18 +1772,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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,205 +1855,450 @@ 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"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Pokus o uvolnění uzlu (DropNode) na stále propojeném uzlu"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Nelze lokalizovat hashovací prvek!"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Použití: apt-extracttemplates soubor1 [soubor2 …]\n"
+"\n"
+"apt-extracttemplates umí z balíků vytáhnout konfigurační skripty a šablony\n"
+"\n"
+"Volby:\n"
+"  -h   Tato nápověda.\n"
+"  -t   Nastaví dočasný adresář\n"
+"  -c=? Načte tento konfigurační soubor\n"
+"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Nelze alokovat diverzi"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Nelze zavolat mkstemp %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Vnitřní chyba při AddDiversion"
-
-#: apt-inst/filelist.cc:477
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Pokus o přepsání diverze, %s -> %s a %s/%s"
+msgid "Unable to write to %s"
+msgstr "Nelze zapsat do %s"
 
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Dvojí přidání diverze %s -> %s"
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Nelze určit verzi programu debconf. Je debconf nainstalován?"
 
-#: apt-inst/filelist.cc:549
+#: 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: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 "Duplicate conf file %s/%s"
-msgstr "Duplicitní konfigurační soubor %s/%s"
+msgid "Error processing directory %s"
+msgstr "Chyba zpracování adresáře %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: 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:400
+msgid "Error writing header to contents file"
+msgstr "Chyba při zapisování hlavičky do souboru"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "Cesta %s je příliš dlouhá"
+msgid "Error processing contents %s"
+msgstr "Chyba při zpracovávání obsahu %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Použití: apt-ftparchive [volby] příkaz\n"
+"Příkazy: packages binárnícesta [souboroverride [prefixcesty]]\n"
+"         sources zdrojovácesta [souboroverride [prefixcesty]]\n"
+"         contents cesta\n"
+"         release cesta\n"
+"         generate konfiguračnísoubor [skupiny]\n"
+"         clean konfiguračnísoubor\n"
+"\n"
+"apt-ftparchive generuje indexové soubory debianích archivů. Podporuje\n"
+"několik režimů vytváření - od plně automatického až po funkční ekvivalent\n"
+"příkazů dpkg-scanpackages a dpkg-scansources.\n"
+"\n"
+"apt-ftparchive vytvoří ze stromu .deb souborů soubory Packages. Soubor\n"
+"Packages obsahuje kromě všech kontrolních polí každého balíku také jeho\n"
+"velikost a MD5 součet. Podporován je také soubor override, kterým můžete \n"
+"vynutit hodnoty polí Priority a Section.\n"
+"\n"
+"Podobně umí apt-ftparchive vygenerovat ze stromu souborů .dsc soubory\n"
+"Sources. Volbou --source-override můžete zadat zdrojový soubor override.\n"
+"\n"
+"Příkazy „packages“ a „sources“ by se měly spouštět z kořene stromu.\n"
+"BinárníCesta by měla ukazovat na začátek rekurzivního hledání a soubor \n"
+"override by měl obsahovat příznaky pro přepis. PrefixCesty, pokud je\n"
+"přítomen, je přidán do polí Filename.\n"
+"Reálný příklad na archivu Debianu:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Volby:\n"
+"  -h          Tato nápověda\n"
+"  --md5       Vygeneruje kontrolní MD5\n"
+"  -s=?        Zdrojový soubor override\n"
+"  -q          Tichý režim\n"
+"  -d=?        Vybere volitelnou databázi pro vyrovnávací paměť\n"
+"  --no-delink Povolí ladicí režim\n"
+"  --contents  Vygeneruje soubor Contents\n"
+"  -c=?        Načte tento konfigurační soubor\n"
+"  -o=?        Nastaví libovolnou volbu"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Žádný výběr nevyhověl"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "%s se rozbaluje vícekrát"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Některé soubory chybí v balíkovém souboru skupiny %s"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Adresář %s je odkloněn"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB je porušená, soubor přejmenován na %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Balík se pokouší zapisovat do diverzního cíle %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB je stará, zkouším aktualizovat %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Diverzní cesta je příliš dlouhá"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Formát databáze je neplatný. Pokud jste přešli ze starší verze apt, databázi "
+"prosím odstraňte a poté ji znovu vytvořte."
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nelze otevřít DB soubor %s: %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Nelze vyhodnotit %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+msgid "Failed to read .dsc"
+msgstr "Nelze přečíst .dsc"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Archiv nemá kontrolní záznam"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Nelze získat kurzor"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Selhalo přejmenování %s na %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Nelze číst adresář %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Adresář %s bude nahrazen neadresářem"
+msgid "W: Unable to stat %s\n"
+msgstr "W: Nelze vyhodnotit %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Nelze nalézt uzel v jeho hashovacím kbelíku"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Cesta je příliš dlouhá"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "W: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: Chyby se týkají souboru "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Přepsat vyhovující balík bez udání verze pro %s"
+msgid "Failed to resolve %s"
+msgstr "Chyba při zjišťování %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Průchod stromem selhal"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Soubor %s/%s přepisuje ten z balíku %s"
+msgid "Failed to open %s"
+msgstr "Nelze otevřít %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Nelze vyhodnotit %s"
+msgid " DeLink %s [%s]\n"
+msgstr "Odlinkování %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Selhal zápis souboru %s"
+msgid "Failed to readlink %s"
+msgstr "Nelze přečíst link %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Selhalo zavření souboru %s"
+msgid "Failed to unlink %s"
+msgstr "Nelze odlinkovat %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Toto není platný DEB archiv, chybí část „%s“"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Nezdařilo se slinkovat %s s %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Vnitřní chyba, nelze najít část %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Odlinkovací limit %sB dosažen.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Nezpracovatelný kontrolní soubor"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Archiv nemá pole Package"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Neplatný podpis archivu"
+#: 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:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  správce %s je %s, ne %s\n"
+
+#: 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:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr " %s nemá ani žádnou binární položku pro override\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Selhal pokus o přidělení paměti"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Nelze otevřít %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Zkomolený override soubor %s, řádek %llu (%s)"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Nezdařilo se přečíst override soubor %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Zkomolený override soubor %s, řádek %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Zkomolený override soubor %s, řádek %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Zkomolený override soubor %s, řádek %llu #3"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Chyba při čtení záhlaví prvku archivu"
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Neznámý kompresní algoritmus „%s“"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/multicompress.cc:103
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "Neplatné záhlaví prvku archivu %s"
+msgid "Compressed output %s needs a compression set"
+msgstr "Komprimovaný výstup %s potřebuje kompresní sadu"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Neplatné záhlaví prvku archivu"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Selhalo vytvoření FILE*"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Archiv je příliš krátký"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Volání fork() se nezdařilo"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Chyba při čtení hlaviček archivu"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Komprimovat potomka"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Selhalo vytvoření roury"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Interní chyba, nezdařilo se vytvořit %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Selhalo spuštění gzipu "
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "V/V operace s podprocesem/souborem selhala"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Porušený archiv"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Chyba čtení při výpočtu MD5"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Kontrolní součet taru selhal, archiv je poškozený"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problém s odlinkováním %s"
 
-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Neznámá hlavička TARu typ %u, člen %s"
+msgid "Failed to rename %s to %s"
+msgstr "Selhalo přejmenování %s na %s"
+
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Použití: apt-internal-solver\n"
+"\n"
+"apt-internal-solver je rozhraní k aktuálnímu internímu řešiteli\n"
+"závislostí, jako by šlo o externí nástroj - vhodné pro ladění\n"
+"\n"
+"Volby:\n"
+"  -h   Tato nápověda.\n"
+"  -q   Nezobrazí indikátor postupu - vhodné pro záznam\n"
+"  -c=? Načte daný konfigurační soubor\n"
+"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Neznámý záznam o balíku!"
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Použití: apt-sortpkgs [volby] soubor1 [soubor2 …]\n"
+"\n"
+"apt-sortpkgs je jednoduchý nástroj pro setřídění souborů Packages.\n"
+"Volbou -s volíte typ souboru.\n"
+"\n"
+"Volby:\n"
+"  -h   Tato nápověda\n"
+"  -s   Setřídí zdrojový soubor\n"
+"  -c=? Načte tento konfigurační soubor\n"
+"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr "Postup: [%3i%%]"
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "Spouští se dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Balíčkovací systém „%s“ není podporován"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Nebylo možno určit vhodný typ balíčkovacího systému"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapsáno %i záznamů.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Zapsáno %i záznamů s chybějícími soubory (%i).\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Zapsáno %i záznamů s nesouhlasícími soubory (%i).\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 "Zapsáno %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n"
@@ -2062,6 +2313,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 ""
@@ -2075,156 +2346,329 @@ 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:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Cache balíků je prázdná"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Závisí na"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Předzávisí na"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Navrhuje"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Doporučuje"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Koliduje s"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Nahrazuje"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Zastarává"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Porušuje"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Rozšiřuje"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "důležitý"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "vyžadovaný"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "standardní"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "volitelný"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ovladač metody %s nemohl být nalezen."
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Propočítává se aktualizace"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Indexový typ souboru „%s“ není podporován"
+
+#: 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/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/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/acquire-worker.cc:118
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
-msgid "Is the package %s installed?"
-msgstr "Je balík %s nainstalován?"
+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/acquire-worker.cc:169
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nebyla spuštěna správně"
+msgid "Couldn't stat source package list %s"
+msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
 
-#: apt-pkg/acquire-worker.cc:455
-#, 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/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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexový typ souboru „%s“ není podporován"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Collecting File poskytuje"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Vytváří se strom závislostí"
+#: 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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidátské verze"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Scénář odeslán řešiteli"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generování závislostí"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Požadavek odeslán řešiteli"
 
-#: 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/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Příprava na obdržení řešení"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nelze otevřít stavový soubor %s"
+#: 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/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nelze zapsat dočasný stavový soubor %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Neshoda kontrolních součtů"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Velikosti nesouhlasí"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 msgid "Invalid file format"
 msgstr "Neplatná formát souboru"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Chyba zápisu"
+
+#: 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:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Při ověřování podpisů se objevila chyba. Repositář není aktualizovaný, tudíž "
+"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:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Chyba GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Adresář %s je odkloněn"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2233,16 +2677,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:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2251,27 +2695,19 @@ msgstr ""
 "Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto "
 "repositáře se nepoužijí."
 
-#: apt-pkg/acquire-item.cc:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Při ověřování podpisů se objevila chyba. Repositář není aktualizovaný, tudíž "
-"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:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Chyba GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2280,131 +2716,50 @@ 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:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Chyba při zpracování %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Načítají se seznamy balíků"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Collecting File poskytuje"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nelze zapsat do %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: apt-pkg/acquire.cc:162
 #, c-format
 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Do sources.list musíte zadat „zdrojové“ URI"
@@ -2432,7 +2787,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2441,12 +2796,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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2457,10 +2812,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"
@@ -2531,11 +2889,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"
 
@@ -2545,7 +2903,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:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2553,166 +2911,87 @@ msgstr ""
 "Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno "
 "podrženými balíky."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr "Požadavek odeslán řešiteli"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Příprava na obdržení řešení"
-
-#: apt-pkg/edsp.cc:327
-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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Spuštění externího řešitele"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Nelze zpracovat soubor %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nelze zpracovat Release soubor %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Release soubor %s neobsahuje žádné sekce"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Release soubor %s neobsahuje Hash záznam"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Verze „%s“ pro „%s“ nebyla nalezena"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Nelze najít úlohu „%s“"
 
-#: apt-pkg/cacheset.cc:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
+#: 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: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: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:743 apt-pkg/cacheset.cc:751
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -2721,160 +3000,170 @@ msgstr ""
 "Nelze vybrat nainstalovanou ani kandidátskou verzi balíku „%s“, protože "
 "žádné takové verze nemá"
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/indexrecords.cc:83
 #, 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í"
+msgid "Unable to parse Release file %s"
+msgstr "Nelze zpracovat Release soubor %s"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/indexrecords.cc:91
 #, 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á"
+msgid "No sections in Release file %s"
+msgstr "Release soubor %s neobsahuje žádné sekce"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/indexrecords.cc:132
 #, 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"
+msgid "No Hash entry in Release file %s"
+msgstr "Release soubor %s neobsahuje Hash záznam"
+
+#: apt-pkg/indexrecords.cc:145
+#, 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:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Neplatná položka „Date“ v Release souboru %s"
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Výběr %s nenalezen"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Nepoužívá se zamykání pro zámkový soubor %s, který je pouze pro čtení"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nešlo otevřít zámkový soubor %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Nepoužívá se zamykání pro zámkový soubor %s připojený přes nfs"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nelze získat zámek %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 "Seznam souborů nelze vytvořit, jelikož „%s“ není adresář"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Ignoruji „%s“ v adresáři „%s“, jelikož to není obyčejný soubor"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož nemá příponu"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr "Ignoruji soubor „%s“ v adresáři „%s“, jelikož má neplatnou příponu"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Podproces %s obdržel chybu segmentace."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Podproces %s obdržel signál %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Podproces %s vrátil chybový kód (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Podproces %s neočekávaně skončil"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problém při zavírání gzip souboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nelze otevřít soubor %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nelze otevřít popisovač souboru %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Nelze vytvořit podproces IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Nezdařilo se spustit kompresor "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "čtení, stále se má přečíst %llu, ale už nic nezbývá"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "zápis, stále se má zapsat %llu, ale nejde to"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problém při zavírání souboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problém při přejmenování souboru %s na %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problém při odstraňování souboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Problém při synchronizování souboru"
 
@@ -2961,112 +3250,106 @@ msgstr "Nelze vyhodnotit přípojný bod %s"
 msgid "Failed to stat the cdrom"
 msgstr "Nezdařilo se vyhodnotit cdrom"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Nerozpoznaná zkratka typu: „%c“"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: 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:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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í"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s není nainstalována žádná klíčenka."
-
-#: 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"
@@ -3076,12 +3359,12 @@ msgstr "Neplatná operace %s"
 msgid "Installing %s"
 msgstr "Instaluje se %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Odstraňuje se %s"
@@ -3102,80 +3385,80 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Adresář „%s“ chybí"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Připravuje se %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozbaluje se %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Připravuje se nastavení %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "Nainstalován %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "Odstraněn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "Kompletně odstraněn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1670
+#: 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:1732
+#: 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:1737
+#: 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:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3183,7 +3466,7 @@ 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:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3191,7 +3474,7 @@ 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:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3199,7 +3482,7 @@ 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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"
@@ -3207,7 +3490,7 @@ 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3215,421 +3498,194 @@ msgstr ""
 "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"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Použití: apt-extracttemplates soubor1 [soubor2 …]\n"
-"\n"
-"apt-extracttemplates umí z balíků vytáhnout konfigurační skripty a šablony\n"
-"\n"
-"Volby:\n"
-"  -h   Tato nápověda.\n"
-"  -t   Nastaví dočasný adresář\n"
-"  -c=? Načte tento konfigurační soubor\n"
-"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Nelze zavolat mkstemp %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Chyba zpracování adresáře %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Seznam zdrojových rozšíření je příliš dlouhý"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Chyba při zapisování hlavičky do souboru"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Chyba při zpracovávání obsahu %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Použití: apt-ftparchive [volby] příkaz\n"
-"Příkazy: packages binárnícesta [souboroverride [prefixcesty]]\n"
-"         sources zdrojovácesta [souboroverride [prefixcesty]]\n"
-"         contents cesta\n"
-"         release cesta\n"
-"         generate konfiguračnísoubor [skupiny]\n"
-"         clean konfiguračnísoubor\n"
-"\n"
-"apt-ftparchive generuje indexové soubory debianích archivů. Podporuje\n"
-"několik režimů vytváření - od plně automatického až po funkční ekvivalent\n"
-"příkazů dpkg-scanpackages a dpkg-scansources.\n"
-"\n"
-"apt-ftparchive vytvoří ze stromu .deb souborů soubory Packages. Soubor\n"
-"Packages obsahuje kromě všech kontrolních polí každého balíku také jeho\n"
-"velikost a MD5 součet. Podporován je také soubor override, kterým můžete \n"
-"vynutit hodnoty polí Priority a Section.\n"
-"\n"
-"Podobně umí apt-ftparchive vygenerovat ze stromu souborů .dsc soubory\n"
-"Sources. Volbou --source-override můžete zadat zdrojový soubor override.\n"
-"\n"
-"Příkazy „packages“ a „sources“ by se měly spouštět z kořene stromu.\n"
-"BinárníCesta by měla ukazovat na začátek rekurzivního hledání a soubor \n"
-"override by měl obsahovat příznaky pro přepis. PrefixCesty, pokud je\n"
-"přítomen, je přidán do polí Filename.\n"
-"Reálný příklad na archivu Debianu:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Volby:\n"
-"  -h          Tato nápověda\n"
-"  --md5       Vygeneruje kontrolní MD5\n"
-"  -s=?        Zdrojový soubor override\n"
-"  -q          Tichý režim\n"
-"  -d=?        Vybere volitelnou databázi pro vyrovnávací paměť\n"
-"  --no-delink Povolí ladicí režim\n"
-"  --contents  Vygeneruje soubor Contents\n"
-"  -c=?        Načte tento konfigurační soubor\n"
-"  -o=?        Nastaví libovolnou volbu"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Žádný výběr nevyhověl"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Některé soubory chybí v balíkovém souboru skupiny %s"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB je porušená, soubor přejmenován na %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB je stará, zkouším aktualizovat %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Formát databáze je neplatný. Pokud jste přešli ze starší verze apt, databázi "
-"prosím odstraňte a poté ji znovu vytvořte."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nelze otevřít DB soubor %s: %s"
-
-#: ftparchive/cachedb.cc:332
-msgid "Failed to read .dsc"
-msgstr "Nelze přečíst .dsc"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Archiv nemá kontrolní záznam"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Nelze získat kurzor"
+#, 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?"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Nelze číst adresář %s\n"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nelze uzamknout administrační adresář (%s). Jste root?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Nelze vyhodnotit %s\n"
+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“."
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Není uzamčen"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "W: "
+#: 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"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: Chyby se týkají souboru "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Nelze lokalizovat hashovací prvek!"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Chyba při zjišťování %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Nelze alokovat diverzi"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Průchod stromem selhal"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Vnitřní chyba při AddDiversion"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "Nelze otevřít %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Pokus o přepsání diverze, %s -> %s a %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "Odlinkování %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Dvojí přidání diverze %s -> %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Nelze přečíst link %s"
+msgid "Duplicate conf file %s/%s"
+msgstr "Duplicitní konfigurační soubor %s/%s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Nelze odlinkovat %s"
+msgid "The path %s is too long"
+msgstr "Cesta %s je příliš dlouhá"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Nezdařilo se slinkovat %s s %s"
+msgid "Unpacking %s more than once"
+msgstr "%s se rozbaluje vícekrát"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Odlinkovací limit %sB dosažen.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Archiv nemá pole Package"
+msgid "The directory %s is diverted"
+msgstr "Adresář %s je odkloněn"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr " %s nemá žádnou položku pro override\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Balík se pokouší zapisovat do diverzního cíle %s/%s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  správce %s je %s, ne %s\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Diverzní cesta je příliš dlouhá"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr " %s nemá žádnou zdrojovou položku pro override\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Adresář %s bude nahrazen neadresářem"
 
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr " %s nemá ani žádnou binární položku pro override\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Nelze nalézt uzel v jeho hashovacím kbelíku"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Selhal pokus o přidělení paměti"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Cesta je příliš dlouhá"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "Nelze otevřít %s"
+msgid "Overwrite package match with no version for %s"
+msgstr "Přepsat vyhovující balík bez udání verze pro %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Zkomolený override soubor %s, řádek %llu (%s)"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Soubor %s/%s přepisuje ten z balíku %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Nezdařilo se přečíst override soubor %s"
+msgid "Unable to stat %s"
+msgstr "Nelze vyhodnotit %s"
 
-#: ftparchive/override.cc:166
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Zkomolený override soubor %s, řádek %llu #1"
+msgid "Failed to write file %s"
+msgstr "Selhal zápis souboru %s"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Zkomolený override soubor %s, řádek %llu #2"
+msgid "Failed to close file %s"
+msgstr "Selhalo zavření souboru %s"
 
-#: ftparchive/override.cc:191
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Zkomolený override soubor %s, řádek %llu #3"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Toto není platný DEB archiv, chybí část „%s“"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Neznámý kompresní algoritmus „%s“"
+msgid "Internal error, could not locate member %s"
+msgstr "Vnitřní chyba, nelze najít část %s"
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Nezpracovatelný kontrolní soubor"
+
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Neplatný podpis archivu"
+
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Chyba při čtení záhlaví prvku archivu"
+
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimovaný výstup %s potřebuje kompresní sadu"
+msgid "Invalid archive member header %s"
+msgstr "Neplatné záhlaví prvku archivu %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Selhalo vytvoření FILE*"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Neplatné záhlaví prvku archivu"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Volání fork() se nezdařilo"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Archiv je příliš krátký"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Komprimovat potomka"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Chyba při čtení hlaviček archivu"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Interní chyba, nezdařilo se vytvořit %s"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Selhalo vytvoření roury"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "V/V operace s podprocesem/souborem selhala"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Selhalo spuštění gzipu "
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Chyba čtení při výpočtu MD5"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Porušený archiv"
 
-#: ftparchive/multicompress.cc:359
+#: 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:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Problém s odlinkováním %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Neznámá hlavička TARu typ %u, člen %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Použití: apt-internal-solver\n"
-"\n"
-"apt-internal-solver je rozhraní k aktuálnímu internímu řešiteli\n"
-"závislostí, jako by šlo o externí nástroj - vhodné pro ladění\n"
-"\n"
-"Volby:\n"
-"  -h   Tato nápověda.\n"
-"  -q   Nezobrazí indikátor postupu - vhodné pro záznam\n"
-"  -c=? Načte daný konfigurační soubor\n"
-"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Celkem místa závislých verzí: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Neznámý záznam o balíku!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Na %s nemáte dostatek volného místa"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Použití: apt-sortpkgs [volby] soubor1 [soubor2 …]\n"
-"\n"
-"apt-sortpkgs je jednoduchý nástroj pro setřídění souborů Packages.\n"
-"Volbou -s volíte typ souboru.\n"
-"\n"
-"Volby:\n"
-"  -h   Tato nápověda\n"
-"  -s   Setřídí zdrojový soubor\n"
-"  -c=? Načte tento konfigurační soubor\n"
-"  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Hotovo"
+
+#~ 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?"
@@ -3720,9 +3776,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Nelze zapsat log, volání openpty() selhalo (/dev/pts není připojen?)\n"
 
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Soubor %s nezačíná podpisem"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Přeskakuji neexistující soubor %s"
 
diff --git a/po/cy.po b/po/cy.po
index 8c4121ae7..e29221cd1 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: 2015-01-16 04:37-0500\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,169 +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:277
+#: cmdline/apt-cache.cc:320
 #, fuzzy
 msgid "Total package names: "
 msgstr "Cyfanswm Enwau Pecynnau : "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Cyfanswm Enwau Pecynnau : "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 #, fuzzy
 msgid "  Normal packages: "
 msgstr "  Pecynnau Normal: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 #, fuzzy
 msgid "  Pure virtual packages: "
 msgstr "  Pecynnau Cwbl Rhithwir: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 #, fuzzy
 msgid "  Single virtual packages: "
 msgstr "  Pecynnau Rhithwir Sengl: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 #, fuzzy
 msgid "  Mixed virtual packages: "
 msgstr "  Pecynnau Rhithwir Cymysg: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Ar Goll: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 #, fuzzy
 msgid "Total distinct versions: "
 msgstr "Cyfanswm Fersiynau Gwahanol: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Cyfanswm Fersiynau Gwahanol: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 #, fuzzy
 msgid "Total dependencies: "
 msgstr "Cyfanswm Dibyniaethau: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 #, fuzzy
 msgid "Total ver/file relations: "
 msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 #, fuzzy
 msgid "Total Provides mappings: "
 msgstr "Cyfanswm Mapiau Darpariath: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 #, fuzzy
 msgid "Total globbed strings: "
 msgstr "Cyfanswm Llinynau Glob: "
 
-#: cmdline/apt-cache.cc:362
-#, fuzzy
-msgid "Total dependency version space: "
-msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 #, fuzzy
 msgid "Total slack space: "
 msgstr "Cyfanswm gofod Slac: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 #, fuzzy
 msgid "Total space accounted for: "
 msgstr "Cyfanswm Gofod Cyfrifwyd: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 #, fuzzy
 msgid "Package files:"
 msgstr "Ffeiliau Pecynnau:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 #, fuzzy
 msgid "Pinned packages:"
 msgstr "Pecynnau wedi eu Pinio:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(heb ganfod)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Wedi Sefydlu: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Ymgeisydd: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(dim)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 #, fuzzy
 msgid "  Package pin: "
 msgstr "  Pin Pecyn: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 #, fuzzy
 msgid "  Version table:"
 msgstr "  Tabl Fersiynnau:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -255,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 ""
@@ -267,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"
@@ -280,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 ""
 
@@ -317,79 +312,79 @@ msgstr ""
 "  -c=? Darllen y ffeil cyfluniad\n"
 "  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Methwyd canfod pecyn %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
 
-#: cmdline/apt-get.cc:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -397,96 +392,95 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: 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"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, fuzzy, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Does dim digon o le rhydd yn %s gennych"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Does dim digon o le rhydd yn %s gennych"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, fuzzy, c-format
 msgid "Fetch source %s\n"
 msgstr "Cyrchu Ffynhonell %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Methwyd cyrchu rhai archifau."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
 
-#: cmdline/apt-get.cc:968
+#: cmdline/apt-get.cc:943
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Methodd proses plentyn"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: cmdline/apt-get.cc:1279
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -495,7 +489,7 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
 "%s"
 
-#: cmdline/apt-get.cc:1294
+#: cmdline/apt-get.cc:1297
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -504,14 +498,14 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
 "%s"
 
-#: cmdline/apt-get.cc:1317
+#: 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:1356
+#: cmdline/apt-get.cc:1359
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -520,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:1362
+#: cmdline/apt-get.cc:1365
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -529,32 +523,32 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
 "%s"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Methwyd prosesu dibyniaethau adeiladu"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Yn cysylltu i %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 #, fuzzy
 msgid "Supported modules:"
 msgstr "Modylau a Gynhelir:"
 
 # FIXME: split
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -650,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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -668,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -797,12 +791,12 @@ msgstr "Ffeil heb ei ganfod"
 msgid "File not found"
 msgstr "Ffeil heb ei ganfod"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Methwyd stat()"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Methwyd gosod amser newid"
 
@@ -811,34 +805,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Yn mewngofnodi"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Ni ellir darganfod enw'r cymar"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Ni ellir darganfod yr enw lleol"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, fuzzy, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -847,126 +841,126 @@ msgstr ""
 "ProxyLogin yn wag.)"
 
 # FIXME
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Goramser cysylltu"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Caeodd y gweinydd y cysylltiad"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Gwall darllen"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Gorlifodd ateb y byffer."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Llygr protocol"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Gwall ysgrifennu"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Methwyd creu soced"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Methwyd"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 #, fuzzy
 msgid "Could not connect passive socket."
 msgstr "Methwyd cysylltu soced goddefol"
 
 # FIXME
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Methodd getaddrinfo gael soced gwrando"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Methwyd rhwymo soced"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Methwyd gwrando ar y soced"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Methwyd canfod enw'r soced"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Methwyd danfod gorchymyn PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Goramserodd cysylltiad y soced data"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Methwyd derbyn cysylltiad"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Goramserodd soced data"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Ymholiad"
 
 # FIXME
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Methwyd gweithredu "
 
@@ -1032,72 +1026,72 @@ 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:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:174
+#: 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr ""
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Gwall wrth ysgrifennu at y ffeil"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Gwall wrth ddarllen o'r gweinydd"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Gwall wrth ysgrifennu at ffeil"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Methwyd dewis"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Goramserodd y cysylltiad"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
 
@@ -1133,287 +1127,31 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
 msgid "Unknown date format"
 msgstr "Fformat dyddiad anhysbys"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 #, fuzzy
 msgid "Bad header data"
 msgstr "Data pennawd gwael"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Methodd y cysylltiad"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "Gwall mewnol"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-
-#: apt-private/private-install.cc:91
-#, fuzzy
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
-
-#: apt-private/private-install.cc:110
-#, fuzzy
-msgid "Internal error, Ordering didn't finish"
-msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Mae angen cyrchu %sB o archifau.\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:167
-#, fuzzy, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
-
-#. 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:172
-#, fuzzy, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
-
-#: apt-private/private-install.cc:200
+#: methods/server.cc:589
 #, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Does dim digon o le rhydd gennych yn %s."
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Ie, gwna fel rydw i'n dweud!"
-
-#: apt-private/private-install.cc:222
-#, fuzzy, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Rydych ar fin gwneud rhywbeth a all fod yn niweidiol\n"
-"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
-" ?]"
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Erthylu."
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Ydych chi eisiau mynd ymlaen?"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Methodd rhai ffeiliau lawrlwytho"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
-"geidio defnyddio --fix-missing?"
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Ni ellir cywiro pecynnau ar goll."
-
-#: apt-private/private-install.cc:330
-#, fuzzy
-msgid "Aborting install."
-msgstr "Yn Erthylu'r Sefydliad."
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
-
-#: apt-private/private-install.cc:506
-#, fuzzy
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-
-#: apt-private/private-install.cc:513
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-
-#: apt-private/private-install.cc:517
-#, fuzzy, c-format
-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] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain:"
-
-# FIXME
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt-get -f install' efo dim "
-"pecyn (neu penodwch ddatrys)"
-
-# FIXME: needs commas
-#: apt-private/private-install.cc:638
 msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"Methwyd sefydlu rhai pecynnau. Gall hyn olygu eich bod chi wedi gofyn\n"
-"am sefyllfa amhosib neu, os ydych chi'n defnyddio'r dosraniad\n"
-"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
-"heb gael eu symud allan o Incoming."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Pecynnau wedi torri"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Pecynnau a awgrymmir:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Pecynnau a argymhellir:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
-
-#: apt-private/private-install.cc:829
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "Gwall mewnol"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1421,31 +1159,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "Yn cywiro dibyniaethau..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " wedi methu."
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "Ni ellir cywiro dibyniaethau"
 
-#: apt-private/private-cachefile.cc:102
+#: 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:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " Wedi Gorffen"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
 
@@ -1614,7 +1352,7 @@ msgstr "I"
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Gwall crynhoi patrwm - %s"
@@ -1623,7 +1361,7 @@ msgstr "Gwall crynhoi patrwm - %s"
 msgid "The update command takes no arguments"
 msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1631,10 +1369,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1655,29 +1397,300 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
-#, fuzzy
-msgid "WARNING: The following packages cannot be authenticated!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
+
+#: apt-private/private-install.cc:90
+#, fuzzy
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
+
+#: apt-private/private-install.cc:109
+#, fuzzy
+msgid "Internal error, Ordering didn't finish"
+msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\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:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Mae angen cyrchu %sB o archifau.\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:166
+#, fuzzy, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
+
+#. 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
+#, fuzzy, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Mae problemau a defnyddwyd -y heb --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 "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Ie, gwna fel rydw i'n dweud!"
+
+#: apt-private/private-install.cc:197
+#, fuzzy, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Rydych ar fin gwneud rhywbeth a all fod yn niweidiol\n"
+"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
+" ?]"
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Erthylu."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Ydych chi eisiau mynd ymlaen?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Methodd rhai ffeiliau lawrlwytho"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
+"geidio defnyddio --fix-missing?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Ni ellir cywiro pecynnau ar goll."
+
+#: apt-private/private-install.cc:305
+#, fuzzy
+msgid "Aborting install."
+msgstr "Yn Erthylu'r Sefydliad."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: 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 ""
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
+
+#: apt-private/private-install.cc:481
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+
+#: apt-private/private-install.cc:488
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+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] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain:"
+
+# FIXME
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt-get -f install' efo dim "
+"pecyn (neu penodwch ddatrys)"
+
+# FIXME: needs commas
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Methwyd sefydlu rhai pecynnau. Gall hyn olygu eich bod chi wedi gofyn\n"
+"am sefyllfa amhosib neu, os ydych chi'n defnyddio'r dosraniad\n"
+"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
+"heb gael eu symud allan o Incoming."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Pecynnau wedi torri"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Pecynnau a awgrymmir:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Pecynnau a argymhellir:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
+
+#: apt-private/private-install.cc:827
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+
+#: apt-private/private-install.cc:892
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %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 "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:98
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
 #, fuzzy
 msgid "Some packages could not be authenticated"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 msgid "Install these packages without verification?"
 msgstr ""
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Methwyd cyrchu %s  %s\n"
 
+#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
+#, fuzzy, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "Does dim digon o le rhydd yn %s gennych"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Does dim digon o le rhydd gennych yn %s."
+
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1692,42 +1705,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-#, fuzzy
-msgid "Calculating upgrade"
-msgstr "Yn Cyfrifo'r Uwchraddiad"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Wedi Gorffen"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Presennol "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Cyrchu:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Anwybyddu "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Gwall "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Gweithio]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, fuzzy, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1740,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1828,212 +1832,461 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Yn cyfuno manylion Ar Gael"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Methyd lleoli yr elfen <hash>!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Methwyd neilltuo dargyfeiriad"
-
-#: apt-inst/filelist.cc:464
+# FIXME: "debian"
+#: cmdline/apt-extracttemplates.cc:229
 #, fuzzy
-msgid "Internal error in AddDiversion"
-msgstr "Gwall Mewnol yn AddDiversion"
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
-
-# FIXME: "the"
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
+"templed o becynnau Debian.\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Dangos y testun cymorth hwn\n"
+"  -t   Gosod y cyfeiriadur dros dro\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Ffeil cyfluniad dyblyg %s/%s"
+#: 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"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "The path %s is too long"
-msgstr "Mae'r llwybr %s yn rhy hir"
+msgid "Unable to write to %s"
+msgstr "Ni ellir ysgrifennu i %s"
 
-#: apt-inst/extract.cc:132
+#: 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: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: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:280
+msgid "Source extension list is too long"
+msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
+
+#: 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:430
+#, fuzzy, c-format
+msgid "Error processing contents %s"
+msgstr "Gwall wrth Brosesu Cynnwys %s"
+
+# FIXME: full stops
+#: ftparchive/apt-ftparchive.cc:625
+#, fuzzy
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n"
+"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n"
+"             sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n"
+"             contents llwybr\n"
+"             release llwybr\n"
+"             generate cyfluniad [grŵpiau]\n"
+"             clean cyfluniad\n"
+"\n"
+"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n"
+"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n"
+"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n"
+"\n"
+"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n"
+"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n"
+"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n"
+"gorfodi'r gwerthoedd Priority a Section.\n"
+"\n"
+"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n"
+".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n"
+"gwrthwneud ffynhonell.\n"
+"\n"
+"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n"
+"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n"
+"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n"
+"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n"
+"defnydd o'r archif Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opsiynnau:\n"
+"  -h          Y testun cymorth hwn\n"
+"  --md5       Rheoli cynhyrchiad stwnch MD5\n"
+"  -s=?        Ffeil gwrthwneud ffynhonell\n"
+"  -q          Tawel\n"
+"  -d=?        Dewis cronda data storfa opsiynnol\n"
+"  --no-delink Galluogi'r modd datgysylltu datnamu\n"
+"  --contents  Rheoli cynhyrchiad ffeil cynnwys\n"
+"  -c=?        Darllen y ffeil cyfluniad hwn\n"
+"  -o=?        Gosod opsiwn cyfluniad mympwyol"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Dim dewisiadau'n cyfateb"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Yn dadbacio %s mwy nag unwaith"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn  `%s'"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ni ellir agor y ffeil DB2 %s: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Methodd stat() o %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Methwyd darllen y cyswllt %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Does dim cofnod rheoli gan yr archif"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Ni ellir cael cyrchydd"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Methwyd ailenwi %s at %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr ""
-"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
+msgid "W: Unable to stat %s\n"
+msgstr "Rh: Ni ellir gwneud stat() o %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "G: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Mae'r llwybr yn rhy hir"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "Rh: "
 
-# FIXME: wtf?
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
+msgid "Failed to resolve %s"
+msgstr "Methwyd datrys %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Methwyd cerdded y goeden"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
+msgid "Failed to open %s"
+msgstr "Methwyd agor %s"
 
-#: apt-inst/extract.cc:498
+# FIXME
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Ni ellir gwneud stat() o %s"
+msgid " DeLink %s [%s]\n"
+msgstr " DatGysylltu %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Methwyd darllen y cyswllt %s"
+
+#: ftparchive/writer.cc:303
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Methwyd datgysylltu %s"
+
+#: ftparchive/writer.cc:311
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Methwyd cysylltu %s at %s"
+
+#: ftparchive/writer.cc:321
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
+
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Doedd dim maes pecyn gan yr archif"
+
+#: 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:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  Cynaliwr %s yw %s nid %s\n"
+
+#: ftparchive/writer.cc:712
 #, fuzzy, c-format
-msgid "Failed to write file %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+msgid "  %s has no source override entry\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:716
+#, fuzzy, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Methwyd neilltuo cof"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Methwyd cau ffeil %s"
+msgid "Unable to open %s"
+msgstr "Ni ellir agor %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
+msgid "Failed to read the override file %s"
+msgstr "Methwydd darllen y ffeil dargyfeirio %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/override.cc:166
 #, fuzzy, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
+msgid "Malformed override %s line %llu #1"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
 
-#: apt-inst/deb/debfile.cc:227
-#, fuzzy
-msgid "Unparsable control file"
-msgstr "Ffeil rheoli ni ellir ei ramadegu"
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Llofnod archif annilys"
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Gwall wrth ddarllen pennawd aelod archif"
+#: ftparchive/multicompress.cc:73
+#, fuzzy, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Dull Cywasgu Anhysbys '%s'"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Methwyd creu FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Methodd fork()"
+
+#: ftparchive/multicompress.cc:209
+#, fuzzy
+msgid "Compress child"
+msgstr "Plentyn Cywasgu"
+
+#: ftparchive/multicompress.cc:232
 #, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Pennawd aelod archif annilys"
+msgid "Internal error, failed to create %s"
+msgstr "Gwall Mewnol, Methwyd creu %s"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Pennawd aelod archif annilys"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Methodd MA i isbroses/ffeil"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Mae'r archif yn rhy fyr"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Methwyd darllen wrth gyfrifo MD5"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Methwyd darllen pennawdau'r archif"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Gwall wrth datgysylltu %s"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Methwyd creu pibau"
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Methwyd ailenwi %s at %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Methwyd gweithredu gzip"
+# FIXME: "debian"
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
+"templed o becynnau Debian.\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Dangos y testun cymorth hwn\n"
+"  -t   Gosod y cyfeiriadur dros dro\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Archif llygredig"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Cofnod pecyn anhysbys!"
 
-#: apt-inst/contrib/extracttar.cc:203
+#: cmdline/apt-sortpkgs.cc:155
 #, fuzzy
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Methodd swm gwirio Tar, archif llygredig"
-
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Math pennawd TAR anhysbys %u, aelod %s"
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n"
+"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Y testun cymorth hwn\n"
+"  -s   Defnyddio trefnu ffeil ffynhonell\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Ni chynhelir y system pecynnu '%s'"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 #, fuzzy
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ni ellir canfod math system addas"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2048,6 +2301,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."
@@ -2060,167 +2336,340 @@ 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:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Storfa pecyn gwag"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Dibynnu"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "CynDdibynnu"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Awgrymu"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Argymell"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Gwrthdaro"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Amnewid"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Darfodi"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "pwysig"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "angenrheidiol"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "safonnol"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "opsiynnol"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "ychwanegol"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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/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/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/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 "Malformed line %lu in source list %s (URI)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid "Is the package %s installed?"
+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 "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)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Yn agor %s"
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "Ni gychwynodd y dull %s yn gywir"
+msgid "Line %u too long in source list %s."
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 
-#: apt-pkg/acquire-worker.cc:455
+#: 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 "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+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/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ni ellir gwneud stat() o %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 ""
-"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
-" '%s'\n"
-"yn y gyrriant '%s' a gwasgwch Enter\n"
+"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/pkgrecords.cc:38
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Ni chynhelir y math ffeil mynegai '%s'"
+msgid "Couldn't stat source package list %s"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
 #, fuzzy
-msgid "Building dependency tree"
-msgstr "Yn Aideladu Coeden Dibyniaeth"
+msgid "Reading package lists"
+msgstr "Yn Darllen Rhestrau Pecynnau"
 
-#: apt-pkg/depcache.cc:139
-#, fuzzy
-msgid "Candidate versions"
-msgstr "Fersiynau Posib"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Yn Casglu Darpariaethau Ffeil"
 
-#: apt-pkg/depcache.cc:168
-#, fuzzy
-msgid "Dependency generation"
-msgstr "Cynhyrchaid Dibyniaeth"
+#: 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/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/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Methwyd agor %s"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Camgyfatebiaeth swm MD5"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Camgyfatebiaeth maint"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Gweithred annilys %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Gwall ysgrifennu"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2228,42 +2677,36 @@ msgid ""
 msgstr ""
 
 # FIXME: number?
-#: apt-pkg/acquire-item.cc:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: apt-pkg/acquire-item.cc:2059
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
 
 # FIXME: case
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2272,136 +2715,50 @@ 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:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ni ellir gwneud stat() o %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-#, 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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-#, fuzzy
-msgid "Reading package lists"
-msgstr "Yn Darllen Rhestrau Pecynnau"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Yn Casglu Darpariaethau Ffeil"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Ni ellir ysgrifennu i %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: apt-pkg/acquire.cc:162
 #, fuzzy, c-format
 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:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
@@ -2430,20 +2787,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:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2454,10 +2811,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
@@ -2525,12 +2886,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 ""
 
@@ -2542,7 +2903,7 @@ msgstr ""
 "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
 "ei gyfer."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2550,336 +2911,266 @@ msgstr ""
 "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
 "ei achosi gan pecynnau wedi eu dal."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)"
-
-# FIXME: number?
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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 "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)"
-
-#: apt-pkg/sourcelist.cc:217
-#, 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/depcache.cc:138 apt-pkg/depcache.cc:167
+#, fuzzy
+msgid "Building dependency tree"
+msgstr "Yn Aideladu Coeden Dibyniaeth"
 
-#: 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)"
+#: apt-pkg/depcache.cc:139
+#, fuzzy
+msgid "Candidate versions"
+msgstr "Fersiynau Posib"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Yn agor %s"
+#: apt-pkg/depcache.cc:168
+#, fuzzy
+msgid "Dependency generation"
+msgstr "Cynhyrchaid Dibyniaeth"
 
-#: 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/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:375
+#: apt-pkg/depcache.cc:252
 #, 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"
+msgid "Failed to open StateFile %s"
+msgstr "Methwyd agor %s"
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/depcache.cc:258
 #, 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 "Failed to write temporary StateFile %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
+
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Methwyd canfod pecyn %s"
 
-#: apt-pkg/cacheset.cc:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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 ""
+
+# 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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:145
+#, 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:164
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Ni chanfuwyd y dewis %s"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Methwyd agor y ffeil clo %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Methwyd cael y clo %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Derbyniodd is-broses %s wall segmentu."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Derbyniodd is-broses %s wall segmentu."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Gorffenodd is-broses %s yn annisgwyl"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Gwall wrth gau'r ffeil"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Methwyd agor ffeil %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Methwyd agor pibell ar gyfer %s"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Methwyd creu isbroses IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Methwyd gweithredu cywasgydd "
 
 # FIXME
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "o hyd %lu i ddarllen ond dim ar ôl"
 
 # FIXME
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "o hyd %lu i ysgrifennu ond methwyd"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Gwall wrth gau'r ffeil"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Gwall wrth gyfamseru'r ffeil"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Gwall wrth dadgysylltu'r ffeil"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Gwall wrth gyfamseru'r ffeil"
 
@@ -2966,114 +3257,108 @@ 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:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Talgryniad math anhysbys: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: 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:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Yn Erthylu'r Sefydliad."
-
 # 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"
@@ -3083,12 +3368,12 @@ msgstr "Gweithred annilys %s"
 msgid "Installing %s"
 msgstr "  Wedi Sefydlu: "
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Yn agor %s"
@@ -3109,103 +3394,103 @@ msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: 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:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: 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:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Wedi Sefydlu: "
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Argymell"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Methwyd dileu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3230,412 +3515,183 @@ msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
-
-# FIXME: "debian"
-#: cmdline/apt-extracttemplates.cc:224
-#, fuzzy
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
-"\n"
-"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
-"templed o becynnau Debian.\n"
-"\n"
-"Opsiynnau:\n"
-"  -h   Dangos y testun cymorth hwn\n"
-"  -t   Gosod y cyfeiriadur dros dro\n"
-"  -c=? Darllen y ffeil cyfluniad hwn\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Ni ellir gwneud stat() o %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, fuzzy, c-format
-msgid "Error processing directory %s"
-msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, fuzzy, c-format
-msgid "Error processing contents %s"
-msgstr "Gwall wrth Brosesu Cynnwys %s"
-
-# FIXME: full stops
-#: ftparchive/apt-ftparchive.cc:626
-#, fuzzy
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n"
-"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n"
-"             sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n"
-"             contents llwybr\n"
-"             release llwybr\n"
-"             generate cyfluniad [grŵpiau]\n"
-"             clean cyfluniad\n"
-"\n"
-"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n"
-"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n"
-"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n"
-"\n"
-"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n"
-"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n"
-"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n"
-"gorfodi'r gwerthoedd Priority a Section.\n"
-"\n"
-"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n"
-".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n"
-"gwrthwneud ffynhonell.\n"
-"\n"
-"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n"
-"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n"
-"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n"
-"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n"
-"defnydd o'r archif Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opsiynnau:\n"
-"  -h          Y testun cymorth hwn\n"
-"  --md5       Rheoli cynhyrchiad stwnch MD5\n"
-"  -s=?        Ffeil gwrthwneud ffynhonell\n"
-"  -q          Tawel\n"
-"  -d=?        Dewis cronda data storfa opsiynnol\n"
-"  --no-delink Galluogi'r modd datgysylltu datnamu\n"
-"  --contents  Rheoli cynhyrchiad ffeil cynnwys\n"
-"  -c=?        Darllen y ffeil cyfluniad hwn\n"
-"  -o=?        Gosod opsiwn cyfluniad mympwyol"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Dim dewisiadau'n cyfateb"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn  `%s'"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ni ellir agor y ffeil DB2 %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Methwyd darllen y cyswllt %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Does dim cofnod rheoli gan yr archif"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Ni ellir cael cyrchydd"
-
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
 
-#: ftparchive/writer.cc:96
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "Rh: Ni ellir gwneud stat() o %s\n"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "G: "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Methyd lleoli yr elfen <hash>!"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "Rh: "
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Methwyd neilltuo dargyfeiriad"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
+#: apt-inst/filelist.cc:464
+#, fuzzy
+msgid "Internal error in AddDiversion"
+msgstr "Gwall Mewnol yn AddDiversion"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "Methwyd datrys %s"
-
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Methwyd cerdded y goeden"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
 
-#: ftparchive/writer.cc:219
+# FIXME: "the"
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to open %s"
-msgstr "Methwyd agor %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
 
-# FIXME
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DatGysylltu %s [%s]\n"
+msgid "Duplicate conf file %s/%s"
+msgstr "Ffeil cyfluniad dyblyg %s/%s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Methwyd darllen y cyswllt %s"
+msgid "The path %s is too long"
+msgstr "Mae'r llwybr %s yn rhy hir"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Methwyd datgysylltu %s"
+msgid "Unpacking %s more than once"
+msgstr "Yn dadbacio %s mwy nag unwaith"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Methwyd cysylltu %s at %s"
+msgid "The directory %s is diverted"
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:152
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Doedd dim maes pecyn gan yr archif"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr ""
+"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  Cynaliwr %s yw %s nid %s\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
 
-#: ftparchive/writer.cc:698
-#, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Mae'r llwybr yn rhy hir"
 
-#: ftparchive/writer.cc:702
-#, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+# FIXME: wtf?
+#: apt-inst/extract.cc:421
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Methwyd neilltuo cof"
+#: apt-inst/extract.cc:438
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Unable to open %s"
-msgstr "Ni ellir agor %s"
+msgid "Unable to stat %s"
+msgstr "Ni ellir gwneud stat() o %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+msgid "Failed to write file %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Methwydd darllen y ffeil dargyfeirio %s"
+msgid "Failed to close file %s"
+msgstr "Methwyd cau ffeil %s"
 
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
 
-#: ftparchive/override.cc:178
+#: apt-inst/deb/debfile.cc:132
 #, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
+msgid "Internal error, could not locate member %s"
+msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
+#: apt-inst/deb/debfile.cc:231
+#, fuzzy
+msgid "Unparsable control file"
+msgstr "Ffeil rheoli ni ellir ei ramadegu"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Llofnod archif annilys"
+
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Gwall wrth ddarllen pennawd aelod archif"
+
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Dull Cywasgu Anhysbys '%s'"
+msgid "Invalid archive member header %s"
+msgstr "Pennawd aelod archif annilys"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Pennawd aelod archif annilys"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Methwyd creu FILE*"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Mae'r archif yn rhy fyr"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Methodd fork()"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Methwyd darllen pennawdau'r archif"
 
-#: ftparchive/multicompress.cc:209
-#, fuzzy
-msgid "Compress child"
-msgstr "Plentyn Cywasgu"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Methwyd creu pibau"
 
-#: ftparchive/multicompress.cc:232
-#, fuzzy, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Gwall Mewnol, Methwyd creu %s"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Methwyd gweithredu gzip"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Methodd MA i isbroses/ffeil"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Archif llygredig"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Methwyd darllen wrth gyfrifo MD5"
+#: apt-inst/contrib/extracttar.cc:207
+#, fuzzy
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Methodd swm gwirio Tar, archif llygredig"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Gwall wrth datgysylltu %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Math pennawd TAR anhysbys %u, aelod %s"
 
-# FIXME: "debian"
-#: cmdline/apt-internal-solver.cc:49
 #, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
-"\n"
-"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
-"templed o becynnau Debian.\n"
-"\n"
-"Opsiynnau:\n"
-"  -h   Dangos y testun cymorth hwn\n"
-"  -t   Gosod y cyfeiriadur dros dro\n"
-"  -c=? Darllen y ffeil cyfluniad hwn\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Cofnod pecyn anhysbys!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Does dim digon o le rhydd yn %s gennych"
+
+#~ msgid "Done"
+#~ msgstr "Wedi Gorffen"
 
-#: cmdline/apt-sortpkgs.cc:153
 #, fuzzy
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
-"\n"
-"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n"
-"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n"
-"\n"
-"Opsiynnau:\n"
-"  -h   Y testun cymorth hwn\n"
-"  -s   Defnyddio trefnu ffeil ffynhonell\n"
-"  -c=? Darllen y ffeil cyfluniad hwn\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Yn Erthylu'r Sefydliad."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/da.po b/po/da.po
index 712dec981..53d3de059 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: 2015-01-16 04:37-0500\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,151 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Samlet antal pakkenavne: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Samlet antal pakkestrukturer: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Normale pakker: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Rene virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Enkelte virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Blandede virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Manglende: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Totale forskellige versioner: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Sammenlagt forskellige beskrivelser: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Sammenlagt afhængigheder: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Sammenlagt version/fil-relationer: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Sammenlagt version/fil-relationer: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Sammenlagt »Tilbyder«-markeringer: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Totalle søgemønsterstrenge: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Total afhængighedsversions-plads: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Total »Slack«-plads: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Total plads, der kan gøres rede for: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: 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:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "»Pinned« pakker:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(ikke fundet)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Installeret: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Pakke-pin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Versionstabel:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -239,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"
@@ -265,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."
 
@@ -301,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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: 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:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunne ikke finde pakken %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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."
@@ -350,24 +346,24 @@ msgstr ""
 "Denne kommando er forældet. Brug venligst »apt-mark auto« og »apt-mark "
 "manual« i stedet for."
 
-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Kunne ikke låse nedhentningsmappen"
 
-#: cmdline/apt-get.cc:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -376,7 +372,7 @@ msgstr ""
 "BEMÆRK: Pakning af »%s« vedligeholdes i versionskontrolsystemet »%s« på:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -387,78 +383,67 @@ msgstr ""
 "bzr branch %s\n"
 "for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Overspringer allerede hentet fil »%s«\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Kunne ikke bestemme ledig plads i %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Du har ikke nok ledig plads i %s"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Henter kildetekst %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Nogle arkiver kunne ikke hentes."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Udpakningskommandoen »%s« fejlede.\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Opbygningskommandoen »%s« fejlede.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Barneprocessen fejlede"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -467,17 +452,27 @@ msgstr ""
 "Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::"
 "Architectures for opsætning"
 
-#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -518,30 +513,30 @@ msgstr ""
 "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en "
 "kandidatversion"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Kunne ikke behandler opbygningsafhængighederne"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Ændringslog for %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Understøttede moduler:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr "Kunne ikke hente pakkerne"
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 #, fuzzy
 msgid ""
 "Usage: apt-helper [options] command\n"
@@ -665,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -833,12 +828,12 @@ msgstr "Disk blev ikke fundet."
 msgid "File not found"
 msgstr "Fil blev ikke fundet"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Kunne ikke finde"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Kunne ikke angive ændringstidspunkt"
 
@@ -847,34 +842,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ugyldig URI, lokale URI'er må ikke starte med //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Logget på"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Kunne ikke bestemme serverens navn"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Kunne ikke bestemme det lokale navn"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Serveren nægtede os forbindelse og sagde: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "angivelse af brugernavn mislykkedes, serveren sagde: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "angivelse af adgangskode mislykkedes, serveren sagde: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -882,123 +877,123 @@ msgstr ""
 "Der blev angivet en proxyserver men intet logpå-skript; Acquire::ftp::"
 "ProxyLogin er tom."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Logpå-skriptets kommando »%s« mislykkedes. Serveren sagde: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE mislykkedes. Serveren sagde: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Tidsudløb på forbindelsen"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Serveren lukkede forbindelsen"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Læsefejl"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Mellemlageret blev overfyldt af et svar."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Protokolfejl"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Skrivefejl"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Kunne ikke oprette sokkel"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Kunne ikke forbinde datasokkel, tidsudløb på forbindelsen"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Mislykkedes"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Kunne ikke forbinde passiv sokkel."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo kunne ikke få en lyttesokkel"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Kunne ikke tilknytte en sokkel"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Kunne ikke lytte på soklen"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Kunne ikke finde soklens navn"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Kunne ikke sende PORT-kommando"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ukendt adressefamilie %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT mislykkedes. Serveren sagde: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Tidsudløb på datasokkel-forbindelse"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Kunne ikke acceptere forbindelse"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Kunne ikke hente fil. Serveren sagde »%s«"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Tidsudløb ved datasokkel"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataoverførsel mislykkedes, serveren sagde »%s«"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Forespørgsel"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Kunne ikke udføre "
 
@@ -1064,23 +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:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Stødte på mindst én ugyldig signatur."
 
-#: methods/gpgv.cc:174
+#: 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?)"
+"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:180
+#: 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:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Ukendt fejl ved kørsel af apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1105,35 +1101,35 @@ msgstr ""
 "Følgende signaturer kunne ikke verificeret, da den offentlige nøgle ikke er "
 "tilgængelig:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "Tomme filer kan ikke være gyldige arkiver"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Fejl ved skrivning til filen"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Fejl ved læsning fra server"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Fejl ved skrivning til fil"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Valg mislykkedes"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Tidsudløb på forbindelsen"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Fejl ved skrivning af uddatafil"
 
@@ -1166,295 +1162,31 @@ msgstr ""
 msgid "Unknown date format"
 msgstr "Ukendt datoformat"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Ugyldige hoved-data"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkedes"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "Intern fejl"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr "Sortering"
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Intern fejl. Sortering blev ikke fuldført"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Mystisk... Størrelserne passede ikke, skriv til 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "%sB/%sB skal hentes fra 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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "%sB skal hentes fra 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
-#: apt-private/private-install.cc:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Efter denne handling, vil %sB yderligere diskplads være brugt.\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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Efter denne handling, vil %sB diskplads blive frigjort.\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Du har ikke nok ledig plads i %s."
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Der er problemer og -y blev brugt uden --force-yes"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "»Trivial Only« angivet, men dette er ikke en triviel handling."
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Ja, gør som jeg siger!"
-
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Du er ved at gøre noget, der kan være skadeligt\n"
-"For at fortsætte, skal du skrive »%s«\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Afbryder."
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Vil du fortsætte?"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Nedhentningen af filer mislykkedes"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Kunne ikke hente nogle af arkiverne. Prøv evt. at køre »apt-get update« "
-"eller prøv med --fix-missing."
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing og medieskift understøttes endnu ikke"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Kunne ikke rette manglende pakker."
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Afbryder installationen."
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"Den følgende pakke forsvandt fra dit system, da\n"
-"alle filer er blevet overskrevet af andre pakker:"
-msgstr[1] ""
-"De følgende pakker forsvandt fra dit system, da\n"
-"alle filer er blevet overskrevet af andre pakker:"
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Bemærk: Dette sker automatisk og med vilje af dpkg."
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-"Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte "
-"AutoRemover"
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Hmm, det lader til at AutoRemover smadrede noget, der virkelig ikke\n"
-"burde kunne ske. Indsend venligst en fejlrapport om apt."
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:"
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Intern fejl. AutoRemover ødelagde noget"
-
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"Følgende pakke blev installeret automatisk, og behøves ikke længere:"
-msgstr[1] ""
-"Følgende pakker blev installeret automatisk, og behøves ikke længere:"
-
-#: apt-private/private-install.cc:517
+#: methods/server.cc:589
 #, c-format
-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] "Pakken %lu blev installeret automatisk, og behøves ikke længere.\n"
-msgstr[1] ""
-"Pakkerne %lu blev installeret automatisk, og behøves ikke længere.\n"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Brug »apt-get autoremove« til at fjerne den."
-msgstr[1] "Brug »apt-get autoremove« til at fjerne dem."
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Du kan muligvis rette det ved at køre »apt-get -f install«:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Uopfyldte afhængigheder. Prøv »apt-get -f install« uden pakker (eller angiv "
-"en løsning)."
-
-#: apt-private/private-install.cc:638
 msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Nogle pakker kunne ikke installeres. Det kan betyde at du har ønsket\n"
-"en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
-"pakker endnu ikke er lavet eller gjort tilgængelige."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Ødelagte pakker"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Følgende yderligere pakker vil blive installeret:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Foreslåede pakker:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Anbefalede pakker:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Springer over %s, den er allerede installeret og opgradering er ikke "
-"angivet.\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"Springer over %s, den er ikke installeret og der blev kun anmodt om "
-"opgraderinger.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Geninstallation af %s er ikke muligt, pakken kan ikke hentes.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s er allerede den nyeste version.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Valgt version »%s« (%s) for »%s«\n"
 
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Valgt version »%s« (%s) for »%s« på grund af »%s«\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Pakke »%s« er ikke installeret, så blev ikke fjernet. Mente du »%s«?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Pakke »%s« er ikke installeret, så blev ikke fjernet\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "Intern fejl"
 
 # måske visning, kategorisering
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr "Listing"
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1464,31 +1196,31 @@ msgstr[0] ""
 msgstr[1] ""
 "Der er %i yderligere versioner. Brug venligst kontakten »-a« til at se dem."
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "Retter afhængigheder ..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " mislykkedes."
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "Kunne ikke rette afhængigheder"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr "Kunne ikke minimere opgraderingssættet"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " Færdig"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "Uopfyldte afhængigheder. Prøv med -f."
 
@@ -1649,7 +1381,7 @@ msgstr "J"
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: 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"
@@ -1658,7 +1390,7 @@ msgstr "Fejl ved tolkning af regulært udtryk - %s"
 msgid "The update command takes no arguments"
 msgstr "»update«-kommandoen benytter ingen parametre"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1668,10 +1400,14 @@ msgstr[0] ""
 msgstr[1] ""
 "%i pakker kan opgraderes. Kør »apt list --upgradable« for at se dem.\n"
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1698,27 +1434,306 @@ msgstr ""
 "    Husk også at låsning er deaktiveret,\n"
 "    så stol ikke på relevansen for den reelle aktuelle situation!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!"
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Intern fejl. Sortering blev ikke fuldført"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Mystisk... Størrelserne passede ikke, skriv til 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "%sB/%sB skal hentes fra 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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "%sB skal hentes fra 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
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Efter denne handling, vil %sB yderligere diskplads være brugt.\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 "Efter denne handling, vil %sB diskplads blive frigjort.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Der er problemer og -y blev brugt uden --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« angivet, men dette er ikke en triviel handling."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Ja, gør som jeg siger!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Du er ved at gøre noget, der kan være skadeligt\n"
+"For at fortsætte, skal du skrive »%s«\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Afbryder."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Vil du fortsætte?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Nedhentningen af filer mislykkedes"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Kunne ikke hente nogle af arkiverne. Prøv evt. at køre »apt-get update« "
+"eller prøv med --fix-missing."
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing og medieskift understøttes endnu ikke"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Kunne ikke rette manglende pakker."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Afbryder installationen."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"Den følgende pakke forsvandt fra dit system, da\n"
+"alle filer er blevet overskrevet af andre pakker:"
+msgstr[1] ""
+"De følgende pakker forsvandt fra dit system, da\n"
+"alle filer er blevet overskrevet af andre pakker:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Bemærk: Dette sker automatisk og med vilje af dpkg."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+"Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte "
+"AutoRemover"
+
+#: 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 ""
+"Hmm, det lader til at AutoRemover smadrede noget, der virkelig ikke\n"
+"burde kunne ske. Indsend venligst en fejlrapport om apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Intern fejl. AutoRemover ødelagde noget"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"Følgende pakke blev installeret automatisk, og behøves ikke længere:"
+msgstr[1] ""
+"Følgende pakker blev installeret automatisk, og behøves ikke længere:"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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] "Pakken %lu blev installeret automatisk, og behøves ikke længere.\n"
+msgstr[1] ""
+"Pakkerne %lu blev installeret automatisk, og behøves ikke længere.\n"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "Brug »apt-get autoremove« til at fjerne den."
+msgstr[1] "Brug »apt-get autoremove« til at fjerne dem."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Du kan muligvis rette det ved at køre »apt-get -f install«:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Uopfyldte afhængigheder. Prøv »apt-get -f install« uden pakker (eller angiv "
+"en løsning)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Nogle pakker kunne ikke installeres. Det kan betyde at du har ønsket\n"
+"en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
+"pakker endnu ikke er lavet eller gjort tilgængelige."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Ødelagte pakker"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Følgende yderligere pakker vil blive installeret:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Foreslåede pakker:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Anbefalede pakker:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Springer over %s, den er allerede installeret og opgradering er ikke "
+"angivet.\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Springer over %s, den er ikke installeret og der blev kun anmodt om "
+"opgraderinger.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Geninstallation af %s er ikke muligt, pakken kan ikke hentes.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s er allerede den nyeste version.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Valgt version »%s« (%s) for »%s«\n"
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Valgt version »%s« (%s) for »%s« på grund af »%s«\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "Pakke »%s« er ikke installeret, så blev ikke fjernet. Mente du »%s«?\n"
+
+#: apt-private/private-install.cc:945
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Pakke »%s« er ikke installeret, så blev ikke fjernet\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ADVARSEL: Følgende pakkers autenticitet kunne ikke verificeres!"
 
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:98
 msgid "Authentication warning overridden.\n"
 msgstr "Autentifikationsadvarsel tilsidesat.\n"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
 msgid "Some packages could not be authenticated"
 msgstr "Nogle pakker kunne ikke autentificeres"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 msgid "Install these packages without verification?"
 msgstr "Installér disse pakker uden verifikation?"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Kunne ikke hente %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 "Kunne ikke bestemme ledig plads i %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Du har ikke nok ledig plads i %s."
+
 #: apt-private/private-sources.cc:58
 #, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1733,41 +1748,33 @@ msgstr "Din »%s« fil blev ændret, kør venligst »apt-get update«."
 msgid "Full Text Search"
 msgstr "Fuldtekst-søgning"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Beregner opgraderingen"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Færdig"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Havde "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Henter:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ignorerer "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Fejl "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Hentede %sB på %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Arbejder]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1780,18 +1787,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1868,205 +1875,453 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Sammenfletter tilgængelighedsoplysninger"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode kaldt med endnu forbundet knude"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Kunne ikke finde hash-element!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Kunne ikke allokere omrokering"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Intern fejl i AddDiversion"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Brug: apt-extracttemplates fil1 [fil2 ...]\n"
+"\n"
+"apt-extracttemplates er et værktøj til at uddrage opsætnings- og skabelon-"
+"oplysninger fra Debianpakker\n"
+"\n"
+"Tilvalg:\n"
+"  -h   Denne hjælpetekst\n"
+"  -t   Angiv temp-mappe\n"
+"  -c=? Læs denne opsætningsfil\n"
+"  -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:477
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Forsøger at overskrive en omrokering, %s -> %s og %s/%s"
+msgid "Unable to mkstemp %s"
+msgstr "Kunne ikke mkstemp %s"
 
-#: apt-inst/filelist.cc:506
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Dobbelt tilføjelse af omrokering %s -> %s"
+msgid "Unable to write to %s"
+msgstr "Kunne ikke skrive til %s"
 
-#: apt-inst/filelist.cc:549
+#: 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:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "Pakkeudvidelseslisten er for lang"
+
+#: 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 "Duplicate conf file %s/%s"
-msgstr "Dobbelt opsætningsfil %s/%s"
+msgid "Error processing directory %s"
+msgstr "Fejl under behandling af mappen %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Kildeudvidelseslisten er for lang"
+
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "Fejl under skrivning af hovedet til indholdsfil"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "Stien %s er for lang"
+msgid "Error processing contents %s"
+msgstr "Fejl under behandling af indhold %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Brug: apt-ftparchive [tilvalg] kommando\n"
+"Kommandoer: packges binærsti [tvangsfil [sti]]\n"
+"            sources kildesti [tvangsfil [sti]]\n"
+"            contents sti\n"
+"            release sti\n"
+"            generate config [grupper]\n"
+"            clean config\n"
+"\n"
+"apt-ftparchive laver indeksfiler til Debianarkiver. Det understøtter \n"
+"mange former for generering, lige fra fuldautomatiske til funktionelle\n"
+"erstatninger for dpkg-scanpackages og dpkg-scansources\n"
+"\n"
+"apt-ftparchive genererer Package-filer ud fra træer af .deb'er.\n"
+"Package-filen indeholder alle styrefelterne fra hver pakke såvel\n"
+"som MD5-mønstre og filstørrelser. En tvangsfil understøttes til at\n"
+"gennemtvinge indholdet af Priority og Section.\n"
+"\n"
+"På samme måde genererer apt-ftparchive Sources-filer ud fra træer\n"
+"med .dsc'er. Tvangstilvalget --source-override kan bruges til at\n"
+"angive en src-tvangsfil.\n"
+"\n"
+"Kommandoerne »packages« og »sources« skal køres i roden af træet.\n"
+"binærsti skal pege på basen af rekursive søgninger og tvangsfilen\n"
+"skal indeholde tvangsflagene. Sti foranstilles eventuelle\n"
+"filnavnfelter. Et eksempel på brug fra Debianarkivet:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Tilvalg:\n"
+"  -h    Denne hjælpetekst\n"
+"  --md5 Styr generering af MD5\n"
+"  -s=?  Kilde-tvangsfil\n"
+"  -q    Stille\n"
+"  -d=?  Vælg den valgfrie mellemlager-database\n"
+"  --no-delink Aktivér \"delinking\"-fejlsporingstilstand\n"
+"  --contents  Bestem generering af indholdsfil\n"
+"  -c=?  Læs denne opsætningsfil\n"
+"  -o=?  Sæt en opsætnings-indstilling"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Ingen valg passede"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Pakkede %s ud flere gange"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Visse filer mangler i pakkefilgruppen »%s«"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Mappen %s er omrokeret"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB var ødelagt, filen omdøbt til %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Pakken forsøger at skrive til omrokeret mål %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB er gammel, forsøger at opgradere %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Omrokeringsstien er for lang"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Databaseformatet er ugyldigt. Hvis du har opgraderet fra en ældre version af "
+"apt, så fjern og genskab databasen."
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Kunne ikke åbne DB-filen %s: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Kunne ikke finde %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+msgid "Failed to read .dsc"
+msgstr "Kunne ikke læse .dsc"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Arkivet har ingen kontrolindgang"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Kunne skaffe en markør"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Kunne ikke omdøbe %s til %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "A: Kunne ikke læse mappen %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Mappen %s bliver erstattet af en ikke-mappe"
+msgid "W: Unable to stat %s\n"
+msgstr "W: Kunne ikke finde %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Kunne ikke finde knuden i sin hash-bucket"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "F: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Stien er for lang"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "A: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "F: Fejlene vedrører filen "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Overskriv pakkematch uden version for %s"
+msgid "Failed to resolve %s"
+msgstr "Kunne ikke omsætte navnet %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Trævandring mislykkedes"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "File %s/%s overskriver filen i pakken %s"
+msgid "Failed to open %s"
+msgstr "Kunne ikke åbne %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Kunne ikke finde %s"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Kunne ikke skrive filen %s"
+msgid "Failed to readlink %s"
+msgstr "Kunne ikke »readlink« %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Kunne ikke lukke filen %s"
+msgid "Failed to unlink %s"
+msgstr "Kunne ikke frigøre %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler »%s«-elementet"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Kunne ikke lænke %s til %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Intern fejl, kunne ikke finde elementet %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Nåede DeLink-begrænsningen på %sB.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Ikke-tolkbar kontrolfil"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Arkivet havde intet package-felt"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Ugyldig arkivsignatur"
+#: 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:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  pakkeansvarlig for %s er %s, ikke %s\n"
+
+#: 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:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr ""
+"  %s har ingen linje med tilsidesættelse af standard for binøre filer\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Kunne ikke allokere hukommelse"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Kunne ikke åbne %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Ugyldig overskrivning af %s-linjen %llu (%s)"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Kunne ikke læse gennemtvangsfilen %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Ugyldig gennemtvangs %s-linje %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Ugyldig gennemtvangs %s-linje %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Ugyldig gennemtvangs %s-linje %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Ukendt komprimeringsalgoritme »%s«"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Komprimerede uddata %s kræver et komprimeringssæt"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Kunne ikke oprette FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Kunne ikke spalte"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Fejl under læsning af arkivelements hoved"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Komprimer barn"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/multicompress.cc:232
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "Ugyldigt arkivelementhoved %s"
-
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Ugyldigt arkivelementhoved"
+msgid "Internal error, failed to create %s"
+msgstr "Intern fejl. Kunne ikke oprette %s"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Arkivet er for kort"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "IO til underproces/fil mislykkedes"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Kunne ikke læse arkivhovederne"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Kunne ikke læse under beregning af MD5"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Kunne ikke oprette videreførsler"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problem under aflænkning af %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Kunne ikke udføre gzip "
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Kunne ikke omdøbe %s til %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Ødelagt arkiv"
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Brug: apt-internal-solver\n"
+"\n"
+"apt-internal-solver er en grænseflade, der skal bruge den aktuelle\n"
+"interne som en ekstern problemløser for APT-familien for fejlsøgning\n"
+"eller lignende\n"
+"\n"
+"Tilvalg:\n"
+" -h   Denne hjælpetekst.\n"
+" -q   Logbare uddata - ingen statusindikator\n"
+" -c=? Læs denne konfigurationsfil\n"
+" -o=? Angiv et arbitrærtkonfigurationstilvalg, f.eks. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar-tjeksum fejlede, arkivet er ødelagt"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Ukendt pakkeindgang!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Ukendt TAR-hovedtype %u, element %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Brug: apt-sortpkgs [tilvalg] fil1 [fil2 ...]\n"
+"\n"
+"apt-sortpkgs er et simpelt værktøj til at sortere pakkefiler. Tilvalget -s\n"
+"bruges til at angive filens type.\n"
+"\n"
+"Tilvalg:\n"
+"  -h   Denne hjælpetekst\n"
+"  -s   Benyt kildefils-sortering\n"
+"  -c=? Læs denne opsætningsfil\n"
+"  -o=? Angiv en opsætningsindstilling. F.eks. -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr "Status: [%3i%%]"
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "Kører dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakkesystemet »%s« understøttes ikke"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Kunne ikke bestemme en passende pakkesystemtype"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skrev %i poster med %i manglende filer.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Skrev %i poster med %i ikke-trufne filer\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n"
@@ -2081,6 +2336,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."
@@ -2093,156 +2368,330 @@ 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:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Tomt pakke-mellemlager"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Afhængigheder"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Præ-afhængigheder"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Foreslåede"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Anbefalede"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Konflikter"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Erstatter"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Overflødiggør"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Ødelægger"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Forbedringer"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "vigtig"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "krævet"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "frivillig"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "ekstra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Beregner opgraderingen"
+
+#: 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:118
+#: 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/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/acquire-worker.cc:169
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startede ikke korrekt"
+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/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/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Kunne ikke finde %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/acquire-worker.cc:455
+#: apt-pkg/pkgcachegen.cc:1196
 #, 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 "Couldn't stat source package list %s"
+msgstr "Kunne ikke finde kildepakkelisten %s"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indeksfiler af typen »%s« understøttes ikke"
+#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Opbygger afhængighedstræ"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Samler filudbud"
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidatversioner"
+#: 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/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Afhængighedsgenerering"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Send scenarie til problemløser"
 
-#: 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/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Send forespørgsel til problemløser"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Kunne ikke åbne StateFile %s"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Forbered for modtagelse af løsning"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Kunne ikke skrive den midlertidige StateFile %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
+
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Hashsum stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Størrelsen stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 msgid "Invalid file format"
 msgstr "Ugyldigt filformat"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Skrivefejl"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Der opstod en fejl under underskriftsbekræftelse. Arkivet er ikke opdateret "
+"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:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG-fejl: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Mappen %s er omrokeret"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2251,17 +2700,17 @@ msgstr ""
 "Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-"
 "punkt eller forkert udformet fil)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2270,27 +2719,19 @@ msgstr ""
 "Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette "
 "arkiv vil ikke blive anvendt."
 
-#: apt-pkg/acquire-item.cc:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Der opstod en fejl under underskriftsbekræftelse. Arkivet er ikke opdateret "
-"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:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG-fejl: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2299,132 +2740,49 @@ 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:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Indeksfiler af typen »%s« understøttes ikke"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kunne ikke finde %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, 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:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kunne ikke finde kildepakkelisten %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Indlæser pakkelisterne"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samler filudbud"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Kunne ikke skrive til %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Du skal have nogle »source«-URI'er i din sources.list"
@@ -2452,7 +2810,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2461,12 +2819,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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2478,10 +2836,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"
@@ -2552,11 +2913,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"
 
@@ -2567,7 +2928,7 @@ msgid ""
 msgstr ""
 "Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2575,331 +2936,262 @@ msgstr ""
 "Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes "
 "tilbageholdte pakker."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr "Send forespørgsel til problemløser"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Forbered for modtagelse af løsning"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Kør ekstern problemløser"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Kunne ikke tolke pakkefilen %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Kunne ikke fortolke udgivelsesfil %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Ingen afsnit i udgivelsesfil %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Intet hashpunkt i udgivelsesfil %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ugyldigt punkt »Valid-Until« i udgivelsesfil %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Opbygger afhængighedstræ"
 
-#: 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:139
+msgid "Candidate versions"
+msgstr "Kandidatversioner"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Åbner %s"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Afhængighedsgenerering"
 
-#: apt-pkg/sourcelist.cc:371
+#: 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/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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Udgaven »%s« for »%s« blev ikke fundet"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versionen »%s« for »%s« blev ikke fundet"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Kunne ikke finde opgaven »%s«"
 
-#: apt-pkg/cacheset.cc:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Kan ikke vælge installeret eller kandidatversion fra pakke »%s« da den ikke "
-"har nogen af dem"
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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 ikke vælge installeret eller kandidatversion fra pakke »%s« da den ikke "
+"har nogen af dem"
+
+#: 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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Intet hashpunkt i udgivelsesfil %s"
+
+#: apt-pkg/indexrecords.cc:145
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ugyldigt punkt »Valid-Until« i udgivelsesfil %s"
+
+#: apt-pkg/indexrecords.cc:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ugyldigt punkt »Date« i udgivelsesfil %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Det valgte %s blev ikke fundet"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Benytter ikke låsning for skrivebeskyttet låsefil %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Kunne ikke åbne låsefilen %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Benytter ikke låsning for nfs-monteret låsefil %s"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Kunne ikke opnå låsen %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 "Liste over filer kan ikke oprettes da »%s« ikke er en mappe"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Ignorerer »%s« i mappe »%s« da det ikke er en regulær fil"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "Ignorerer fil »%s« i mappe »%s« da den ikke har en filendelse"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr "Ignorerer fil »%s« i mappe »%s« da den har en ugyldig filendelse"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprocessen %s modtog en segmenteringsfejl."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprocessen %s modtog en signal %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprocessen %s returnerede en fejlkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprocessen %s afsluttedes uventet"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problem under lukning af gzip-filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Kunne ikke åbne filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Kunne ikke åbne filbeskrivelse %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Kunne ikke oprette underproces IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Kunne ikke udføre komprimeringsprogram "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "læs, mangler stadig at læse %llu men der er ikke flere"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "skriv, mangler stadig at skrive %llu men kunne ikke"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem under lukning af filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem under omdøbning af filen %s til %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Fejl ved frigivelse af filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Problem under synkronisering af fil"
 
@@ -2988,109 +3280,103 @@ msgstr "Kunne ikke finde monteringspunktet %s"
 msgid "Failed to stat the cdrom"
 msgstr "Kunne ikke finde cdrommen"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Ukendt type-forkortelse: »%c«"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Åbner konfigurationsfilen %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nøglering installeret i %s."
-
-#: 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"
@@ -3100,12 +3386,12 @@ msgstr "Ugyldig handling %s"
 msgid "Installing %s"
 msgstr "Installerer %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Fjerner %s"
@@ -3126,80 +3412,80 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mappe »%s« mangler"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Klargør %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Pakker %s ud"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: 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:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "Installerede %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "Fjernede %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "Fjernede %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1670
+#: 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:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "afhængighedsproblemer - efterlader ukonfigureret"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3207,14 +3493,14 @@ msgstr ""
 "Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en "
 "opfølgningsfejl fra en tidligere fejl."
 
-#: apt-pkg/deb/dpkgpm.cc:1745
+#: 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:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3222,7 +3508,7 @@ msgstr ""
 "Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok "
 "hukommelsesfejl"
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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"
@@ -3230,7 +3516,7 @@ msgstr ""
 "Ingen apportrapport skrevet da fejlbeskeden indikerer en fejl på det lokale "
 "system"
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: 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"
@@ -3238,423 +3524,193 @@ 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"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Brug: apt-extracttemplates fil1 [fil2 ...]\n"
-"\n"
-"apt-extracttemplates er et værktøj til at uddrage opsætnings- og skabelon-"
-"oplysninger fra Debianpakker\n"
-"\n"
-"Tilvalg:\n"
-"  -h   Denne hjælpetekst\n"
-"  -t   Angiv temp-mappe\n"
-"  -c=? Læs denne opsætningsfil\n"
-"  -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Kunne ikke mkstemp %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Fejl under behandling af mappen %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Kildeudvidelseslisten er for lang"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Fejl under skrivning af hovedet til indholdsfil"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Fejl under behandling af indhold %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Brug: apt-ftparchive [tilvalg] kommando\n"
-"Kommandoer: packges binærsti [tvangsfil [sti]]\n"
-"            sources kildesti [tvangsfil [sti]]\n"
-"            contents sti\n"
-"            release sti\n"
-"            generate config [grupper]\n"
-"            clean config\n"
-"\n"
-"apt-ftparchive laver indeksfiler til Debianarkiver. Det understøtter \n"
-"mange former for generering, lige fra fuldautomatiske til funktionelle\n"
-"erstatninger for dpkg-scanpackages og dpkg-scansources\n"
-"\n"
-"apt-ftparchive genererer Package-filer ud fra træer af .deb'er.\n"
-"Package-filen indeholder alle styrefelterne fra hver pakke såvel\n"
-"som MD5-mønstre og filstørrelser. En tvangsfil understøttes til at\n"
-"gennemtvinge indholdet af Priority og Section.\n"
-"\n"
-"På samme måde genererer apt-ftparchive Sources-filer ud fra træer\n"
-"med .dsc'er. Tvangstilvalget --source-override kan bruges til at\n"
-"angive en src-tvangsfil.\n"
-"\n"
-"Kommandoerne »packages« og »sources« skal køres i roden af træet.\n"
-"binærsti skal pege på basen af rekursive søgninger og tvangsfilen\n"
-"skal indeholde tvangsflagene. Sti foranstilles eventuelle\n"
-"filnavnfelter. Et eksempel på brug fra Debianarkivet:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Tilvalg:\n"
-"  -h    Denne hjælpetekst\n"
-"  --md5 Styr generering af MD5\n"
-"  -s=?  Kilde-tvangsfil\n"
-"  -q    Stille\n"
-"  -d=?  Vælg den valgfrie mellemlager-database\n"
-"  --no-delink Aktivér \"delinking\"-fejlsporingstilstand\n"
-"  --contents  Bestem generering af indholdsfil\n"
-"  -c=?  Læs denne opsætningsfil\n"
-"  -o=?  Sæt en opsætnings-indstilling"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Ingen valg passede"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Visse filer mangler i pakkefilgruppen »%s«"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB var ødelagt, filen omdøbt til %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB er gammel, forsøger at opgradere %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Databaseformatet er ugyldigt. Hvis du har opgraderet fra en ældre version af "
-"apt, så fjern og genskab databasen."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Kunne ikke åbne DB-filen %s: %s"
-
-#: ftparchive/cachedb.cc:332
-msgid "Failed to read .dsc"
-msgstr "Kunne ikke læse .dsc"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arkivet har ingen kontrolindgang"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Kunne skaffe en markør"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Kunne ikke låse administrationsmappen (%s), bruger en anden proces den?"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: Kunne ikke læse mappen %s\n"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Kunne ikke låse administrationsmappen (%s), er du rod (root)?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Kunne ikke finde %s\n"
+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."
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "F: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Ikke låst"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "A: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode kaldt med endnu forbundet knude"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "F: Fejlene vedrører filen "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Kunne ikke finde hash-element!"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Kunne ikke omsætte navnet %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Kunne ikke allokere omrokering"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Trævandring mislykkedes"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Intern fejl i AddDiversion"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "Kunne ikke åbne %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Forsøger at overskrive en omrokering, %s -> %s og %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Dobbelt tilføjelse af omrokering %s -> %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Kunne ikke »readlink« %s"
+msgid "Duplicate conf file %s/%s"
+msgstr "Dobbelt opsætningsfil %s/%s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Kunne ikke frigøre %s"
+msgid "The path %s is too long"
+msgstr "Stien %s er for lang"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Kunne ikke lænke %s til %s"
+msgid "Unpacking %s more than once"
+msgstr "Pakkede %s ud flere gange"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Nåede DeLink-begrænsningen på %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arkivet havde intet package-felt"
+msgid "The directory %s is diverted"
+msgstr "Mappen %s er omrokeret"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s har ingen tvangs-post\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Pakken forsøger at skrive til omrokeret mål %s/%s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  pakkeansvarlig for %s er %s, ikke %s\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Omrokeringsstien er for lang"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s har ingen linje med tilsidesættelse af standard for kildefiler\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Mappen %s bliver erstattet af en ikke-mappe"
 
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr ""
-"  %s har ingen linje med tilsidesættelse af standard for binøre filer\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Kunne ikke finde knuden i sin hash-bucket"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Kunne ikke allokere hukommelse"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Stien er for lang"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "Kunne ikke åbne %s"
+msgid "Overwrite package match with no version for %s"
+msgstr "Overskriv pakkematch uden version for %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Ugyldig overskrivning af %s-linjen %llu (%s)"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "File %s/%s overskriver filen i pakken %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Kunne ikke læse gennemtvangsfilen %s"
+msgid "Unable to stat %s"
+msgstr "Kunne ikke finde %s"
 
-#: ftparchive/override.cc:166
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Ugyldig gennemtvangs %s-linje %llu #1"
+msgid "Failed to write file %s"
+msgstr "Kunne ikke skrive filen %s"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Ugyldig gennemtvangs %s-linje %llu #2"
+msgid "Failed to close file %s"
+msgstr "Kunne ikke lukke filen %s"
 
-#: ftparchive/override.cc:191
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Ugyldig gennemtvangs %s-linje %llu #3"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler »%s«-elementet"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Ukendt komprimeringsalgoritme »%s«"
+msgid "Internal error, could not locate member %s"
+msgstr "Intern fejl, kunne ikke finde elementet %s"
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Ikke-tolkbar kontrolfil"
+
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Ugyldig arkivsignatur"
+
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Fejl under læsning af arkivelements hoved"
+
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimerede uddata %s kræver et komprimeringssæt"
+msgid "Invalid archive member header %s"
+msgstr "Ugyldigt arkivelementhoved %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Kunne ikke oprette FILE*"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Ugyldigt arkivelementhoved"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Kunne ikke spalte"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arkivet er for kort"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Komprimer barn"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Kunne ikke læse arkivhovederne"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Intern fejl. Kunne ikke oprette %s"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Kunne ikke oprette videreførsler"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "IO til underproces/fil mislykkedes"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Kunne ikke udføre gzip "
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Kunne ikke læse under beregning af MD5"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Ødelagt arkiv"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar-tjeksum fejlede, arkivet er ødelagt"
+
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem under aflænkning af %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Ukendt TAR-hovedtype %u, element %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Brug: apt-internal-solver\n"
-"\n"
-"apt-internal-solver er en grænseflade, der skal bruge den aktuelle\n"
-"interne som en ekstern problemløser for APT-familien for fejlsøgning\n"
-"eller lignende\n"
-"\n"
-"Tilvalg:\n"
-" -h   Denne hjælpetekst.\n"
-" -q   Logbare uddata - ingen statusindikator\n"
-" -c=? Læs denne konfigurationsfil\n"
-" -o=? Angiv et arbitrærtkonfigurationstilvalg, f.eks. -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Total afhængighedsversions-plads: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Ukendt pakkeindgang!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Du har ikke nok ledig plads i %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Brug: apt-sortpkgs [tilvalg] fil1 [fil2 ...]\n"
-"\n"
-"apt-sortpkgs er et simpelt værktøj til at sortere pakkefiler. Tilvalget -s\n"
-"bruges til at angive filens type.\n"
-"\n"
-"Tilvalg:\n"
-"  -h   Denne hjælpetekst\n"
-"  -s   Benyt kildefils-sortering\n"
-"  -c=? Læs denne opsætningsfil\n"
-"  -o=? Angiv en opsætningsindstilling. F.eks. -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Færdig"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Ingen nøglering installeret i %s."
 
 #~ msgid "Is stdout a terminal?"
 #~ msgstr "Er standardud en terminal?"
diff --git a/po/de.po b/po/de.po
index bc74e184c..85b0cb7ac 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: 2015-01-16 04:37-0500\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,152 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Gesamtzahl an Paketnamen: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Gesamtzahl an Paketstrukturen: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  davon gewöhnliche Pakete: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  davon rein virtuelle Pakete: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  davon einzelne virtuelle Pakete: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  davon gemischte virtuelle Pakete: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  davon fehlend: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Gesamtzahl an unterschiedlichen Versionen: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Gesamtzahl an unterschiedlichen Beschreibungen: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Gesamtzahl an Abhängigkeiten: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Gesamtzahl an Version/Datei-Beziehungen: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Gesamtzahl an Beschreibung/Datei-Beziehungen: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Gesamtzahl an Bereitstellungen: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Gesamtzahl an Mustern: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Gesamtmenge des Abhängigkeits-/Versionsspeichers: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Gesamtmenge an Slack: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Gesamtmenge an Speicher: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: 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:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Paketdateien:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Mit Pinning verwaltete Pakete:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(nicht gefunden)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Installiert: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Installationskandidat: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(keine)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Paket-Pinning: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Versionstabelle:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -241,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"
@@ -273,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."
@@ -311,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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: 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:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Paket %s konnte nicht gefunden werden"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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."
@@ -360,26 +356,26 @@ msgstr ""
 "Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark auto« "
 "und »apt-mark manual«."
 
-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden."
 
-#: cmdline/apt-get.cc:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -389,7 +385,7 @@ msgstr ""
 "auf:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -401,80 +397,69 @@ msgstr ""
 "um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n"
 "für das Paket abzurufen.\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Freier Platz in %s konnte nicht bestimmt werden."
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Sie haben nicht genügend freien Speicherplatz in %s."
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Quelle %s wird heruntergeladen.\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Einige Archive konnten nicht heruntergeladen werden."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Entpackbefehl »%s« fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Kindprozess fehlgeschlagen"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -483,18 +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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -538,30 +533,30 @@ msgstr ""
 "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da für Paket %s kein "
 "Installationskandidat existiert."
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Änderungsprotokoll (Changelog) für %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Unterstützte Module:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr "Herunterladen fehlgeschlagen"
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -692,54 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -866,12 +861,12 @@ msgid "File not found"
 msgstr "Datei nicht gefunden"
 
 # looks like someone hardcoded English grammar
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Abfrage mit »stat« fehlgeschlagen"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Änderungszeitpunkt kann nicht gesetzt werden."
 
@@ -880,34 +875,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ungültige URI, lokale URIs dürfen nicht mit // beginnen."
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Anmeldung läuft"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Name des Kommunikationspartners kann nicht bestimmt werden."
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Lokaler Name kann nicht bestimmt werden."
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Verbindung durch Server abgelehnt; Server meldet: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Befehl USER fehlgeschlagen, Server meldet: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Befehl PASS fehlgeschlagen, Server meldet: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -915,125 +910,125 @@ msgstr ""
 "Es war ein Proxy-Server angegeben, aber kein Login-Skript, Acquire::ftp::"
 "ProxyLogin ist leer."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Befehl »%s« des Login-Skriptes fehlgeschlagen, Server meldet: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Befehl TYPE fehlgeschlagen: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Zeitüberschreitung der Verbindung"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Verbindung durch Server geschlossen"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Lesefehler"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Durch eine Antwort wurde der Puffer zum Überlaufen gebracht."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Protokoll beschädigt"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Schreibfehler"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Socket konnte nicht erzeugt werden."
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Daten-Socket konnte wegen Zeitüberschreitung nicht verbunden werden."
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Passiver Socket konnte nicht verbunden werden."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 "Von der Funktion getaddrinfo wurde kein auf Verbindungen wartender Socket "
 "gefunden."
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Verbindung des Sockets nicht möglich"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Warten auf Verbindungen auf dem Socket nicht möglich"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Name des Sockets konnte nicht bestimmt werden."
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "PORT-Befehl konnte nicht gesendet werden."
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Unbekannte Adressfamilie %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Befehl EPRT fehlgeschlagen: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Zeitüberschreitung bei Datenverbindungsaufbau"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Verbindung konnte nicht angenommen werden."
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Datei konnte nicht heruntergeladen werden; Server meldet: »%s«"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Zeitüberschreitung bei Datenverbindung"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Datenübertragung fehlgeschlagen; Server meldet: »%s«"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Abfrage"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Aufruf nicht möglich: "
 
@@ -1101,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:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Mindestens eine ungültige Signatur wurde entdeckt."
 
-#: methods/gpgv.cc:174
+#: 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?)"
+"»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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1128,15 +1123,15 @@ msgstr ""
 "Durch Clearsign signierte Datei ist nicht gültig, »%s« erhalten (erfordert "
 "das Netzwerk eine Authentifizierung?)"
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Unbekannter Fehler beim Ausführen von apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1145,37 +1140,37 @@ msgstr ""
 "öffentlicher\n"
 "Schlüssel nicht verfügbar ist:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "Leere Dateien können kein gültiges Archiv sein."
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Fehler beim Schreiben der Datei"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Fehler beim Lesen vom Server"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Fehler beim Schreiben in Datei"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Auswahl fehlgeschlagen"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Zeitüberschreitung bei Verbindung"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Fehler beim Schreiben der Ausgabedatei"
 
@@ -1210,183 +1205,441 @@ msgstr ""
 msgid "Unknown date format"
 msgstr "Unbekanntes Datumsformat"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Fehlerhafte Kopfzeilendaten"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr "Sortierung"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Auflistung"
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!"
+#: 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-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Abhängigkeiten werden korrigiert ..."
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Interner Fehler, Anordnung beendete nicht"
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " fehlgeschlagen."
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Wie merkwürdig ... die Größen haben nicht übereingestimmt; schreiben Sie "
-"eine E-Mail an apt@packages.debian.org (auf Englisch bitte)."
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Abhängigkeiten konnten nicht korrigiert werden."
 
-#. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Es müssen noch %sB von %sB an Archiven heruntergeladen werden.\n"
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden."
 
-#. 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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Es müssen %sB an Archiven heruntergeladen werden.\n"
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Fertig"
 
-#. 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:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n"
+#: 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."
 
-#. 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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n"
+#: 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-install.cc:200
+#: 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 "You don't have enough free space in %s."
-msgstr "Sie haben nicht genug Platz in %s."
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installiert,aktualisierbar auf: %s]"
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet."
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr " [Installiert,lokal]"
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "»Nur triviale« angegeben, aber dies ist keine triviale Operation."
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[installiert,automatisch-entfernbar]"
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Ja, tue was ich sage!"
+#: 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-install.cc:222
+#: apt-private/private-output.cc:277
 #, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Sie sind im Begriff, etwas potentiell Schädliches zu tun.\n"
-"Zum Fortfahren geben Sie bitte »%s« ein.\n"
-" ?] "
+msgid "[upgradable from: %s]"
+msgstr "[aktualisierbar von: %s]"
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Abbruch."
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[Konfiguration-verbleibend]"
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Möchten Sie fortfahren?"
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "aber %s ist installiert"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Einige Dateien konnten nicht heruntergeladen werden."
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "aber %s soll installiert werden"
 
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Einige Archive konnten nicht heruntergeladen werden; vielleicht »apt-get "
-"update« ausführen oder mit »--fix-missing« probieren?"
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ist aber nicht installierbar"
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing und Wechselmedien werden derzeit nicht unterstützt."
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ist aber ein virtuelles Paket"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Fehlende Pakete konnten nicht korrigiert werden."
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ist aber nicht installiert"
 
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Installation abgebrochen."
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "soll aber nicht installiert werden"
 
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"Das folgende Paket verschwand von Ihrem System, da alle\n"
-"Dateien von anderen Paketen überschrieben wurden:"
-msgstr[1] ""
-"Die folgenden Pakete verschwanden von Ihrem System, da alle\n"
-"Dateien von anderen Paketen überschrieben wurden:"
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " oder"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Hinweis: Dies wird automatisch und absichtlich von dpkg durchgeführt."
+#: 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-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
+#: 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 ""
-"Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden."
+"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-install.cc:499
+#: apt-private/private-output.cc:696
 msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
-"Hmm, es sieht so aus, als ob der AutoRemover etwas beschädigt hat, was\n"
-"wirklich nicht geschehen sollte. Bitte erstellen Sie einen Fehlerbericht\n"
-"über apt."
+"WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
+"Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualisiert, %lu neu installiert, "
 
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Interner Fehler, AutoRemover hat etwas beschädigt."
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu erneut installiert, "
 
-#: apt-private/private-install.cc:513
-msgid ""
+#: 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!"
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Interner Fehler, Anordnung beendete nicht"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Wie merkwürdig ... die Größen haben nicht übereingestimmt; schreiben Sie "
+"eine E-Mail an apt@packages.debian.org (auf Englisch bitte)."
+
+#. 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Es müssen noch %sB von %sB an Archiven 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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Es müssen %sB an Archiven 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
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n"
+
+#. 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 "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet."
+
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "»Nur triviale« angegeben, aber dies ist keine triviale Operation."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Ja, tue was ich sage!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Sie sind im Begriff, etwas potentiell Schädliches zu tun.\n"
+"Zum Fortfahren geben Sie bitte »%s« ein.\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Abbruch."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Möchten Sie fortfahren?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Einige Dateien konnten nicht heruntergeladen werden."
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Einige Archive konnten nicht heruntergeladen werden; vielleicht »apt-get "
+"update« ausführen oder mit »--fix-missing« probieren?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing und Wechselmedien werden derzeit nicht unterstützt."
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Fehlende Pakete konnten nicht korrigiert werden."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Installation abgebrochen."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"Das folgende Paket verschwand von Ihrem System, da alle\n"
+"Dateien von anderen Paketen überschrieben wurden:"
+msgstr[1] ""
+"Die folgenden Pakete verschwanden von Ihrem System, da alle\n"
+"Dateien von anderen Paketen überschrieben wurden:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Hinweis: Dies wird automatisch und absichtlich von dpkg durchgeführt."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+"Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden."
+
+#: 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 ""
+"Hmm, es sieht so aus, als ob der AutoRemover etwas beschädigt hat, was\n"
+"wirklich nicht geschehen sollte. Bitte erstellen Sie einen Fehlerbericht\n"
+"über apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Interner Fehler, AutoRemover hat etwas beschädigt."
+
+#: apt-private/private-install.cc:488
+msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
@@ -1398,7 +1651,7 @@ msgstr[1] ""
 "Die folgenden Pakete wurden automatisch installiert und werden nicht mehr "
 "benötigt:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:492
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1408,17 +1661,17 @@ msgstr[0] ""
 msgstr[1] ""
 "%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n"
 
-#: apt-private/private-install.cc:519
+#: apt-private/private-install.cc:494
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Verwenden Sie »apt-get autoremove«, um es zu entfernen."
 msgstr[1] "Verwenden Sie »apt-get autoremove«, um sie zu entfernen."
 
-#: apt-private/private-install.cc:612
+#: apt-private/private-install.cc:587
 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-install.cc:614
+#: apt-private/private-install.cc:589
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1426,7 +1679,7 @@ msgstr ""
 "Unerfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne Angabe "
 "eines Pakets (oder geben Sie eine Lösung an)."
 
-#: apt-private/private-install.cc:638
+#: apt-private/private-install.cc:612
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1438,348 +1691,109 @@ msgstr ""
 "Unstable-Distribution verwenden, dass einige erforderliche Pakete noch\n"
 "nicht erstellt wurden oder Incoming noch nicht verlassen haben."
 
-#: apt-private/private-install.cc:659
+#: apt-private/private-install.cc:633
 msgid "Broken packages"
 msgstr "Beschädigte Pakete"
 
-#: apt-private/private-install.cc:712
+#: apt-private/private-install.cc:710
 msgid "The following extra packages will be installed:"
 msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
 
-#: apt-private/private-install.cc:802
+#: apt-private/private-install.cc:800
 msgid "Suggested packages:"
 msgstr "Vorgeschlagene Pakete:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:801
 msgid "Recommended packages:"
 msgstr "Empfohlene Pakete:"
 
-#: apt-private/private-install.cc:825
+#: apt-private/private-install.cc:823
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "%s wird übersprungen; es ist schon installiert und ein Upgrade ist nicht "
 "angefordert.\n"
 
-#: apt-private/private-install.cc:829
+#: apt-private/private-install.cc:827
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "%s wird übersprungen; es ist nicht installiert und lediglich Upgrades sind "
 "angefordert.\n"
 
-#: apt-private/private-install.cc:841
+#: apt-private/private-install.cc:839
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "Erneute Installation von %s ist nicht möglich,\n"
 "es kann nicht heruntergeladen werden.\n"
 
-#: apt-private/private-install.cc:846
+#: apt-private/private-install.cc:844
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ist schon die neueste Version.\n"
 
-#: apt-private/private-install.cc:894
+#: apt-private/private-install.cc:892
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Version »%s« (%s) für »%s« gewählt.\n"
 
-#: apt-private/private-install.cc:899
+#: apt-private/private-install.cc:897
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Version »%s« (%s) für »%s« gewählt aufgrund von »%s«.\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
+#: apt-private/private-install.cc:939
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "Paket »%s« ist nicht installiert, wird also auch nicht entfernt. Meinten Sie "
 "»%s«?\n"
 
-#: apt-private/private-install.cc:947
+#: apt-private/private-install.cc:945
 #, c-format
 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:129
-msgid "Listing"
-msgstr "Auflistung"
-
-#: apt-private/private-list.cc:159
+#: apt-private/private-download.cc:62
 #, 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."
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
 
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Abhängigkeiten werden korrigiert ..."
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!"
 
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " fehlgeschlagen."
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "Authentifizierungswarnung überstimmt.\n"
 
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Abhängigkeiten konnten nicht korrigiert werden."
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Einige Pakete konnten nicht authentifiziert werden."
 
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden."
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fertig"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Authentifizierungswarnung überstimmt.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Einige Pakete konnten nicht authentifiziert werden."
-
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 msgid "Install these packages without verification?"
 msgstr "Diese Pakete ohne Überprüfung installieren?"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Fehlschlag beim Holen von %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 "Freier Platz in %s konnte nicht bestimmt werden."
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Sie haben nicht genug Platz in %s."
+
 #: apt-private/private-sources.cc:58
 #, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1795,41 +1809,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr "Volltextsuche"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Paketaktualisierung (Upgrade) wird berechnet"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Fertig"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "OK   "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Holen: "
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Fehl "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Es wurden %sB in %s geholt (%sB/s).\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Wird verarbeitet]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1842,18 +1848,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1930,205 +1936,462 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Verfügbare Informationen werden zusammengeführt."
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "»DropNode« auf noch verknüpften Knoten aufgerufen"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Hash-Element konnte nicht gefunden werden!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Umleitung konnte nicht reserviert werden."
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Interner Fehler in »AddDiversion«"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Aufruf: apt-extracttemplates datei1 [datei2 ...]\n"
+"\n"
+"apt-extracttemplates ist ein Werkzeug, um Informationen zu Konfiguration\n"
+"und Vorlagen (Templates) aus Debian-Paketen zu extrahieren.\n"
+"\n"
+"Optionen:\n"
+"  -h    Dieser Hilfetext\n"
+"  -t    Das temporäre Verzeichnis setzen\n"
+"  -c=?  Diese Konfigurationsdatei lesen\n"
+"  -o=?  Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:477
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Es wird versucht, eine Umleitung zu überschreiben: %s -> %s und %s/%s"
+msgid "Unable to mkstemp %s"
+msgstr "mkstemp %s nicht möglich"
 
-#: apt-inst/filelist.cc:506
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Doppelte Hinzufügung der Umleitung %s -> %s"
+msgid "Unable to write to %s"
+msgstr "Schreiben nach %s nicht möglich"
 
-#: apt-inst/filelist.cc:549
+#: 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:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "Paketerweiterungsliste ist zu lang."
+
+#: 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 "Duplicate conf file %s/%s"
-msgstr "Doppelte Konfigurationsdatei %s/%s"
+msgid "Error processing directory %s"
+msgstr "Fehler beim Verarbeiten von Verzeichnis %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Quellerweiterungsliste ist zu lang."
+
+#: 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:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "Der Pfad %s ist zu lang."
+msgid "Error processing contents %s"
+msgstr "Fehler beim Verarbeiten der Inhalte %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Aufruf:  apt-ftparchive [optionen] befehl\n"
+"Befehle: packages Binärpfad [Override-Datei [Pfadpräfix]]\n"
+"         sources Quellpfad [Override-Datei [Pfadpräfix]]\n"
+"         contents Pfad\n"
+"         release Pfad\n"
+"         generate Konfigurationsdatei [Gruppen]\n"
+"         clean Konfigurationsdatei\n"
+"\n"
+"apt-ftparchive erstellt Indexdateien für Debian-Archive. Es unterstützt "
+"viele\n"
+"verschiedene Arten der Erstellung, von vollautomatisch bis hin zu den\n"
+"funktionalen Äquivalenten von dpkg-scanpackages und dpkg-scansources.\n"
+"\n"
+"apt-ftparchive erstellt Package-Dateien aus einem Baum von .debs. Die "
+"Package-\n"
+"Datei enthält den Inhalt aller Steuerfelder aus jedem Paket sowie einen "
+"MD5-\n"
+"Hashwert und die Dateigröße. Eine Override-Datei wird unterstützt, um Werte "
+"für\n"
+"Priorität und Bereich (Section) zu erzwingen.\n"
+"\n"
+"Auf ganz ähnliche Weise erstellt apt-ftparchive Sources-Dateien aus einem "
+"Baum\n"
+"von .dscs. Die Option --source-override kann benutzt werden, um eine "
+"Override-\n"
+"Datei für Quellen anzugeben.\n"
+"\n"
+"Die Befehle »packages« und »source« sollten von der Wurzel des Baums aus\n"
+"aufgerufen werden. Binärpfad sollte auf die Basis der rekursiven Suche "
+"zeigen\n"
+"und Override-Datei sollte die Override-Flags enthalten. Pfadpräfix wird, so\n"
+"vorhanden, jedem Dateinamen vorangestellt. Beispielaufruf im Debian-Archiv:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Optionen:\n"
+"  -h           dieser Hilfe-Text\n"
+"  --md5        MD5-Hashes erzeugen\n"
+"  -s=?         Override-Datei für Quellen\n"
+"  -q           ruhig\n"
+"  -d=?         optionale Zwischenspeicher-Datenbank auswählen\n"
+"  --no-delink  Debug-Modus für Delinking aktivieren\n"
+"  --contents   Inhaltsdatei erzeugen\n"
+"  -c=?         diese Konfigurationsdatei lesen\n"
+"  -o=?         eine beliebige Konfigurationsoption setzen"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Keine Auswahl traf zu"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "%s mehr als einmal entpackt"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«."
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Das Verzeichnis %s ist umgeleitet."
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Datenbank wurde beschädigt, Datei umbenannt in %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Schreibversuch vom Paket auf das Umleitungsziel %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Datenbank ist veraltet; es wird versucht, %s zu erneuern."
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Der Umleitungspfad ist zu lang."
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Datenbankformat ist ungültig. Wenn Sie ein Upgrade (Paketaktualisierung) von "
+"einer älteren apt-Version gemacht haben, entfernen Sie bitte die Datenbank "
+"und erstellen Sie sie neu."
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Datenbankdatei %s kann nicht geöffnet werden: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s mit »stat« abfragen fehlgeschlagen"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+msgid "Failed to read .dsc"
+msgstr "Lesen von .dsc fehlgeschlagen"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Archiv hat keinen Steuerungsdatensatz."
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Unmöglich, einen Cursor zu bekommen"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "%s konnte nicht in %s umbenannt werden."
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Verzeichnis %s kann nicht gelesen werden.\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Das Verzeichnis %s wird durch ein Nicht-Verzeichnis ersetzt."
+msgid "W: Unable to stat %s\n"
+msgstr "W: %s mit »stat« abfragen nicht möglich.\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Knoten konnte nicht in seinem Hash gefunden werden."
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "F: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Der Pfad ist zu lang."
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "W: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "F: Fehler gehören zu Datei "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Pakettreffer ohne Version für %s wird überschrieben."
+msgid "Failed to resolve %s"
+msgstr "%s konnte nicht aufgelöst werden."
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Durchlaufen des Verzeichnisbaums fehlgeschlagen"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben."
+msgid "Failed to open %s"
+msgstr "Öffnen von %s fehlgeschlagen"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "%s mit »stat« abfragen nicht möglich"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Datei %s konnte nicht geschrieben werden."
+msgid "Failed to readlink %s"
+msgstr "readlink von %s fehlgeschlagen"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Datei %s konnte nicht geschlossen werden."
+msgid "Failed to unlink %s"
+msgstr "Entfernen (unlink) von %s fehlgeschlagen"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Dies ist kein gültiges DEB-Archiv, da es »%s« nicht enthält."
+msgid "*** Failed to link %s to %s"
+msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Interner Fehler, Bestandteil %s konnte nicht gefunden werden"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink-Limit von %sB erreicht\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Auswerten der »control«-Datei nicht möglich"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Archiv hatte kein Feld »package«"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Ungültige Archiv-Signatur"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Fehler beim Lesen der Archivdatei-Kopfzeilen"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:712
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "Ungültige Archivbestandteil-Kopfzeile %s"
+msgid "  %s has no source override entry\n"
+msgstr "  %s hat keinen Eintrag in der Source-Override-Liste.\n"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Ungültige Archivdatei-Kopfzeilen"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Archiv ist zu kurz."
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Speicheranforderung fehlgeschlagen"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s konnte nicht geöffnet werden."
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Missgestaltetes Override %s Zeile %llu (%s)"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Override-Datei %s konnte nicht gelesen werden."
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Missgestaltetes Override %s Zeile %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Missgestaltetes Override %s Zeile %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Missgestaltetes Override %s Zeile %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Unbekannter Komprimierungsalgorithmus »%s«"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Komprimierte Ausgabe %s benötigt einen Komprimierungssatz."
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "FILE* konnte nicht erzeugt werden."
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Fork fehlgeschlagen"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Komprimierungs-Kindprozess"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Interner Fehler, %s konnte nicht erzeugt werden."
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "E/A zu Kindprozess/Datei fehlgeschlagen"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Archiv-Kopfzeilen konnten nicht gelesen werden."
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Pipes (Weiterleitungen) konnten nicht erzeugt werden."
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problem beim Entfernen (unlink) von %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "gzip konnte nicht ausgeführt werden."
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "%s konnte nicht in %s umbenannt werden."
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Beschädigtes Archiv"
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Aufruf: apt-internal-solver\n"
+"\n"
+"apt-internal-solver ist eine Schnittstelle, um den derzeitigen internen\n"
+"Problemlöser für die APT-Familie wie einen externen zu verwenden, zwecks\n"
+"Fehlersuche oder ähnlichem.\n"
+"\n"
+"Optionen:\n"
+"  -h   dieser Hilfetext\n"
+"  -q   protokollierbare Ausgabe – keine Fortschrittsanzeige\n"
+"  -c=? Diese Konfigurationsdatei benutzen\n"
+"  -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv beschädigt"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Unbekannter Paketeintrag!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Aufruf: apt-sortpkgs [optionen] datei1 [datei2 ...]\n"
+"\n"
+"apt-sortpkgs ist ein einfaches Werkzeug, um Paketdateien zu sortieren. Die\n"
+"Option -s wird benutzt, um anzuzeigen, um was für eine Datei es sich "
+"handelt.\n"
+"\n"
+"Optionen:\n"
+"  -h   Dieser Hilfetext\n"
+"  -s   Quelldateisortierung benutzen\n"
+"  -c=? Diese Konfigurationsdatei lesen\n"
+"  -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr "Fortschritt: [%3i%%]"
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "Ausführen von dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketierungssystem »%s« wird nicht unterstützt."
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Bestimmung eines passenden Paketierungssystemtyps nicht möglich"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Es wurden %i Datensätze geschrieben.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2145,6 +2408,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 ""
@@ -2159,159 +2444,342 @@ 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:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Leerer Paketzwischenspeicher"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Hängt ab von"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Hängt ab von (vorher)"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Schlägt vor"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Empfiehlt"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Kollidiert mit"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Ersetzt"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Löst ab"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Beschädigt"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Wertet auf"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "wichtig"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "erforderlich"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "optional"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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/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:118
+#: 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:169
+#: 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/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/acquire-worker.cc:455
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+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/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/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/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/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Zeile %u in Quellliste %s zu lang."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Abhängigkeitsbaum wird aufgebaut."
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Szenario an Problemlöser senden"
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Installationskandidat-Versionen"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Anfrage an Problemlöser senden"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Abhängigkeitsgenerierung"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Vorbereiten, eine Lösung zu erhalten"
 
-#: 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/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen."
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "StateFile %s konnte nicht geöffnet werden."
+#: 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/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Temporäres StateFile %s konnte nicht geschrieben werden."
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Hash-Summe stimmt nicht überein"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Größe stimmt nicht überein"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 msgid "Invalid file format"
 msgstr "Ungültiges Dateiformat"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Schreibfehler"
+
+#: 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:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Während der Überprüfung der Signatur trat ein Fehler auf. Das Repository "
+"wurde nicht aktualisiert und die vorherigen Indexdateien werden verwendet. "
+"GPG-Fehler: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG-Fehler: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Das Verzeichnis %s ist umgeleitet."
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2320,17 +2788,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:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2339,28 +2807,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:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Während der Überprüfung der Signatur trat ein Fehler auf. Das Repository "
-"wurde nicht aktualisiert und die vorherigen Indexdateien werden verwendet. "
-"GPG-Fehler: %s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG-Fehler: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2370,142 +2829,52 @@ msgstr ""
 "Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
 "Architektur)."
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fehler aufgetreten beim Verarbeiten von %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Paketlisten werden gelesen"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Schreiben nach %s nicht möglich"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: apt-pkg/acquire.cc:162
 #, c-format
 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2536,7 +2905,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2545,12 +2914,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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2562,10 +2931,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"
@@ -2636,11 +3008,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"
 
@@ -2652,7 +3024,7 @@ msgstr ""
 "Das Paket %s muss neu installiert werden, es kann jedoch kein Archiv dafür "
 "gefunden werden."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2660,269 +3032,198 @@ msgstr ""
 "Fehler: Unterbrechungen durch pkgProblemResolver::Resolve hervorgerufen; "
 "dies könnte durch zurückgehaltene Pakete verursacht worden sein."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr "Anfrage an Problemlöser senden"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Vorbereiten, eine Lösung zu erhalten"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen."
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Externen Problemlöser ausführen"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Paketdatei %s konnte nicht verarbeitet werden (%d)."
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Release-Datei %s kann nicht verarbeitet werden."
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Keine Bereiche (Sections) in Release-Datei %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Kein Hash-Eintrag in Release-Datei %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden."
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Version »%s« für »%s« konnte nicht gefunden werden."
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Task »%s« konnte nicht gefunden werden."
 
-#: apt-pkg/cacheset.cc:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Es kann weder eine installierte Version noch ein Installationskandidat von "
-"Paket »%s« ausgewählt werden, da beide nicht existieren."
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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 ""
+"Es kann weder eine installierte Version noch ein Installationskandidat von "
+"Paket »%s« ausgewählt werden, da beide nicht existieren."
+
+#: 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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Kein Hash-Eintrag in Release-Datei %s"
+
+#: apt-pkg/indexrecords.cc:145
+#, 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:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%li min %li s"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%li s"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Auswahl %s nicht gefunden"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Es wird keine Sperre für schreibgeschützte Sperrdatei %s verwendet."
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Sperrdatei %s konnte nicht geöffnet werden."
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Es wird keine Sperre für per NFS eingebundene Sperrdatei %s verwendet."
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Konnte Sperre %s nicht bekommen"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 "Dateiliste kann nicht erstellt werden, da »%s« kein Verzeichnis ist."
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 "»%s« in Verzeichnis »%s« wird ignoriert, da es keine reguläre Datei ist."
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie keine Dateinamen-"
 "Erweiterung hat."
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2930,79 +3231,79 @@ msgstr ""
 "Datei »%s« in Verzeichnis »%s« wird ignoriert, da sie eine ungültige "
 "Dateinamen-Erweiterung hat."
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Unterprozess %s hat das Signal %u empfangen."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Unterprozess %s unerwartet beendet"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problem beim Schließen der gzip-Datei %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Datei %s konnte nicht geöffnet werden."
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Datei-Deskriptor %d konnte nicht geöffnet werden."
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr ""
 "Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden."
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Fehler beim Ausführen von Komprimierer "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 "Lesevorgang: es verbleiben noch %llu zu lesen, jedoch ist nichts mehr übrig."
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr ""
 "Schreibvorgang: es verbleiben noch %llu zu schreiben, Schreiben ist jedoch "
 "nicht möglich."
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem beim Schließen der Datei %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem beim Umbenennen der Datei %s nach %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem beim Entfernen (unlink) der Datei %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Problem beim Synchronisieren der Datei"
 
@@ -3091,112 +3392,106 @@ 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:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Nicht erkannte Typabkürzung: »%c«"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Konfigurationsdatei %s wird geöffnet"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Kein Schlüsselring in %s installiert"
-
-#: 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"
@@ -3206,12 +3501,12 @@ msgstr "Ungültige Operation %s"
 msgid "Installing %s"
 msgstr "%s wird installiert."
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "%s wird entfernt."
@@ -3232,81 +3527,81 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Verzeichnis »%s« fehlt"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "%s wird vorbereitet."
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s wird entpackt."
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Konfiguration von %s wird vorbereitet."
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "%s installiert"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "%s entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s vollständig entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1670
+#: 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:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3314,7 +3609,7 @@ 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:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3322,7 +3617,7 @@ msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
 "wegen voller Festplatte hindeutet."
 
-#: apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3330,7 +3625,7 @@ msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
 "wegen erschöpftem Arbeitsspeicher hindeutet."
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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"
@@ -3338,7 +3633,7 @@ msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
 "im lokalen System hindeutet."
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3354,430 +3649,191 @@ 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"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Aufruf: apt-extracttemplates datei1 [datei2 ...]\n"
-"\n"
-"apt-extracttemplates ist ein Werkzeug, um Informationen zu Konfiguration\n"
-"und Vorlagen (Templates) aus Debian-Paketen zu extrahieren.\n"
-"\n"
-"Optionen:\n"
-"  -h    Dieser Hilfetext\n"
-"  -t    Das temporäre Verzeichnis setzen\n"
-"  -c=?  Diese Konfigurationsdatei lesen\n"
-"  -o=?  Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, c-format
-msgid "Unable to mkstemp %s"
-msgstr "mkstemp %s nicht möglich"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Fehler beim Verarbeiten von Verzeichnis %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Quellerweiterungsliste ist zu lang."
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Fehler beim Schreiben der Kopfzeilen in die Inhaltsdatei"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Fehler beim Verarbeiten der Inhalte %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Aufruf:  apt-ftparchive [optionen] befehl\n"
-"Befehle: packages Binärpfad [Override-Datei [Pfadpräfix]]\n"
-"         sources Quellpfad [Override-Datei [Pfadpräfix]]\n"
-"         contents Pfad\n"
-"         release Pfad\n"
-"         generate Konfigurationsdatei [Gruppen]\n"
-"         clean Konfigurationsdatei\n"
-"\n"
-"apt-ftparchive erstellt Indexdateien für Debian-Archive. Es unterstützt "
-"viele\n"
-"verschiedene Arten der Erstellung, von vollautomatisch bis hin zu den\n"
-"funktionalen Äquivalenten von dpkg-scanpackages und dpkg-scansources.\n"
-"\n"
-"apt-ftparchive erstellt Package-Dateien aus einem Baum von .debs. Die "
-"Package-\n"
-"Datei enthält den Inhalt aller Steuerfelder aus jedem Paket sowie einen "
-"MD5-\n"
-"Hashwert und die Dateigröße. Eine Override-Datei wird unterstützt, um Werte "
-"für\n"
-"Priorität und Bereich (Section) zu erzwingen.\n"
-"\n"
-"Auf ganz ähnliche Weise erstellt apt-ftparchive Sources-Dateien aus einem "
-"Baum\n"
-"von .dscs. Die Option --source-override kann benutzt werden, um eine "
-"Override-\n"
-"Datei für Quellen anzugeben.\n"
-"\n"
-"Die Befehle »packages« und »source« sollten von der Wurzel des Baums aus\n"
-"aufgerufen werden. Binärpfad sollte auf die Basis der rekursiven Suche "
-"zeigen\n"
-"und Override-Datei sollte die Override-Flags enthalten. Pfadpräfix wird, so\n"
-"vorhanden, jedem Dateinamen vorangestellt. Beispielaufruf im Debian-Archiv:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Optionen:\n"
-"  -h           dieser Hilfe-Text\n"
-"  --md5        MD5-Hashes erzeugen\n"
-"  -s=?         Override-Datei für Quellen\n"
-"  -q           ruhig\n"
-"  -d=?         optionale Zwischenspeicher-Datenbank auswählen\n"
-"  --no-delink  Debug-Modus für Delinking aktivieren\n"
-"  --contents   Inhaltsdatei erzeugen\n"
-"  -c=?         diese Konfigurationsdatei lesen\n"
-"  -o=?         eine beliebige Konfigurationsoption setzen"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Keine Auswahl traf zu"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«."
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Datenbank wurde beschädigt, Datei umbenannt in %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Datenbank ist veraltet; es wird versucht, %s zu erneuern."
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Datenbankformat ist ungültig. Wenn Sie ein Upgrade (Paketaktualisierung) von "
-"einer älteren apt-Version gemacht haben, entfernen Sie bitte die Datenbank "
-"und erstellen Sie sie neu."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Datenbankdatei %s kann nicht geöffnet werden: %s"
-
-#: ftparchive/cachedb.cc:332
-msgid "Failed to read .dsc"
-msgstr "Lesen von .dsc fehlgeschlagen"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Archiv hat keinen Steuerungsdatensatz."
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Unmöglich, einen Cursor zu bekommen"
-
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Verzeichnis %s kann nicht gelesen werden.\n"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"Sperren des Administrationsverzeichnisses (%s) nicht möglich, sind Sie root?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: %s mit »stat« abfragen nicht möglich.\n"
+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."
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "F: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Nicht gesperrt"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "W: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "»DropNode« auf noch verknüpften Knoten aufgerufen"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "F: Fehler gehören zu Datei "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Hash-Element konnte nicht gefunden werden!"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "%s konnte nicht aufgelöst werden."
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Umleitung konnte nicht reserviert werden."
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Durchlaufen des Verzeichnisbaums fehlgeschlagen"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Interner Fehler in »AddDiversion«"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "Öffnen von %s fehlgeschlagen"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Es wird versucht, eine Umleitung zu überschreiben: %s -> %s und %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Doppelte Hinzufügung der Umleitung %s -> %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "readlink von %s fehlgeschlagen"
+msgid "Duplicate conf file %s/%s"
+msgstr "Doppelte Konfigurationsdatei %s/%s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Entfernen (unlink) von %s fehlgeschlagen"
+msgid "The path %s is too long"
+msgstr "Der Pfad %s ist zu lang."
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen"
+msgid "Unpacking %s more than once"
+msgstr "%s mehr als einmal entpackt"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink-Limit von %sB erreicht\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Archiv hatte kein Feld »package«"
+msgid "The directory %s is diverted"
+msgstr "Das Verzeichnis %s ist umgeleitet."
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s hat keinen Eintrag in der Override-Liste.\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Schreibversuch vom Paket auf das Umleitungsziel %s/%s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s-Betreuer ist %s und nicht %s.\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Der Umleitungspfad ist zu lang."
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s hat keinen Eintrag in der Source-Override-Liste.\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Das Verzeichnis %s wird durch ein Nicht-Verzeichnis ersetzt."
 
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s hat keinen Eintrag in der Binary-Override-Liste.\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Knoten konnte nicht in seinem Hash gefunden werden."
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Speicheranforderung fehlgeschlagen"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Der Pfad ist zu lang."
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "%s konnte nicht geöffnet werden."
+msgid "Overwrite package match with no version for %s"
+msgstr "Pakettreffer ohne Version für %s wird überschrieben."
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Missgestaltetes Override %s Zeile %llu (%s)"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben."
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Override-Datei %s konnte nicht gelesen werden."
+msgid "Unable to stat %s"
+msgstr "%s mit »stat« abfragen nicht möglich"
 
-#: ftparchive/override.cc:166
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Missgestaltetes Override %s Zeile %llu #1"
+msgid "Failed to write file %s"
+msgstr "Datei %s konnte nicht geschrieben werden."
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Missgestaltetes Override %s Zeile %llu #2"
+msgid "Failed to close file %s"
+msgstr "Datei %s konnte nicht geschlossen werden."
 
-#: ftparchive/override.cc:191
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Missgestaltetes Override %s Zeile %llu #3"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Dies ist kein gültiges DEB-Archiv, da es »%s« nicht enthält."
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Unbekannter Komprimierungsalgorithmus »%s«"
+msgid "Internal error, could not locate member %s"
+msgstr "Interner Fehler, Bestandteil %s konnte nicht gefunden werden"
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Auswerten der »control«-Datei nicht möglich"
+
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Ungültige Archiv-Signatur"
+
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Fehler beim Lesen der Archivdatei-Kopfzeilen"
+
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimierte Ausgabe %s benötigt einen Komprimierungssatz."
+msgid "Invalid archive member header %s"
+msgstr "Ungültige Archivbestandteil-Kopfzeile %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "FILE* konnte nicht erzeugt werden."
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Ungültige Archivdatei-Kopfzeilen"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Fork fehlgeschlagen"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Archiv ist zu kurz."
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Komprimierungs-Kindprozess"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Archiv-Kopfzeilen konnten nicht gelesen werden."
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Interner Fehler, %s konnte nicht erzeugt werden."
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Pipes (Weiterleitungen) konnten nicht erzeugt werden."
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "E/A zu Kindprozess/Datei fehlgeschlagen"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "gzip konnte nicht ausgeführt werden."
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Beschädigtes Archiv"
 
-#: ftparchive/multicompress.cc:359
+#: 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:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem beim Entfernen (unlink) von %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Aufruf: apt-internal-solver\n"
-"\n"
-"apt-internal-solver ist eine Schnittstelle, um den derzeitigen internen\n"
-"Problemlöser für die APT-Familie wie einen externen zu verwenden, zwecks\n"
-"Fehlersuche oder ähnlichem.\n"
-"\n"
-"Optionen:\n"
-"  -h   dieser Hilfetext\n"
-"  -q   protokollierbare Ausgabe – keine Fortschrittsanzeige\n"
-"  -c=? Diese Konfigurationsdatei benutzen\n"
-"  -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Gesamtmenge des Abhängigkeits-/Versionsspeichers: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Unbekannter Paketeintrag!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Sie haben nicht genügend freien Speicherplatz in %s."
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Aufruf: apt-sortpkgs [optionen] datei1 [datei2 ...]\n"
-"\n"
-"apt-sortpkgs ist ein einfaches Werkzeug, um Paketdateien zu sortieren. Die\n"
-"Option -s wird benutzt, um anzuzeigen, um was für eine Datei es sich "
-"handelt.\n"
-"\n"
-"Optionen:\n"
-"  -h   Dieser Hilfetext\n"
-"  -s   Quelldateisortierung benutzen\n"
-"  -c=? Diese Konfigurationsdatei lesen\n"
-"  -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Fertig"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Kein Schlüsselring in %s installiert"
 
 #~ msgid "Is stdout a terminal?"
 #~ msgstr "Ist stdout ein Terminal?"
@@ -3876,9 +3932,6 @@ msgstr ""
 #~ "Schreiben des Protokolls nicht möglich, openpty() fehlgeschlagen (/dev/"
 #~ "pts nicht eingebunden?)\n"
 
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Datei %s beginnt nicht mit einer Klartext-signierten Nachricht."
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Nicht vorhandene Datei %s wird übersprungen."
 
diff --git a/po/dz.po b/po/dz.po
index fa842efc7..8d1e57b35 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: 2015-01-16 04:37-0500\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,153 +24,149 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "ཐུམ་སྒྲིལ་ %s ཐོན་རིམ་ %s ལུ་ ཌེཔ་མ་ཚང་ཅིག་འདུག:\n"
 
-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ:"
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ:"
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "སྤྱིར་བཏང་ཐུམ་སྒྲིལ་ཚུ།"
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་གཙང་མ་ཚུ:"
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་རྐྱང་པ་ཚུ:"
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་སླ་བསྲེ་ཡོད་མི་ཚུ:"
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "བརླག་སྟོར་ཞུགས་པ:"
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "རྟེན་འབྲེལ་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "ཡོངས་བསྡོམས་ཀྱིས་ས་ཁྲ་བཟོ་བ་ཚུ་བྱིནམ་ཨིན:"
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "སྤུངས་ཡོད་པའི་ཡིག་རྒྱུན་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "རྟེན་འབྲེལ་ཐོན་རིམ་བར་སྟོང་གྱི་བསྡོམས:"
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "བར་སྟོང་ལྷུག་ལྷུག་གི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "གི་དོན་ལུ་རྩིས་ཐོ་བཏོན་ཡོད་པའི་བར་སྟོང:"
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "%sཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "ཁབ་གཟེར་བཏབ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(མ་ཐོབ།)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "གཞི་བཙུགས་འབད་ཡོདཔ།"
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "མི་ངོ:"
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(ཅི་མེད།)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཁབ་གཟེར:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -245,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"
@@ -267,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 "ཁྱོད་ཀྱི་ཆ་ཚན་ནང་གི་སི་ཌི་ལྷག་ལུས་ཡོད་མི་གི་དོན་ལུ་འ་ནི་ལས་སྦྱོར་དེ་ཡང་བསྐྱར་འབད།"
 
@@ -303,78 +299,78 @@ msgstr ""
 "  -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
 "  -o=? མཐུན་སྒྲིག་གི་རིམ་སྒྲིག་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན་  དཔེར་ན་-o dir::cache=/tmp་བཟུམ།\n"
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-get.cc:367
+#: cmdline/apt-get.cc:358
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
 
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -382,116 +378,115 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "%s་ནང་བར་སྟོང་"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་"
-
 #. 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:895
+#: 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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n"
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s་འབྱུང་ཁུངས་ལེན།\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།"
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n"
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
 
-#: cmdline/apt-get.cc:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
+
+#: 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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: cmdline/apt-get.cc:1359
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -500,37 +495,37 @@ msgstr ""
 "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་"
 "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:1362
+#: 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:1385
+#: cmdline/apt-get.cc:1388
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s)་ལུ་མཐུད་དོ།"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -628,11 +623,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -646,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -772,12 +767,12 @@ msgstr "ཌིཀསི་དེ་འཚོལ་མ་ཐོབ།"
 msgid "File not found"
 msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
@@ -786,34 +781,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "ཡུ་ཨར་ཨེལ་ ནུས་མེད་  ཉེ་གནས་ ཡུ་ཨར་ཨེལ་ཨེསི་འདི་གིས་//་དང་གཅིག་ཁར་འགོ་བཙུགས་ནི་མི་འོང་།"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "ནང་བསྐྱོད་འབད་དོ།"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "དོ་བཉམ་གི་མིང་འདི་གཏན་འབེབས་བཟོ་མ་ཚུགས།"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "ཉེ་གནས་མིང་འདི་གཏན་འབེེབས་བཟོ་མ་ཚུགས།"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "སར་བར་འདི་གིས་ མཐུད་ལམ་འདི་ངོས་ལེན་འབད་མ་བཏུབ་པར་སླབ་མས: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "ལག་ལེན་པ་འཐུས་ཤོར་བྱུང་ཡོད་  སར་བར་གྱིས་སླབ་མས་: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "རྩི་སྤྲོད་འཐུས་ཤོར་བྱུང་ཡོད་  སར་བར་གྱིས་སླབ་མས་: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -821,123 +816,123 @@ msgstr ""
 "པོརོ་སི་སར་བར་ཅིག་གསལ་བཀོད་འབད་ཡོད་འདི་འབདཝ་ད་  ནང་བསྐྱོད་ཡིག་ཚུགས་མིན་འདུག་ Acquire::ftp::"
 "ProxyLoginའདི་སྟོངམ་ཨིན་པས།"
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "ནང་བསྐྱོད་ཡིག་ཚུགས་ བརྡ་བཀོད་'%s'་འདི་འཐོས་ཤོར་བྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས:%s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "ཡིག་དཔར་རྐྱབ་མ་བཏུབ་སར་བར་གྱིས་སླབ་མས། %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "མཐུད་ལམ་ངལ་མཚམས"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "འཛོལ་བ་ལྷབ།"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས་ ལུད་སོང་སྟེ་ཡོདཔ་ཨིན།"
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "འཛོལ་བ་འབྲི།"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འབད་མ་ཚུགས་པར་ཡོདཔ་ཨིན།"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "གནད་སྡུད་སོ་ཀེཊི་མཐུད་མ་ཚུགས་པར་ཡོདཔ་ཨིན་  མཐུད་ལམ་ངལ་མཚམས།"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "བྱ་ཡུལ་གྱི་སོ་ཀེཊི་མཐུད་མ་ཚུགས།"
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo་འདི་གིས་ཉན་ནིའི་སོ་ཀེཊི་ཅིག་ལེན་མ་ཚུགས།"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "སོ་ཀེཊི་ཅིག་བསྡམས་མ་ཚུགས།"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "སོ་ཀེཊི་གུར་ཉེན་མ་ཚུགས།"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "སོ་ཀེཊི་གི་མིང་འདི་གཏན་འབེབས་བཟོ་མ་ཚུགས།"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "འདྲེན་ལམ་གྱི་བརྡ་བཀོད་འདི་བཏང་མ་ཚུགས།"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "མ་ཤེས་པའི་ཁ་བྱང་གི་རིགས་ཚན་%u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "ཨི་པི་ཨར་ཊི་ འཐུས་ཤོར་བྱུང་ཡོད་  སར་བར་གིས་སླབ་མས:%s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ནི་ངལ་མཚམས་བྱུང་ནུག"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "ཡིག་སྣོད་ལེན་མ་ཚུགས་ སར་བར་'%s'གིས་སླབ་མས"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "གནད་སྡུད་སོ་ཀེཊི་ངལ་མཚམས།"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "གནད་སྡུད་གནས་སོར་དེ་འཐུས་ཤོར་བྱུང་ཡོད་  སར་བར་'%s'་གིས་སླབ་མས།"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "འདྲི་དཔྱད།"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།"
 
@@ -1003,75 +998,76 @@ msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།"
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་  འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་"
 "མ་ཚུགས?!"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།"
 
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:164
 #, fuzzy
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
-"མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gnupg་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)"
+"མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gnupg་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་"
+"ན།?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "apt-key་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n"
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 "འོག་གི་མིང་རྟགས་ཚུ་བདེན་སྦྱོར་་འབད་མ་ཚུགས་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་མི་དམང་ལྡེ་མིག་དེ་འཐོབ་མི་ཚུགས་པས:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།"
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
@@ -1103,289 +1099,30 @@ msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བ
 msgid "Unknown date format"
 msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "ནང་འཁོད་འཛོལ་བ།"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-"ནང་འཁོད་ཀྱི་འཛོལ་བ་  གཞི་བཙུགས་ཐུམ་སྒྲིལ་ཚུ་ ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་དང་གཅིག་ཁར་བོད་བརྡ་འབད་འདི་"
-"ཡོད!"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏང་དགོཔ་འདུག་འདི་འབདགཝ་ད་རྩ་བསྐྲད་གཏང་ནི་འདི་ལྕོགས་མིན་ཐལ་ཏེ་འདུག"
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "ནང་འཁོད་འཛོལ་བ་  གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"ག་ཅི་གི་ཡ་མཚན་ཆེ་མི་ཆེ་  ཚད་འདི་གིས་ email 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of 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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "ཡིག་མཛོད་ཀྱི་%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
-#: apt-private/private-install.cc:167
-#, fuzzy, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "ཁ་སྐོང་གི་%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
-#: apt-private/private-install.cc:172
-#, fuzzy, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག"
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "གལ་ཆུང་རྐྱངམ་ཅིག་ཁསལ་བཀོད་འབད་ནུག་ འདི་འབདཝ་ད་འ་ནི་འདི་གལ་ཆུང་གི་བཀོལ་སྤྱོད་མེན།"
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "ཨིན་ ང་གིས་སླབ་དོ་བཟུམ་སྦེ་རང་འབད!"
-
-#: apt-private/private-install.cc:222
+#: methods/server.cc:589
 #, c-format
 msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"ཁྱོད་ཀྱི་གནོད་ངན་འབྱུང་ནིའི་ལཱ་ཅི་འབད་ནི་འབད་དོ།\n"
-"འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་'%s'ཚིག་ཚན་ནང་ལུ་ཡིག་དཔར་རྐྱབས།\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "བར་བཤོལ་འབད།"
-
-#: apt-private/private-install.cc:243
-#, fuzzy
-msgid "Do you want to continue?"
-msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་མི་ཚུགས་པས་  apt-get་དུས་མཐུན་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-"
-"missing་དང་གཅིག་ཁར་འབད་རྩོལ་བསྐྱེད་ནི་ཨིན་ན་?"
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing་དང་བརྡ་ལམ་བརྗེ་སོར་འབད་ནི་འདི་ད་ལྟོ་ལས་རང་རྒྱབ་སྐྱོར་མི་འབད་བས།"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:"
-
-#: apt-private/private-install.cc:506
-#, fuzzy
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
-
-#: apt-private/private-install.cc:513
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
-msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
-
-#: apt-private/private-install.cc:517
-#, fuzzy, c-format
-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] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
-msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"མ་ཚང་བའི་རྟེན་འབྲེལ་  ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།"
-"(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)"
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་གཞི་བཙུགས་འབད་མ་ཚུགས། འ་ནི་གི་དོན་དག་དེ་ཁྱོད་ཀྱི་ མི་སྲིད་པའི་དུས་སྐབས་ཅིག་ཞུ་བ་"
-"འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་"
-"འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།"
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"%s་གོམ་འགྱོ་འབད་དོ་  འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
-"འབད་བས།\n"
-
-#: apt-private/private-install.cc:829
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"%s་གོམ་འགྱོ་འབད་དོ་  འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
-"འབད་བས།\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འདི་མི་སྲིད་པ་ཅིག་ཨིན་པས་ འདི་ཕབ་ལེན་འབད་མི་བཏུབ་པས།\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "ནང་འཁོད་འཛོལ་བ།"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1393,31 +1130,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།"
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr "འབད་ཚར་ཡི།"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།"
 
@@ -1581,7 +1318,7 @@ msgstr "ཝའི།"
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
@@ -1590,7 +1327,7 @@ msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོ
 msgid "The update command takes no arguments"
 msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1598,10 +1335,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1622,28 +1363,302 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
+"ནང་འཁོད་ཀྱི་འཛོལ་བ་  གཞི་བཙུགས་ཐུམ་སྒྲིལ་ཚུ་ ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་དང་གཅིག་ཁར་བོད་བརྡ་འབད་འདི་"
+"ཡོད!"
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏང་དགོཔ་འདུག་འདི་འབདགཝ་ད་རྩ་བསྐྲད་གཏང་ནི་འདི་ལྕོགས་མིན་ཐལ་ཏེ་འདུག"
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "ནང་འཁོད་འཛོལ་བ་  གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"ག་ཅི་གི་ཡ་མཚན་ཆེ་མི་ཆེ་  ཚད་འདི་གིས་ email 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of 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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "ཡིག་མཛོད་ཀྱི་%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
+#: apt-private/private-install.cc:166
+#, fuzzy, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "ཁ་སྐོང་གི་%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
+#: apt-private/private-install.cc:171
+#, fuzzy, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --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 "གལ་ཆུང་རྐྱངམ་ཅིག་ཁསལ་བཀོད་འབད་ནུག་ འདི་འབདཝ་ད་འ་ནི་འདི་གལ་ཆུང་གི་བཀོལ་སྤྱོད་མེན།"
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "ཨིན་ ང་གིས་སླབ་དོ་བཟུམ་སྦེ་རང་འབད!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"ཁྱོད་ཀྱི་གནོད་ངན་འབྱུང་ནིའི་ལཱ་ཅི་འབད་ནི་འབད་དོ།\n"
+"འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་'%s'ཚིག་ཚན་ནང་ལུ་ཡིག་དཔར་རྐྱབས།\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "བར་བཤོལ་འབད།"
+
+#: apt-private/private-install.cc:218
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་མི་ཚུགས་པས་  apt-get་དུས་མཐུན་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-"
+"missing་དང་གཅིག་ཁར་འབད་རྩོལ་བསྐྱེད་ནི་ཨིན་ན་?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing་དང་བརྡ་ལམ་བརྗེ་སོར་འབད་ནི་འདི་ད་ལྟོ་ལས་རང་རྒྱབ་སྐྱོར་མི་འབད་བས།"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: 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 ""
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:"
+
+#: apt-private/private-install.cc:481
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
+
+#: apt-private/private-install.cc:488
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
+msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+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] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
+msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"མ་ཚང་བའི་རྟེན་འབྲེལ་  ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།"
+"(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)"
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་གཞི་བཙུགས་འབད་མ་ཚུགས། འ་ནི་གི་དོན་དག་དེ་ཁྱོད་ཀྱི་ མི་སྲིད་པའི་དུས་སྐབས་ཅིག་ཞུ་བ་"
+"འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་"
+"འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།"
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"%s་གོམ་འགྱོ་འབད་དོ་  འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
+"འབད་བས།\n"
+
+#: apt-private/private-install.cc:827
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"%s་གོམ་འགྱོ་འབད་དོ་  འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
+"འབད་བས།\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འདི་མི་སྲིད་པ་ཅིག་ཨིན་པས་ འདི་ཕབ་ལེན་འབད་མི་བཏུབ་པས།\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
+
+#: apt-private/private-install.cc:892
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
+
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%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 "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ཉེན་བརྡ:འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་བདེན་བཤད་འབད་མི་བཏུབ་པས།"
 
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:98
 msgid "Authentication warning overridden.\n"
 msgstr "བདེན་བཤད་ཉེན་བརྡ་འདི་ཟུར་འབད་ཡོད།\n"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
 msgid "Some packages could not be authenticated"
 msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས།"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 #, fuzzy
 msgid "Install these packages without verification?"
 msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་ཐུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%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 "%s་ནང་བར་སྟོང་"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག"
+
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1658,41 +1673,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "འབད་ཚར་ཡི།"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "ཨེབ།"
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "ལེན:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "ཨེལ་ཇི་ཨེན:"
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "ཨི་ཨར་ཨར།"
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%s (%sB/s)་ནང་ལུ་%sB་དེ་ལེན་ཡོདཔ་ཨིན།\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [ལཱ་འབད་དོ།]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1705,18 +1712,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1794,205 +1801,460 @@ msgstr ""
 msgid "Merging available information"
 msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "ད་ལྟོ་ཡང་འབྲེལ་ལམ་ཡོད་པའི་མཐུད་མཚམས་གུར་བཀོག་བཞག་མཐུད་མཚམས་དེ་བོད་བརྡ་འབད་འདི་ཡོད།"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "དྲྭ་རྟགས་རྒྱུ་རྫས་འདི་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "ཁ་ཕྱོགས་སྤྲོད་བཞག་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "ཁ་ཕྱོགས་ཁ་སྐོང་རྐྱབ་ནི་ནང་  ནང་འཁོད་ཀྱི་འཛོལ་བ།"
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "%s -> %s ་དང་ %s/%s་ཁ་ཕྱོགས་ཅིག་ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།"
-
-#: apt-inst/filelist.cc:506
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ ཐུམ་སྒྲིལ་ཚུ་ནང་ལས་\n"
+"རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིན།\n"
+"གདམ་ཁ་ཚུ།\n"
+"  -h   འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདཝ་ཨིན།\n"
+"  -t   འདི་གིས་temp་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།\n"
+"  -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
+"  -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་  དཔེར་ན་-o dir::cache=/tmp་"
+"བཟུམ།\n"
+
+#: 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:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "%s -> %s་ཁ་ཕྱོགས་ཀྱི་ལོག་བལྟབ་ཁ་སྐོང་།"
+msgid "Unable to write to %s"
+msgstr " %sལུ་འབྲི་མ་ཚུགས།"
 
-#: apt-inst/filelist.cc:549
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "debconf ་་འཐོན་རིམ་འདི་ལེན་མ་ཚུགས། debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?"
+
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "ཐུམ་སྒྲིལ་རྒྱ་བསྐྱེད་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག"
+
+#: 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 "Duplicate conf file %s/%s"
-msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s/%s་འདི་ངོ་བཤུས་བཟོ།"
+msgid "Error processing directory %s"
+msgstr "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "འབྱུང་ཁུངས་རྒྱ་བསྐྱེད་ཀྱི་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིང་པས།"
+
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "ནང་དོན་ཡིག་སྣོད་ལུ་མགོ་ཡིག་འཛོལ་བ་འབྲི་ནིའི་མགོ་ཡིག"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "%s་འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག"
+msgid "Error processing contents %s"
+msgstr "%sའཛོལ་བ་ལས་སྦྱོར་འབད་ནིའི་ནང་དོན།"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"ལག་ལེན:apt-ftparchive [options] command\n"
+"བརྡ་བཀོད་ཚུ:packages binarypath [overridefile [pathprefix]]\n"
+"sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive་འདི་གིས་ ཌི་བི་ཡཱན་ཡིག་མཛོད་ཚུ་གི་དོན་ལུ་ ཚིག་ཡིག་གི་ཡིག་སྣོད་ཚུ་བཟོ་བཏོན་འབདཝ་"
+"ཨིན། dpkg-scanpackages དང་ dpkg-scansources་གི་དོན་ལུ་ལས་འགན་ཚབ་མ་ཚུ་ལུ་ཆ་ཚང་སྦེ་  "
+"རང་བཞིན་གྱི་སྦེ་བཟོ་བཟོཝ་་ནང་ལས་བཟོ་བཏོན་གྱི་བཟོ་རྣམ་ཚུ་ལྷམ་པ་མ་འདྲཝ་སྦེ་ཡོད་མི་ལུ་རྒྱབ་སྐྱོར་འབདཝ་"
+"ཨིན།\n"
+"\n"
+"apt-ftparchive་ འདི་གིས་.debs་གི་རྩ་འབྲེལ་ཅིག་ནང་ལས་ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད་ཚུ་བཟོ་བཏོན་འབདཝ་ཨིན། "
+"ཐུམ་སྒྲིལ་\n"
+" ཡིག་སྣོད་འདི་གི་ནང་ན་ ཐུམ་སྒྲིལ་རེ་རེ་བཞིན་ནང་གི་ཚད་འཛིན་ས་སྒོ་ཚུ་ཆ་མཉམ་གི་ནང་དོན་དང་ ཨེམ་ཌི་༥་དྲྭ་"
+"རྟགས། (#)་དང་ཡིག་སྣོད་ཀྱི་ཚད་ཚུ་ཡང་ཡོདཔ་ཨིན། ཟུར་བཞག་ཡིག་སྣོད་འདི་\n"
+"གཙོ་རིམ་དང་དབྱེ་ཚན་གྱི་གནས་གོང་དེ་བང་བཙོང་འབད་ནི་ལུ་རྒྱབ་སྐྱོར་འབད་ཡོདཔ་ཨིན།\n"
+"\n"
+"འདི་དང་ཆ་འདྲཝ་སྦེ་ apt-ftparchive་ འདི་གིས་.dscs་གི་རྩ་འབྲེལ་ཅིག་ནང་ལས་འབྱུང་ཁུངས་ཡིག་སྣོད་ཚུ་"
+"བཟོ་བཏོན་འབདཝ་ཨིན།\n"
+" --source-ཟུར་བཞག་གི་གདམ་ཁ་འདི་ ཨེསི་ཨར་སི་ ཟུར་བཞག་ཡིག་སྣོད་ཅིག་གསལ་བཀོད་འབད་ནི་ལུ་ལག་ལེན་"
+"འཐབ་བཐུབ་ཨིན།\n"
+"\n"
+"'ཐུམ་སྒྲིལ་ཚུ་'་དང་'འབྱུང་ཁུངས་་' བརྡ་བཀོད་ཚུ་རྩ་འབྲེལ་འདི་གི་་རྩ་བ་ནང་ལུ་སྦེ་གཡོག་བཀོལ་དགོཔ་ཨིན། ཟུང་"
+"ལྡན་འགྲུལ་ལམ་འདི་གིས་ལོག་རིམ་འཚོལ་ཞིབ་འདི་གི་གཞི་རྟེན་ལུ་དཔག་དགོཔ་ཨིནམ་དང་\n"
+"ཟུར་བཞག་ཡིག་སྣོད་འདི་ལུ་ཟུར་བཞག་གི་ཟུར་རྟགས་འོང་དགོཔ་ཨིན། འགྲུལ་ལམ་སྔོན་ཚིག་འདི་\n"
+"ཡོད་པ་ཅིན་ཡིག་སྣོད་མིང་གི་ས་སྒོ་ཚུ་ལུ་འཇུག་སྣོན་འབད་དེ་ཡོདཔ་ཨིན། དཔེར་ན་ ཌི་བི་ཡཱན་ཡིག་མཛོད་ལས་ལག་"
+"ལེན་བཟུམ:\n"
+"apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"གདམ་ཁ་ཚུ:\n"
+"  -h    འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདཝ་ཨིན།\n"
+"  --md5 ཨེམ་ཌི་༥་ བཟོ་བཏོན་འདི་ཚད་འཛིན་འབདཝ་ཨིན།\n"
+"  -s=?  འབྱུང་ཁུངས་ཟུར་བཞག་གི་ཡིག་སྣོད།\n"
+"  -q    ཁུ་སིམ་སིམ།\n"
+"  -d=?  གདམ་ཁ་ཅན་གྱི་འདྲ་མཛོད་གནད་སྡུད་གཞི་རྟེན་འདི་སེལ་འཐུ་འབད།\n"
+"  --no-delink འབྲེལ་ལམ་མེད་སྦེ་བཟོ་་ནིའི་རྐྱེན་སེལ་ཐབས་ལམ་འདི་ལྕོགས་ཅན་བཟོ།\n"
+"  --contents  ནང་དོན་གི་ཡིག་སྣོད་བཟོ་བཏོན་འདི་ཚད་འཛིན་འབད།\n"
+"  -c=?  འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷག\n"
+"  -o=?  མཐུན་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབད།"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "སེལ་འཐུ་ཚུ་མཐུན་སྒྲིག་མིན་འདུག"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "སྦུང་ཚན་བཟོ་བཤོལ་%s་གཅིག་ལས་ལྷག་སྟེ་འདུག"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཐུམ་སྒྲིལ་ཡིག་སྣོད་སྡེ་ཚན་`%s'ནང་བརླག་སྟོར་ཞུགས་ནུག"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "སྣོད་ཐོ་%s་འདི་ཁ་ཕྱོགས་སྒྱུར་དེ་ཡོད།"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "ཌི་བི་ངན་ཅན་བྱུང་ནུག་   %s.རྒསཔ་ལུ་ཡིག་སྣོད་འདི་བསྐྱར་མིང་བཏགས་ཡི།"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "ཐུམ་སྒྲིལ་འདི་གིས་ག་སྒྱུར་དམིགས་གཏད་%s/%s་ལུ་འབྲི་ནིའི་འབད་རྩོལ་བསྐྱེདཔ་དེ་ཡོད།"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་  %s་ཡར་བསྐྱེད་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོ།"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "ཁ་སྒྱུར་འགྲུལ་ལམ་འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པས།"
+#: ftparchive/cachedb.cc:96
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"ཌི་བི་རྩ་སྒྲིག་འདི་ ནུས་མེད་ཨིན་པས།  ཁྱོད་ཀྱི་ apt་ གྱི་འཐོན་རིམ་རྙིངམ་ཅིག་ནང་ལས་  ཡར་བསྐྱེད་འབད་ཡོད་"
+"པ་ཅིན་  རྩ་བསྐྲད་གཏང་ཞིནམ་ལས་  གནད་སྡུད་གཞི་རྟེན་འདི་ ལོག་དེ་གསར་བསྐྲུན་འབད། "
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་ཐོ་མིན་འདུག"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+msgid "W: Unable to read directory %s\n"
+msgstr "ཌབ་ལུ:%sསྣོད་ཐོ་འདི་ལྷག་མ་ཚུགས།\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "སྣོད་ཡིག་%s་འདི་སྣོད་ཡིག་མེན་མི་ཅིག་གིས་ཚབ་བཙུག་དེ་ཡོདཔ་ཨིན།"
+msgid "W: Unable to stat %s\n"
+msgstr "ཌབ་ལུ་ %s སིཊེཊི་འབད་མ་ཚུགས།\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "ཁོང་རའི་དྲྭ་རྟགས། (#)རྡོབ་ནང་ལུ་མཐུད་མཚམས་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "ཨི:"
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་ཅིག་ཨིན་པས།"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "ཌབ་ལུ:"
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབད།"
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "%s་གི་དོན་ལུ་ཚབ་སྲུང་འབད་བའི་ཐུམ་སྒྲིལ་དེ་གིས་འཐོན་རིམ་གཅིག་ད་ཡང་མཐུན་སྒྲིག་མི་འབད་བས།"
+msgid "Failed to resolve %s"
+msgstr "%s་མོས་མཐུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "རྩ་འབྲེལ་ཕྱིར་བགྲོད་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོདཔ།"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་སྣོད་%s/%sགིས་གཅིག་ཚབ་སྲུང་འབདཝ་ཨིན།"
+msgid "Failed to open %s"
+msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས།"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+msgid "Failed to readlink %s"
+msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "%s་ཡིག་སྣོད་འདི་ཁ་བསྡམས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+msgid "Failed to unlink %s"
+msgstr "%s་འབྲེལ་ལམ་མེད་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "འ་ནི་འདི་ ཌི་ཨི་བི་ཡིག་མཛོད་ནུས་ཅན་ཅིག་མེན་པས་  '%s'འཐུས་མི་བརླག་སྟོར་ཞུགས་དོ།"
+msgid "*** Failed to link %s to %s"
+msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "ནང་འཁོད་འཛོལ་བ་གིས་འཐུས་མི་%sའདི་ག་ཡོད་འཚོལ་མ་འཐོབ།"
+msgid " DeLink limit of %sB hit.\n"
+msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "མིང་དཔྱད་འབད་མ་བཏུབ་པའི་ཚད་འཛིན་ཡིག་སྣོད།"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།"
+
+#: 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:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s ་རྒྱུན་སྐྱོང་པ་འདི་  %s ཨིན་   %s མེན།\n"
+
+#: ftparchive/writer.cc:712
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n"
+
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "དྲན་ཚད་སྤྲོད་ནིའི་དོན་ལུ་ རི་ཨེ་ལོཀ་ འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "ཟུར་བཞག་ཡིག་སྣོད་%sའདི་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr " མ་ཤེས་ཨེབ་བཙུགས་ཨཱལ་གོ་རི་དམ'%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "ཨེབ་བཙུགས་འབད་ཡོད་པའི་ཨའུཊི་པུཊི་%sལུ་ཨེབ་བཙུགས་ཆ་ཚན་ཅིག་དགོཔ་འདུག"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "ནུས་མེད་ཡིག་མཛོད་ཀྱི་མིང་རྟགས།"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "ཡིག་སྣོད་*་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "ཡིག་མཛོད་འཐུས་མི་མགོ་ཡིག་ལྷག་ནིའི་འཛོལ་བ།"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "ཁ་སྤེལ་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/contrib/arfile.cc:96
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "ཆ་ལག་ཨེབ་བཙུགས་འབད།"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "ནང་འཁོད་འཛོལ་བ་ %s་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "ཡིག་མཛོད་འདི་གནམ་མེད་ས་མེད་ཐུང་ཀུ་འདུག"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་IO/ཡིག་སྣོད་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "ཡིག་མཛོད་མགོ་ཡིག་ཚུ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "ཨེམ་ཌི་༥་གློག་རིག་རྐྱབ་པའི་སྐབས་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "རྒྱུད་དུང་ཚུ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ།"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "ཇི་ཛིཔ་འདི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "ངན་ཅན་གྱི་ཡིག་མཛོད།"
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ ཐུམ་སྒྲིལ་ཚུ་ནང་ལས་\n"
+"རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིན།\n"
+"གདམ་ཁ་ཚུ།\n"
+"  -h   འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདཝ་ཨིན།\n"
+"  -t   འདི་གིས་temp་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།\n"
+"  -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
+"  -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་  དཔེར་ན་-o dir::cache=/tmp་"
+"བཟུམ།\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "ཊར་ཅེག་སམ་དེ་འཐུས་ཤོར་བྱུང་ཡོད་  ཡིག་མཛོད་ངན་ཅན་བྱུང་ནུག"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "མ་ཤེས་པའི་ཐུམ་སྒྲིལ་གི་དྲན་ཐོ།"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འཐུས་མི་ %s།"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"ལག་ལེན: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs་ འདི་ཐུམ་སྒྲིལ་གི་ཡིག་སྣོད་ཚུ་དབྱེ་སེལ་འབད་ནི་ལུ་  འཇམ་སམ་གྱི་ལག་ཆས་ཅིག་ཨིན། -s  "
+"གདམ་ཁ་འདི་ ཡིག་སྣོད་ཀྱི་དབྱེ་ཁག་ག་ཅི་བཟུམ་ཅིག་ཨིན་ན\n"
+"་བརྡ་སྟོན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་སྟེ་ཡོདཔ་ཨིན།\n"
+"\n"
+"གདམ་ཁ་ཚུ:\n"
+"  -h   འ་ནི་འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདཝ་ཨིན།\n"
+"  -s  འདི་གིས་འབྱུང་ཁུངས་ ཡིག་སྣོད་གསོག་འཇོག་འབད་དོན་ལུ་ལག་ལེན་འཐབ་ཨིན།\n"
+"  -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
+"  -o=? འདི་གིས་ མཐུན་སྒྲིག་ རིམ་སྒྲིག་གི་གདམ་ཁ་ཚུ་ཁཞི་སྒྲིག་འབདཝ་ཨིན་   དཔེར་ན་-o dir::cache=/"
+"tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་སྐྱོར་མ་འབད་བས།"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་གཏན་འབེབས་བཟོ་མི་ཚུགས་པས།"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་ཡོད།\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i་མཐུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i་དྲན་ཐོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན།\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2009,6 +2271,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 "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་ན་གནས་ཚད་ཡིག་སྣོད་ཚུ་ མིང་དཔྱད་ཡང་ན་ཁ་ཕྱེ་མ་ཚུགས།"
@@ -2021,201 +2303,365 @@ msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ན
 msgid "The list of sources could not be read."
 msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་སྟོངམ།"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr "ཐུམ་སྒྲིས་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ མི་མཐུན་པའི་འཐོན་རིམ་ཅིག་ཨིན་པས།"
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "འ་ནི་ཨེ་པི་ཊི་ འདི་གིས་ '%s'འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་དེ་ལུ་རྒྱབ་སྐྱོར་མི་འབད་བས།"
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "རྟེནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "སྔོན་གོང་མ་རྟེནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "བསམ་འཆར་བཀོདཔ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "འོས་སྦྱོར་འབདཝ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "མི་མཐུནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "ཚབ་བཙུགསཔ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "ཕན་མེདཔ་བཟོཝ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "གལ་ཅན།"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "དགོས་མཁོ་ཡོདཔ།"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "ཚད་ལྡན།"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "གདམ་ཁ་ཅན།"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "ཐེབས།"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་"
+
+#: 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/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
+
+#: 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 (ཡུ་ཨར་ཨའི་)གི་ནང་ན།"
+
+#: 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: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/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/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།"
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"
+msgid "Couldn't stat source package list %s"
+msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ།"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།"
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "མི་ངོ་འཐོན་རིམཚུ།"
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "བརྟེན་པའི་བཟོ་བཏོན།"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "ཚད་མ་མཐུན།"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "འཛོལ་བ་འབྲི།"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "སྣོད་ཐོ་%s་འདི་ཁ་ཕྱོགས་སྒྱུར་དེ་ཡོད།"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: apt-pkg/acquire-item.cc:2059
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
+"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:1926
+#: 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 "
@@ -2224,133 +2670,50 @@ msgstr ""
 " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
 "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr " %sལུ་འབྲི་མ་ཚུགས།"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: apt-pkg/acquire.cc:162
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི་ཡིག་སྣོད་%li (%s ལྷག་ལུས་དོ།)"
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2377,19 +2740,19 @@ msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འ
 msgid "No priority (or zero) specified for pin"
 msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2401,10 +2764,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
@@ -2472,11 +2839,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"
 
@@ -2488,335 +2855,267 @@ msgstr ""
 "ཐུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབདཝ་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་"
 "མ་ཐོབ།"
 
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བཏོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མཐུན་བཟོཝ་ཨིན འ་ནི་ཐུམ་"
-"སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རྐྱེན་ལས་བརྟེན་ཨིན་པས།"
-
-#: apt-pkg/algorithms.cc:1088
-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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "%s (%d)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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 (ཡུ་ཨར་ཨའི་)གི་ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
+#: apt-pkg/algorithms.cc:1090
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བཏོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མཐུན་བཟོཝ་ཨིན འ་ནི་ཐུམ་"
+"སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རྐྱེན་ལས་བརྟེན་ཨིན་པས།"
 
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
+#: apt-pkg/algorithms.cc:1092
+msgid "Unable to correct problems, you have held broken packages."
+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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+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:139
+msgid "Candidate versions"
+msgstr "མི་ངོ་འཐོན་རིམཚུ།"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "%s་ཁ་ཕྱེ་དོ།"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "བརྟེན་པའི་བཟོ་བཏོན།"
 
-#: apt-pkg/sourcelist.cc:371
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%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:375
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
+#: apt-pkg/depcache.cc:252
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/depcache.cc:258
 #, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "%s (%d)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/cacheset.cc:635
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/cacheset.cc:641
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: apt-pkg/cacheset.cc:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:145
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
+
+#: apt-pkg/indexrecords.cc:164
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "%s ལྷག་ནི་རྐྱངམ་ཅིག་འབད་མི་ལྡེ་མིག་ཡིག་སྣོད་འདི་གི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ལྡེ་མིག་རྐྱབས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "ཨེན་ཨེཕ་ཨེསི་ %s སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "ཡན་ལག་ལས་སྦྱོར་ ཨའི་པི་སི་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "ཨེབ་འཕྲུལ་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "ལྷག་  ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "འབྲི་  ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
 
@@ -2902,109 +3201,103 @@ msgstr "སྦྱར་བརྩེགས་ས་ཚིགས་%s་འདི
 msgid "Failed to stat the cdrom"
 msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "ངོ་མ་ཤེས་པའི་སྡུད་ཚིག་གི་དབྱེ་བ:'%c'"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཟོ་ཉེས་འགྱུར་བའི་ངོ་རྟགས།"
 
-#: apt-pkg/contrib/configuration.cc:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ཡིག་སྣོད་ཀྱི་མཇུག་ལུ་མཁོ་མེད་ཐེབས།"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-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 "བརྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%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"
@@ -3014,12 +3307,12 @@ msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
 msgid "Installing %s"
 msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།"
@@ -3040,103 +3333,103 @@ msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3165,408 +3458,172 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ ཐུམ་སྒྲིལ་ཚུ་ནང་ལས་\n"
-"རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིན།\n"
-"གདམ་ཁ་ཚུ།\n"
-"  -h   འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདཝ་ཨིན།\n"
-"  -t   འདི་གིས་temp་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།\n"
-"  -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
-"  -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་  དཔེར་ན་-o dir::cache=/tmp་"
-"བཟུམ།\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས།"
-
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "debconf ་་འཐོན་རིམ་འདི་ལེན་མ་ཚུགས། debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?"
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "འབྱུང་ཁུངས་རྒྱ་བསྐྱེད་ཀྱི་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིང་པས།"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "ནང་དོན་ཡིག་སྣོད་ལུ་མགོ་ཡིག་འཛོལ་བ་འབྲི་ནིའི་མགོ་ཡིག"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "%sའཛོལ་བ་ལས་སྦྱོར་འབད་ནིའི་ནང་དོན།"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"ལག་ལེན:apt-ftparchive [options] command\n"
-"བརྡ་བཀོད་ཚུ:packages binarypath [overridefile [pathprefix]]\n"
-"sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive་འདི་གིས་ ཌི་བི་ཡཱན་ཡིག་མཛོད་ཚུ་གི་དོན་ལུ་ ཚིག་ཡིག་གི་ཡིག་སྣོད་ཚུ་བཟོ་བཏོན་འབདཝ་"
-"ཨིན། dpkg-scanpackages དང་ dpkg-scansources་གི་དོན་ལུ་ལས་འགན་ཚབ་མ་ཚུ་ལུ་ཆ་ཚང་སྦེ་  "
-"རང་བཞིན་གྱི་སྦེ་བཟོ་བཟོཝ་་ནང་ལས་བཟོ་བཏོན་གྱི་བཟོ་རྣམ་ཚུ་ལྷམ་པ་མ་འདྲཝ་སྦེ་ཡོད་མི་ལུ་རྒྱབ་སྐྱོར་འབདཝ་"
-"ཨིན།\n"
-"\n"
-"apt-ftparchive་ འདི་གིས་.debs་གི་རྩ་འབྲེལ་ཅིག་ནང་ལས་ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད་ཚུ་བཟོ་བཏོན་འབདཝ་ཨིན། "
-"ཐུམ་སྒྲིལ་\n"
-" ཡིག་སྣོད་འདི་གི་ནང་ན་ ཐུམ་སྒྲིལ་རེ་རེ་བཞིན་ནང་གི་ཚད་འཛིན་ས་སྒོ་ཚུ་ཆ་མཉམ་གི་ནང་དོན་དང་ ཨེམ་ཌི་༥་དྲྭ་"
-"རྟགས། (#)་དང་ཡིག་སྣོད་ཀྱི་ཚད་ཚུ་ཡང་ཡོདཔ་ཨིན། ཟུར་བཞག་ཡིག་སྣོད་འདི་\n"
-"གཙོ་རིམ་དང་དབྱེ་ཚན་གྱི་གནས་གོང་དེ་བང་བཙོང་འབད་ནི་ལུ་རྒྱབ་སྐྱོར་འབད་ཡོདཔ་ཨིན།\n"
-"\n"
-"འདི་དང་ཆ་འདྲཝ་སྦེ་ apt-ftparchive་ འདི་གིས་.dscs་གི་རྩ་འབྲེལ་ཅིག་ནང་ལས་འབྱུང་ཁུངས་ཡིག་སྣོད་ཚུ་"
-"བཟོ་བཏོན་འབདཝ་ཨིན།\n"
-" --source-ཟུར་བཞག་གི་གདམ་ཁ་འདི་ ཨེསི་ཨར་སི་ ཟུར་བཞག་ཡིག་སྣོད་ཅིག་གསལ་བཀོད་འབད་ནི་ལུ་ལག་ལེན་"
-"འཐབ་བཐུབ་ཨིན།\n"
-"\n"
-"'ཐུམ་སྒྲིལ་ཚུ་'་དང་'འབྱུང་ཁུངས་་' བརྡ་བཀོད་ཚུ་རྩ་འབྲེལ་འདི་གི་་རྩ་བ་ནང་ལུ་སྦེ་གཡོག་བཀོལ་དགོཔ་ཨིན། ཟུང་"
-"ལྡན་འགྲུལ་ལམ་འདི་གིས་ལོག་རིམ་འཚོལ་ཞིབ་འདི་གི་གཞི་རྟེན་ལུ་དཔག་དགོཔ་ཨིནམ་དང་\n"
-"ཟུར་བཞག་ཡིག་སྣོད་འདི་ལུ་ཟུར་བཞག་གི་ཟུར་རྟགས་འོང་དགོཔ་ཨིན། འགྲུལ་ལམ་སྔོན་ཚིག་འདི་\n"
-"ཡོད་པ་ཅིན་ཡིག་སྣོད་མིང་གི་ས་སྒོ་ཚུ་ལུ་འཇུག་སྣོན་འབད་དེ་ཡོདཔ་ཨིན། དཔེར་ན་ ཌི་བི་ཡཱན་ཡིག་མཛོད་ལས་ལག་"
-"ལེན་བཟུམ:\n"
-"apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"གདམ་ཁ་ཚུ:\n"
-"  -h    འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདཝ་ཨིན།\n"
-"  --md5 ཨེམ་ཌི་༥་ བཟོ་བཏོན་འདི་ཚད་འཛིན་འབདཝ་ཨིན།\n"
-"  -s=?  འབྱུང་ཁུངས་ཟུར་བཞག་གི་ཡིག་སྣོད།\n"
-"  -q    ཁུ་སིམ་སིམ།\n"
-"  -d=?  གདམ་ཁ་ཅན་གྱི་འདྲ་མཛོད་གནད་སྡུད་གཞི་རྟེན་འདི་སེལ་འཐུ་འབད།\n"
-"  --no-delink འབྲེལ་ལམ་མེད་སྦེ་བཟོ་་ནིའི་རྐྱེན་སེལ་ཐབས་ལམ་འདི་ལྕོགས་ཅན་བཟོ།\n"
-"  --contents  ནང་དོན་གི་ཡིག་སྣོད་བཟོ་བཏོན་འདི་ཚད་འཛིན་འབད།\n"
-"  -c=?  འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷག\n"
-"  -o=?  མཐུན་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབད།"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "སེལ་འཐུ་ཚུ་མཐུན་སྒྲིག་མིན་འདུག"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཐུམ་སྒྲིལ་ཡིག་སྣོད་སྡེ་ཚན་`%s'ནང་བརླག་སྟོར་ཞུགས་ནུག"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "ཌི་བི་ངན་ཅན་བྱུང་ནུག་   %s.རྒསཔ་ལུ་ཡིག་སྣོད་འདི་བསྐྱར་མིང་བཏགས་ཡི།"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་  %s་ཡར་བསྐྱེད་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོ།"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"ཌི་བི་རྩ་སྒྲིག་འདི་ ནུས་མེད་ཨིན་པས།  ཁྱོད་ཀྱི་ apt་ གྱི་འཐོན་རིམ་རྙིངམ་ཅིག་ནང་ལས་  ཡར་བསྐྱེད་འབད་ཡོད་"
-"པ་ཅིན་  རྩ་བསྐྲད་གཏང་ཞིནམ་ལས་  གནད་སྡུད་གཞི་རྟེན་འདི་ ལོག་དེ་གསར་བསྐྲུན་འབད། "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "ད་ལྟོ་ཡང་འབྲེལ་ལམ་ཡོད་པའི་མཐུད་མཚམས་གུར་བཀོག་བཞག་མཐུད་མཚམས་དེ་བོད་བརྡ་འབད་འདི་ཡོད།"
 
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "དྲྭ་རྟགས་རྒྱུ་རྫས་འདི་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད!"
 
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "ཁ་ཕྱོགས་སྤྲོད་བཞག་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་ཐོ་མིན་འདུག"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "ཁ་ཕྱོགས་ཁ་སྐོང་རྐྱབ་ནི་ནང་  ནང་འཁོད་ཀྱི་འཛོལ་བ།"
 
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།"
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "%s -> %s ་དང་ %s/%s་ཁ་ཕྱོགས་ཅིག་ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།"
 
-#: ftparchive/writer.cc:91
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "ཌབ་ལུ:%sསྣོད་ཐོ་འདི་ལྷག་མ་ཚུགས།\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "%s -> %s་ཁ་ཕྱོགས་ཀྱི་ལོག་བལྟབ་ཁ་སྐོང་།"
 
-#: ftparchive/writer.cc:96
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "ཌབ་ལུ་ %s སིཊེཊི་འབད་མ་ཚུགས།\n"
+msgid "Duplicate conf file %s/%s"
+msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s/%s་འདི་ངོ་བཤུས་བཟོ།"
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "ཨི:"
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#, c-format
+msgid "The path %s is too long"
+msgstr "%s་འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "ཌབ་ལུ:"
+#: apt-inst/extract.cc:132
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "སྦུང་ཚན་བཟོ་བཤོལ་%s་གཅིག་ལས་ལྷག་སྟེ་འདུག"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབད།"
+#: apt-inst/extract.cc:142
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "སྣོད་ཐོ་%s་འདི་ཁ་ཕྱོགས་སྒྱུར་དེ་ཡོད།"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "%s་མོས་མཐུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "ཐུམ་སྒྲིལ་འདི་གིས་ག་སྒྱུར་དམིགས་གཏད་%s/%s་ལུ་འབྲི་ནིའི་འབད་རྩོལ་བསྐྱེདཔ་དེ་ཡོད།"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "རྩ་འབྲེལ་ཕྱིར་བགྲོད་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོདཔ།"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "ཁ་སྒྱུར་འགྲུལ་ལམ་འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པས།"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "Failed to open %s"
-msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "སྣོད་ཡིག་%s་འདི་སྣོད་ཡིག་མེན་མི་ཅིག་གིས་ཚབ་བཙུག་དེ་ཡོདཔ་ཨིན།"
 
-#: ftparchive/writer.cc:278
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "ཁོང་རའི་དྲྭ་རྟགས། (#)རྡོབ་ནང་ལུ་མཐུད་མཚམས་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: ftparchive/writer.cc:286
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་ཅིག་ཨིན་པས།"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "%s་འབྲེལ་ལམ་མེད་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+msgid "Overwrite package match with no version for %s"
+msgstr "%s་གི་དོན་ལུ་ཚབ་སྲུང་འབད་བའི་ཐུམ་སྒྲིལ་དེ་གིས་འཐོན་རིམ་གཅིག་ད་ཡང་མཐུན་སྒྲིག་མི་འབད་བས།"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་སྣོད་%s/%sགིས་གཅིག་ཚབ་སྲུང་འབདཝ་ཨིན།"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:498
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།"
+msgid "Unable to stat %s"
+msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས།"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n"
+msgid "Failed to write file %s"
+msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s ་རྒྱུན་སྐྱོང་པ་འདི་  %s ཨིན་   %s མེན།\n"
+msgid "Failed to close file %s"
+msgstr "%s་ཡིག་སྣོད་འདི་ཁ་བསྡམས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "འ་ནི་འདི་ ཌི་ཨི་བི་ཡིག་མཛོད་ནུས་ཅན་ཅིག་མེན་པས་  '%s'འཐུས་མི་བརླག་སྟོར་ཞུགས་དོ།"
 
-#: ftparchive/writer.cc:702
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "དྲན་ཚད་སྤྲོད་ནིའི་དོན་ལུ་ རི་ཨེ་ལོཀ་ འཐུས་ཤོར་བྱུང་ཡོད།"
+msgid "Internal error, could not locate member %s"
+msgstr "ནང་འཁོད་འཛོལ་བ་གིས་འཐུས་མི་%sའདི་ག་ཡོད་འཚོལ་མ་འཐོབ།"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
-#, c-format
-msgid "Unable to open %s"
-msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "མིང་དཔྱད་འབད་མ་བཏུབ་པའི་ཚད་འཛིན་ཡིག་སྣོད།"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "ནུས་མེད་ཡིག་མཛོད་ཀྱི་མིང་རྟགས།"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "ཟུར་བཞག་ཡིག་སྣོད་%sའདི་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "ཡིག་མཛོད་འཐུས་མི་མགོ་ཡིག་ལྷག་ནིའི་འཛོལ་བ།"
 
-#: ftparchive/override.cc:166
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1"
+msgid "Invalid archive member header %s"
+msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #2"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #3"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "ཡིག་མཛོད་འདི་གནམ་མེད་ས་མེད་ཐུང་ཀུ་འདུག"
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr " མ་ཤེས་ཨེབ་བཙུགས་ཨཱལ་གོ་རི་དམ'%s'"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "ཡིག་མཛོད་མགོ་ཡིག་ཚུ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "ཨེབ་བཙུགས་འབད་ཡོད་པའི་ཨའུཊི་པུཊི་%sལུ་ཨེབ་བཙུགས་ཆ་ཚན་ཅིག་དགོཔ་འདུག"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "རྒྱུད་དུང་ཚུ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "ཡིག་སྣོད་*་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "ཇི་ཛིཔ་འདི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "ཁ་སྤེལ་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོད།"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "ངན་ཅན་གྱི་ཡིག་མཛོད།"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "ཆ་ལག་ཨེབ་བཙུགས་འབད།"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "ཊར་ཅེག་སམ་དེ་འཐུས་ཤོར་བྱུང་ཡོད་  ཡིག་མཛོད་ངན་ཅན་བྱུང་ནུག"
 
-#: ftparchive/multicompress.cc:232
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Internal error, failed to create %s"
-msgstr "ནང་འཁོད་འཛོལ་བ་ %s་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འཐུས་མི་ %s།"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་IO/ཡིག་སྣོད་འཐུས་ཤོར་བྱུང་ཡོད།"
+#~ msgid "Total dependency version space: "
+#~ msgstr "རྟེན་འབྲེལ་ཐོན་རིམ་བར་སྟོང་གྱི་བསྡོམས:"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "ཨེམ་ཌི་༥་གློག་རིག་རྐྱབ་པའི་སྐབས་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་"
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ།"
+#~ msgid "Done"
+#~ msgstr "འབད་ཚར་ཡི།"
 
-#: cmdline/apt-internal-solver.cc:49
 #, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ ཐུམ་སྒྲིལ་ཚུ་ནང་ལས་\n"
-"རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིན།\n"
-"གདམ་ཁ་ཚུ།\n"
-"  -h   འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདཝ་ཨིན།\n"
-"  -t   འདི་གིས་temp་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།\n"
-"  -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
-"  -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་  དཔེར་ན་-o dir::cache=/tmp་"
-"བཟུམ།\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "མ་ཤེས་པའི་ཐུམ་སྒྲིལ་གི་དྲན་ཐོ།"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"ལག་ལེན: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs་ འདི་ཐུམ་སྒྲིལ་གི་ཡིག་སྣོད་ཚུ་དབྱེ་སེལ་འབད་ནི་ལུ་  འཇམ་སམ་གྱི་ལག་ཆས་ཅིག་ཨིན། -s  "
-"གདམ་ཁ་འདི་ ཡིག་སྣོད་ཀྱི་དབྱེ་ཁག་ག་ཅི་བཟུམ་ཅིག་ཨིན་ན\n"
-"་བརྡ་སྟོན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འཐབ་སྟེ་ཡོདཔ་ཨིན།\n"
-"\n"
-"གདམ་ཁ་ཚུ:\n"
-"  -h   འ་ནི་འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདཝ་ཨིན།\n"
-"  -s  འདི་གིས་འབྱུང་ཁུངས་ ཡིག་སྣོད་གསོག་འཇོག་འབད་དོན་ལུ་ལག་ལེན་འཐབ་ཨིན།\n"
-"  -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
-"  -o=? འདི་གིས་ མཐུན་སྒྲིག་ རིམ་སྒྲིག་གི་གདམ་ཁ་ཚུ་ཁཞི་སྒྲིག་འབདཝ་ཨིན་   དཔེར་ན་-o dir::cache=/"
-"tmp\n"
+#~ msgid "No keyring installed in %s."
+#~ msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/el.po b/po/el.po
index 393d5ceef..e0750b61e 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: 2015-01-16 04:37-0500\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,149 +32,145 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Το πακέτο %s με έκδοση %s έχει ανικανοποίητες εξαρτήσεις:\n"
 
-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Συνολικά Ονόματα Πακέτων : "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Συνολο Δομών Πακέτου : "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Κανονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr " Πλήρως Εικονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr " Μονά Εικονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr " Μικτά Εικονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "Αγνοούμενα: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Σύνολο Διαφορετικών Εκδόσεων: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Σύνολο Διαφορετικών Εκδόσεων: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Σύνολο Εξαρτήσεων: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Σύνολο Αντιστοιχίσεων Παροχών: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Σύνολο Κοινών Στοιχειοσειρών : "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Συνολικός χώρος Εξαρτήσεων Εκδόσεων: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Σύνολο χώρου ασφαλείας: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Συνολικός Καταμετρημένος Χώρος: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Αδυναμία εντοπισμού του πακέτου %s"
 
-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Αρχεία Πακέτου:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Καθηλωμένα Πακέτα:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(δε βρέθηκαν)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Εγκατεστημένα: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Υποψήφιο: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(κανένα)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr " Καθήλωση Πακέτου: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Πίνακας Έκδοσης:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -249,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"
@@ -271,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 από το σετ σας."
 
@@ -308,82 +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:245
+#: cmdline/apt-get.cc:224
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
-#: cmdline/apt-get.cc:367
+#: 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:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
 "υλικό"
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
 "κωδικάτου"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -391,96 +387,95 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
-
 #. 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:895
+#: 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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Μεταφόρτωση Κωδικα %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Η απογονική διεργασία απέτυχε"
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
 
-#: cmdline/apt-get.cc:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
+
+#: 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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -522,30 +517,30 @@ msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν έχει "
 "υποψήφιαέκδοση"
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1388
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog για %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Υποστηριζόμενοι Οδηγοί:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -641,11 +636,11 @@ msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
 "κωδικάτου"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -659,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -784,12 +779,12 @@ msgstr "Ο δίσκος δεν βρέθηκε."
 msgid "File not found"
 msgstr "Το αρχείο Δε Βρέθηκε"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Αποτυχία εύρεσης της κατάστασης"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης"
 
@@ -798,34 +793,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Μη έγκυρο URI, τα τοπικά URI δεν πρέπει να αρχίζουν με //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Σύνδεση στο σύστημα"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Αδύνατος ο καθορισμός του ονόματος του ομότιμου (peer)"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Αδύνατος ο καθορισμός του τοπικού ονόματος"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Ο διακομιστής αρνήθηκε την σύνδεση με μήνυμα: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Η εντολή USER απέτυχε, ο διακομιστής απάντησε: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Η εντολή PASS απέτυχε, ο διακομιστής απάντησε: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -833,123 +828,123 @@ msgstr ""
 "Ο διαμεσολαβητής έχει οριστεί αλλά χωρίς σενάριο εισόδου, το Acquire::ftp::"
 "ProxyLogin είναι άδειο"
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Η εντολή '%s' στο σενάριο εισόδου απέτυχε, ο διακομιστής απάντησε: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Η εντολή TYPE απέτυχε, ο διακομιστής απάντησε: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Λήξη χρόνου σύνδεσης"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Ο διακομιστής έκλεισε την σύνδεση"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Σφάλμα ανάγνωσης"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Το μήνυμα απάντησης υπερχείλισε την ενδιάμεση μνήμη."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Αλλοίωση του πρωτοκόλλου"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Σφάλμα εγγραφής"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Αδύνατη η δημιουργία μιας υποδοχής (socket)"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Αδύνατη η σύνδεση υποδοχής δεδομένων, λήξη χρόνου σύνδεσης"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Απέτυχε"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Αδύνατη η σύνδεση σε παθητική υποδοχή (socket)."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Το getaddrinfo ήταν αδύνατο να δέσμευση υποδοχή παρακολούθησης"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Αδύνατη η πρόσδεση στην υποδοχή (socket)"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Αδύνατη η παρακολούθηση της υποδοχής (socket)"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Αδύνατος ο καθορισμός του ονόματος της υποδοχής (socket)"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Αδύνατη η αποστολή της εντολής PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Άγνωστη οικογένεια διευθύνσεων %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Το EPRT απέτυχε, ο διακομιστής απάντησε: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδομένων"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Αδύνατη η αποδοχή συνδέσεων"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Πρόβλημα κατά το hashing του αρχείου"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Αδυναμία λήψης του αρχείου, ο διακομιστής απάντησε '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Λήξη χρόνου υποδοχής δεδομένων"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Αποτυχία κατά τη μεταφορά δεδομένων, ο διακομιστής απάντησε '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Επερώτηση"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Αδύνατη η εκτέλεση"
 
@@ -1015,18 +1010,18 @@ msgstr "Κάτι παράξενο συνέβη κατά την εύρεση το
 msgid "Unable to connect to %s:%s:"
 msgstr "Αδύνατη η σύνδεση στο %s %s:"
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του "
 "αποτυπώματος?!"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή."
 
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:164
 #, fuzzy
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
@@ -1034,22 +1029,22 @@ msgstr ""
 "εγκατεστημένο το gnupg;)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n"
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1057,36 +1052,36 @@ msgstr ""
 "Οι παρακάτω υπογραφές δεν ήταν δυνατόν να επαληθευτούν επειδή δεν ήταν "
 "διαθέσιμο το δημόσιο κλειδί:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Η επιλογή απέτυχε"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Λήξη χρόνου σύνδεσης"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
 
@@ -1118,423 +1113,158 @@ msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρω
 msgid "Unknown date format"
 msgstr "Άγνωστη μορφή ημερομηνίας"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Εσωτερικό Σφάλμα"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
+#: apt-private/private-list.cc:121
+msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
+#: 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-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-"Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη."
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Διόρθωση εξαρτήσεων..."
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε"
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " απέτυχε."
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Πολύ περίεργο! Τα μεγέθη δεν ταιριάζουν, στείλτε μήνυμα στο apt@packages."
-"debian.org"
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB από αρχεία.\n"
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Χρειάζεται να μεταφορτωθούν %sB από αρχεία.\n"
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+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
-#: apt-private/private-install.cc:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
-"Μετά από αυτή τη λειτουργία, θα χρησιμοποιηθούν %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
-#: apt-private/private-install.cc:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
+"Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
+"προβλήματα."
 
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο  %s."
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f."
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Υπάρχουν προβλήματα και δώσατε -y  χωρίς το --force-yes"
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία"
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Εγκατεστημένα]"
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Ναι, κανε ότι λέω!"
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Εγκατεστημένα]"
 
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
 msgstr ""
-"Πρόκειται να κάνετε κάτι πιθανόν πολύ επιζήμιο.\n"
-"Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Εγκατάλειψη."
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Θέλετε να συνεχίσετε;"
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Εγκατεστημένα]"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Εγκατεστημένα]"
 
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
 msgstr ""
-"Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update "
-"ή το --fix-missing;"
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
 msgstr ""
-"ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Αδύνατη η επίλυση των χαμένων πακέτων."
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "αλλά το %s είναι εγκατεστημένο"
 
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Εγκατάλειψη της εγκατάστασης."
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
 
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "αλλά δεν είναι εγκαταστάσημο"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "αλλά είναι ένα εικονικό πακέτο"
 
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-"Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover"
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "αλλά δεν είναι εγκατεστημένο"
 
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Φαίνεται πως το AutoRemover κατέστρεψε κάτι ενώ δεν θα έπρεπε. Παρακαλείστε "
-"να υποβάλλετε αναφορά σφάλματος για το apt."
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "αλλά δεν πρόκειται να εγκατασταθεί"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " η"
 
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα"
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
 
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "Το ακόλουθο πακέτο εγκαταστάθηκε αυτόματα και δεν χρειάζεται πλέον:"
-msgstr[1] ""
-"Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
 
-#: apt-private/private-install.cc:517
-#, fuzzy, c-format
-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 το ακόλουθο πακέτο εγκαταστάθηκε αυτόματα και δεν χρειάζεται πλέον:"
-msgstr[1] ""
-"%lu τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
 
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Χρησιμοποιήστε 'apt-get autoremove' για να το διαγράψετε."
-msgstr[1] "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε."
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
 
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
 
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
-"πακέτο (ή καθορίστε μια λύση)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Μερικά πακέτα είναι αδύνατον να εγκατασταθούν. Αυτό μπορεί να σημαίνει ότι\n"
-"δημιουργήσατε μια απίθανη κατάσταση ή αν χρησιμοποιείτε την ασταθή\n"
-"διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
-"μετακινηθεί από τα εισερχόμενα."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Χαλασμένα πακέτα"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Προτεινόμενα πακέτα:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Συνιστώμενα πακέτα:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Παράκαμψη του %s, είναι εγκατεστημένο και μόνο αναβαθμίσεις έχουν οριστεί.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-"Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή "
-"του\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Επιλέχθηκε η έκδοση %s (%s) για το %s\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Επιλέχθηκε η έκδοση %s (%s) για το %s λόγω του %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
-"Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί. Εννοείτε '%s'?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n"
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Διόρθωση εξαρτήσεων..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " απέτυχε."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Ετοιμο"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
-"προβλήματα."
-
-#: apt-private/private-cachefile.cc:111
-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:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:"
 
 #: apt-private/private-output.cc:633
 msgid "The following held packages will be changed:"
@@ -1604,7 +1334,7 @@ msgstr ""
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "σφάλμα μεταγλωτισμου - %s"
@@ -1613,7 +1343,7 @@ msgstr "σφάλμα μεταγλωτισμου - %s"
 msgid "The update command takes no arguments"
 msgstr "Η εντολή update δεν παίρνει ορίσματα"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1621,10 +1351,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1645,76 +1379,348 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr ""
+"Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη."
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε"
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση;"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Πολύ περίεργο! Τα μεγέθη δεν ταιριάζουν, στείλτε μήνυμα στο apt@packages."
+"debian.org"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#. 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
+#: apt-private/private-install.cc:154
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Αποτυχία ανάκτησης του %s   %s\n"
-
-#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "Αποτυχία μετονομασίας του %s σε %s"
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB από αρχεία.\n"
 
-#: apt-private/private-sources.cc:70
+#. 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:159
 #, c-format
-msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
+msgid "Need to get %sB of archives.\n"
+msgstr "Χρειάζεται να μεταφορτωθούν %sB από αρχεία.\n"
 
-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
+#. 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:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
+"Μετά από αυτή τη λειτουργία, θα χρησιμοποιηθούν %sB χώρου από το δίσκο.\n"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Υπολογισμός της αναβάθμισης"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-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
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Hit "
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Υπάρχουν προβλήματα και δώσατε -y  χωρίς το --force-yes"
 
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Φέρε:"
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία"
 
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Αγνόησε "
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Ναι, κανε ότι λέω!"
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Πρόκειται να κάνετε κάτι πιθανόν πολύ επιζήμιο.\n"
+"Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Εγκατάλειψη."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Θέλετε να συνεχίσετε;"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update "
+"ή το --fix-missing;"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr ""
+"ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Αδύνατη η επίλυση των χαμένων πακέτων."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Εγκατάλειψη της εγκατάστασης."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+"Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του 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 ""
+"Φαίνεται πως το AutoRemover κατέστρεψε κάτι ενώ δεν θα έπρεπε. Παρακαλείστε "
+"να υποβάλλετε αναφορά σφάλματος για το apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "Το ακόλουθο πακέτο εγκαταστάθηκε αυτόματα και δεν χρειάζεται πλέον:"
+msgstr[1] ""
+"Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+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 το ακόλουθο πακέτο εγκαταστάθηκε αυτόματα και δεν χρειάζεται πλέον:"
+msgstr[1] ""
+"%lu τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "Χρησιμοποιήστε 'apt-get autoremove' για να το διαγράψετε."
+msgstr[1] "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
+"πακέτο (ή καθορίστε μια λύση)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Μερικά πακέτα είναι αδύνατον να εγκατασταθούν. Αυτό μπορεί να σημαίνει ότι\n"
+"δημιουργήσατε μια απίθανη κατάσταση ή αν χρησιμοποιείτε την ασταθή\n"
+"διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
+"μετακινηθεί από τα εισερχόμενα."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Χαλασμένα πακέτα"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Προτεινόμενα πακέτα:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Συνιστώμενα πακέτα:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Παράκαμψη του %s, είναι εγκατεστημένο και μόνο αναβαθμίσεις έχουν οριστεί.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+"Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή "
+"του\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Επιλέχθηκε η έκδοση %s (%s) για το %s\n"
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Επιλέχθηκε η έκδοση %s (%s) για το %s λόγω του %s\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+"Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί. Εννοείτε '%s'?\n"
+
+#: apt-private/private-install.cc:945
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν"
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση;"
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Αποτυχία ανάκτησης του %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 "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο  %s."
+
+#: apt-private/private-sources.cc:58
+#, fuzzy, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "Αποτυχία μετονομασίας του %s σε %s"
+
+#: apt-private/private-sources.cc:70
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""
+
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Hit "
+
+#: apt-private/acqprogress.cc:88
+msgid "Get:"
+msgstr "Φέρε:"
+
+#: apt-private/acqprogress.cc:119
+msgid "Ign "
+msgstr "Αγνόησε "
+
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Σφάλμα "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Μεταφορτώθηκαν %sB σε %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Επεξεργασία]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1727,18 +1733,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1816,205 +1822,459 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Κλήση του DropNode σε έναν ήδη συνδεδεμένο κόμβο"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Χρήση: apt-extracttemplates αρχείο1 [αρχείο2 ...]\n"
+"\n"
+"το apt-extracttemplates είναι ένα βοήθημα για να εξάγετε ρυθμίσεις \n"
+"και πρότυπα από πακέτα debian\n"
+"\n"
+"Επιλογές:\n"
+"  -h   Το παρόν κείμενο βοήθειας\n"
+"  -t   Καθορισμός προσωρινού καταλόγου\n"
+"  -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
+"  -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Αποτυχία εντοπισμού του στοιχείου hash!"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Αδύνατη η εύρεση της κατάστασης του %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Αδυναμία εντοπισμού εκτροπής"
+#: 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"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Εσωτερικό Σφάλμα στο AddDiversion"
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Προσπάθεια για αντικατάσταση εκτροπής, %s -> %s και %s/%s"
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "Ο κατάλογος επεκτάσεων του πακέτου είναι υπερβολικά μακρύς"
 
-#: apt-inst/filelist.cc:506
+#: 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 "Double add of diversion %s -> %s"
-msgstr "Διπλή προσθήκη εκτροπής %s -> %s"
+msgid "Error processing directory %s"
+msgstr "Σφάλμα επεξεργασίας του καταλόγου %s"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Διπλό αρχείο ρυθμίσεων %s/%s"
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Ο κατάλογος επεκτάσεων των πηγών είναι υπερβολικά μακρύς"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "Σφάλμα εγγραφής κεφαλίδων στο αρχείο περιεχομένων"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "Η διαδρομή %s έχει υπερβολικό μήκος"
+msgid "Error processing contents %s"
+msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Χρήση: apt-ftparchive [επιλογές] εντολή\n"
+"Εντολές: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"Το apt-ftparchive παράγει αρχεία περιεχομένων για τις αρχειοθήκες Debian\n"
+"Υποστηρίζει πολλές παραλλαγές παραγωγής, από απόλυτα αυτοματοποιημένες έως\n"
+"λειτουργικές αντικαταστάσεις για την dpkg-scanpackages και dpkg-scansources\n"
+"\n"
+"Το apt-ftparchive παράγει αρχεία Package από ένα σύνολο αρχείων .debs. Στο\n"
+"αρχείο Package περιέχονται όλα τα πεδία ελέγχου κάθε πακέτου καθώς και\n"
+"το μέγεθος τους και το MD5 hash. Υποστηρίζει την ύπαρξη αρχείου παράκαμψης\n"
+"για τη βεβιασμένη αλλαγή των πεδίων Priority (Προτεραιότητα) και Section\n"
+"(Τομέας).\n"
+"\n"
+"Με τον ίδιο τρόπο, το apt-ftparchive παράγει αρχεία πηγών (Sources) από μια\n"
+"ιεραρχία αρχείων .dsc. Η επιλογή --source-override μπορεί να χρησιμοποιηθεί\n"
+"για παράκαμψη των αρχείων πηγών src.\n"
+"\n"
+"Οι εντολές 'packages' και 'sources' θα πρέπει να εκτελούνται στον βασικό\n"
+"κατάλογο της ιεραρχίας.Το BinaryPath θα πρέπει να δείχνει στον αρχικό\n"
+"κατάλογο που θα ξεκινάει η αναδρομική αναζήτηση και το αρχείο παράκαμψης\n"
+"θα πρέπει να περιέχει τις επιλογές παράκαμψης. Το Pathprefix προστίθεται "
+"στα\n"
+"πεδία όνομάτων αρχείων, αν υπάρχει. Δείτε παράδειγμα χρήσης στην αρχειοθήκη\n"
+"πακέτων του Debian :\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Επιλογές:\n"
+"  -h    Αυτό το κείμενο βοηθείας\n"
+"  --md5 Έλεγχος παραγωγής MD5\n"
+"  -s=?  αρχείο παράκαμψης πηγών\n"
+"  -q    Χωρίς έξοδο\n"
+"  -d=?  Επιλογή προαιρετικής βάσης δεδομένων cache\n"
+"  --no-delink Αποσφαλμάτωση του delinking\n"
+"  --contents  Έλεγχος παραγωγής αρχείου περιεχομένων\n"
+"  -c=?  Χρήση αυτού του αρχείου ρυθμίσεων\n"
+"  -o=?  Ορισμός αυθαίρετης επιλογής ρύθμισης"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Δεν ταιριαξε καμία επιλογή"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Αποσυμπίεση του %s πάνω από μια φορά"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Λείπουν μερικά αρχεία από την ομάδα πακέτων '%s'"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Ο φάκελος %s έχει εκτραπεί"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Η βάση είναι κατεστραμμένη, το αρχείο μετονομάστηκε σε %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Το πακέτο προσπαθεί να γράψει στον προορισμό εκτροπής %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Η διαδρομή εκτροπής έχει υπερβολικό μήκος"
+#: ftparchive/cachedb.cc:96
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Το φορμά της βάσης δεν είναι έγκυρο. Εάν αναβαθμίσατε το apt σε νεότερη "
+"έκδοση, παρακαλώ αφαιρέστε και δημιουργήστε τη βάση εκ νέου."
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Το άνοιγμά του αρχείου της βάσης %s: %s απέτυχε"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Αποτυχία εύρεσης της κατάστασης του %s."
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Αποτυχία ανάγνωσης του %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχου"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Αδύνατη η πρόσβαση σε δείκτη"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Αποτυχία μετονομασίας του %s σε %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Αδύνατη η ανάγνωση του καταλόγου  %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Ο φάκελος %s αντικαθίσταται από ένα μη-φάκελο"
+msgid "W: Unable to stat %s\n"
+msgstr "W: Αδύνατη η εύρεση της κατάστασης του %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Αποτυχία εντοπισμού του κόμβου στην ομάδα hash του"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Η διαδρομή έχει υπερβολικό μήκος"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "W: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: Σφάλματα στο αρχείο"
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Αντικατάσταση πακέτου χωρίς καμία έκδοση %s"
+msgid "Failed to resolve %s"
+msgstr "Αδύνατη η εύρεση του %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Αποτυχία ανεύρεσης"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s"
+msgid "Failed to open %s"
+msgstr "Αποτυχία ανοίγματος του %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Αδύνατη η εύρεση της κατάστασης του %s"
+msgid " DeLink %s [%s]\n"
+msgstr "Αποσύνδεση %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Αποτυχία εγγραφής του αρχείου %s"
+msgid "Failed to readlink %s"
+msgstr "Αποτυχία ανάγνωσης του %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Αποτυχία στο κλείσιμο του αρχείου %s"
+msgid "Failed to unlink %s"
+msgstr "Αποτυχία αποσύνδεσης του %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Αυτό δεν είναι ένα έγκυρο αρχείο DEB, αγνοείται το μέλος '%s'"
+msgid "*** Failed to link %s to %s"
+msgstr "    Αποτυχία σύνδεσης του %s με το %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού του μέλους %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Αποσύνδεση ορίου του %sB hit.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Μη αναλύσιμο αρχείο control"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Μη έγκυρη υπογραφή αρχειοθήκης"
+#: 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:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s συντηρητής είναι ο %s όχι ο %s\n"
+
+#: ftparchive/writer.cc:712
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s δεν έχει εγγραφή πηγαίας παράκαμψης\n"
+
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realoc - Αδυναμία εκχώρησης μνήμης"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Αδύνατο το άνοιγμα του %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Αποτυχία ανάγνωσης του αρχείου παράκαμψης %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Άγνωστος Αλγόριθμος Συμπίεσης '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Η συμπιεσμένη έξοδος του %s χρειάζεται καθορισμό συμπίεσης"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Αποτυχία δημιουργίας του ΑΡΧΕΙΟΥ"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Σφάλμα κατά την ανάγνωση της επικεφαλίδας του μέλους της αρχειοθήκης"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Αποτυχία αγκίστρωσης"
 
-#: apt-inst/contrib/arfile.cc:96
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Συμπίεση απογόνου"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Εσωτερικό Σφάλμα, Αποτυχία δημιουργίας του %s"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Η αρχειοθήκη είναι πολύ μικρή"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "απέτυχε η Ε/Ε στην υποδιεργασία/αρχείο"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Αποτυχία ανάγνωσης των επικεφαλίδων της αρχειοθήκης"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό MD5"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Αποτυχία κατά τη δημιουργία διασωληνώσεων"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Πρόβλημα κατά την αποσύνδεση του %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Αποτυχία κατά την εκτέλεση του gzip "
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Αποτυχία μετονομασίας του %s σε %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Κατεστραμμένη αρχειοθήκη"
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Χρήση: apt-extracttemplates αρχείο1 [αρχείο2 ...]\n"
+"\n"
+"το apt-extracttemplates είναι ένα βοήθημα για να εξάγετε ρυθμίσεις \n"
+"και πρότυπα από πακέτα debian\n"
+"\n"
+"Επιλογές:\n"
+"  -h   Το παρόν κείμενο βοήθειας\n"
+"  -t   Καθορισμός προσωρινού καταλόγου\n"
+"  -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
+"  -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είναι κατεστραμμένη"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Άγνωστη εγγραφή πακέτου!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Χρήση: apt-sortpkgs [παράμετροι] file1 [file2 ...]\n"
+"\n"
+"το apt-sortpkgs είναι ένα απλό εργαλείο για να ταξινομήσετε αρχεία πηγαίου "
+"κώδικα. Η επιλογή\n"
+"-s δείχνει τον τύπο του αρχείου.\n"
+"\n"
+"Παράμετροι:\n"
+"  -h   Αυτό το κείμενο βοήθειας\n"
+"  -s   Χρήση του τύπου αρχείου\n"
+"  -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
+"  -o=? Θέσε μια αυθαίρετη παράμετρο,πχ -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Εγιναν %i εγγραφές.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n"
@@ -2029,6 +2289,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 ""
@@ -2043,201 +2325,367 @@ msgstr ""
 msgid "The list of sources could not be read."
 msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Άδειο cache πακέτων"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr "Το αρχείο cache των πακέτων είναι ασύμβατης έκδοσης"
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Αυτό το APT δεν υποστηρίζει το Σύστημα Απόδοσης Έκδοσης '%s'"
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Εξαρτάται από"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "ΠροΕξαρτάται από"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Προτείνει"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Συστήνει"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Ασύμβατο με"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Αντικαθιστά"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Απαρχαιώνει"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Χαλάει"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "σημαντικό"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "απαιτούμενο"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "καθιερωμένο"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "προαιρετικό"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "επιπλέον"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Υπολογισμός της αναβάθμισης"
+
+#: 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:118
+#: 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/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/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/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 "Η 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/acquire-worker.cc:169
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου"
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
-"enter."
+msgid "Couldn't stat source package list %s"
+msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Συλλογή Παροχών Αρχείου"
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Υποψήφιες Εκδόσεις"
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Παραγωγή Εξαρτήσεων"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Αποτυχία ανοίγματος του αρχείου κατάστασης %s"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
+
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Ανόμοιο MD5Sum"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Ανόμοιο μέγεθος"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Μη έγκυρη λειτουργία %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Σφάλμα εγγραφής"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Ο φάκελος %s έχει εκτραπεί"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: apt-pkg/acquire-item.cc:2059
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
+"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:1926
+#: 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 "
@@ -2246,12 +2694,12 @@ msgstr ""
 "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
 "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2259,124 +2707,38 @@ msgstr ""
 "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
 "πακέτο %s."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το "
-"APT."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Εκπληκτικό, υπερβήκατε τον αριθμό των περιγραφών που υποστηρίζει το APT."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT."
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Ανάγνωση Λιστών Πακέτων"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Συλλογή Παροχών Αρχείου"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Αδύνατη η εγγραφή στο %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: apt-pkg/acquire.cc:162
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)"
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list"
@@ -2403,19 +2765,19 @@ msgid "No priority (or zero) specified for pin"
 msgstr ""
 "Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2427,10 +2789,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"
@@ -2499,11 +2865,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"
 
@@ -2515,7 +2881,7 @@ msgstr ""
 "Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση "
 "κάποιας κατάλληλης αρχείοθήκης."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2523,329 +2889,260 @@ msgstr ""
 "Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως "
 "προκλήθηκε από κρατούμενα πακέτα."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%s)"
-msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (%s)"
-
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+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:139
+msgid "Candidate versions"
+msgstr "Υποψήφιες Εκδόσεις"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Άνοιγμα του %s"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Παραγωγή Εξαρτήσεων"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση"
+
+#: 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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/cacheset.cc:635
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/cacheset.cc:641
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
-#: apt-pkg/cacheset.cc:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:145
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
+
+#: apt-pkg/indexrecords.cc:164
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Η επιλογή %s δε βρέθηκε"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος "
 "%s"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Αδύνατο το κλείδωμα %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Αποτυχία δημιουργίας IPC στην υποδιεργασία"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Αποτυχία εκτέλεσης του συμπιεστή "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Πρόβλημα κατά την διαγραφή του αρχείου"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
 
@@ -2931,112 +3228,106 @@ msgstr "Αδύνατη η εύρεση της κατάστασης του σημ
 msgid "Failed to stat the cdrom"
 msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Μη αναγνωρισμένος τύπος σύντμησης: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Συντακτικό σφάλμα %s:%u: Λάθος μορφή Ετικέτας (Tag)"
 
-#: apt-pkg/contrib/configuration.cc:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-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 "Η επιλογή γραμμής εντολών %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"
@@ -3046,12 +3337,12 @@ msgstr "Μη έγκυρη λειτουργία %s"
 msgid "Installing %s"
 msgstr "Εγκατάσταση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Αφαιρώ το %s"
@@ -3072,103 +3363,103 @@ msgid "Running post-installation trigger %s"
 msgstr "Εκτέλεση του post-installation trigger %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Ο φάκελος %s αγνοείται."
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Προετοιμασία του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Ξεπακετάρισμα του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Προετοιμασία ρύθμισης του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "Έγινε εγκατάσταση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Προετοιμασία για την αφαίρεση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "Αφαίρεσα το %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Προετοιμασία πλήρης αφαίρεσης του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "Το %s διαγράφηκε πλήρως"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3185,419 +3476,184 @@ msgstr ""
 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 ""
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Χρήση: apt-extracttemplates αρχείο1 [αρχείο2 ...]\n"
-"\n"
-"το apt-extracttemplates είναι ένα βοήθημα για να εξάγετε ρυθμίσεις \n"
-"και πρότυπα από πακέτα debian\n"
-"\n"
-"Επιλογές:\n"
-"  -h   Το παρόν κείμενο βοήθειας\n"
-"  -t   Καθορισμός προσωρινού καταλόγου\n"
-"  -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
-"  -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Αδύνατη η εύρεση της κατάστασης του %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;"
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Σφάλμα επεξεργασίας του καταλόγου %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Ο κατάλογος επεκτάσεων των πηγών είναι υπερβολικά μακρύς"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Σφάλμα εγγραφής κεφαλίδων στο αρχείο περιεχομένων"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Χρήση: apt-ftparchive [επιλογές] εντολή\n"
-"Εντολές: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"Το apt-ftparchive παράγει αρχεία περιεχομένων για τις αρχειοθήκες Debian\n"
-"Υποστηρίζει πολλές παραλλαγές παραγωγής, από απόλυτα αυτοματοποιημένες έως\n"
-"λειτουργικές αντικαταστάσεις για την dpkg-scanpackages και dpkg-scansources\n"
-"\n"
-"Το apt-ftparchive παράγει αρχεία Package από ένα σύνολο αρχείων .debs. Στο\n"
-"αρχείο Package περιέχονται όλα τα πεδία ελέγχου κάθε πακέτου καθώς και\n"
-"το μέγεθος τους και το MD5 hash. Υποστηρίζει την ύπαρξη αρχείου παράκαμψης\n"
-"για τη βεβιασμένη αλλαγή των πεδίων Priority (Προτεραιότητα) και Section\n"
-"(Τομέας).\n"
-"\n"
-"Με τον ίδιο τρόπο, το apt-ftparchive παράγει αρχεία πηγών (Sources) από μια\n"
-"ιεραρχία αρχείων .dsc. Η επιλογή --source-override μπορεί να χρησιμοποιηθεί\n"
-"για παράκαμψη των αρχείων πηγών src.\n"
-"\n"
-"Οι εντολές 'packages' και 'sources' θα πρέπει να εκτελούνται στον βασικό\n"
-"κατάλογο της ιεραρχίας.Το BinaryPath θα πρέπει να δείχνει στον αρχικό\n"
-"κατάλογο που θα ξεκινάει η αναδρομική αναζήτηση και το αρχείο παράκαμψης\n"
-"θα πρέπει να περιέχει τις επιλογές παράκαμψης. Το Pathprefix προστίθεται "
-"στα\n"
-"πεδία όνομάτων αρχείων, αν υπάρχει. Δείτε παράδειγμα χρήσης στην αρχειοθήκη\n"
-"πακέτων του Debian :\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Επιλογές:\n"
-"  -h    Αυτό το κείμενο βοηθείας\n"
-"  --md5 Έλεγχος παραγωγής MD5\n"
-"  -s=?  αρχείο παράκαμψης πηγών\n"
-"  -q    Χωρίς έξοδο\n"
-"  -d=?  Επιλογή προαιρετικής βάσης δεδομένων cache\n"
-"  --no-delink Αποσφαλμάτωση του delinking\n"
-"  --contents  Έλεγχος παραγωγής αρχείου περιεχομένων\n"
-"  -c=?  Χρήση αυτού του αρχείου ρυθμίσεων\n"
-"  -o=?  Ορισμός αυθαίρετης επιλογής ρύθμισης"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Δεν ταιριαξε καμία επιλογή"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Λείπουν μερικά αρχεία από την ομάδα πακέτων '%s'"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Η βάση είναι κατεστραμμένη, το αρχείο μετονομάστηκε σε %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Το φορμά της βάσης δεν είναι έγκυρο. Εάν αναβαθμίσατε το apt σε νεότερη "
-"έκδοση, παρακαλώ αφαιρέστε και δημιουργήστε τη βάση εκ νέου."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Το άνοιγμά του αρχείου της βάσης %s: %s απέτυχε"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Αποτυχία ανάγνωσης του %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχου"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Αδύνατη η πρόσβαση σε δείκτη"
-
-#: ftparchive/writer.cc:91
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Αδύνατη η ανάγνωση του καταλόγου  %s\n"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
 
-#: ftparchive/writer.cc:96
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Αδύνατη η εύρεση της κατάστασης του %s\n"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Κλήση του DropNode σε έναν ήδη συνδεδεμένο κόμβο"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "W: "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Αποτυχία εντοπισμού του στοιχείου hash!"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: Σφάλματα στο αρχείο"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Αδυναμία εντοπισμού εκτροπής"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Αδύνατη η εύρεση του %s"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Εσωτερικό Σφάλμα στο AddDiversion"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Αποτυχία ανεύρεσης"
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Προσπάθεια για αντικατάσταση εκτροπής, %s -> %s και %s/%s"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to open %s"
-msgstr "Αποτυχία ανοίγματος του %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Διπλή προσθήκη εκτροπής %s -> %s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "Αποσύνδεση %s [%s]\n"
+msgid "Duplicate conf file %s/%s"
+msgstr "Διπλό αρχείο ρυθμίσεων %s/%s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Αποτυχία ανάγνωσης του %s"
+msgid "The path %s is too long"
+msgstr "Η διαδρομή %s έχει υπερβολικό μήκος"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Αποτυχία αποσύνδεσης του %s"
+msgid "Unpacking %s more than once"
+msgstr "Αποσυμπίεση του %s πάνω από μια φορά"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "    Αποτυχία σύνδεσης του %s με το %s"
+msgid "The directory %s is diverted"
+msgstr "Ο φάκελος %s έχει εκτραπεί"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:152
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Αποσύνδεση ορίου του %sB hit.\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Το πακέτο προσπαθεί να γράψει στον προορισμό εκτροπής %s/%s"
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Η διαδρομή εκτροπής έχει υπερβολικό μήκος"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s δεν περιέχει εγγραφή παράκαμψης\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Ο φάκελος %s αντικαθίσταται από ένα μη-φάκελο"
+
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Αποτυχία εντοπισμού του κόμβου στην ομάδα hash του"
+
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Η διαδρομή έχει υπερβολικό μήκος"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s συντηρητής είναι ο %s όχι ο %s\n"
+msgid "Overwrite package match with no version for %s"
+msgstr "Αντικατάσταση πακέτου χωρίς καμία έκδοση %s"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s δεν έχει εγγραφή πηγαίας παράκαμψης\n"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s"
 
-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n"
+msgid "Unable to stat %s"
+msgstr "Αδύνατη η εύρεση της κατάστασης του %s"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realoc - Αδυναμία εκχώρησης μνήμης"
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Αποτυχία εγγραφής του αρχείου %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Unable to open %s"
-msgstr "Αδύνατο το άνοιγμα του %s"
+msgid "Failed to close file %s"
+msgstr "Αποτυχία στο κλείσιμο του αρχείου %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1"
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Αυτό δεν είναι ένα έγκυρο αρχείο DEB, αγνοείται το μέλος '%s'"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Αποτυχία ανάγνωσης του αρχείου παράκαμψης %s"
+msgid "Internal error, could not locate member %s"
+msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού του μέλους %s"
 
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Μη αναλύσιμο αρχείο control"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #2"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Μη έγκυρη υπογραφή αρχειοθήκης"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #3"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Σφάλμα κατά την ανάγνωση της επικεφαλίδας του μέλους της αρχειοθήκης"
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Άγνωστος Αλγόριθμος Συμπίεσης '%s'"
+#: apt-inst/contrib/arfile.cc:96
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Η συμπιεσμένη έξοδος του %s χρειάζεται καθορισμό συμπίεσης"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Αποτυχία δημιουργίας του ΑΡΧΕΙΟΥ"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Η αρχειοθήκη είναι πολύ μικρή"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Αποτυχία αγκίστρωσης"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Αποτυχία ανάγνωσης των επικεφαλίδων της αρχειοθήκης"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Συμπίεση απογόνου"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Αποτυχία κατά τη δημιουργία διασωληνώσεων"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Εσωτερικό Σφάλμα, Αποτυχία δημιουργίας του %s"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Αποτυχία κατά την εκτέλεση του gzip "
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "απέτυχε η Ε/Ε στην υποδιεργασία/αρχείο"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Κατεστραμμένη αρχειοθήκη"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό MD5"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είναι κατεστραμμένη"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Πρόβλημα κατά την αποσύνδεση του %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s"
 
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Χρήση: apt-extracttemplates αρχείο1 [αρχείο2 ...]\n"
-"\n"
-"το apt-extracttemplates είναι ένα βοήθημα για να εξάγετε ρυθμίσεις \n"
-"και πρότυπα από πακέτα debian\n"
-"\n"
-"Επιλογές:\n"
-"  -h   Το παρόν κείμενο βοήθειας\n"
-"  -t   Καθορισμός προσωρινού καταλόγου\n"
-"  -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
-"  -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Συνολικός χώρος Εξαρτήσεων Εκδόσεων: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Άγνωστη εγγραφή πακέτου!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Χρήση: apt-sortpkgs [παράμετροι] file1 [file2 ...]\n"
-"\n"
-"το apt-sortpkgs είναι ένα απλό εργαλείο για να ταξινομήσετε αρχεία πηγαίου "
-"κώδικα. Η επιλογή\n"
-"-s δείχνει τον τύπο του αρχείου.\n"
-"\n"
-"Παράμετροι:\n"
-"  -h   Αυτό το κείμενο βοήθειας\n"
-"  -s   Χρήση του τύπου αρχείου\n"
-"  -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
-"  -o=? Θέσε μια αυθαίρετη παράμετρο,πχ -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Ετοιμο"
+
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Εγκατάλειψη της εγκατάστασης."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/es.po b/po/es.po
index 8ef8006a0..e094ccafa 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,7 +33,7 @@ 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: 2015-01-16 04:37-0500\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"
@@ -79,150 +79,146 @@ msgstr ""
 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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Nombres de paquetes totales: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Estructuras de paquetes totales: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Paquetes normales: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Paquetes virtuales puros: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Paquetes virtuales únicos: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Paquetes virtuales mixtos: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Faltan: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Versiones diferentes totales: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Descripciones diferentes totales: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Dependencias totales: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Relaciones versión/archivo totales: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Relaciones descripción/archivo totales: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Mapeo Total de Provisiones: "
 
 # globbed -> globalizadas ? (jfs)
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Cadenas globalizadas totales: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Espacio de versión de dependencias total: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Espacio desperdiciado total: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Espacio registrado total: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Esta orden está desfasada. Utilice «apt-mark showauto» en su lugar."
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Archivos de paquetes:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Paquetes con pin:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(no encontrado)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Instalados: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Pin del paquete: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Tabla de versión:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -295,21 +291,21 @@ msgstr ""
 "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 "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"
@@ -323,7 +319,7 @@ msgstr ""
 "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."
 
@@ -361,48 +357,48 @@ msgstr ""
 "  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n"
 "       cache=/tmp\n"
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224
 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "No se pudo encontrar ningún paquete para la arquitectura «%s»"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "No se pudo encontrar el paquete «%s» en la versión «%s»"
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "No se pudo encontrar el paquete «%s» en la versión de publicación «%s»"
 
-#: cmdline/apt-get.cc:367
+#: 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:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "No se pudo encontrar la versión «%s» del paquete «%s»"
 
-#: cmdline/apt-get.cc:454
+#: 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:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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."
@@ -410,25 +406,25 @@ msgstr ""
 "Esta orden está desfasada. Utilice «apt-mark auto» y «apt-mark manual» en su "
 "lugar."
 
-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: 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:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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 el paquete de fuentes para %s"
 
-#: cmdline/apt-get.cc:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -438,7 +434,7 @@ msgstr ""
 "versiones «%s» en:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -450,81 +446,70 @@ msgstr ""
 "para obtener las últimas actualizaciones (posiblemente no publicadas aún) "
 "del paquete.\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Omitiendo el fichero ya descargado «%s»\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "No se pudo determinar el espacio libre en %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "No tiene suficiente espacio libre en %s"
-
 #. 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:895
+#: cmdline/apt-get.cc:863
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Se necesita descargar %sB de archivos fuente.\n"
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fuente obtenida %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "No se pudieron obtener algunos archivos."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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 solo descarga"
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Omitiendo desempaquetamiento de paquetes fuente ya desempaquetados en %s\n"
 
-#: cmdline/apt-get.cc:967
+#: 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:968
+#: 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:996
+#: 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:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Falló el proceso hijo"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -533,17 +518,27 @@ msgstr ""
 "No hay información disponible de arquitectura para %s. Vea apt.conf(5) APT::"
 "Arquitecturas para la configuración"
 
-#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: cmdline/apt-get.cc:1279
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -552,7 +547,7 @@ msgstr ""
 "La dependencia %s para %s no puede satisfacerse porque no se permite %s en "
 "los paquetes «%s»"
 
-#: cmdline/apt-get.cc:1294
+#: cmdline/apt-get.cc:1297
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -561,14 +556,14 @@ msgstr ""
 "La dependencia %s para %s no puede satisfacerse porque no se puede encontrar "
 "el paquete %s"
 
-#: cmdline/apt-get.cc:1317
+#: 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:1356
+#: cmdline/apt-get.cc:1359
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -577,7 +572,7 @@ msgstr ""
 "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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -586,30 +581,30 @@ msgstr ""
 "La dependencia %s para %s no puede satisfacerse porque el paquete %s no "
 "tiene ninguna versión presentada"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: 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:1405
+#: 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:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Informe de cambios para %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Módulos admitidos:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -709,11 +704,11 @@ msgstr "Se necesita una URL como argumento"
 msgid "Must specify at least one pair url/filename"
 msgstr "Debe especificar al menos una pareja url/nombre-fichero"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr "Falló la descarga"
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -737,53 +732,53 @@ msgstr ""
 "\n"
 "                       Este Ayudante de APT tiene poderes de Super Llanto.\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 no se puede marcar como no 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 ya estaba fijado como 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 ya estaba fijado como instalado automáticamente.\n"
 
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ya estaba fijado como retenido.\n"
 
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ya no estaba retenido.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
-#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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 "Se esperaba %s pero no estaba 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 fijado como retenido.\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 "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 "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"
@@ -905,12 +900,12 @@ msgstr "Disco no encontrado."
 msgid "File not found"
 msgstr "Fichero no encontrado"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Fallo al leer"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Fallo al establecer el tiempo de modificación"
 
@@ -919,34 +914,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI inválido, los URIS locales no deben empezar por //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Ingresando"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "No se pudo determinar el nombre del par"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "No se pudo determinar el nombre local"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "El servidor rechazó la conexión y devolvió: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Usuario (USER) falló, el servidor devolvió: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Clave (PASS) falló, el servidor devolvió: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -954,123 +949,123 @@ msgstr ""
 "Se especificó un servidor proxy pero no un script de entrada, «Acquire::ftp::"
 "ProxyLogin» está vacío."
 
-#: methods/ftp.cc:280
+#: 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 devolvió: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Tipo (TYPE) falló, el servidor devolvió: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Caducó la conexión"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "El servidor cerró la conexión"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "La respuesta desbordó la memoria intermedia (buffer)."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Fallo del protocolo"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Error de escritura"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "No se pudo crear el socket"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "No se pudo conectar el socket de datos, caducó el tiempo de conexión"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Falló"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "No se pudo conectar el socket pasivo."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "«getaddrinfo» no pudo obtener un socket pasivo"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "No se pudo asociar el socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "No se pudo escuchar en el socket"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "No se pudo determinar el nombre del socket"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "No se pudo mandar la orden PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Familia de direcciones %u desconocida (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT falló, el servidor devolvió: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Caducó conexión al socket de datos"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "No se pudo aceptar la conexión"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Problema al cifrar el fichero"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "No se pudo obtener el fichero, el servidor devolvió «%s»"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Caducó el socket de datos"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Falló transferencia de datos, el servidor devolvió «%s»"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Consulta"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "No se pudo invocar "
 
@@ -1136,24 +1131,25 @@ 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:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Se encontró al menos una firma inválida."
 
-#: methods/gpgv.cc:174
+#: 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?)"
+"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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1162,15 +1158,15 @@ msgstr ""
 "El fichero firmado en claro no es válido, «%s» obtenido (¿la red requiere "
 "autenticación?)"
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Error desconocido ejecutando «apt-key»"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr "Las siguientes firmas no fueron válidas:\n"
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1178,35 +1174,35 @@ msgstr ""
 "Las firmas siguientes no se pudieron verificar porque su clave pública no "
 "está disponible:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "Los ficheros vacíos no pueden ser archivos válidos"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Error escribiendo al archivo"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Error leyendo del servidor"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Error escribiendo a archivo"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Falló la selección"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Caducó la conexión"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Error escribiendo al fichero de salida"
 
@@ -1238,429 +1234,162 @@ msgstr "Este servidor de http admite alcance roto"
 msgid "Unknown date format"
 msgstr "Formato de fecha desconocido"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Datos de cabecera incorrectos"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Falló la conexión"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Error interno"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr "Ordenando"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Listando"
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!"
+#: 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-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-"Se necesita eliminar paquetes, pero está desactivada la posibilidad de "
-"eliminar."
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Corrigiendo dependencias..."
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Error interno, no terminó la ordenación"
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " falló."
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr "Los tamaños no concuerdan, mande un correo a apt@packages.debian.org"
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "No se pueden corregir las dependencias"
 
-#. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Se necesita descargar %sB/%sB de archivos.\n"
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "No se puede minimizar el conjunto de actualizació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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Se necesita descargar %sB de archivos.\n"
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Listo"
 
-#. 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:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr ""
-"Se utilizarán %sB de espacio de disco adicional después de esta operación.\n"
+#: 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."
 
-#. 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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Se liberarán %sB después de esta operación.\n"
+#: 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-install.cc:200
+#: apt-private/private-output.cc:265
 #, c-format
-msgid "You don't have enough free space in %s."
-msgstr "No tiene suficiente espacio libre en %s."
+msgid "[installed,upgradable to: %s]"
+msgstr "[instalado, actualizable a: %s]"
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Hay problemas y se utilizó -y sin --force-yes"
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr "[instalado, local]"
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Se especificó «Trivial Only» pero esta no es una operación trivial."
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[instalado, autodesinstalable]"
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Sí, ¡haga lo que le digo!"
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr "[instalado, automático]"
 
-#: apt-private/private-install.cc:222
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr "[instalado]"
+
+#: apt-private/private-output.cc:277
 #, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Está a punto de hacer algo potencialmente dañino\n"
-"Para continuar escriba la frase «%s»\n"
-" ?] "
+msgid "[upgradable from: %s]"
+msgstr "[actualizable desde: %s]"
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Anulado."
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[configuración-residual]"
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "¿Desea continuar?"
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "pero %s está instalado"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "No se pudieron descargar algunos archivos"
+#: 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-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"No se pudieron obtener algunos archivos, ¿quizás deba ejecutar «apt-get "
-"update» o deba intentarlo de nuevo con --fix-missing?"
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "pero no es instalable"
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "Actualmente no se admite --fix-missing ni intercambio de medio"
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "pero es un paquete virtual"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "No se pudieron corregir los paquetes que faltan."
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "pero no está instalado"
 
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Anulando la instalación."
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "pero no va a instalarse"
 
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"El paquete mostrado a continuación ha desaparecido de su sistema\n"
-"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 otros paquetes han sobreescrito todos sus paquetes:"
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " o"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Nota: Dpkg realiza esto de forma automática y a propósito."
+#: 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-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-"Se supone que no se van a eliminar cosas, no se puede iniciar «AutoRemover»"
+#: 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-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Parece que «AutoRemover» destruyó algo y eso no debería haber pasado.\n"
-"Envíe un informe de errores al programa apt."
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Los siguientes paquetes se ELIMINARÁN:"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "La siguiente información puede ayudar a resolver la situació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-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Error interno, «AutoRemover» rompió cosas"
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Se actualizarán los siguientes paquetes:"
 
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"El paquete indicado a continuación se instaló de forma automática y ya no es "
-"necesario."
-msgstr[1] ""
-"Los paquetes indicados a continuación se instalaron de forma automática y ya "
-"no son necesarios."
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Se DESACTUALIZARÁN los siguientes paquetes:"
 
-#: apt-private/private-install.cc:517
-#, c-format
-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ó  %lu paquete de forma automática y ya no es necesario.\n"
-msgstr[1] ""
-"Se instalaron %lu paquetes de forma automática y ya no son necesarios.\n"
+#: 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-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Utilice «apt-get autoremove» para eliminarlo."
-msgstr[1] "Utilice «apt-get autoremove» para eliminarlos."
-
-#: apt-private/private-install.cc:612
-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-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dependencias incumplidas. Intente «apt-get -f install» sin paquetes (o "
-"especifique una solución)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"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 aún no se han creado o se\n"
-"han sacado de «Incoming»."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Paquetes rotos"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Se instalarán los siguientes paquetes extras:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Paquetes sugeridos:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Paquetes recomendados:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Omitiendo %s, ya está instalado y no está activada la actualización.\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Omitiendo %s, no está instalado y solo se están solicitando "
-"actualizaciones.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "No es posible reinstalar el paquete %s, no se pudo descargar.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ya está en su versión más reciente.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%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:941
-#, 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á. ¿Quiso decir «%s»?\n"
-
-#: apt-private/private-install.cc:947
-#, 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:129
-msgid "Listing"
-msgstr "Listando"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Corrigiendo dependencias..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " falló."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "No se pueden corregir las dependencias"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "No se puede minimizar el conjunto de actualización"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Listo"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (por %s) "
 
 #: apt-private/private-output.cc:696
 msgid ""
@@ -1721,7 +1450,7 @@ msgstr "S"
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: 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"
@@ -1730,7 +1459,7 @@ msgstr "Error de compilación de expresiones regulares - %s"
 msgid "The update command takes no arguments"
 msgstr "La orden de actualización no necesita argumentos"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1741,10 +1470,14 @@ msgstr[1] ""
 "Se pueden actualizar %i paquetes. Ejecute «apt list --upgradable» para "
 "verlos.\n"
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1769,76 +1502,350 @@ msgstr ""
 "      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-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ATENCIÓN: ¡No se han podido autenticar los siguientes paquetes!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Aviso de autenticación ignorado.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr ""
+"Se necesita eliminar paquetes, pero está desactivada la posibilidad de "
+"eliminar."
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Algunos paquetes no se pueden autenticar"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Error interno, no terminó la ordenación"
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "¿Instalar estos paquetes sin verificación?"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr "Los tamaños no concuerdan, mande un correo a apt@packages.debian.org"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#. 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
+#: apt-private/private-install.cc:154
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Fallo al obtener %s  %s\n"
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Se necesita descargar %sB/%sB de archivos.\n"
 
-#: apt-private/private-sources.cc:58
+#. 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:159
 #, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "Fallo al tratar %s. ¿Editar de nuevo?"
+msgid "Need to get %sB of archives.\n"
+msgstr "Se necesita descargar %sB de archivos.\n"
 
-#: apt-private/private-sources.cc:70
+#. 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:166
 #, c-format
-msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr "El fichero «%s» cambió, ejecute «apt-get update»."
-
-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
-msgstr "Buscar en todo el texto"
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr ""
+"Se utilizarán %sB de espacio de disco adicional después de esta operación.\n"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Calculando la actualizació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 "Se liberarán %sB después de esta operación.\n"
 
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Listo"
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+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 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Sí, ¡haga lo que le digo!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Está a punto de hacer algo potencialmente dañino\n"
+"Para continuar escriba la frase «%s»\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Anulado."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "¿Desea continuar?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "No se pudieron descargar algunos archivos"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"No se pudieron obtener algunos archivos, ¿quizás deba ejecutar «apt-get "
+"update» o deba intentarlo de nuevo con --fix-missing?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "Actualmente no se admite --fix-missing ni intercambio de medio"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "No se pudieron corregir los paquetes que faltan."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Anulando la instalación."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"El paquete mostrado a continuación ha desaparecido de su sistema\n"
+"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 otros paquetes han sobreescrito todos sus paquetes:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+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 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 ""
+"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)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "La siguiente información puede ayudar a resolver la situación:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Error interno, «AutoRemover» rompió cosas"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"El paquete indicado a continuación se instaló de forma automática y ya no es "
+"necesario."
+msgstr[1] ""
+"Los paquetes indicados a continuación se instalaron de forma automática y ya "
+"no son necesarios."
+
+#: apt-private/private-install.cc:492
+#, c-format
+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ó  %lu paquete de forma automática y ya no es necesario.\n"
+msgstr[1] ""
+"Se instalaron %lu paquetes de forma automática y ya no son necesarios.\n"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "Utilice «apt-get autoremove» para eliminarlo."
+msgstr[1] "Utilice «apt-get autoremove» para eliminarlos."
+
+#: apt-private/private-install.cc:587
+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-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Dependencias incumplidas. Intente «apt-get -f install» sin paquetes (o "
+"especifique una solución)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"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 aún no se han creado o se\n"
+"han sacado de «Incoming»."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Paquetes rotos"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Se instalarán los siguientes paquetes extras:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Paquetes sugeridos:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+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 "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 ""
+"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 pudo descargar.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s ya está en su versión más reciente.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%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
+#, 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á. ¿Quiso decir «%s»?\n"
+
+#: apt-private/private-install.cc:945
+#, 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-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ATENCIÓN: ¡No se han podido autenticar los siguientes paquetes!"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "Aviso de autenticación ignorado.\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Algunos paquetes no se pueden autenticar"
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+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 "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 se pudo determinar el espacio libre en %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "No tiene suficiente espacio libre en %s."
+
+#: apt-private/private-sources.cc:58
+#, c-format
+msgid "Failed to parse %s. Edit again? "
+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 "El fichero «%s» cambió, ejecute «apt-get update»."
+
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr "Buscar en todo el texto"
 
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Obj "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Des:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Descargados %sB en %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Trabajando]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1851,18 +1858,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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 se pudo leer %s"
 
 #: 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:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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,206 +1947,459 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Fusionando información disponible"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode llamado en un nodo todavía conectado"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uso: apt-extracttemplates archivo1 [archivo2 ...]\n"
+"\n"
+"apt-extracttemplates es una herramienta para extraer información de\n"
+"configuración y plantillas de paquetes de debian.\n"
+"\n"
+"Opciones:\n"
+"  -h   Este texto de ayuda.\n"
+"  -t   Define el directorio temporal\n"
+"  -c=? Lee este archivo de configuración\n"
+"  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
+"cache=/tmp\n"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "¡Fallo al localizar el elemento enlazado!"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, c-format
+msgid "Unable to mkstemp %s"
+msgstr "No pude leer %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Fallo al asignar una desviación"
+#: 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 pudo escribir en %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Error interno en AddDiversion"
+#: 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?"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Intentando sobreescribir una desviación, %s -> %s y %s/%s"
+#: 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"
 
-#: apt-inst/filelist.cc:506
+#: 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 "Double add of diversion %s -> %s"
-msgstr "Doble suma de desviación %s -> %s"
+msgid "Error processing directory %s"
+msgstr "Error procesando el directorio %s"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Fichero de configuración duplicado %s/%s"
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "La lista de extensión de fuentes es demasiado larga"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "Error escribiendo cabeceras de archivos de contenido"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "La trayectoria %s es demasiado larga"
+msgid "Error processing contents %s"
+msgstr "Error procesando contenidos %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Uso: apt-ftparchive [opciones] orden\n"
+"Comandos: packages ruta-binaria [archivo-predominio\n"
+"                                      [prefijo-ruta]]\n"
+"          sources ruta-fuente [archivo-predominio \n"
+"                                     [prefijo-ruta]]\n"
+"          contents ruta\n"
+"          release ruta\n"
+"          generate config [grupos]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive genera índices para archivos de Debian. Soporta\n"
+"varios estilos de generación de reemplazos desde los completamente\n"
+"automatizados a los funcionales para dpkg-scanpackages y dpkg-scansources.\n"
+"\n"
+"apt-ftparchive genera ficheros Package de un árbol de .debs. El fichero\n"
+"Package contiene los contenidos de todos los campos de control de cada\n"
+"paquete al igual que la suma MD5 y el tamaño del archivo. Se puede usar\n"
+"un archivo de predominio para forzar el valor de Priority y\n"
+"Section.\n"
+"\n"
+"Igualmente, apt-ftparchive genera ficheros Sources para un árbol de\n"
+".dscs. Se puede utilizar la opción --source-override para especificar un\n"
+"fichero de predominio de fuente.\n"
+"\n"
+"Las órdenes «packages» y «sources» deben ejecutarse en la raíz del\n"
+"árbol. BinaryPath debe apuntar a la base de la búsqueda\n"
+"recursiva, y el archivo de predominio debe de contener banderas de\n"
+"predominio. Se añade Pathprefix a los campos de nombre de fichero\n"
+"si existen. A continuación se muestra un ejemplo de uso basado en los \n"
+"archivos de Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opciones:\n"
+"  -h    Este texto de ayuda\n"
+"  --md5 Generación de control MD5 \n"
+"  -s=?  Archivo fuente de predominio\n"
+"  -q    Silencioso\n"
+"  -d=?  Selecciona la base de datos de caché opcional \n"
+"  --no-delink Habilita modo de depuración delink\n"
+"  --contents  Generación del contenido del archivo «Control»\n"
+"  -c=?  Lee este archivo de configuración\n"
+"  -o=?  Establece una opción de configuración arbitraria"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Ninguna selección coincide"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Desempaquetando %s más de una vez"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Faltan algunos archivos en el grupo de archivo de paquetes «%s»"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "El directorio %s está desviado"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "BD dañada, se renombró el archivo a %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "El paquete está tratando de escribir al objetivo desviado %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB anticuada, intentando actualizar %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "La ruta de la desviación es demasiado larga"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"El formato de la base de datos no es válido. Debe eliminar y recrear la base "
+"de datos si vd. se actualizó de una versión anterior de apt."
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "No se pudo abrir el archivo DB %s: %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Fallo al leer %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+msgid "Failed to read .dsc"
+msgstr "No se pudo leer el enlace %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "No hay registro de control del archivo"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "No se pudo obtener un cursor"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Fallo al renombrar %s a %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "A: No se pudo leer directorio %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Se está reemplazando el directorio %s por un no-directorio"
+msgid "W: Unable to stat %s\n"
+msgstr "A: No se pudo leer %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Fallo al localizar el nodo en su posición en el hash"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "La ruta es demasiado larga"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "A: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: Errores aplicables al archivo "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Sobreescribiendo concordancia del paquete sin versión para %s"
+msgid "Failed to resolve %s"
+msgstr "No se pudo resolver %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Falló el recorrido por el árbol."
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "El archivo %s/%s sobreescribe al que está en el paquete %s"
+msgid "Failed to open %s"
+msgstr "No se pudo abrir %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "No se pudo leer %s"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Fallo al escribir el archivo %s"
+msgid "Failed to readlink %s"
+msgstr "No se pudo leer el enlace %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Fallo al cerrar el archivo %s"
+msgid "Failed to unlink %s"
+msgstr "No se pudo desligar %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Este no es un archivo DEB válido, falta el miembro «%s»"
+msgid "*** Failed to link %s to %s"
+msgstr "*** No pude enlazar %s con %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Error interno, no se pudo localizar el miembro %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink se ha llegado al límite de %sB.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Archivo de control inanalizable"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Archivo no tiene campo de paquetes"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Firma del archivo inválida"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Error leyendo la cabecera de miembro del archivo"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:712
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "Cabecera de miembro del archivo inválida %s"
+msgid "  %s has no source override entry\n"
+msgstr " %s no tiene una entrada fuente predominante\n"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Cabecera de miembro del archivo inválida"
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr " %s tampoco tiene una entrada binaria predominante\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - No pudo reservar memoria"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "No se pudo abrir %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+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 fichero de predominio %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Predominio mal formado %s línea %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Predominio mal formado %s línea %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Predominio mal formado %s línea %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algoritmo desconocido de compresión «%s»"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Salida comprimida %s necesita una herramienta de compresión"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "No se pudo crear FICHERO*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "No se pudo bifurcar"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Hijo compresión"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "El archivo es muy pequeño"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Error interno, no se pudo crear %s"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Fallo al leer las cabeceras del archivo"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Falló la ES a subproceso/archivo"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Fallo al crear las tuberías"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "No se pudo leer mientras se computaba MD5"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Fallo al ejecutar gzip"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Se produjo un problema al desligar %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Archivo dañado"
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Fallo al renombrar %s a %s"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Se produjo un fallo al calcular la suma de control de tar, archivo dañado"
+"Uso: apt-extracttemplates archivo1 [archivo2 ...]\n"
+"\n"
+"apt-extracttemplates es una herramienta para extraer información de\n"
+"configuración y plantillas de paquetes de debian.\n"
+"\n"
+"Opciones:\n"
+"  -h   Este texto de ayuda.\n"
+"  -t   Define el directorio temporal\n"
+"  -c=? Lee este archivo de configuración\n"
+"  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
+"cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Cabecera del TAR tipo %u desconocida, miembro %s"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "¡Registro de paquete desconocido!"
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uso: apt-sortpkgs [opciones] archivo1 [archivo2 ...]\n"
+"\n"
+"apt-sortpkgs es una herramienta sencilla para ordenar archivos de paquetes.\n"
+"La opción -s se utiliza para indicar qué tipo de archivo es.\n"
+"\n"
+"Opciones:\n"
+"  -h   Este texto de ayuda.\n"
+"  -s   Utiliza ordenamiento de archivos fuente\n"
+"  -c=? Lee este archivo de configuración\n"
+"  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n"
+"cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr "Progreso: [%3i%%]"
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "Ejecutando dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "No se admite el sistema de paquetes «%s»"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i registros escritos.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: 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 ficheros de menos.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: 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 ficheros mal emparejados\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2155,6 +2415,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 ""
@@ -2169,156 +2449,336 @@ msgstr "Tal vez deba ejecutar «apt-get update» para corregir estos problemas"
 msgid "The list of sources could not be read."
 msgstr "No se pudieron leer las listas de fuentes."
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Caché de paquetes vacía."
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr "El fichero de caché de paquetes está dañado"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr "El fichero de caché de paquetes es una versión incompatible"
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168
 msgid "The package cache file is corrupted, it is too small"
 msgstr "El fichero de caché de paquetes está dañado, es demasiado pequeño"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Esta versión de APT no admite el sistema de versiones «%s»"
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "PreDepende"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Sugiere"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Recomienda"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Entra en conflicto"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Reemplaza"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Hace obsoleto"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Rompe"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Mejora"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "requiere"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "estándar"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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/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:118
+#: apt-pkg/sourcelist.cc:127
 #, c-format
-msgid "Is the package %s installed?"
-msgstr "¿Está instalado el paquete %s?"
+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:169
+#: 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:455
+#: apt-pkg/sourcelist.cc:173
 #, 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."
+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 "El tipo de fichero de índice «%s» no se admite"
+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/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/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/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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Creando árbol de dependencias"
+#: 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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versiones candidatas"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Enviar situación al solucionador"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generación de dependencias"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Enviar petición al solucionador"
 
-#: 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/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Preparar para recibir una solución"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "No se pudo abrir el fichero de estado %s"
+#: 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/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falló la escritura del fichero de estado temporal %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "La suma hash difiere"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "El tamaño difiere"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 msgid "Invalid file format"
 msgstr "Formato inválido de fichero"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Error de escritura"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Se produjo un error durante la verificación de las firmas. El repositorio no "
+"está actualizado y se utilizarán los ficheros de índice antiguos. El error "
+"GPG es: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: 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"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "El directorio %s está desviado"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2327,18 +2787,18 @@ 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:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2347,28 +2807,19 @@ 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:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Se produjo un error durante la verificación de las firmas. El repositorio no "
-"está actualizado y se utilizarán los ficheros de índice antiguos. El error "
-"GPG es: %s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Error de GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2378,13 +2829,13 @@ msgstr ""
 "que necesita arreglar manualmente este paquete (debido a que falta una "
 "arquitectura)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2392,120 +2843,38 @@ msgstr ""
 "Los archivos de índice de paquetes están dañados. No existe un campo "
 "«Filename:» para el paquete %s."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, 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:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Leyendo lista de paquetes"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Recogiendo archivos que proveen"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "No se pudo escribir en %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Error de E/S al guardar la 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:87 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:91
+#: 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:99
+#: 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:902
+#: 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:904
+#: 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
-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/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"
@@ -2535,7 +2904,7 @@ msgstr "No se entendió el pin tipo %s"
 msgid "No priority (or zero) specified for pin"
 msgstr "No hay prioridad especificada para pin (o es cero)"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2545,12 +2914,12 @@ msgstr ""
 "de manual con «man 5 apt.conf» bajo «APT::Immediate-Configure» para más "
 "información. (%d)"
 
-#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "No se pudo configurar «%s»"
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2562,10 +2931,13 @@ msgstr ""
 "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"
@@ -2636,11 +3008,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 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"
 
@@ -2652,7 +3024,7 @@ msgstr ""
 "El paquete %s necesita ser reinstalado, pero no se encuentra el archivo para "
 "ello."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2660,272 +3032,197 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve generó cortes, esto puede deberse a "
 "paquetes retenidos."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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 "Enviar situación al solucionador"
-
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Enviar petición al solucionador"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Preparar para recibir una solución"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Falló solucionador externo sin un mensaje de error apropiado"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Ejecutar solucionador externo"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "No se pudo tratar el archivo de paquetes %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "No se pudo leer el archivo «Release» %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "No se encontraron secciones en el archivo «Release» %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, 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
-#, 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/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 analizable)"
-
-#: 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/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/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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Creando árbol 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:139
+msgid "Candidate versions"
+msgstr "Versiones candidatas"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Abriendo %s"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generación de dependencias"
 
-#: apt-pkg/sourcelist.cc:371
+#: 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/depcache.cc:252
 #, 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 open StateFile %s"
+msgstr "No se pudo abrir el fichero de estado %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 "Tipo «%s» desconocido en la línea %u de la lista de fuentes %s"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falló la escritura del fichero de estado temporal %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 "Tipo «%s» desconocido en el bloque %u de la 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:489
+#: 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»"
 
-#: apt-pkg/cacheset.cc:492
+#: 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:603
+#: 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:609
+#: 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:615
+#: apt-pkg/cacheset.cc:641
 #, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "No se pudo encontrar ningún paquete usando «*» con «%s»"
 
-#: apt-pkg/cacheset.cc:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-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/cacheset.cc:647
+#: 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:655
+#: 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 la versión candidata del paquete %s dado que no "
 "tiene candidatos"
 
-#: apt-pkg/cacheset.cc:663
+#: 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 la versión instalada del paquete «%s» puesto que no "
 "está instalado"
 
+#: 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 ""
+"No se puede seleccionar una versión instalada o candidata para el paquete "
+"«%s» dado que éste no tiene ninguna de éstas"
+
+#: 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:132
+#, 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:145
+#, 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:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Entrada «Date» inválida en el archivo «Release» %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selección %s no encontrada"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "No se utilizan bloqueos para el fichero de bloqueo de sólo lectura %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "No se pudo abrir el fichero de bloqueo «%s»"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "No se pudo bloquear %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 "La lista de los ficheros no se pudo crear, ya que «%s» no es un directorio"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Omitiendo «%s» del directorio «%s», ya que no es un fichero regular"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: 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:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2933,75 +3230,75 @@ 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:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "El subproceso %s recibió un fallo de segmentación."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "El subproceso %s recibió la señal %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "El subproceso %s devolvió un código de error (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "El subproceso %s terminó de forma inesperada"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Se produjo un problema al cerrar el fichero gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "No pude abrir el fichero %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "No se pudo abrir el descriptor de fichero %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "No se pudo crear el subproceso IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "No se pudo ejecutar el compresor "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "leídos, todavía quedaban por leer %llu pero no queda ninguna"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "escritos, todavía quedaban por escribir %llu pero no se pudo hacer"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Se produjo un problema al cerrar el fichero %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Se produjo un problema al renombrar el fichero %s a %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Se produjo un problema al desligar el fichero %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Se produjo un problema al sincronizar el fichero"
 
@@ -3090,115 +3387,109 @@ 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:519
+#: 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:633
+#: 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:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "No se instaló ningún anillo de claves %s."
-
-#: 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"
@@ -3208,12 +3499,12 @@ msgstr "Operación inválida: %s"
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Eliminando %s"
@@ -3234,81 +3525,81 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta el directorio «%s»."
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparándose para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "%s eliminado"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s se borró completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1670
+#: 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:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependencias - dejando sin configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3316,7 +3607,7 @@ 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:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3324,7 +3615,7 @@ 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:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3332,7 +3623,7 @@ msgstr ""
 "No se escribió un informe «apport» porque el mensaje de error indica un "
 "error de memoria excedida"
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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"
@@ -3340,7 +3631,7 @@ msgstr ""
 "No se escribió un informe «apport» porque el mensaje de error indica un "
 "problema en el sistema local"
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3358,426 +3649,191 @@ msgstr ""
 
 #: 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"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uso: apt-extracttemplates archivo1 [archivo2 ...]\n"
-"\n"
-"apt-extracttemplates es una herramienta para extraer información de\n"
-"configuración y plantillas de paquetes de debian.\n"
-"\n"
-"Opciones:\n"
-"  -h   Este texto de ayuda.\n"
-"  -t   Define el directorio temporal\n"
-"  -c=? Lee este archivo de configuración\n"
-"  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
-"cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, c-format
-msgid "Unable to mkstemp %s"
-msgstr "No pude leer %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Error procesando el directorio %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "La lista de extensión de fuentes es demasiado larga"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Error escribiendo cabeceras de archivos de contenido"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Error procesando contenidos %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Uso: apt-ftparchive [opciones] orden\n"
-"Comandos: packages ruta-binaria [archivo-predominio\n"
-"                                      [prefijo-ruta]]\n"
-"          sources ruta-fuente [archivo-predominio \n"
-"                                     [prefijo-ruta]]\n"
-"          contents ruta\n"
-"          release ruta\n"
-"          generate config [grupos]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive genera índices para archivos de Debian. Soporta\n"
-"varios estilos de generación de reemplazos desde los completamente\n"
-"automatizados a los funcionales para dpkg-scanpackages y dpkg-scansources.\n"
-"\n"
-"apt-ftparchive genera ficheros Package de un árbol de .debs. El fichero\n"
-"Package contiene los contenidos de todos los campos de control de cada\n"
-"paquete al igual que la suma MD5 y el tamaño del archivo. Se puede usar\n"
-"un archivo de predominio para forzar el valor de Priority y\n"
-"Section.\n"
-"\n"
-"Igualmente, apt-ftparchive genera ficheros Sources para un árbol de\n"
-".dscs. Se puede utilizar la opción --source-override para especificar un\n"
-"fichero de predominio de fuente.\n"
-"\n"
-"Las órdenes «packages» y «sources» deben ejecutarse en la raíz del\n"
-"árbol. BinaryPath debe apuntar a la base de la búsqueda\n"
-"recursiva, y el archivo de predominio debe de contener banderas de\n"
-"predominio. Se añade Pathprefix a los campos de nombre de fichero\n"
-"si existen. A continuación se muestra un ejemplo de uso basado en los \n"
-"archivos de Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opciones:\n"
-"  -h    Este texto de ayuda\n"
-"  --md5 Generación de control MD5 \n"
-"  -s=?  Archivo fuente de predominio\n"
-"  -q    Silencioso\n"
-"  -d=?  Selecciona la base de datos de caché opcional \n"
-"  --no-delink Habilita modo de depuración delink\n"
-"  --contents  Generación del contenido del archivo «Control»\n"
-"  -c=?  Lee este archivo de configuración\n"
-"  -o=?  Establece una opción de configuración arbitraria"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Ninguna selección coincide"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Faltan algunos archivos en el grupo de archivo de paquetes «%s»"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "BD dañada, se renombró el archivo a %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB anticuada, intentando actualizar %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"El formato de la base de datos no es válido. Debe eliminar y recrear la base "
-"de datos si vd. se actualizó de una versión anterior de apt."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "No se pudo abrir el archivo DB %s: %s"
-
-#: ftparchive/cachedb.cc:332
-msgid "Failed to read .dsc"
-msgstr "No se pudo leer el enlace %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "No hay registro de control del archivo"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "No se pudo obtener un cursor"
-
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: No se pudo leer directorio %s\n"
+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?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A: No se pudo leer %s\n"
+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"
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "No bloqueado"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "A: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode llamado en un nodo todavía conectado"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: Errores aplicables al archivo "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "¡Fallo al localizar el elemento enlazado!"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "No se pudo resolver %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Fallo al asignar una desviación"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Falló el recorrido por el árbol."
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Error interno en AddDiversion"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "No se pudo abrir %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Intentando sobreescribir una desviación, %s -> %s y %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Doble suma de desviación %s -> %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "No se pudo leer el enlace %s"
+msgid "Duplicate conf file %s/%s"
+msgstr "Fichero de configuración duplicado %s/%s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "No se pudo desligar %s"
+msgid "The path %s is too long"
+msgstr "La trayectoria %s es demasiado larga"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** No pude enlazar %s con %s"
+msgid "Unpacking %s more than once"
+msgstr "Desempaquetando %s más de una vez"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink se ha llegado al límite de %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Archivo no tiene campo de paquetes"
+msgid "The directory %s is diverted"
+msgstr "El directorio %s está desviado"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr " %s no tiene entrada de predominio\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "El paquete está tratando de escribir al objetivo desviado %s/%s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr " el encargado de %s es %s y no %s\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "La ruta de la desviación es demasiado larga"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr " %s no tiene una entrada fuente predominante\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Se está reemplazando el directorio %s por un no-directorio"
 
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr " %s tampoco tiene una entrada binaria predominante\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Fallo al localizar el nodo en su posición en el hash"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - No pudo reservar memoria"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "La ruta es demasiado larga"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "No se pudo abrir %s"
+msgid "Overwrite package match with no version for %s"
+msgstr "Sobreescribiendo concordancia del paquete sin versión para %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Predominio mal formado %s línea %llu (%s)"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "El archivo %s/%s sobreescribe al que está en el paquete %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "No se pudo leer el fichero de predominio %s"
+msgid "Unable to stat %s"
+msgstr "No se pudo leer %s"
 
-#: ftparchive/override.cc:166
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Predominio mal formado %s línea %llu #1"
+msgid "Failed to write file %s"
+msgstr "Fallo al escribir el archivo %s"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Predominio mal formado %s línea %llu #2"
+msgid "Failed to close file %s"
+msgstr "Fallo al cerrar el archivo %s"
 
-#: ftparchive/override.cc:191
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Predominio mal formado %s línea %llu #3"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Este no es un archivo DEB válido, falta el miembro «%s»"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritmo desconocido de compresión «%s»"
+msgid "Internal error, could not locate member %s"
+msgstr "Error interno, no se pudo localizar el miembro %s"
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Archivo de control inanalizable"
+
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Firma del archivo inválida"
+
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Error leyendo la cabecera de miembro del archivo"
+
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Salida comprimida %s necesita una herramienta de compresión"
+msgid "Invalid archive member header %s"
+msgstr "Cabecera de miembro del archivo inválida %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "No se pudo crear FICHERO*"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Cabecera de miembro del archivo inválida"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "No se pudo bifurcar"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "El archivo es muy pequeño"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Hijo compresión"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Fallo al leer las cabeceras del archivo"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Error interno, no se pudo crear %s"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Fallo al crear las tuberías"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Falló la ES a subproceso/archivo"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Fallo al ejecutar gzip"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "No se pudo leer mientras se computaba MD5"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Archivo dañado"
 
-#: ftparchive/multicompress.cc:359
+#: 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, archivo dañado"
+
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Se produjo un problema al desligar %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Cabecera del TAR tipo %u desconocida, miembro %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uso: apt-extracttemplates archivo1 [archivo2 ...]\n"
-"\n"
-"apt-extracttemplates es una herramienta para extraer información de\n"
-"configuración y plantillas de paquetes de debian.\n"
-"\n"
-"Opciones:\n"
-"  -h   Este texto de ayuda.\n"
-"  -t   Define el directorio temporal\n"
-"  -c=? Lee este archivo de configuración\n"
-"  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
-"cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Espacio de versión de dependencias total: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "¡Registro de paquete desconocido!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "No tiene suficiente espacio libre en %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uso: apt-sortpkgs [opciones] archivo1 [archivo2 ...]\n"
-"\n"
-"apt-sortpkgs es una herramienta sencilla para ordenar archivos de paquetes.\n"
-"La opción -s se utiliza para indicar qué tipo de archivo es.\n"
-"\n"
-"Opciones:\n"
-"  -h   Este texto de ayuda.\n"
-"  -s   Utiliza ordenamiento de archivos fuente\n"
-"  -c=? Lee este archivo de configuración\n"
-"  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n"
-"cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Listo"
+
+#~ 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?"
diff --git a/po/eu.po b/po/eu.po
index 943d81b78..e268f6059 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: 2015-01-16 04:37-0500\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,152 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Pakete Izenak Guztira : "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Pakete Izenak Guztira : "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Pakete normalak:"
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Pakete birtual puruak:"
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Bakanako pakete birtualak: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Nahastutako pakete birtualak: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Falta direnak: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Bertsio Ezberdinak Guztira: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Azalpen Ezberdinak Guztira: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Dependentziak Guztira: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Guztira Bertsio/fitxategi erlazioak: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Fitx/Azalpen erlazioak guztira: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Guztira Saltzaile Mapatzea: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Guztira bateratutako kateak: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Guztira bertsio dependentzia lekua: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Guztira galdutako tokia:"
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Guztira erregistratutako lekua: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Pakete Fitxategiak:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Pin duten Paketeak:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(ez da aurkitu)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Instalatuta: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Hautagaia: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(bat ere ez)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Paketearen pin-a:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Bertsio taula:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -240,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"
@@ -263,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."
 
@@ -299,78 +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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ezin izan da %s paketea aurkitu"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Ezin da deskarga direktorioa blokeatu"
 
-#: cmdline/apt-get.cc:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -378,97 +374,96 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Ezin da %s(e)n duzun leku librea atzeman."
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Ez daukazu nahikoa leku libre %s(e)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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Eskuratu %s iturburua\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Huts egin du zenbat artxibo lortzean."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: 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:968
+#: 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:996
+#: 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:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Prozesu umeak huts egin du"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -508,30 +503,30 @@ msgid ""
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Konektatzen -> %s.(%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Onartutako Moduluak:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -645,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -771,12 +766,12 @@ msgstr "Ez da diska aurkitu"
 msgid "File not found"
 msgstr "Ez da fitxategia aurkitu"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Huts egin du atzitzean"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Huts egin du aldaketa ordua ezartzean"
 
@@ -785,34 +780,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI baliogabea. URI lokalek ezin dute // eduki hasieran"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Sartzen"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Ezin izan da peer edo parekoaren izena zehaztu"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Ezin izan da izen lokala zehaztu"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Zerbitzariak gure konexioa ukatu eta hau esan du: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USERek huts egin du, eta zerbitzariak hau esan du: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASSek huts egin du, eta zerbitzariak hau esan du: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -820,126 +815,126 @@ msgstr ""
 "Proxy zerbitzari bat zehaztu da, baina sarrerako script-ik ez. Acquire::ftp::"
 "ProxyLogin hutsik dago."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "Sarrerako script-eko '%s' komandoak huts egin du, eta zerbitzariak hau esan "
 "du: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPEk huts egin du, eta zerbitzariak hau esan du: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Konexioa denboraz kanpo"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Zerbitzariak konexioa itxi du"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Irakurketa errorea"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Erantzun batek bufferrari gainez eragin dio."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Protokolo hondatzea"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Idazketa errorea"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Ezin izan da socket-a sortu"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Ezin izan da datu-socketa konektatu; konexioak denbora muga gainditu du"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Huts egin du"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Ezin izan da socket pasibora konektatu."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo-k ezin izan du socket entzule bat eskuratu"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Ezin izan da socket bat lotu"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Ezin izan da socket-ean entzun"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Ezin izan da socket-aren izena zehaztu"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Ezin da PORT komandoa bidali"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Helbide familia ezezagunaa: %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRTek huts egin du, eta zerbitzariak hau esan du: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Datu-socket konexioak denbora muga gainditu du"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Ezin da konexioa onartu"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Ezin da fitxategia lortu; zerbitzariak hau esan du: '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Datu-socketak denbora muga gainditu du"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Datu transferentziak huts egin du, eta zerbitzariak hau esan du: '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Kontsulta"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Ezin da deitu "
 
@@ -1006,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:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Beintza sinadura baliogabe bat aurkitu da."
 
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:164
 #, fuzzy
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
-msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)"
+msgstr ""
+"Ezin da %s abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Errore ezezaguna apt-key exekutatzean"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr "Ondorengo sinadurak baliogabeak dira:\n"
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1044,35 +1040,35 @@ msgstr ""
 "Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez bait dago "
 "eskuragarri:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Errorea zerbitzaritik irakurtzean"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Hautapenak huts egin du"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Konexioaren denbora muga gainditu da"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Errorea irteerako fitxategian idaztean"
 
@@ -1104,419 +1100,156 @@ msgstr "http zerbitzariak barruti onarpena apurturik du"
 msgid "Unknown date format"
 msgstr "Datu formatu ezezaguna"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Goiburu data gaizki dago"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Konexioak huts egin du"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Barne errorea"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
+#: apt-private/private-list.cc:121
+msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago."
+#: 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-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Barne errorea, ez da ordenatzeaz amaitu"
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Mendekotasunak zuzentzen..."
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Hau bitxia... Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra "
-"berri emanez (ingelesez)"
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " : huts egin du."
 
-#. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n"
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Ezin dira mendekotasunak zuzendu"
 
-#. 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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Artxiboetako %sB eskuratu behar dira.\n"
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
 
-#. 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:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n"
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Eginda"
 
-#. 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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n"
+#: 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-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Ez daukazu nahikoa leku libre %s(e)n."
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz."
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Arazoak daude, eta -y erabili da --force-yes gabe"
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat."
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalatuta]"
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Bai, egin esandakoa!"
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalatuta]"
 
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
 msgstr ""
-"Egin nahi duzunak kalte larriak eragin ditzake\n"
-"Jarraitzeko, idatzi '%s' esaldia\n"
-" ?] "
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Abortatu."
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalatuta]"
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Aurrera jarraitu nahi al duzu?"
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalatuta]"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Fitxategi batzuk ezin izan dira deskargatu"
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
 
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
 msgstr ""
-"Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo "
-"--fix-missing aukerarekin saiatu?"
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing eta euskarri aldaketa ez dira onartzen oraingoz"
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "baina %s instalatuta dago"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Falta diren paketeak ezin dira zuzendu."
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "baina %s instalatzeko dago"
 
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Abortatu instalazioa."
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "baina ez da instalagarria"
 
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "baina pakete birtuala da"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "baina ez dago instalatuta"
 
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi"
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "baina ez da instalatuko"
 
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Hmm, dirudienez AutoRemover-ek gertatu behar ez zen apurtu du\n"
-"Mesedez programa errore txosten bat bete mesedez."
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " edo"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Informazio honek arazoa konpontzen lagun dezake:"
+#: 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-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du"
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
 
-#: apt-private/private-install.cc:513
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
-"behar."
-msgstr[1] ""
-"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
-"behar."
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Ondorengo paketeak KENDUKO dira:"
 
-#: apt-private/private-install.cc:517
-#, fuzzy, c-format
-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] ""
-"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
-"behar."
-msgstr[1] ""
-"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
-"behar."
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Ondorengo paketeak mantendu egin dira:"
 
-#: apt-private/private-install.cc:519
-#, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "'apt-get autoremove' erabili ezabatzeko."
-msgstr[1] "'apt-get autoremove' erabili ezabatzeko."
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Ondorengo paketeak bertsio-berrituko dira:"
 
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
-"zehaztu konponbide bat)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Pakete batzuk ezin izan dira instalatu. Beharbada ezinezko egoera \n"
-"bat eskatu duzu, edo, banaketa ezegonkorra erabiltzen ari bazara,\n"
-"beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
-"Sarrerakoetan (Incoming) egoten jarraituko dute."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Hautsitako paketeak"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Iradokitako paketeak:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Gomendatutako paketeak:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
-
-#: apt-private/private-install.cc:829
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s bertsiorik berriena da jada.\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Mendekotasunak zuzentzen..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " : huts egin du."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Ezin dira mendekotasunak zuzendu"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Eginda"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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: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:"
@@ -1586,7 +1319,7 @@ msgstr ""
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Adierazpen erregularren konpilazio errorea - %s"
@@ -1595,7 +1328,7 @@ msgstr "Adierazpen erregularren konpilazio errorea - %s"
 msgid "The update command takes no arguments"
 msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1603,10 +1336,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1627,76 +1364,346 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Egiaztapen abisua gainidazten.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago."
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Zenbait pakete ezin dira egiaztatu"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Barne errorea, ez da ordenatzeaz amaitu"
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Paketeak egiaztapen gabe instalatu?"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Hau bitxia... Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra "
+"berri emanez (ingelesez)"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#. 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
+#: apt-private/private-install.cc:154
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Ezin da lortu %s  %s\n"
-
-#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "Huts egin du %s izenaren ordez %s ipintzean"
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n"
 
-#: apt-private/private-sources.cc:70
+#. 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:159
 #, c-format
-msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
-
-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
-msgstr ""
+msgid "Need to get %sB of archives.\n"
+msgstr "Artxiboetako %sB eskuratu behar dira.\n"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Berriketak kalkulatzen"
+#. 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:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n"
 
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Eginda"
+#. 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 "Ekintza honen ondoren, %sB libratuko dira diskoan.\n"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Atzituta "
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Arazoak daude, eta -y erabili da --force-yes gabe"
 
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Hartu:"
+#: 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' zehaztu da, baina hau ez da eragiketa tribial bat."
 
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ez ikusi "
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Bai, egin esandakoa!"
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Egin nahi duzunak kalte larriak eragin ditzake\n"
+"Jarraitzeko, idatzi '%s' esaldia\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Abortatu."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Aurrera jarraitu nahi al duzu?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Fitxategi batzuk ezin izan dira deskargatu"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo "
+"--fix-missing aukerarekin saiatu?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing eta euskarri aldaketa ez dira onartzen oraingoz"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Falta diren paketeak ezin dira zuzendu."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Abortatu instalazioa."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi"
+
+#: 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 ""
+"Hmm, dirudienez AutoRemover-ek gertatu behar ez zen apurtu du\n"
+"Mesedez programa errore txosten bat bete mesedez."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Informazio honek arazoa konpontzen lagun dezake:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du"
+
+#: apt-private/private-install.cc:488
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
+"behar."
+msgstr[1] ""
+"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
+"behar."
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+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] ""
+"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
+"behar."
+msgstr[1] ""
+"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
+"behar."
+
+#: 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' erabili ezabatzeko."
+msgstr[1] "'apt-get autoremove' erabili ezabatzeko."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
+"zehaztu konponbide bat)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Pakete batzuk ezin izan dira instalatu. Beharbada ezinezko egoera \n"
+"bat eskatu duzu, edo, banaketa ezegonkorra erabiltzen ari bazara,\n"
+"beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
+"Sarrerakoetan (Incoming) egoten jarraituko dute."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Hautsitako paketeak"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Iradokitako paketeak:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Gomendatutako paketeak:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
+
+#: apt-private/private-install.cc:827
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s bertsiorik berriena da jada.\n"
+
+#: apt-private/private-install.cc:892
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
+
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Hautatutako bertsioa: %s (%s) -- %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 "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+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-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "Egiaztapen abisua gainidazten.\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Zenbait pakete ezin dira egiaztatu"
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Paketeak egiaztapen gabe instalatu?"
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Ezin da lortu %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 "Ezin da %s(e)n duzun leku librea atzeman."
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Ez daukazu nahikoa leku libre %s(e)n."
+
+#: apt-private/private-sources.cc:58
+#, fuzzy, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "Huts egin du %s izenaren ordez %s ipintzean"
+
+#: apt-private/private-sources.cc:70
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""
+
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Atzituta "
+
+#: apt-private/acqprogress.cc:88
+msgid "Get:"
+msgstr "Hartu:"
+
+#: apt-private/acqprogress.cc:119
+msgid "Ign "
+msgstr "Ez ikusi "
+
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Lortuta: %sB (%s) (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Lanean]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1709,18 +1716,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1796,205 +1803,453 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Eskuragarrien datuak biltzen"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode-ri dei egin zaio oraindik estekatutako nodoan"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n"
+"\n"
+"apt-extracttemplates debian-eko paketeen konfigurazioaren eta txantiloien\n"
+"informazioa ateratzeko tresna bat da\n"
+"\n"
+"Aukerak:\n"
+"  -h   Laguntza testu hau\n"
+"  -t   Ezarri aldi baterako direktorioa\n"
+"  -c=? Irakurri konfigurazio fitxategi hau\n"
+"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Huts egin du hash-elementua lokalizatzean!"
+#: 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"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Huts egin du desbideratzea lokalizatzean"
+#: 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"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "AddDiversion-n barne errorea"
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Desbideratze bat gainidazten saiatzen: %s -> %s eta %s/%s"
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "Pakete luzapenen zerrenda luzeegia da"
 
-#: apt-inst/filelist.cc:506
+#: 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 "Double add of diversion %s -> %s"
-msgstr "Desbideratzearen gehitze bikoitza: %s -> %s"
+msgid "Error processing directory %s"
+msgstr "Errorea direktorioa prozesatzean %s"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Konfigurazio fitxategi bikoiztua: %s/%s"
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Iturburu luzapenen zerrenda luzeegia da"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "Errorea eduki fitxategiaren goiburua idaztean"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "%s bidea luzeegia da"
+msgid "Error processing contents %s"
+msgstr "Errorea edukiak prozesatzean %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Erabilera: apt-ftparchive [aukerak] komandoa\n"
+"Komandoak: packages binarypath [overridefile [pathprefix]]\n"
+"           sources srcpath [overridefile [pathprefix]]\n"
+"           contents path\n"
+"           release path\n"
+"           generate config [groups]\n"
+"           clean config\n"
+"\n"
+"apt-ftparchive Debian artxiboen indizeak sortzeko erabiltzen da. Sortzeko \n"
+"estilo asko onartzen ditu, erabat automatizatuak nahiz ordezte funtzionalak\n"
+"'dpkg-scanpackages' eta 'dpkg-scansources'erako\n"
+"Package izeneko fitxategiak sortzen ditu .deb fitxategien zuhaitz batetik.\n"
+"Package fitxategiak pakete bakoitzaren kontrol eremu guztiak izaten ditu,\n"
+"MD5 hash balioa eta fitxategi tamaina barne. Override fitxategia erabiltzen\n"
+"da lehentasunaren eta sekzioaren balioak behartzeko.\n"
+"\n"
+"Era berean, iturburu fitxategiak ere sortzen ditu .dsc fitxategien\n"
+"zuhaitzetik. --source-override aukera erabil daiteke src override \n"
+"fitxategi bat zehazteko.\n"
+"'packages' eta 'sources' komandoa zuhaitzaren erroan exekutatu behar dira.\n"
+"BinaryPath-ek bilaketa errekurtsiboaren oinarria seinalatu behar du, eta\n"
+"override fitxategiak override banderak izan behar ditu. Pathprefix \n"
+"fitxategi izenen eremuei eransten zaie (halakorik badago). Hona hemen\n"
+"Debian artxiboko erabilera argibide bat:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Aukerak:\n"
+"  -h    Laguntza testu hau\n"
+"  --md5 Kontrolatu MD5 sortzea\n"
+"  -s=?  Iturburuaren override fitxategia\n"
+"  -q    Isilik\n"
+"  -d=?  Hautatu aukerako katxearen datu-basea\n"
+"  --no-delink Gaitu delink arazketa modua\n"
+"  --contents  Kontrolatu eduki fitxategia sortzea\n"
+"  -c=?  Irakurri konfigurazio fitxategi hau\n"
+"  -o=?  Ezarri konfigurazio aukera arbitrario bat"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Ez dago bat datorren hautapenik"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "%s behin baino gehiagotan deskonprimitzen"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Fitxategi batzuk falta dira `%s' pakete fitxategien taldean"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "%s direktorioa desbideratuta dago"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Datu-basea hondatuta dago; fitxategiari %s.old izena jarri zaio"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Paketea desbideratze helburuan %s/%s idazten saiatzen ari da"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Desbideratzearen bidea luzeegia da"
+#: ftparchive/cachedb.cc:96
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, "
+"mesedez datubasea ezabatu eta birsortu."
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ezin da ireki %s datu-base fitxategia: %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Huts egin du %s(e)tik datuak lortzean"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Huts egin du %s esteka irakurtzean"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Artxiboak ez du kontrol erregistrorik"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Ezin da kurtsorerik eskuratu"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Huts egin du %s izenaren ordez %s ipintzean"
+msgid "W: Unable to read directory %s\n"
+msgstr "A: Ezin da %s direktorioa irakurri\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "%s direktorioa ez-direktorio batekin ordezten ari da"
+msgid "W: Unable to stat %s\n"
+msgstr "A: Ezin da %s atzitu\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Huts egin du nodoa bere hash-ontzian lokalizatzean"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Bidea luzeegia da"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "A: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: Erroreak fitxategiari dagozkio "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Gainidatzi pakete-konkordantzia %s(r)en bertsiorik gabe"
+msgid "Failed to resolve %s"
+msgstr "Huts egin du %s ebaztean"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Huts egin dute zuhaitz-urratsek"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "%s/%s fitxategiak %s paketekoa gainidazten du"
+msgid "Failed to open %s"
+msgstr "Huts egin du %s irekitzean"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Ezin da daturik lortu %s(e)tik"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Ezin izan da %s fitxategian idatzi"
+msgid "Failed to readlink %s"
+msgstr "Huts egin du %s esteka irakurtzean"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Ezin izan da %s fitxategia itxi"
+msgid "Failed to unlink %s"
+msgstr "Huts egin du %s desestekatzean"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Ezin izan da %s %s(r)ekin estekatu"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Barne Errorea, ezin da %s atala kokatu"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink-en mugara (%sB) heldu da.\n"
+
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Artxiboak ez du pakete eremurik"
+
+#: 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:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s mantentzailea %s da, eta ez %s\n"
+
+#: 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:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s: ez du bitar gainidazketa sarrerarik\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Huts egin du memoria esleitzean"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Ezin da %s ireki"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Gaizki osatutako override %s, lerroa: %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Huts egin du %s override fitxategia irakurtzean"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Gaizki osatutako override %s, lerroa: %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Gaizki osatutako override %s, lerroa: %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Gaizki osatutako override %s, lerroa: %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "'%s' Konpresio Algoritmo Ezezaguna"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Kontrol fitxategi ezin analizagarria"
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "%s irteera konprimituak konpresio-tresna bat behar du"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Artxibo sinadura baliogabea"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Huts egin du FILE* sortzean"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Errorea artxiboko kidearen goiburua irakurtzean"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Huts egin du sardetzean"
 
-#: apt-inst/contrib/arfile.cc:96
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Artxiboko kidearen goiburua baliogabea da"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Konprimatu Umeak"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Artxiboko kidearen goiburua baliogabea da"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Barne Errorea, Huts %s sortzerakoan"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Artxiboa laburregia da"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Huts egin artxibo goiburuak irakurtzean"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Huts egin du MD5 konputatzean"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Huts egin du kanalizazioak sortzean"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Arazoa %s desestekatzean"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Huts egin du gzip exekutatzean "
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Huts egin du %s izenaren ordez %s ipintzean"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Hondatutako artxiboa"
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n"
+"\n"
+"apt-extracttemplates debian-eko paketeen konfigurazioaren eta txantiloien\n"
+"informazioa ateratzeko tresna bat da\n"
+"\n"
+"Aukerak:\n"
+"  -h   Laguntza testu hau\n"
+"  -t   Ezarri aldi baterako direktorioa\n"
+"  -c=? Irakurri konfigurazio fitxategi hau\n"
+"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Pakete erregistro ezezaguna!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "%u TAR goiburu mota ezezaguna, %s kidea"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Erabilera: apt-sortpkgs [aukerak] fitxategia1 [fitxategia2...]\n"
+"\n"
+"apt-sortpkgs pakete fitxategiak ordenatzeko tresna soil bat da. Zein\n"
+"motatako fitxategia den adierazteko -s aukera erabiltzen da.\n"
+"\n"
+"Aukerak:\n"
+"  -h   Laguntza testu hau\n"
+"  -s   Erabili iturburu fitxategien ordenatzea\n"
+"  -c=? Irakurri konfigurazio fitxategi hau\n"
+"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib: -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "'%s' pakete sistema ez da onartzen"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ezin da pakete sistemaren mota egokirik zehaztu"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i erregistro grabaturik.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2010,6 +2265,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."
@@ -2022,199 +2297,363 @@ 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:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Paketeen katxea hutsik"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Mendekotasuna:"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Aurremendekotasuna:"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Iradokizuna:"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Gomendioa:"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Gatazka:"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Ordeztea:"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Zaharkitzea:"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Apurturik"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "garrantzitsua"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "beharrezkoa"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "estandarra"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "aukerakoa"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "estra"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Berriketak kalkulatzen"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "'%s' motako indize fitxategirik ez da onartzen"
+
+#: 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/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/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/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ezin da %s atzitu."
+
+#: 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/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
+#: 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/acquire-worker.cc:169
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s metodoa ez da behar bezala abiarazi"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean"
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/pkgcachegen.cc:1196
 #, 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 "Couldn't stat source package list %s"
+msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "'%s' motako indize fitxategirik ez da onartzen"
+#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Dependentzia zuhaitza eraikitzen"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Fitxategiaren erreferentziak biltzen"
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Hautagaien bertsioak"
+#: 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/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Dependentzi Sormena"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: 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/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
+
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Egiaztapena ez dator bat"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Tamaina ez dator bat"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Eragiketa baliogabea: %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Idazketa errorea"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "%s direktorioa desbideratuta dago"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: apt-pkg/acquire-item.cc:2059
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
+"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:1926
+#: 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 "
@@ -2223,12 +2662,12 @@ msgstr ""
 "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
 "beharko duzu paketea. (arkitektura falta delako)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2236,120 +2675,38 @@ msgstr ""
 "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
 "paketearentzat."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "'%s' motako indize fitxategirik ez da onartzen"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ezin da %s atzitu."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Pakete Zerrenda irakurtzen"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Fitxategiaren erreferentziak biltzen"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "%s : ezin da idatzi"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: apt-pkg/acquire.cc:162
 #, fuzzy, c-format
 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en"
@@ -2375,19 +2732,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:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2399,10 +2756,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"
@@ -2471,11 +2832,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"
 
@@ -2486,7 +2847,7 @@ msgid ""
 msgstr ""
 "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2494,329 +2855,260 @@ msgstr ""
 "Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada "
 "atxikitako paketeek eraginda."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Ezin da %s pakete fitxategia analizatu (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Lerro baliogabea desbideratze fitxategian: %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
 
-#: apt-pkg/cacheset.cc:603
+#: 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:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:145
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Lerro baliogabea desbideratze fitxategian: %s"
+
+#: apt-pkg/indexrecords.cc:164
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ezin da %s pakete fitxategia analizatu (1)"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s hautapena ez da aurkitu"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo "
 "fitxategiarentzat"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Ezin izan da %s blokeo fitxategia ireki"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo fitxategiarentzat"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Ezin izan da %s blokeoa hartu"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "%s azpiprozesua ustekabean amaitu da"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Arazoa fitxategia ixtean"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s fitxategia ezin izan da ireki"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Huts egin du IPC azpiprozesua sortzean"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Huts egin du konpresorea exekutatzean "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "idatzita; oraindik %lu idazteke, baina ezin da"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Arazoa fitxategia ixtean"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Arazoa fitxategia sinkronizatzean"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Arazoa fitxategia desestekatzean"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Arazoa fitxategia sinkronizatzean"
 
@@ -2903,110 +3195,104 @@ msgstr "Ezin da atzitu %s muntatze puntua"
 msgid "Failed to stat the cdrom"
 msgstr "Huts egin du CDROMa atzitzean"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Mota ezezaguneko laburtzapena: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "%s konfigurazio fitxategia irekitzen"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abortatu instalazioa."
-
-#: 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"
@@ -3016,12 +3302,12 @@ msgstr "Eragiketa baliogabea: %s"
 msgid "Installing %s"
 msgstr "%s Instalatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "%s kentzen"
@@ -3042,103 +3328,103 @@ msgid "Running post-installation trigger %s"
 msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "'%s' direktorioa falta da"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "%s prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s irekitzen"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s konfiguratzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "%s Instalatuta"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s kentzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "%s kendurik"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s guztiz ezabatzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s guztiz ezabatu da"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3153,415 +3439,186 @@ 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 ""
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n"
-"\n"
-"apt-extracttemplates debian-eko paketeen konfigurazioaren eta txantiloien\n"
-"informazioa ateratzeko tresna bat da\n"
-"\n"
-"Aukerak:\n"
-"  -h   Laguntza testu hau\n"
-"  -t   Ezarri aldi baterako direktorioa\n"
-"  -c=? Irakurri konfigurazio fitxategi hau\n"
-"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Ezin da daturik lortu %s(e)tik"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Errorea direktorioa prozesatzean %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Iturburu luzapenen zerrenda luzeegia da"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Errorea eduki fitxategiaren goiburua idaztean"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Errorea edukiak prozesatzean %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Erabilera: apt-ftparchive [aukerak] komandoa\n"
-"Komandoak: packages binarypath [overridefile [pathprefix]]\n"
-"           sources srcpath [overridefile [pathprefix]]\n"
-"           contents path\n"
-"           release path\n"
-"           generate config [groups]\n"
-"           clean config\n"
-"\n"
-"apt-ftparchive Debian artxiboen indizeak sortzeko erabiltzen da. Sortzeko \n"
-"estilo asko onartzen ditu, erabat automatizatuak nahiz ordezte funtzionalak\n"
-"'dpkg-scanpackages' eta 'dpkg-scansources'erako\n"
-"Package izeneko fitxategiak sortzen ditu .deb fitxategien zuhaitz batetik.\n"
-"Package fitxategiak pakete bakoitzaren kontrol eremu guztiak izaten ditu,\n"
-"MD5 hash balioa eta fitxategi tamaina barne. Override fitxategia erabiltzen\n"
-"da lehentasunaren eta sekzioaren balioak behartzeko.\n"
-"\n"
-"Era berean, iturburu fitxategiak ere sortzen ditu .dsc fitxategien\n"
-"zuhaitzetik. --source-override aukera erabil daiteke src override \n"
-"fitxategi bat zehazteko.\n"
-"'packages' eta 'sources' komandoa zuhaitzaren erroan exekutatu behar dira.\n"
-"BinaryPath-ek bilaketa errekurtsiboaren oinarria seinalatu behar du, eta\n"
-"override fitxategiak override banderak izan behar ditu. Pathprefix \n"
-"fitxategi izenen eremuei eransten zaie (halakorik badago). Hona hemen\n"
-"Debian artxiboko erabilera argibide bat:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Aukerak:\n"
-"  -h    Laguntza testu hau\n"
-"  --md5 Kontrolatu MD5 sortzea\n"
-"  -s=?  Iturburuaren override fitxategia\n"
-"  -q    Isilik\n"
-"  -d=?  Hautatu aukerako katxearen datu-basea\n"
-"  --no-delink Gaitu delink arazketa modua\n"
-"  --contents  Kontrolatu eduki fitxategia sortzea\n"
-"  -c=?  Irakurri konfigurazio fitxategi hau\n"
-"  -o=?  Ezarri konfigurazio aukera arbitrario bat"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Ez dago bat datorren hautapenik"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Fitxategi batzuk falta dira `%s' pakete fitxategien taldean"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Datu-basea hondatuta dago; fitxategiari %s.old izena jarri zaio"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, "
-"mesedez datubasea ezabatu eta birsortu."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ezin da ireki %s datu-base fitxategia: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Huts egin du %s esteka irakurtzean"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Artxiboak ez du kontrol erregistrorik"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Ezin da kurtsorerik eskuratu"
+msgstr "Ezin da zerrenda direktorioa blokeatu"
 
-#: ftparchive/writer.cc:91
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: Ezin da %s direktorioa irakurri\n"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
 
-#: ftparchive/writer.cc:96
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A: Ezin da %s atzitu\n"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode-ri dei egin zaio oraindik estekatutako nodoan"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "A: "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Huts egin du hash-elementua lokalizatzean!"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: Erroreak fitxategiari dagozkio "
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Huts egin du desbideratzea lokalizatzean"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Huts egin du %s ebaztean"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "AddDiversion-n barne errorea"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Huts egin dute zuhaitz-urratsek"
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Desbideratze bat gainidazten saiatzen: %s -> %s eta %s/%s"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to open %s"
-msgstr "Huts egin du %s irekitzean"
+msgid "Double add of diversion %s -> %s"
+msgstr "Desbideratzearen gehitze bikoitza: %s -> %s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Duplicate conf file %s/%s"
+msgstr "Konfigurazio fitxategi bikoiztua: %s/%s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Huts egin du %s esteka irakurtzean"
+msgid "The path %s is too long"
+msgstr "%s bidea luzeegia da"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Huts egin du %s desestekatzean"
+msgid "Unpacking %s more than once"
+msgstr "%s behin baino gehiagotan deskonprimitzen"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Ezin izan da %s %s(r)ekin estekatu"
+msgid "The directory %s is diverted"
+msgstr "%s direktorioa desbideratuta dago"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:152
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink-en mugara (%sB) heldu da.\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Paketea desbideratze helburuan %s/%s idazten saiatzen ari da"
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Artxiboak ez du pakete eremurik"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Desbideratzearen bidea luzeegia da"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s: ez du override sarrerarik\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "%s direktorioa ez-direktorio batekin ordezten ari da"
+
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Huts egin du nodoa bere hash-ontzian lokalizatzean"
+
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Bidea luzeegia da"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s mantentzailea %s da, eta ez %s\n"
+msgid "Overwrite package match with no version for %s"
+msgstr "Gainidatzi pakete-konkordantzia %s(r)en bertsiorik gabe"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s: ez du jatorri gainidazketa sarrerarik\n"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "%s/%s fitxategiak %s paketekoa gainidazten du"
 
-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s: ez du bitar gainidazketa sarrerarik\n"
+msgid "Unable to stat %s"
+msgstr "Ezin da daturik lortu %s(e)tik"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Huts egin du memoria esleitzean"
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Ezin izan da %s fitxategian idatzi"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Unable to open %s"
-msgstr "Ezin da %s ireki"
+msgid "Failed to close file %s"
+msgstr "Ezin izan da %s fitxategia itxi"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Gaizki osatutako override %s, lerroa: %lu #1"
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Huts egin du %s override fitxategia irakurtzean"
+msgid "Internal error, could not locate member %s"
+msgstr "Barne Errorea, ezin da %s atala kokatu"
 
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Gaizki osatutako override %s, lerroa: %lu #1"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Kontrol fitxategi ezin analizagarria"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Gaizki osatutako override %s, lerroa: %lu #2"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Artxibo sinadura baliogabea"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Gaizki osatutako override %s, lerroa: %lu #3"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Errorea artxiboko kidearen goiburua irakurtzean"
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "'%s' Konpresio Algoritmo Ezezaguna"
+#: apt-inst/contrib/arfile.cc:96
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "Artxiboko kidearen goiburua baliogabea da"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "%s irteera konprimituak konpresio-tresna bat behar du"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Artxiboko kidearen goiburua baliogabea da"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Huts egin du FILE* sortzean"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Artxiboa laburregia da"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Huts egin du sardetzean"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Huts egin artxibo goiburuak irakurtzean"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Konprimatu Umeak"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Huts egin du kanalizazioak sortzean"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Barne Errorea, Huts %s sortzerakoan"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Huts egin du gzip exekutatzean "
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Hondatutako artxiboa"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Huts egin du MD5 konputatzean"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Arazoa %s desestekatzean"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "%u TAR goiburu mota ezezaguna, %s kidea"
 
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n"
-"\n"
-"apt-extracttemplates debian-eko paketeen konfigurazioaren eta txantiloien\n"
-"informazioa ateratzeko tresna bat da\n"
-"\n"
-"Aukerak:\n"
-"  -h   Laguntza testu hau\n"
-"  -t   Ezarri aldi baterako direktorioa\n"
-"  -c=? Irakurri konfigurazio fitxategi hau\n"
-"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Guztira bertsio dependentzia lekua: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Pakete erregistro ezezaguna!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Ez daukazu nahikoa leku libre %s(e)n."
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Erabilera: apt-sortpkgs [aukerak] fitxategia1 [fitxategia2...]\n"
-"\n"
-"apt-sortpkgs pakete fitxategiak ordenatzeko tresna soil bat da. Zein\n"
-"motatako fitxategia den adierazteko -s aukera erabiltzen da.\n"
-"\n"
-"Aukerak:\n"
-"  -h   Laguntza testu hau\n"
-"  -s   Erabili iturburu fitxategien ordenatzea\n"
-"  -c=? Irakurri konfigurazio fitxategi hau\n"
-"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib: -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Eginda"
+
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Abortatu instalazioa."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/fi.po b/po/fi.po
index 532f8be58..d58fb9b04 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: 2015-01-16 04:37-0500\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,150 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Pakettien kokonaismäärä : "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Pakettien kokonaismäärä : "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Tavallisia paketteja: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Aitoja näennäispaketteja: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Yksinkertaisia näennäispaketteja: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Sekanäennäispaketteja: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Puuttuu: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Eri versioita yhteensä: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Eri kuvauksia yhteensä: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Riippuvuuksia yhteensä: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Versio/tdsto suhteita yht: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Kuvaus/tdsto suhteita yht: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Tarjoamiskuvauksia yhteensä: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Erilaisia merkkijonoja yhteensä: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Versioriippuvuustila yhteensä: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Löysää tilaa yhteensä: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Käytetty tila yhteensä: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Pakettitiedostot:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Paketit joissa tunniste:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(ei löydy)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Asennettu: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Ehdokas: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(ei mitään)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Paketin tunnistenumero: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Versiotaulukko:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -238,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"
@@ -260,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."
 
@@ -296,78 +292,78 @@ msgstr ""
 "  -c=? Lue tämä asetustiedosto\n"
 "  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Pakettia %s ei löytynyt"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Noutokansiota ei saatu lukittua"
 
-#: cmdline/apt-get.cc:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -375,96 +371,95 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Nouda lähdekoodi %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Purkukomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Lapsiprosessi kaatui"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -504,30 +499,30 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Avataan yhteys %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Tuetut moduulit:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -640,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -765,12 +760,12 @@ msgstr "Levyä ei löydy"
 msgid "File not found"
 msgstr "Tiedostoa ei löydy"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Komento stat ei toiminut"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
 
@@ -779,34 +774,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI on kelvoton, paikallinen URI ei saa alkaa //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Kirjaudutaan sisään"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Vastapään nimeä ei saa selville"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Paikallista nimeä ei saa selville"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Palvelin ei huolinut yhteyttä ilmoituksella: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER ei onnistunut, palvelimen ilmoitus: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS ei onnistunut, palvelimen ilmoitus: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -814,123 +809,123 @@ msgstr ""
 "Määritettiin välipalvelin mutta ei komentotiedostoa kirjautumiseen, Acquire::"
 "ftp::ProxyLogin on tyhjä."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Komentotiedoston rivi \"%s\" ei toiminut, palvelin ilmoitti: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE ei toiminut, palvelin ilmoitti: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Yhteys aikakatkaistiin"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Palvelin sulki yhteyden"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Lukuvirhe"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Vastaus aiheutti puskurin ylivuodon."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Yhteyskäytäntö on turmeltunut"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Virhe kirjoitettaessa"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Pistoketta ei voitu luoda"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Pistoketta ei voitu kytkeä, yhteys aikakatkaistiin"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Ei onnistunut"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Passiivista pistoketta ei voitu kytkeä."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo ei saanut kuuntelupistoketta"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Pistoketta ei voitu nimetä"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Pistoketta ei voitu kuunnella"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Pistokkeen nimeä ei saatu selville"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Komennon PORT lähetys ei onnistu"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Tuntematon osoiteperhe %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT ei onnistunut, palvelin ilmoitti: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Pistokkeen kytkeminen aikakatkaistiin"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Yhteyttä ei voitu hyväksyä"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Pulmia tiedoston hajautuksessa"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Tiedostoa ei saatu noudettua, palvelin ilmoitti \"%s\""
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Pistoke aikakatkaistiin"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Tiedonsiirto ei onnistunut, palvelin ilmoitti \"%s\""
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Kysely"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Käynnistys ei onnistu"
 
@@ -996,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:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus."
 
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:164
 #, fuzzy
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
 "Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gnupg asennettu?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Tapahtui tuntematon virhe suoritettaessa apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1036,35 +1031,35 @@ msgstr ""
 "Seuraavia allekirjoituksia ei voinut varmentaa koska julkista avainta ei ole "
 "saatavilla:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Tapahtui virhe luettaessa palvelimelta"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Select ei toiminut"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Yhteys aikakatkaistiin"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
 
@@ -1096,293 +1091,30 @@ msgstr "HTTP-palvelimen arvoaluetuki on rikki"
 msgid "Unknown date format"
 msgstr "Tuntematon päiväysmuoto"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Virheellinen otsikkotieto"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Yhteys ei toiminut"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "Sisäinen virhe"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"No jo on... Koot eivät täsmää, sähköpostita email apt@packages.debian.org"
-
-#. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Noudettavaa arkistoa %st/%st.\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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Noudettavaa arkistoa %st.\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:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\n"
-
-#. 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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa."
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-"On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide."
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Kyllä, tee kuten käsketään!"
-
-#: apt-private/private-install.cc:222
+#: methods/server.cc:589
 #, c-format
 msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Olet aikeissa tehdä mahdollisesti vahingollisen toimenpiteen.\n"
-"Jatka kirjoittamalla \"%s\"\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Keskeytä."
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Haluatko jatkaa?"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Joidenkin tiedostojen nouto ei onnistunut"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai "
-"kokeile --fix-missing?"
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Puuttuvia paketteja ei voi korjata."
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Asennus keskeytetään."
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-"On tarkoitus olla poistamatta mitään, joten AutoRemover:ia ei voi käynnistää"
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Hmm, nähtävästi AutoRemover tuhosi jotain, mitä ei pitäisi tapahtua.\n"
-"Tekisitkö vikailmoituksen apt:sta."
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Sisäinen virhe, AutoRemover rikkoi jotain"
-
-#: apt-private/private-install.cc:513
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
-"vaadittuja:"
-msgstr[1] ""
-"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
-"vaadittuja:"
-
-#: apt-private/private-install.cc:517
-#, fuzzy, c-format
-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] ""
-"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
-"vaadittuja:"
-msgstr[1] ""
-"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
-"vaadittuja:"
-
-#: apt-private/private-install.cc:519
-#, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Poista ne komennolla \"apt-get autoremove\"."
-msgstr[1] "Poista ne komennolla \"apt-get autoremove\"."
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
-"ilmanpaketteja (tai ratkaise itse)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"Joitakin paketteja ei voitu asentaa. On ehkä vaadittu mahdottomia tai,\n"
-"jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
-"vielä luotu tai siirretty Incoming-kansiosta."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Rikkinäiset paketit"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Ehdotetut paketit:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Suositellut paketit:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
-
-#: apt-private/private-install.cc:829
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s on jo uusin versio.\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Valittiin versio %s (%s) paketille %s\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Valittiin versio %s (%s) paketille %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "Sisäinen virhe"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1390,31 +1122,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "Korjataan riippuvuuksia..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " ei onnistunut."
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "Riippuvuuksien korjaus ei onnistu"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr "Päivitysjoukon minimointi ei onnistu"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " Valmis"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f."
 
@@ -1578,7 +1310,7 @@ msgstr "K"
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Käännösvirhe lausekkeessa - %s"
@@ -1587,7 +1319,7 @@ msgstr "Käännösvirhe lausekkeessa - %s"
 msgid "The update command takes no arguments"
 msgstr "Komento update ei käytä parametreja"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1595,11 +1327,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: apt-private/private-update.cc:99
 msgid "All packages are up to date."
 msgstr ""
 
-#: apt-private/private-show.cc:156
+#: 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 ""
@@ -1619,27 +1355,305 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!"
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"No jo on... Koot eivät täsmää, sähköpostita email apt@packages.debian.org"
+
+#. 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Noudettavaa arkistoa %st/%st.\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:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Noudettavaa arkistoa %st.\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:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\n"
+
+#. 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 "Toiminnon jälkeen vapautuu %s t levytilaa.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --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 ""
+"On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Kyllä, tee kuten käsketään!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Olet aikeissa tehdä mahdollisesti vahingollisen toimenpiteen.\n"
+"Jatka kirjoittamalla \"%s\"\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Keskeytä."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Haluatko jatkaa?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Joidenkin tiedostojen nouto ei onnistunut"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai "
+"kokeile --fix-missing?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Puuttuvia paketteja ei voi korjata."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Asennus keskeytetään."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+"On tarkoitus olla poistamatta mitään, joten AutoRemover:ia ei voi käynnistää"
+
+#: 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 ""
+"Hmm, nähtävästi AutoRemover tuhosi jotain, mitä ei pitäisi tapahtua.\n"
+"Tekisitkö vikailmoituksen apt:sta."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Sisäinen virhe, AutoRemover rikkoi jotain"
+
+#: apt-private/private-install.cc:488
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
+"vaadittuja:"
+msgstr[1] ""
+"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
+"vaadittuja:"
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+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] ""
+"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
+"vaadittuja:"
+msgstr[1] ""
+"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
+"vaadittuja:"
+
+#: 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] "Poista ne komennolla \"apt-get autoremove\"."
+msgstr[1] "Poista ne komennolla \"apt-get autoremove\"."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
+"ilmanpaketteja (tai ratkaise itse)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Joitakin paketteja ei voitu asentaa. On ehkä vaadittu mahdottomia tai,\n"
+"jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
+"vielä luotu tai siirretty Incoming-kansiosta."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Rikkinäiset paketit"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Ehdotetut paketit:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Suositellut paketit:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
+
+#: apt-private/private-install.cc:827
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s on jo uusin versio.\n"
+
+#: apt-private/private-install.cc:892
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Valittiin versio %s (%s) paketille %s\n"
+
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Valittiin versio %s (%s) paketille %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 "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!"
 
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:98
 msgid "Authentication warning overridden.\n"
 msgstr "Varoitus varmistamisesta on ohitettu.\n"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
 msgid "Some packages could not be authenticated"
 msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 msgid "Install these packages without verification?"
 msgstr "Asennetaanko nämä paketit ilman todennusta?"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Tiedoston %s nouto ei onnistunut  %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 "Kansion %s vapaan tilan määrä ei selvinnyt"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa."
+
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1654,41 +1668,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Käsitellään päivitystä"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Valmis"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Löytyi "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Nouda:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Siv "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Vrhe "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Noudettiin %st ajassa %s (%st/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Työskennellään]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1701,18 +1707,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1789,205 +1795,457 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Yhdistetään saatavuustiedot"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Kutsuttiin DropNode mutta tiedostoon on vielä linkki"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Hajautusalkiota ei löytynyt!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Korvautuksen varaus ei onnistunut"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "AddDiversion: sisäinen virhe"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n"
+"\n"
+"apt-extracttemplates on työkalu asetus- ja mallitietojen \n"
+"poimintaan debian-paketeista\n"
+"\n"
+"Valitsimet:\n"
+"  -h   Tämä ohje\n"
+"  -t   Aseta väliaikaisten tiedostojen kansio\n"
+"  -c=? Lue tämä asetustiedosto\n"
+"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Yritetään kirjoittaa korvautuksen päälle, %s -> %s ja %s/%s"
+#: 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"
 
-#: apt-inst/filelist.cc:506
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Korvautuksen kaksoislisäys %s -> %s"
+msgid "Unable to write to %s"
+msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
 
-#: apt-inst/filelist.cc:549
+#: 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:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "Paketin laajennuslista on liian pitkä"
+
+#: 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 "Duplicate conf file %s/%s"
-msgstr "Asetustiedoston kaksoiskappale %s/%s"
+msgid "Error processing directory %s"
+msgstr "Tapahtui virhe käsiteltäessa kansiota %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Lähteiden laajennuslista on liian pitkä"
+
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr ""
+"Tapahtui virhe kirjoitettaessa otsikkotietoa sisällysluettelotiedostoon"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "Polku %s on liian pitkä"
+msgid "Error processing contents %s"
+msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Käyttö: apt-ftparchive [valitsimet] komento\n"
+"Komennot: packages binääripolku [poikkeustdsto [polun alku]]\n"
+"          sources lähdepolku [poikkeustdsto [polun alku]]\n"
+"          contents polku\n"
+"          release polku\n"
+"          generate asetukset [ryhmät]\n"
+"          clean asetukset\n"
+"\n"
+"apt-ftparchive tuottaa hakemistoja Debianin arkistoista. Monta "
+"tuottamistapaa\n"
+"on tuettu alkaen täysin automaattisista toiminnallisesti samoihin kuin\n"
+"dpkg-scanpackages ja dpkg-scansources.\n"
+"\n"
+"apt-ftparchive tuottaa pakettitiedostoja .deb-tiedostojen puusta.\n"
+"Pakettitiedostossa on kunkin paketin kaikkien ohjauskenttien\n"
+"sisältö sekä MD5 tiiviste ja tiedoston koko. Poikkeus-\n"
+"tiedostolla voidaan arvot Priority ja Section pakottaa halutuiksi.\n"
+"\n"
+"Samaan tapaan apt-ftparchive tuottaa lähdetiedostoja\n"
+".dscs-tiedostojen puusta. Valitsimella --source-overrride voidaan\n"
+"määrittää lähteiden poikkeustiedosto.\n"
+"\n"
+"Komennot \"packages\" ja \"sources\" olisi suoritettava puun juuressa.\n"
+"Binääripolun olisi osoitettava rekursiivisen haun alkukohtaan ja\n"
+"poikkeustiedostossa olisi oltava poikkeusilmaisimet. Polun alku\n"
+"yhdistetään tiedoston nimeen jos se on annettu. Esimerkki\n"
+"käytöstä Debianin arkiston kanssa:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Valitsimet:\n"
+"  -h    Tämä ohje\n"
+"  --md5 MD5 luonti\n"
+"  -s=?  Lähteiden poikkeustdosto\n"
+"  -q    Ei tulostusta\n"
+"  -d=?  Valinnainen välimuistitietokanta\n"
+"  --no-delink delinking-virheenjäljitys päälle\n"
+"  --contents  Sisällysluettelotiedoston luonti\n"
+"  -c=?  Lue tämä asetustiedosto\n"
+"  -o=?  Aseta mikä asetusvalitsin tahansa"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Mitkään valinnat eivät täsmänneet"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Purettiin %s useammin kuin kerran"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Kansio %s on korvautunut"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Tietokanta on turmeltunut, tiedosto nimetty %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Paketti yrittää kirjoittaa korvautuksen kohteeseen %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Tietokanta on vanha, yritetään päivittää %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Korvautuspolku on liian pitkä"
+#: ftparchive/cachedb.cc:96
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, "
+"on tietokanta poistettava ja luotava uudelleen."
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Tietokantatiedostoa %s ei saatu avattua: %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Tiedostolle %s ei toimi stat"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "readlink %s ei onnistunut"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Arkistolla ei ole ohjaustietuetta"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Kohdistinta ei saada"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Kansiota %s ei voi lukea\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Kansiota %s ollaan korvaamassa muulla kuin kansiolla"
+msgid "W: Unable to stat %s\n"
+msgstr "W: Tdstolle %s ei toimi stat\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Solmua ei löytynyt sen hajautuslokerosta"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Polku on liian pitkä"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "W: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: Tiedostossa virheitä "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Päälle kirjoitettava paketti täsmää mutta paketille %s ei ole versiota"
+msgid "Failed to resolve %s"
+msgstr "Osoitteen %s selvitys ei onnistunut"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Puun läpikäynti ei onnistunut"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle"
+msgid "Failed to open %s"
+msgstr "Tiedoston %s avaaminen ei onnistunut"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Tiedostolle %s ei toimi stat"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Tiedoston %s kirjoittaminen ei onnistunut"
+msgid "Failed to readlink %s"
+msgstr "readlink %s ei onnistunut"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Tiedoston %s sulkeminen ei onnistunut"
+msgid "Failed to unlink %s"
+msgstr "unlink %s ei onnistunut"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Tämä ei ole kelvollinen DEB-arkisto, puuttuu tiedosto \"%s\""
+msgid "*** Failed to link %s to %s"
+msgstr "*** Linkin %s -> %s luonti ei onnistunut"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Tapahtui sisäinen virhe, tiedostoa %s ei löydy"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLinkin yläraja %st saavutettu.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Ohjaustiedosto ei jäsenny"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Arkistossa ei ollut pakettikenttää"
+
+#: 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:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s ylläpitäjä on %s eikä %s\n"
+
+#: ftparchive/writer.cc:712
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s:llä ei ole poikkeustietuetta\n"
+
+#: 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"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Muistin varaaminen ei onnistunut"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Tiedoston %s avaaminen ei onnistunut"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Poikkeustiedoston %s lukeminen ei onnistunut"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Tuntematon pakkausalgoritmi \"%s\""
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Pakattu tulostus %s tarvitsee pakkausjoukon"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Arkiston tarkistussumma on virheellinen"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "FILE* luominen ei onnistunut"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Tapahtui virhe luettaessa arkiston tiedoston otsikkoa"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "fork ei onnistunut"
 
-#: apt-inst/contrib/arfile.cc:96
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Arkiston tiedoston otsikko on virheellinen"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Compress-lapsiprosessi"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Arkiston tiedoston otsikko on virheellinen"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Sisäinen virhe, prosessin %s luominen ei onnistunut"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Arkisto on pienempi kuin pitäisi"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Syöttö/tulostus aliprosessiin/tiedostoon ei onnistunut"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Arkiston otsikoiden luku ei onnistunut"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Putkien luonti ei onnistunut"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Ilmeni pulmia poistettaessa tiedosto %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "exec gzip ei onnistunut"
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Arkisto on turmeltunut"
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n"
+"\n"
+"apt-extracttemplates on työkalu asetus- ja mallitietojen \n"
+"poimintaan debian-paketeista\n"
+"\n"
+"Valitsimet:\n"
+"  -h   Tämä ohje\n"
+"  -t   Aseta väliaikaisten tiedostojen kansio\n"
+"  -c=? Lue tämä asetustiedosto\n"
+"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Tuntematon pakettitietue!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Käyttö: apt-sortpkgs [valitsimet] tdsto1 [tdsto2 ...]\n"
+"\n"
+"apt-sortpkgs on yksinkertainen työkalu pakettitiedostojen lajitteluun.\n"
+"Valitsimella -s ilmaistaan minkälainen tiedosto on.\n"
+"\n"
+"Valitsimet:\n"
+"  -h   Tämä ohje\n"
+"  -s   Käytä lähdetiedostolajittelua\n"
+"  -c=? Lue tämä asetustiedosto\n"
+"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Kirjoitettiin %i tietuetta.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2004,6 +2262,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 ""
@@ -2017,199 +2295,364 @@ 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:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Pakettivarasto on tyhjä"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr "Pakettivaraston versio on yhteensopimaton"
 
-#: apt-pkg/pkgcache.cc:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Riippuvuudet"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Esiriippuvuudet"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Ehdotukset"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Suosittelut"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Ristiriidat"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Korvaavuudet"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Täydet korvaavuudet"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Rikkoo"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "tärkeä"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "välttämätön"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "perus"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "valinnainen"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "ylimääräinen"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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/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/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/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/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/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "stat %s ei onnistu."
+
+#: 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/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
+#: 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/acquire-worker.cc:169
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "Menetelmä %s ei käynnistynyt oikein"
+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/acquire-worker.cc:455
+#: apt-pkg/pkgcachegen.cc:1196
 #, 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 "Couldn't stat source package list %s"
+msgstr "stat ei toiminut lähdepakettiluettelolle %s"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
+#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Muodostetaan riippuvuussuhteiden puu"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Kootaan tiedostojen tarjoamistietoja"
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Mahdolliset versiot"
+#: 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/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Luodaan riippuvuudet"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Luetaan tilatiedot"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Tilatiedoston %s avaaminen ei onnistunut"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Tarkistussumma ei täsmää"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Koko ei täsmää"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Virheellinen toiminto %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Virhe kirjoitettaessa"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Kansio %s on korvautunut"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: apt-pkg/acquire-item.cc:2059
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
+"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:1926
+#: 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 "
@@ -2218,12 +2661,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:1992
+#: 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:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2231,121 +2674,38 @@ msgstr ""
 "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
 "kenttää."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "stat %s ei onnistu."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "stat ei toiminut lähdepakettiluettelolle %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Luetaan pakettiluetteloita"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Kootaan tiedostojen tarjoamistietoja"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: apt-pkg/acquire.cc:162
 #, fuzzy, c-format
 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI"
@@ -2371,19 +2731,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:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2394,10 +2754,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"
@@ -2466,11 +2830,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"
 
@@ -2480,7 +2844,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:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2488,326 +2852,257 @@ msgstr ""
 "Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt "
 "paketit."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Pakettitiedostoa %s ei voi jäsentää (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Huomautus, valitaan %s eikä %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Virheellinen rivi korvautustiedostossa: %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Muodostetaan riippuvuussuhteiden puu"
 
-#: 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:139
+msgid "Candidate versions"
+msgstr "Mahdolliset versiot"
 
-#: 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:168
+msgid "Dependency generation"
+msgstr "Luodaan riippuvuudet"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Avataan %s"
+#: 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:371
+#: apt-pkg/depcache.cc:252
 #, 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 open StateFile %s"
+msgstr "Tilatiedoston %s avaaminen ei onnistunut"
 
-#: 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 "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
 
-#: 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/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "Pakettitiedostoa %s ei voi jäsentää (%d)"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
 
-#: apt-pkg/cacheset.cc:603
+#: 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:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:145
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Virheellinen rivi korvautustiedostossa: %s"
+
+#: apt-pkg/indexrecords.cc:164
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Valintaa %s ei löydy"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Lukkoa ei käytetä kirjoitussuojatulle tiedostolle %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Lukkotiedostoa %s ei voitu avata"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Lukkoa %s ei saada"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Aliprosessi %s aiheutti suojausvirheen."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Aliprosessi %s aiheutti suojausvirheen."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Aliprosessi %s palautti virhekoodin (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Aliprosessi %s lopetti odottamatta"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Pulmia tiedoston sulkemisessa"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Tiedostoa %s ei voitu avata"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Putkea %s ei voitu avata"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Prosessien välistä kommunikaatiota aliprosessiin ei saatu luotua"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Pakkaajan käynnistäminen ei onnistunut"
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "read, vielä %lu lukematta mutta tiedosto loppui"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Pulmia tiedoston sulkemisessa"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Pulmia tehtäessä tiedostolle sync"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Pulmia tehtäessä tiedostolle unlink"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Pulmia tehtäessä tiedostolle sync"
 
@@ -2892,109 +3187,103 @@ msgstr "Komento stat ei toiminut liitoskohdalle %s"
 msgid "Failed to stat the cdrom"
 msgstr "Komento stat ei toiminut rompulle"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Tuntematon tyypin lyhenne: \"%c\""
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Avataan asetustiedosto %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Asennus keskeytetää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 "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"
@@ -3004,12 +3293,12 @@ msgstr "Virheellinen toiminto %s"
 msgid "Installing %s"
 msgstr "Asennetaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Poistetaan %s"
@@ -3030,103 +3319,103 @@ msgid "Running post-installation trigger %s"
 msgstr "Suoritetaan jälkiasennusliipaisin %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Kansio \"%s\" puuttuu."
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Valmistellaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Puretaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Valmistaudutaan tekemään asetukset: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "%s asennettu"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Valmistaudutaan poistamaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "%s poistettu"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Valmistaudutaan poistamaan %s kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s poistettiin kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3141,419 +3430,186 @@ 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 ""
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n"
-"\n"
-"apt-extracttemplates on työkalu asetus- ja mallitietojen \n"
-"poimintaan debian-paketeista\n"
-"\n"
-"Valitsimet:\n"
-"  -h   Tämä ohje\n"
-"  -t   Aseta väliaikaisten tiedostojen kansio\n"
-"  -c=? Lue tämä asetustiedosto\n"
-"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Tiedostolle %s ei toimi stat"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Tapahtui virhe käsiteltäessa kansiota %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Lähteiden laajennuslista on liian pitkä"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr ""
-"Tapahtui virhe kirjoitettaessa otsikkotietoa sisällysluettelotiedostoon"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Käyttö: apt-ftparchive [valitsimet] komento\n"
-"Komennot: packages binääripolku [poikkeustdsto [polun alku]]\n"
-"          sources lähdepolku [poikkeustdsto [polun alku]]\n"
-"          contents polku\n"
-"          release polku\n"
-"          generate asetukset [ryhmät]\n"
-"          clean asetukset\n"
-"\n"
-"apt-ftparchive tuottaa hakemistoja Debianin arkistoista. Monta "
-"tuottamistapaa\n"
-"on tuettu alkaen täysin automaattisista toiminnallisesti samoihin kuin\n"
-"dpkg-scanpackages ja dpkg-scansources.\n"
-"\n"
-"apt-ftparchive tuottaa pakettitiedostoja .deb-tiedostojen puusta.\n"
-"Pakettitiedostossa on kunkin paketin kaikkien ohjauskenttien\n"
-"sisältö sekä MD5 tiiviste ja tiedoston koko. Poikkeus-\n"
-"tiedostolla voidaan arvot Priority ja Section pakottaa halutuiksi.\n"
-"\n"
-"Samaan tapaan apt-ftparchive tuottaa lähdetiedostoja\n"
-".dscs-tiedostojen puusta. Valitsimella --source-overrride voidaan\n"
-"määrittää lähteiden poikkeustiedosto.\n"
-"\n"
-"Komennot \"packages\" ja \"sources\" olisi suoritettava puun juuressa.\n"
-"Binääripolun olisi osoitettava rekursiivisen haun alkukohtaan ja\n"
-"poikkeustiedostossa olisi oltava poikkeusilmaisimet. Polun alku\n"
-"yhdistetään tiedoston nimeen jos se on annettu. Esimerkki\n"
-"käytöstä Debianin arkiston kanssa:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Valitsimet:\n"
-"  -h    Tämä ohje\n"
-"  --md5 MD5 luonti\n"
-"  -s=?  Lähteiden poikkeustdosto\n"
-"  -q    Ei tulostusta\n"
-"  -d=?  Valinnainen välimuistitietokanta\n"
-"  --no-delink delinking-virheenjäljitys päälle\n"
-"  --contents  Sisällysluettelotiedoston luonti\n"
-"  -c=?  Lue tämä asetustiedosto\n"
-"  -o=?  Aseta mikä asetusvalitsin tahansa"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Mitkään valinnat eivät täsmänneet"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Tietokanta on turmeltunut, tiedosto nimetty %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Tietokanta on vanha, yritetään päivittää %s"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, "
-"on tietokanta poistettava ja luotava uudelleen."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Tietokantatiedostoa %s ei saatu avattua: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "readlink %s ei onnistunut"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arkistolla ei ole ohjaustietuetta"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Kohdistinta ei saada"
+msgstr "Luettelokansiota ei voitu lukita"
 
-#: ftparchive/writer.cc:91
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Kansiota %s ei voi lukea\n"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
 
-#: ftparchive/writer.cc:96
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Tdstolle %s ei toimi stat\n"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Kutsuttiin DropNode mutta tiedostoon on vielä linkki"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "W: "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Hajautusalkiota ei löytynyt!"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: Tiedostossa virheitä "
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Korvautuksen varaus ei onnistunut"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Osoitteen %s selvitys ei onnistunut"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "AddDiversion: sisäinen virhe"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Puun läpikäynti ei onnistunut"
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Yritetään kirjoittaa korvautuksen päälle, %s -> %s ja %s/%s"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to open %s"
-msgstr "Tiedoston %s avaaminen ei onnistunut"
+msgid "Double add of diversion %s -> %s"
+msgstr "Korvautuksen kaksoislisäys %s -> %s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Duplicate conf file %s/%s"
+msgstr "Asetustiedoston kaksoiskappale %s/%s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "readlink %s ei onnistunut"
+msgid "The path %s is too long"
+msgstr "Polku %s on liian pitkä"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "unlink %s ei onnistunut"
+msgid "Unpacking %s more than once"
+msgstr "Purettiin %s useammin kuin kerran"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Linkin %s -> %s luonti ei onnistunut"
+msgid "The directory %s is diverted"
+msgstr "Kansio %s on korvautunut"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:152
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLinkin yläraja %st saavutettu.\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Paketti yrittää kirjoittaa korvautuksen kohteeseen %s/%s"
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arkistossa ei ollut pakettikenttää"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Korvautuspolku on liian pitkä"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s:llä ei ole poikkeustietuetta\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Kansiota %s ollaan korvaamassa muulla kuin kansiolla"
+
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Solmua ei löytynyt sen hajautuslokerosta"
+
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Polku on liian pitkä"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s ylläpitäjä on %s eikä %s\n"
+msgid "Overwrite package match with no version for %s"
+msgstr "Päälle kirjoitettava paketti täsmää mutta paketille %s ei ole versiota"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s:llä ei ole poikkeustietuetta\n"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle"
 
-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s:llä ei  ole binääristäkään poikkeustietuetta\n"
+msgid "Unable to stat %s"
+msgstr "Tiedostolle %s ei toimi stat"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Muistin varaaminen ei onnistunut"
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Tiedoston %s kirjoittaminen ei onnistunut"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Unable to open %s"
-msgstr "Tiedoston %s avaaminen ei onnistunut"
+msgid "Failed to close file %s"
+msgstr "Tiedoston %s sulkeminen ei onnistunut"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1"
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Tämä ei ole kelvollinen DEB-arkisto, puuttuu tiedosto \"%s\""
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Poikkeustiedoston %s lukeminen ei onnistunut"
+msgid "Internal error, could not locate member %s"
+msgstr "Tapahtui sisäinen virhe, tiedostoa %s ei löydy"
 
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Ohjaustiedosto ei jäsenny"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Arkiston tarkistussumma on virheellinen"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Tapahtui virhe luettaessa arkiston tiedoston otsikkoa"
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Tuntematon pakkausalgoritmi \"%s\""
+#: apt-inst/contrib/arfile.cc:96
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "Arkiston tiedoston otsikko on virheellinen"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Pakattu tulostus %s tarvitsee pakkausjoukon"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Arkiston tiedoston otsikko on virheellinen"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "FILE* luominen ei onnistunut"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arkisto on pienempi kuin pitäisi"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "fork ei onnistunut"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Arkiston otsikoiden luku ei onnistunut"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Compress-lapsiprosessi"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Putkien luonti ei onnistunut"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Sisäinen virhe, prosessin %s luominen ei onnistunut"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "exec gzip ei onnistunut"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Syöttö/tulostus aliprosessiin/tiedostoon ei onnistunut"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Arkisto on turmeltunut"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Ilmeni pulmia poistettaessa tiedosto %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s"
 
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n"
-"\n"
-"apt-extracttemplates on työkalu asetus- ja mallitietojen \n"
-"poimintaan debian-paketeista\n"
-"\n"
-"Valitsimet:\n"
-"  -h   Tämä ohje\n"
-"  -t   Aseta väliaikaisten tiedostojen kansio\n"
-"  -c=? Lue tämä asetustiedosto\n"
-"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Versioriippuvuustila yhteensä: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Tuntematon pakettitietue!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Käyttö: apt-sortpkgs [valitsimet] tdsto1 [tdsto2 ...]\n"
-"\n"
-"apt-sortpkgs on yksinkertainen työkalu pakettitiedostojen lajitteluun.\n"
-"Valitsimella -s ilmaistaan minkälainen tiedosto on.\n"
-"\n"
-"Valitsimet:\n"
-"  -h   Tämä ohje\n"
-"  -s   Käytä lähdetiedostolajittelua\n"
-"  -c=? Lue tämä asetustiedosto\n"
-"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Valmis"
+
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Asennus keskeytetään."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/fr.po b/po/fr.po
index 8f49987f1..cb9d82856 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -25,148 +25,144 @@ msgstr ""
 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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Nombre total de paquets : "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Nombre total de structures de paquets : "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Paquets ordinaires : "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Paquets entièrement virtuels : "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Paquets virtuels simples : "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Paquets virtuels mixtes : "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Manquants : "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Nombre de versions distinctes : "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Nombre de descriptions distinctes : "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Nombre de dépendances : "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Nombre de relations version/fichier : "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Nombre de relations description/fichier : "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Nombre de relations « Provides » : "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Nombre de motifs rationnels : "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Espace occupé par les versions des dépendances : "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Espace disque gaspillé : "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Total de l'espace attribué : "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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 du paquet %s désynchronisé."
 
-#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: 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:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Fichiers du paquet :"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Paquets épinglés :"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(non trouvé)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Installé : "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Candidat : "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(aucun)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Épinglage de paquet : "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr " Table de version :"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -240,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"
@@ -268,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 "
@@ -306,50 +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:245
+#: cmdline/apt-get.cc:224
 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Impossible de trouver de paquet correspondant à l'architecture « %s »"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr ""
 "Impossible de trouver de paquet «%s » correspondant à la version « %s »"
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr ""
 "Impossible de trouver de paquet « %s » correspondant à la publication « %s »"
 
-#: cmdline/apt-get.cc:367
+#: 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:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Impossible de trouver la version « %s » du paquet « %s »"
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossible de trouver le paquet %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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."
@@ -357,26 +353,26 @@ msgstr ""
 "Cette commande est obsolète. Veuillez utiliser « apt-mark auto » et « apt-"
 "mark manual »."
 
-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: 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:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -386,7 +382,7 @@ msgstr ""
 "suivi de versions « %s » à l'adresse :\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -398,80 +394,69 @@ msgstr ""
 "pour récupérer les dernières mises à jour (éventuellement non encore "
 "publiées) du paquet.\n"
 
-#: cmdline/apt-get.cc:839
+#: 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"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Impossible de déterminer l'espace disponible sur %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Pas assez d'espace disponible sur %s"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Récupération des sources %s\n"
 
-#: cmdline/apt-get.cc:924
+#: 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:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: 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:968
+#: 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:996
+#: 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:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Échec du processus fils"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -481,17 +466,27 @@ msgstr ""
 "consulter la section à propos de APT::Architectures dans la page de manuel "
 "apt.conf(5)."
 
-#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: cmdline/apt-get.cc:1279
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -500,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:1294
+#: cmdline/apt-get.cc:1297
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -509,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:1317
+#: 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:1356
+#: cmdline/apt-get.cc:1359
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -525,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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -534,31 +529,31 @@ 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:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Impossible d'activer les dépendances de construction"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Journal des modifications pour %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Modules reconnus :"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -657,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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -675,55 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -841,12 +836,12 @@ msgstr "Disque non trouvé."
 msgid "File not found"
 msgstr "Fichier non trouvé"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Impossible de statuer"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Impossible de modifier l'heure "
 
@@ -855,34 +850,34 @@ msgid "Invalid URI, local URIS must not start with //"
 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:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Connexion en cours"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Impossible de déterminer le nom de la machine distante"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Impossible de déterminer le nom local"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Le serveur a refusé la connexion et a répondu : %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER incorrect, le serveur a répondu : %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS incorrect, le serveur a répondu : %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -890,125 +885,125 @@ msgstr ""
 "Un serveur proxy a été spécifié, mais aucun script de connexion, Acquire::"
 "ftp::ProxyLogin est vide."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "La commande « %s » du script de connexion a échoué, le serveur a répondu : %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Échec de TYPE, le serveur a répondu : %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Dépassement du délai de connexion"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Le serveur a fermé la connexion"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Erreur de lecture"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Une réponse a fait déborder le tampon."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Corruption du protocole"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Erreur d'écriture"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Impossible de créer un connecteur"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Impossible de se connecter sur le port de données, délai de connexion dépassé"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Échec"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Impossible de se connecter au port en mode passif."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo n'a pu obtenir un port d'écoute"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Impossible de se connecter à un port"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Impossible d'écouter sur le port"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Impossible de déterminer le nom du port"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Impossible d'envoyer la commande PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Famille d'adresses %u inconnue (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT a échoué, le serveur a répondu : %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Délai de connexion au port de données dépassé"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Impossible d'accepter une connexion"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Impossible de récupérer le fichier, le serveur a répondu « %s »"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Pas de réponse du port de données dans les délais"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Le transfert de données a échoué, le serveur a répondu « %s »"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Requête"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Impossible d'invoquer "
 
@@ -1076,25 +1071,25 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr "Impossible de se connecter à %s:%s :"
 
-#: methods/gpgv.cc:168
+#: 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:172
+#: 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:174
+#: 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1103,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:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Erreur inconnue à l'exécution de apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1119,35 +1114,35 @@ msgstr ""
 "Les signatures suivantes n'ont pas pu être vérifiées car la clé publique "
 "n'est pas disponible :\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "Les fichiers vides ne peuvent être des archives valables"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Erreur d'écriture sur le fichier"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Erreur de lecture du serveur"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Erreur d'écriture sur un fichier"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Sélection défaillante"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Délai de connexion dépassé"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Erreur d'écriture du fichier de sortie"
 
@@ -1179,445 +1174,164 @@ msgstr "Ce serveur http possède un support des limites non-valide"
 msgid "Unknown date format"
 msgstr "Format de date inconnu"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Mauvais en-tête de donnée"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Échec de la connexion"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr "En train de trier"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "En train de lister"
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
+#: 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-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-"Les paquets doivent être enlevés mais la désinstallation est désactivée."
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Correction des dépendances..."
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Erreur interne. Le tri a été interrompu."
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " a échoué."
 
-#: apt-private/private-install.cc:148
-#, 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 "
-"courriel à apt@packages.debian.org."
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Impossible de corriger les dépendances"
 
-#. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Il est nécessaire de prendre %so/%so dans les archives.\n"
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossible de minimiser le nombre des paquets mis à jour"
 
-#. 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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Il est nécessaire de prendre %so dans les archives.\n"
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Fait"
 
-#. 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:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
+#: 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 ""
-"Après cette opération, %so d'espace disque supplémentaires seront utilisé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
-#: apt-private/private-install.cc:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Après cette opération, %so d'espace disque seront libérés.\n"
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "installé, pouvant être mis à jour vers :"
 
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Pas assez d'espace disponible sur %s"
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr " [installé, local]"
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Il y a des problèmes et -y a été employé sans --force-yes"
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[installé, pouvant être supprimé automatiquement]"
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-"L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération "
-"triviale."
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr " [installé, automatique]"
 
-# The space before the exclamation mark must not be a non-breaking space; this
-# sentence is supposed to be typed by a user who cannot see the difference.
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Oui, faites ce que je vous dis !"
+#: 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-install.cc:222
+#: apt-private/private-output.cc:455
 #, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Vous êtes sur le point de faire quelque chose de potentiellement dangereux\n"
-"Pour continuer, tapez la phrase « %s »\n"
-" ?]"
+msgid "but %s is installed"
+msgstr "mais %s est installé"
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Annulation."
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mais %s devra être installé"
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Souhaitez-vous continuer ?"
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "mais il n'est pas installable"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Certains fichiers n'ont pu être téléchargés."
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "mais c'est un paquet virtuel"
 
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Impossible de récupérer certaines archives, peut-être devrez-vous lancer apt-"
-"get update ou essayer avec --fix-missing ?"
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "mais il n'est pas installé"
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
-"l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "mais ne sera pas installé"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Impossible de corriger le fait que des paquets manquent."
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " ou"
 
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Annulation de l'installation."
+#: 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-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"Le paquet suivant a disparu du système car tous ses fichiers\n"
-"ont été remplacés par d'autres paquets :"
-msgstr[1] ""
-"Les paquets suivants ont disparu du système car tous leurs fichiers\n"
-"ont été remplacés par d'autres paquets :"
+#: 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-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-"Note : cette opération volontaire (effectuée par dpkg) est automatique."
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Les paquets suivants seront ENLEVÉS :"
 
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-"Aucune suppression n'est censée se produire : impossible de lancer "
-"« Autoremover »"
+#: 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-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Il semble que l'outil de suppression automatique (« Autoremover ») ait\n"
-"supprimé quelque chose, ce qui est inattendu. Veuillez envoyer un\n"
-"rapport de bogue pour le paquet « apt »."
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Les paquets suivants seront mis à jour :"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "L'information suivante devrait vous aider à résoudre la situation : "
+#: 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-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
-"Erreur interne, l'outil de suppression automatique a cassé quelque chose."
+#: 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-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"Le paquet suivant a été installé automatiquement et n'est plus nécessaire :"
-msgstr[1] ""
-"Les paquets suivants ont été installés automatiquement et ne sont plus "
-"nécessaires :"
-
-#: apt-private/private-install.cc:517
-#, c-format
-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 paquet a été installé automatiquement et n'est plus nécessaire.\n"
-msgstr[1] ""
-"%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Veuillez utiliser « apt-get autoremove » pour le supprimer."
-msgstr[1] "Veuillez utiliser « apt-get autoremove » pour les supprimer."
-
-#: apt-private/private-install.cc:612
-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-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n"
-"(ou indiquez une solution)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Certains paquets ne peuvent être installés. Ceci peut signifier\n"
-"que vous avez demandé l'impossible, ou bien, si vous utilisez\n"
-"la distribution unstable, que certains paquets n'ont pas encore\n"
-"été créés ou ne sont pas sortis d'Incoming."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Paquets défectueux"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Les paquets supplémentaires suivants seront installés : "
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Paquets suggérés :"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Paquets recommandés :"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"%s ignoré : il n'est pas installé et seules des mises à jour ont été "
-"demandées.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s est déjà la plus récente version disponible.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Version choisie « %s » (%s) pour « %s »\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Version choisie « %s » (%s) pour « %s » à cause de « %s »\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
-"Le paquet « %s » n'est pas installé, et ne peut donc être supprimé. Peut-"
-"être vouliez-vous écrire « %s » ?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Le paquet « %s » n'est pas installé, et ne peut donc être supprimé\n"
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr "En train de lister"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Correction des dépendances..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " a échoué."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Impossible de corriger les dépendances"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossible de minimiser le nombre des paquets mis à jour"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fait"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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
+#: 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!"
@@ -1677,7 +1391,7 @@ msgstr "O"
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: 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"
@@ -1686,7 +1400,7 @@ msgstr "Erreur de compilation de l'expression rationnelle - %s"
 msgid "The update command takes no arguments"
 msgstr "La commande de mise à jour ne prend pas de paramètre"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1694,10 +1408,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1724,29 +1442,325 @@ msgstr ""
 "      et la situation n'est donc pas forcément représentative\n"
 "      de la réalité !"
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Avertissement d'authentification ignoré.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr ""
+"Les paquets doivent être enlevés mais la désinstallation est désactivée."
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Certains paquets n'ont pas pu être authentifiés"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Erreur interne. Le tri a été interrompu."
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Faut-il installer ces paquets sans vérification ?"
+#: 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 "
+"courriel à apt@packages.debian.org."
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#. 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
+#: apt-private/private-install.cc:154
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Impossible de récupérer %s  %s\n"
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Il est nécessaire de prendre %so/%so dans les archives.\n"
 
-#: apt-private/private-sources.cc:58
-#, c-format
+#. 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:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Il est nécessaire de prendre %so dans les archives.\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:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr ""
+"Après cette opération, %so d'espace disque supplémentaires seront utilisé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
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "Après cette opération, %so d'espace disque seront libérés.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Il y a des problèmes et -y a été employé sans --force-yes"
+
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr ""
+"L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération "
+"triviale."
+
+# The space before the exclamation mark must not be a non-breaking space; this
+# sentence is supposed to be typed by a user who cannot see the difference.
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Oui, faites ce que je vous dis !"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Vous êtes sur le point de faire quelque chose de potentiellement dangereux\n"
+"Pour continuer, tapez la phrase « %s »\n"
+" ?]"
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Annulation."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Souhaitez-vous continuer ?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Certains fichiers n'ont pu être téléchargés."
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"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
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr ""
+"l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Impossible de corriger le fait que des paquets manquent."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Annulation de l'installation."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"Le paquet suivant a disparu du système car tous ses fichiers\n"
+"ont été remplacés par d'autres paquets :"
+msgstr[1] ""
+"Les paquets suivants ont disparu du système car tous leurs fichiers\n"
+"ont été remplacés par d'autres paquets :"
+
+#: 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."
+
+#: 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 "
+"« 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 ""
+"Il semble que l'outil de suppression automatique (« Autoremover ») ait\n"
+"supprimé quelque chose, ce qui est inattendu. Veuillez envoyer un\n"
+"rapport de bogue pour le paquet « apt »."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "L'information suivante devrait vous aider à résoudre la situation : "
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+"Erreur interne, l'outil de suppression automatique a cassé quelque chose."
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"Le paquet suivant a été installé automatiquement et n'est plus nécessaire :"
+msgstr[1] ""
+"Les paquets suivants ont été installés automatiquement et ne sont plus "
+"nécessaires :"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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 paquet a été installé automatiquement et n'est plus nécessaire.\n"
+msgstr[1] ""
+"%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "Veuillez utiliser « apt-get autoremove » pour le supprimer."
+msgstr[1] "Veuillez utiliser « apt-get autoremove » pour les supprimer."
+
+#: apt-private/private-install.cc:587
+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-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n"
+"(ou indiquez une solution)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Certains paquets ne peuvent être installés. Ceci peut signifier\n"
+"que vous avez demandé l'impossible, ou bien, si vous utilisez\n"
+"la distribution unstable, que certains paquets n'ont pas encore\n"
+"été créés ou ne sont pas sortis d'Incoming."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Paquets défectueux"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Les paquets supplémentaires suivants seront installés : "
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Paquets suggérés :"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Paquets recommandés :"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"%s ignoré : il n'est pas installé et seules des mises à jour ont été "
+"demandées.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s est déjà la plus récente version disponible.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Version choisie « %s » (%s) pour « %s »\n"
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Version choisie « %s » (%s) pour « %s » à cause de « %s »\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+"Le paquet « %s » n'est pas installé, et ne peut donc être supprimé. Peut-"
+"être vouliez-vous écrire « %s » ?\n"
+
+#: apt-private/private-install.cc:945
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Le paquet « %s » n'est pas installé, et ne peut donc être supprimé\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "Avertissement d'authentification ignoré.\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Certains paquets n'ont pas pu être authentifiés"
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Faut-il installer ces paquets sans vérification ?"
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Impossible de récupérer %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 "Impossible de déterminer l'espace disponible sur %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Pas assez d'espace disponible sur %s"
+
+#: apt-private/private-sources.cc:58
+#, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Impossible de lire %s. Faut-il l'éditer à nouveau ?"
 
@@ -1759,41 +1773,33 @@ msgstr "Votre fichier « %s » a changé, veuillez lancer « apt-get update »
 msgid "Full Text Search"
 msgstr "Recherche en texte intégral"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Calcul de la mise à jour"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Fait"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Atteint "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Réception de : "
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%so réceptionnés en %s (%so/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [En cours]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1806,18 +1812,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1894,205 +1900,462 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Fusion des informations disponibles"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode appelé sur un nœud toujours lié"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Impossible de situer l'élément haché !"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Échec lors de l'allocation de la déviation"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Usage : apt-extracttemplates fichier1 [fichier2 ...]\n"
+"\n"
+"apt-extracttemplates est un outil pour extraire la configuration et les\n"
+"informations des gabarits des paquets Debian\n"
+"\n"
+"Options :\n"
+"   -h   Ce texte d'aide\n"
+"   -t   Place le répertoire temporaire\n"
+"   -c=? Lit ce fichier de configuration\n"
+"   -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Erreur interne dans AddDiversion"
+#: 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."
 
-#: apt-inst/filelist.cc:477
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Essaye d'écraser une déviation, %s -> %s et %s/%s"
+msgid "Unable to write to %s"
+msgstr "Impossible d'écrire sur %s"
 
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Addition double d'une déviation %s -> %s"
+#: 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é ?"
 
-#: apt-inst/filelist.cc:549
+#: 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: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 "Duplicate conf file %s/%s"
-msgstr "Fichier de configuration en double %s/%s"
+msgid "Error processing directory %s"
+msgstr "Erreur lors du traitement du répertoire %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: 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: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:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "Le chemin %s est trop long"
+msgid "Error processing contents %s"
+msgstr "Erreur du traitement du contenu %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Usage : apt-ftparchive [options] commande\n"
+"Commandes :  paquets binarypath [fichier d'« override » [chemin du "
+"préfixe]]\n"
+"             sources srcpath [fichier d'« override » [chemin du préfixe]]\n"
+"             contents path\n"
+"             release path\n"
+"             generate config [groupes]\n"
+"             clean config\n"
+"\n"
+"apt-ftparchive génère des fichiers d'index pour les archives Debian. Il\n"
+"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"
+"de chaque paquet aussi bien que les hachés MD5 et la taille du fichier. Un\n"
+"fichier d'« override » est accepté pour forcer la valeur des priorités et\n"
+"des sections\n"
+"\n"
+"De façon similaire, apt-ftparchive génère des fichiers de source à partir\n"
+"d'un arbre de .dscs. L'option --source-override peut être employée pour\n"
+"spécifier un fichier src d'« override »\n"
+"\n"
+"Les commandes « packages » et « sources » devraient être démarrées à la\n"
+"racine de l'arbre. « BinaryPath » devrait pointer sur la base d'une\n"
+"recherche récursive et le fichier d'« override » devrait contenir les\n"
+"drapeaux d'annulation. « Pathprefix » est ajouté au champ du 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"
+"\n"
+"Options :\n"
+"  -h     Ce texte d'aide\n"
+"  --md5  Contrôle la génération des MD5\n"
+"  -s=?   Fichier d'« override » pour les sources\n"
+"  -q     Silencieux\n"
+"  -d=?   Sélectionne la base de données optionnelle de cache\n"
+"  --no-delink Permet le mode de débogage délié\n"
+"  --contents  Contrôle la génération de fichier\n"
+"  -c=? Lit ce fichier de configuration\n"
+"  -o=? Place une option de configuration arbitraire"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Aucune sélection ne correspond"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Veuillez décompresser %s plus d'une fois"
+msgid "Some files are missing in the package file group `%s'"
+msgstr ""
+"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Le répertoire %s est détourné"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Base de données corrompue, fichier renommé en %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Le paquet est en train d'essayer d'écrire sur la cible détournée %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Base de données ancienne, tentative de mise à jour de %s\""
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Le chemin de déviation est trop long"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Le format de la base de données n'est pas valable. Si vous mettez APT à "
+"jour, veuillez supprimer puis recréer la base de données."
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Impossible d'ouvrir le fichier de base de données %s : %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Impossible de statuer %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Impossible de lire le lien %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "L'archive n'a pas d'enregistrement de contrôle"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Impossible d'obtenir un curseur"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Impossible de changer le nom %s en %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "A : Impossible de lire le contenu du répertoire %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Le répertoire %s va être remplacé par un non-répertoire"
+msgid "W: Unable to stat %s\n"
+msgstr "A : Impossible de statuer %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Échec pour localiser le nœud dans la table de hachage"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E : "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Le chemin est trop long"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "A : "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E : des erreurs sont survenues sur le fichier "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Écrase la correspondance de paquet sans version pour %s "
+msgid "Failed to resolve %s"
+msgstr "Impossible de résoudre %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Échec du parcours de l'arbre"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s"
+msgid "Failed to open %s"
+msgstr "Impossible d'ouvrir %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Impossible de statuer pour %s."
+msgid " DeLink %s [%s]\n"
+msgstr " Délier %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Erreur d'écriture du fichier %s"
+msgid "Failed to readlink %s"
+msgstr "Impossible de lire le lien %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Échec de clôture du fichier %s"
+msgid "Failed to unlink %s"
+msgstr "Impossible de délier %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, 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"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Impossible de lier %s à %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Erreur interne, ne peut localiser la partie %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Seuil de delink de %so atteint.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Fichier de contrôle non traitable"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "L'archive ne possède pas de champ de paquet"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Signature d'archive invalide"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Erreur de lecture de l'en-tête du membre d'archive"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:712
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "En-tête du membre d'archive %s non valable"
+msgid "  %s has no source override entry\n"
+msgstr "  %s ne possède pas d'entrée « source override »\n"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "En-tête du membre d'archive non-valable"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "L'archive est trop petite"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Échec de l'allocation de mémoire"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Échec de la lecture des en-têtes d'archive"
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Impossible d'ouvrir %s"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Échec de création de tubes"
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Entrée « override » %s mal formée ligne %llu n° 1"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Impossible d'exécuter gzip "
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Impossible de lire le fichier d'« override » %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Archive corrompue"
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Entrée « override » %s mal formée ligne %llu n° 1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Entrée « override » %s mal formée %llu n° 2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Entrée « override » %s mal formée %llu n° 3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algorithme de compression « %s » inconnu"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "La sortie compressée %s a besoin d'un ensemble de compression"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Impossible de créer FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Échec du fork"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Fils compressé"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Erreur interne, impossible de créer %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Échec d'entrée/sortie du sous-processus sur le fichier"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Impossible de lire lors du calcul de la somme MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problème en déliant %s"
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Impossible de changer le nom %s en %s"
+
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Utilisation: apt-internal-solver\n"
+"\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"
+"équivalent.\n"
+"\n"
+"Options:\n"
+"  -h  La présente aide.\n"
+"  -q  Affichage journalisable - pas de barre de progression\n"
+"  -c=? lecture du fichier de configuration indiqué\n"
+"  -o=? utilisation d'une option de configuration,\n"
+"       p. ex. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Enregistrement de paquet inconnu !"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Type d'en-tête %u inconnu pour TAR, partie %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Usage : apt-sortpkgs [options] fichier1 [fichier2 ...]\n"
+"\n"
+"apt-sortpkgs est un outil simple pour trier les paquets. L'option -s est\n"
+"employée pour indiquer le type de fichier dont il s'agit.\n"
+"\n"
+"Options :\n"
+"  -h   Ce texte d'aide\n"
+"  -s   Trie le fichier source\n"
+"  -c=? Lit ce fichier de configuration\n"
+"  -o=? Place une option de configuration arbitraire, p. ex. -o dir::cache=/"
+"tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr "Progression : [%3i%%]"
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "Exécution de dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Le système de paquet « %s » n'est pas supporté"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Impossible de déterminer un type du système de paquets adéquat"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i enregistrements écrits.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i enregistrements écrits avec %i fichiers manquants.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2109,6 +2372,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 ""
@@ -2123,158 +2408,353 @@ 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:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Cache des paquets vide"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Dépend"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Pré-Dépend"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Suggère"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Recommande"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Est en conflit avec"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Remplace"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Rend obsolète"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Casse"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Améliore"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "nécessaire"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "optionnel"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "supplémentaire"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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/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:118
+#: 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:169
+#: 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:455
+#: 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/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:1196
+#, c-format
+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/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/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Préparation à la réception de la solution"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Impossible d'ouvrir le fichier d'état %s"
+#: 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/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Erreur d'écriture du fichier d'état temporaire %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Somme de contrôle de hachage incohérente"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Taille incohérente"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 msgid "Invalid file format"
 msgstr "Format de fichier invalide"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Erreur d'écriture"
+
+#: 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:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Une erreur s'est produite lors du contrôle de la signature. Le dépôt n'est "
+"pas mis à jour et les fichiers d'index précédents seront utilisés. Erreur de "
+"GPG : %s : %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: 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"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Le répertoire %s est détourné"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2283,18 +2763,18 @@ msgstr ""
 "Impossible de trouver l'entrée « %s » attendue dans le fichier « Release » : "
 "ligne non valable dans sources.list ou fichier corrompu"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/acquire-item.cc:1975
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr ""
 "Impossible de trouver la somme de contrôle de « %s » dans le fichier Release"
 
-#: apt-pkg/acquire-item.cc:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2303,28 +2783,19 @@ msgstr ""
 "Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises "
 "à jour depuis ce dépôt ne s'effectueront pas."
 
-#: apt-pkg/acquire-item.cc:1758
+#: 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)"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Une erreur s'est produite lors du contrôle de la signature. Le dépôt n'est "
-"pas mis à jour et les fichiers d'index précédents seront utilisés. Erreur de "
-"GPG : %s : %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Erreur de GPG : %s : %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2333,14 +2804,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:1992
+#: 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:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2348,130 +2819,38 @@ msgstr ""
 "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
 "pour le paquet %s."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Le type de fichier d'index « %s » n'est pas accepté"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Impossible de localiser %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Erreur apparue lors du traitement de %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Impossible de localiser la liste des paquets sources %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Lecture des listes de paquets"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Assemblage des fichiers listés dans les champs Provides"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Impossible d'écrire sur %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2502,7 +2881,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2512,12 +2891,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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2529,10 +2908,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"
@@ -2605,11 +2987,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"
 
@@ -2621,7 +3003,7 @@ msgstr ""
 "Le paquet %s doit être réinstallé, mais il est impossible de trouver son "
 "archive."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2629,285 +3011,204 @@ 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:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr "Envoi d'une requête au solveur"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Préparation à la réception de la solution"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Échec du solveur externe sans message d'erreur adapté"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Exécution du solveur externe"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Impossible de traiter le fichier %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Impossible d'analyser le fichier Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Pas de sections dans le fichier Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, 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/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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construction de l'arbre des dépendances"
 
-#: 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:139
+msgid "Candidate versions"
+msgstr "Versions possibles"
 
-#: 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:168
+msgid "Dependency generation"
+msgstr "Génération des dépendances"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Ouverture de %s"
+#: 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:371
+#: apt-pkg/depcache.cc:252
 #, 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 open StateFile %s"
+msgstr "Impossible d'ouvrir le fichier d'état %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 ""
-"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Erreur d'écriture du fichier d'état temporaire %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/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "Impossible de traiter le fichier %s (%d)"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "La version « %s » de « %s » est introuvable"
 
-#: apt-pkg/cacheset.cc:492
+#: 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:603
+#: 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:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Impossible de choisir une version installée ou candidate du paquet « %s » "
-"qui n'en n'a aucune"
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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 ""
+"Impossible de choisir une version installée ou candidate du paquet « %s » "
+"qui n'en n'a aucune"
+
+#: 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:132
+#, 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:145
+#, 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:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Entrée « Date » non valable dans le fichier Release %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: 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/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Verrou non utilisé pour le fichier %s en lecture seule"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Impossible d'ouvrir le fichier verrou %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Impossible d'obtenir le verrou %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 "La liste des fichiers ne peut pas être créée car « %s » n'est pas un "
 "répertoire"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 "« %s » dans le répertoire « %s » a été ignoré car ce n'est pas un fichier "
 "ordinaire"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "« %s » dans le répertoire « %s » a été ignoré car il n'utilise pas "
 "d'extension"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2915,75 +3216,75 @@ msgstr ""
 "« %s » dans le répertoire « %s » a été ignoré car il utilise une extension "
 "non valable"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Le sous-processus %s a commis une violation d'accès mémoire"
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Le sous-processus %s a reçu le signal %u"
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Le sous-processus %s s'est arrêté prématurément"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problème de fermeture du fichier gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Impossible d'ouvrir le fichier %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Impossible d'ouvrir le descripteur de fichier %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Impossible de créer un sous-processus IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Impossible d'exécuter la compression "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lu(s), %llu restant à lire, mais rien n'est disponible"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "écrit(s), %llu restant à écrire, mais l'écriture est impossible"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problème de fermeture du fichier %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problème de renommage du fichier %s en %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problème de suppression du lien %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Problème de synchronisation du fichier"
 
@@ -3073,113 +3374,107 @@ 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:519
+#: 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:633
+#: 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:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Pas de porte-clés installé dans %s."
-
-#: 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"
@@ -3189,12 +3484,12 @@ msgstr "L'opération %s n'est pas valable"
 msgid "Installing %s"
 msgstr "Installation de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Suppression de %s"
@@ -3215,79 +3510,79 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Répertoire %s inexistant"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Préparation de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Décompression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: 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:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "%s installé"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "%s supprimé"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s complètement supprimé"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1670
+#: 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:1732
+#: 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:1737
+#: 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:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3295,14 +3590,14 @@ 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:1745
+#: 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:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3310,7 +3605,7 @@ 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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"
@@ -3318,7 +3613,7 @@ 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3338,427 +3633,188 @@ msgstr ""
 #, 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é"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Usage : apt-extracttemplates fichier1 [fichier2 ...]\n"
-"\n"
-"apt-extracttemplates est un outil pour extraire la configuration et les\n"
-"informations des gabarits des paquets Debian\n"
-"\n"
-"Options :\n"
-"   -h   Ce texte d'aide\n"
-"   -t   Place le répertoire temporaire\n"
-"   -c=? Lit ce fichier de configuration\n"
-"   -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Impossible de statuer pour %s."
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Erreur lors du traitement du répertoire %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "La liste d'extension des sources est trop grande"
-
-#: ftparchive/apt-ftparchive.cc:401
-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
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Erreur du traitement du contenu %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Usage : apt-ftparchive [options] commande\n"
-"Commandes :  paquets binarypath [fichier d'« override » [chemin du "
-"préfixe]]\n"
-"             sources srcpath [fichier d'« override » [chemin du préfixe]]\n"
-"             contents path\n"
-"             release path\n"
-"             generate config [groupes]\n"
-"             clean config\n"
-"\n"
-"apt-ftparchive génère des fichiers d'index pour les archives Debian. Il\n"
-"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"
-"de chaque paquet aussi bien que les hachés MD5 et la taille du fichier. Un\n"
-"fichier d'« override » est accepté pour forcer la valeur des priorités et\n"
-"des sections\n"
-"\n"
-"De façon similaire, apt-ftparchive génère des fichiers de source à partir\n"
-"d'un arbre de .dscs. L'option --source-override peut être employée pour\n"
-"spécifier un fichier src d'« override »\n"
-"\n"
-"Les commandes « packages » et « sources » devraient être démarrées à la\n"
-"racine de l'arbre. « BinaryPath » devrait pointer sur la base d'une\n"
-"recherche récursive et le fichier d'« override » devrait contenir les\n"
-"drapeaux d'annulation. « Pathprefix » est ajouté au champ du 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"
-"\n"
-"Options :\n"
-"  -h     Ce texte d'aide\n"
-"  --md5  Contrôle la génération des MD5\n"
-"  -s=?   Fichier d'« override » pour les sources\n"
-"  -q     Silencieux\n"
-"  -d=?   Sélectionne la base de données optionnelle de cache\n"
-"  --no-delink Permet le mode de débogage délié\n"
-"  --contents  Contrôle la génération de fichier\n"
-"  -c=? Lit ce fichier de configuration\n"
-"  -o=? Place une option de configuration arbitraire"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Aucune sélection ne correspond"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr ""
-"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Base de données corrompue, fichier renommé en %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Base de données ancienne, tentative de mise à jour de %s\""
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Le format de la base de données n'est pas valable. Si vous mettez APT à "
-"jour, veuillez supprimer puis recréer la base de données."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Impossible d'ouvrir le fichier de base de données %s : %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Impossible de lire le lien %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "L'archive n'a pas d'enregistrement de contrôle"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Impossible d'obtenir un curseur"
-
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A : Impossible de lire le contenu du répertoire %s\n"
+"Impossible de verrouiller le répertoire d'administration (%s). Avez-vous les "
+"privilèges du superutilisateur ?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A : Impossible de statuer %s\n"
+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."
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E : "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Non verrouillé"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "A : "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode appelé sur un nœud toujours lié"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E : des erreurs sont survenues sur le fichier "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Impossible de situer l'élément haché !"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Impossible de résoudre %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Échec lors de l'allocation de la déviation"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Échec du parcours de l'arbre"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Erreur interne dans AddDiversion"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "Impossible d'ouvrir %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Essaye d'écraser une déviation, %s -> %s et %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Délier %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Addition double d'une déviation %s -> %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Impossible de lire le lien %s"
+msgid "Duplicate conf file %s/%s"
+msgstr "Fichier de configuration en double %s/%s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Impossible de délier %s"
+msgid "The path %s is too long"
+msgstr "Le chemin %s est trop long"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Impossible de lier %s à %s"
+msgid "Unpacking %s more than once"
+msgstr "Veuillez décompresser %s plus d'une fois"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Seuil de delink de %so atteint.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "L'archive ne possède pas de champ de paquet"
+msgid "The directory %s is diverted"
+msgstr "Le répertoire %s est détourné"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "%s ne possède pas d'entrée « override »\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Le paquet est en train d'essayer d'écrire sur la cible détournée %s/%s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr " le responsable de %s est %s et non %s\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Le chemin de déviation est trop long"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s ne possède pas d'entrée « source override »\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Le répertoire %s va être remplacé par un non-répertoire"
 
-#: ftparchive/writer.cc:702
-#, 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"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Échec pour localiser le nœud dans la table de hachage"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Échec de l'allocation de mémoire"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Le chemin est trop long"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "Impossible d'ouvrir %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Entrée « override » %s mal formée ligne %llu n° 1"
+msgid "Overwrite package match with no version for %s"
+msgstr "Écrase la correspondance de paquet sans version pour %s "
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Impossible de lire le fichier d'« override » %s"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s"
 
-#: ftparchive/override.cc:166
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Entrée « override » %s mal formée ligne %llu n° 1"
+msgid "Unable to stat %s"
+msgstr "Impossible de statuer pour %s."
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Entrée « override » %s mal formée %llu n° 2"
+msgid "Failed to write file %s"
+msgstr "Erreur d'écriture du fichier %s"
 
-#: ftparchive/override.cc:191
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Entrée « override » %s mal formée %llu n° 3"
+msgid "Failed to close file %s"
+msgstr "Échec de clôture du fichier %s"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algorithme de compression « %s » inconnu"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Ce n'est pas une archive DEB valide, partie « %s » manquante"
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "La sortie compressée %s a besoin d'un ensemble de compression"
+msgid "Internal error, could not locate member %s"
+msgstr "Erreur interne, ne peut localiser la partie %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Impossible de créer FILE*"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Fichier de contrôle non traitable"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Échec du fork"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Signature d'archive invalide"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Fils compressé"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Erreur de lecture de l'en-tête du membre d'archive"
 
-#: ftparchive/multicompress.cc:232
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Erreur interne, impossible de créer %s"
+msgid "Invalid archive member header %s"
+msgstr "En-tête du membre d'archive %s non valable"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Échec d'entrée/sortie du sous-processus sur le fichier"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "En-tête du membre d'archive non-valable"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Impossible de lire lors du calcul de la somme MD5"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "L'archive est trop petite"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Échec de la lecture des en-têtes d'archive"
+
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Échec de création de tubes"
+
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Impossible d'exécuter gzip "
+
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Archive corrompue"
+
+#: 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:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Problème en déliant %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Type d'en-tête %u inconnu pour TAR, partie %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Utilisation: apt-internal-solver\n"
-"\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"
-"équivalent.\n"
-"\n"
-"Options:\n"
-"  -h  La présente aide.\n"
-"  -q  Affichage journalisable - pas de barre de progression\n"
-"  -c=? lecture du fichier de configuration indiqué\n"
-"  -o=? utilisation d'une option de configuration,\n"
-"       p. ex. -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Espace occupé par les versions des dépendances : "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Enregistrement de paquet inconnu !"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Pas assez d'espace disponible sur %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Usage : apt-sortpkgs [options] fichier1 [fichier2 ...]\n"
-"\n"
-"apt-sortpkgs est un outil simple pour trier les paquets. L'option -s est\n"
-"employée pour indiquer le type de fichier dont il s'agit.\n"
-"\n"
-"Options :\n"
-"  -h   Ce texte d'aide\n"
-"  -s   Trie le fichier source\n"
-"  -c=? Lit ce fichier de configuration\n"
-"  -o=? Place une option de configuration arbitraire, p. ex. -o dir::cache=/"
-"tmp\n"
+#~ msgid "Done"
+#~ msgstr "Fait"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Pas de porte-clés installé dans %s."
 
 #~ msgid "Internal error, Upgrade broke stuff"
 #~ msgstr "Erreur interne, Upgrade a cassé le boulot !"
@@ -3859,9 +3915,6 @@ msgstr ""
 #~ "Impossible d'écrire le journal, échec d'openpty()\n"
 #~ "(/dev/pts est-il monté ?)\n"
 
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Le fichier %s ne commence pas par un message signé en clair."
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Fichier %s inexistant ignoré"
 
diff --git a/po/gl.po b/po/gl.po
index 9ae0dd5a3..d6bb1e92e 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: 2015-01-16 04:37-0500\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,150 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Número total de nomes de paquetes : "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Estruturas de paquetes totais: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Paquetes normais: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Paquetes virtuais puros: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Paquetes virtuais simples: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Paquetes virtuais mixtos: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Non atopados: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Número total de versións distintas: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Número total de descricións distintas: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Número total de dependencias: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Número total de relacións versión/ficheiro: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Número total de relacións descrición/ficheiro: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Número total de asignacións provistas: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Número total de cadeas: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Espazo total de versións de dependencias: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Espazo de reserva total: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Espazo total contabilizado: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Ficheiros de paquetes:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Paquetes inmobilizados:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(non se atopou)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(ningún)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Inmobilizado: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Táboa de versións:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -244,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"
@@ -265,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."
 
@@ -302,71 +298,71 @@ msgstr ""
 "  -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-get.cc:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: 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:454
+#: 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:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: 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:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -375,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:791
+#: cmdline/apt-get.cc:785
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
@@ -387,97 +383,96 @@ msgstr ""
 "para obter as últimas actualizacións (posibelmente non publicadas) do "
 "paquete.\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Omítese o ficheiro xa descargado «%s»\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Non foi posíbel determinar o espazo libre en %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Non hai espazo libre abondo en %s"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Non se puideron obter algúns arquivos."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: 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:968
+#: 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:996
+#: 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:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "O proceso fillo fallou"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -520,30 +515,30 @@ msgstr ""
 "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
 "paquete %s"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Non se puideron procesar as dependencias de construción"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Rexistro de cambios de %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Módulos admitidos:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -663,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -788,12 +783,12 @@ msgstr "Non se atopou o disco"
 msgid "File not found"
 msgstr "Non se atopou o ficheiro"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Non foi posíbel determinar o estado"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Non foi posíbel estabelecer a hora de modificación"
 
@@ -802,34 +797,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI incorrecto, os URI locais non deben comezar por //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Identificándose"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Non é posíbel determinar o nome do outro extremo"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Non é posíbel determinar o nome local"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "O servidor rexeitou a conexión e dixo: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Fallou a orde USER, o servidor dixo: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Fallou a orde PASS, o servidor dixo: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -837,124 +832,124 @@ msgstr ""
 "Especificouse un servidor proxy pero non un script de conexión, Acquire::"
 "ftp::ProxyLogin está baleiro."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Fallou a orde do script de acceso «%s», o servidor dixo: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Fallou a orde TYPE, o servidor dixo: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Esgotouse o tempo para a conexión"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "O servidor pechou a conexión"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Produciuse un erro de lectura"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Unha resposta desbordou o búfer."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Dano no protocolo"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Produciuse un erro de escritura"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Non é posíbel crear un socket"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Non é posíbel conectar o socket de datos, o tempo esgotouse para a conexión"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Fallou"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Non é posíbel conectar o socket pasivo."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo non puido obter un socket no que atender"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Non é posíbel ligar un socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Non é posíbel escoitar no socket"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Non é posíbel determinar o nome do socket"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Non é posíbel enviar a orde PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Familia de enderezos %u (AF_*) descoñecida"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Produciuse un fallou na orde EPRT, o servidor dixo: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "A conexión do socket de datos esgotou o tempo"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Non é posíbel aceptar a conexión"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Non é posíbel obter o ficheiro, o servidor dixo «%s»"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "O socket de datos esgotou o tempo"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Produciuse un fallou na transferencia de datos, o servidor dixo «%s»"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Petición"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Non é posíbel chamar a "
 
@@ -1020,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:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Atopouse polo menos unha sinatura incorrecta."
 
-#: methods/gpgv.cc:174
+#: 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Produciuse un erro descoñecido ao executar apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1061,36 +1056,36 @@ msgstr ""
 "Non se puideron verificar as seguintes sinaturas porque a chave pública non "
 "está dispoñíbel:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "Os ficheiros baleiros non poden ser arquivadores válidos"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Produciuse un erro ao escribir no ficheiro"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Produciuse un erro ao ler do servidor"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Produciuse un erro ao escribir nun ficheiro"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Fallou a chamada a select"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "A conexión esgotou o tempo"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Produciuse un erro ao escribir no ficheiro de saída"
 
@@ -1123,188 +1118,436 @@ msgstr "Este servidor HTTP ten a compatibilidade de rangos estragada"
 msgid "Unknown date format"
 msgstr "Formato de datos descoñecido"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Datos da cabeceira incorrectos"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Produciuse un fallo na conexión"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Produciuse un erro interno"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
+#: apt-private/private-list.cc:121
+msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
+#: 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 ""
-"Produciuse un erro interno, chamouse a InstallPackages con paquetes "
-"estragados."
 
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Hai que retirar paquetes mais o retirado está desactivado."
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalado]"
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Produciuse un erro interno; non rematou a ordenación"
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalado]"
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
 msgstr ""
-"Que estraño... Os tamaños non coinciden; envíe un correo-e 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Ten que recibir %sB/%sB de arquivos.\n"
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalado]"
 
-#. 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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Ten que recibir %sB de arquivos.\n"
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalado]"
 
-#. 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:167
+#: apt-private/private-output.cc:277
 #, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Despois desta operación ocuparanse %sB de disco adicionais.\n"
+msgid "[upgradable from: %s]"
+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
-#: apt-private/private-install.cc:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Despois desta operación liberaranse %sB de espazo de disco.\n"
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
 
-#: apt-private/private-install.cc:200
+#: apt-private/private-output.cc:455
 #, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Non hai espazo libre abondo en %s."
+msgid "but %s is installed"
+msgstr "mais %s está instalado"
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Xurdiron problemas e empregouse -y sen --force-yes"
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mais vaise instalar %s"
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Especificouse «Só triviais» mais esta non é unha operación trivial."
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "mais non é instalábel"
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Si, fai o que digo!"
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "mais é un paquete virtual"
 
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Está a piques de facer algo perigoso.\n"
-"Para continuar escriba a frase «%s»\n"
-" ?] "
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "mais non está instalado"
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Interromper."
+#: 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-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Quere continuar?"
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " ou"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Non foi posíbel descargar algúns ficheiros"
+#: 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-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Non foi posíbel obter algúns arquivos; probe con apt-get update ou --fix-"
-"missing."
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Os seguintes paquetes NOVOS hanse instalar:"
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
-"O emprego conxunto de --fix-missing e intercambio de discos non está admitido"
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Vanse RETIRAR os paquetes seguintes:"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Non é posíbel corrixir os paquetes non dispoñíbeis."
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Consérvanse os seguintes paquetes:"
 
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Interrompendo a instalación."
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Vanse anovar os paquetes seguintes:"
 
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"O seguinte paquete desapareceu do seu sistema e todos os \n"
-"ficheiros serán sobrescritos por outros paquetes:"
-msgstr[1] ""
-"Os seguintes paquetes desapareceron do seu sistema e todos os \n"
-"ficheiros serán sobrescritos por outros paquetes:"
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Vanse REVERTER os seguintes paquetes :"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Nota: Isto será feito automaticamente por dpkg."
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Vanse modificar os paquetes retidos seguintes:"
 
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-"Non se agarda que eliminemos cousas, non se pode iniciar o Retirado "
-"automático"
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (por mor de %s) "
 
-#: apt-private/private-install.cc:499
+#: apt-private/private-output.cc:696
 msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
-"Vaia, semella que o Retirado automático destruíu algo que realmente\n"
-"non debería ter feito. Informe deste erro de apt."
+"AVISO: Retiraranse os seguintes paquetes esenciais.\n"
+"Isto NON se debe facer a menos que saiba exactamente o que está a facer!"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "A seguinte información pode axudar a solucionar a situación:"
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu anovados, %lu instalados, "
 
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Produciuse un erro interno, o Retirado automático estragou cousas"
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalados, "
 
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
+#: 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 ""
+"Produciuse un erro interno, chamouse a InstallPackages con paquetes "
+"estragados."
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Hai que retirar paquetes mais o retirado está desactivado."
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Produciuse un erro interno; non rematou a ordenación"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Que estraño... Os tamaños non coinciden; envíe un correo-e 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Ten que recibir %sB/%sB de arquivos.\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:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Ten que recibir %sB de arquivos.\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:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Despois desta operación ocuparanse %sB de disco adicionais.\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 "Despois desta operación liberaranse %sB de espazo de disco.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Xurdiron problemas e empregouse -y sen --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 "Especificouse «Só triviais» mais esta non é unha 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Si, fai o que digo!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Está a piques de facer algo perigoso.\n"
+"Para continuar escriba a frase «%s»\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Interromper."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Quere continuar?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Non foi posíbel descargar algúns ficheiros"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Non foi posíbel obter algúns arquivos; probe con apt-get update ou --fix-"
+"missing."
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr ""
+"O emprego conxunto de --fix-missing e intercambio de discos non está admitido"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Non é posíbel corrixir os paquetes non dispoñíbeis."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Interrompendo a instalación."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"O seguinte paquete desapareceu do seu sistema e todos os \n"
+"ficheiros serán sobrescritos por outros paquetes:"
+msgstr[1] ""
+"Os seguintes paquetes desapareceron do seu sistema e todos os \n"
+"ficheiros serán sobrescritos por outros paquetes:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Nota: Isto será feito automaticamente por dpkg."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+"Non se agarda que eliminemos cousas, non se pode iniciar o Retirado "
+"automático"
+
+#: 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 ""
+"Vaia, semella que o Retirado automático destruíu algo que realmente\n"
+"non debería ter feito. Informe deste erro de apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "A seguinte información pode axudar a solucionar a situación:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Produciuse un erro interno, o Retirado automático estragou cousas"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
 "required:"
 msgstr[0] ""
 "O seguinte paquete foi instalado automaticamente e xa non é necesario:"
@@ -1312,7 +1555,7 @@ msgstr[1] ""
 "Os seguintes paquetes foron instalados automaticamente e xa non son "
 "necesarios:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:492
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1321,18 +1564,18 @@ msgstr[0] "%lu paquete foi instalado automaticamente e xa non é necesario.\n"
 msgstr[1] ""
 "%lu paquetes foron instalados automaticamente e xa non son necesarios.\n"
 
-#: apt-private/private-install.cc:519
+#: 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] "Empregue «apt-get autoremove» para eliminalos."
 msgstr[1] "Empregue «apt-get autoremove» para eliminalos."
 
-#: apt-private/private-install.cc:612
+#: apt-private/private-install.cc:587
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Pode querer executar «apt-get -f install» para corrixir isto:"
 
-#: apt-private/private-install.cc:614
+#: apt-private/private-install.cc:589
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1340,7 +1583,7 @@ msgstr ""
 "Dependencias incumpridas. Probe «apt-get -f install» sen paquetes (ou "
 "especifique unha solución)."
 
-#: apt-private/private-install.cc:638
+#: apt-private/private-install.cc:612
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1353,329 +1596,100 @@ msgstr ""
 "algúns paquetes solicitados aínda non se creasen ou que se movesen da "
 "entrada."
 
-#: apt-private/private-install.cc:659
+#: apt-private/private-install.cc:633
 msgid "Broken packages"
 msgstr "Paquetes estragados"
 
-#: apt-private/private-install.cc:712
+#: apt-private/private-install.cc:710
 msgid "The following extra packages will be installed:"
 msgstr "Instalaranse os seguintes paquetes extra:"
 
-#: apt-private/private-install.cc:802
+#: apt-private/private-install.cc:800
 msgid "Suggested packages:"
 msgstr "Paquetes suxeridos:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:801
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados:"
 
-#: apt-private/private-install.cc:825
+#: apt-private/private-install.cc:823
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Omítese %s, xa está instalado e non se especificou a anovación.\n"
 
-#: apt-private/private-install.cc:829
+#: apt-private/private-install.cc:827
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "Omitindo %s, non está instalado e só se solicitaron as anovacións.\n"
 
-#: apt-private/private-install.cc:841
+#: apt-private/private-install.cc:839
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "A reinstalación de %s non é posíbel, non se pode descargar.\n"
 
-#: apt-private/private-install.cc:846
+#: apt-private/private-install.cc:844
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s xa é a versión máis recente.\n"
 
-#: apt-private/private-install.cc:894
+#: apt-private/private-install.cc:892
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
 
-#: apt-private/private-install.cc:899
+#: apt-private/private-install.cc:897
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versión seleccionada «%s» (%s) para «%s» xa que «%s»\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
+#: apt-private/private-install.cc:939
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr "O paquete %s non está instalado, así que non foi retirado\n"
 
-#: apt-private/private-install.cc:947
+#: apt-private/private-install.cc:945
 #, fuzzy, c-format
 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:129
-msgid "Listing"
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
 msgstr ""
 
-#: apt-private/private-list.cc:159
-#, 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-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVISO: Non se poden autenticar os seguintes paquetes!"
 
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Corrixindo as dependencias..."
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "Ignórase o aviso de autenticación.\n"
 
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " fallou."
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Non foi posíbel autenticar algúns paquetes"
 
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Non foi posíbel corrixir as dependencias."
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Instalar estes paquetes sen verificación?"
 
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Non foi posíbel minimizar o conxunto de anovacións"
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Non foi posíbel obter %s  %s\n"
 
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Feito"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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
+#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
 #, 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:35
-#, 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:97
-#, 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:101
-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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVISO: Non se poden autenticar os seguintes paquetes!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Ignórase o aviso de autenticación.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Non foi posíbel autenticar algúns paquetes"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Instalar estes paquetes sen verificación?"
+msgid "Couldn't determine free space in %s"
+msgstr "Non foi posíbel determinar o espazo libre en %s"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:188
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Non foi posíbel obter %s  %s\n"
+msgid "You don't have enough free space in %s."
+msgstr "Non hai espazo libre abondo en %s."
 
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
@@ -1691,41 +1705,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Calculando a anovación"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Feito"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Teño "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Rcb:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Obtivéronse %sB en %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Traballando]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1738,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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,205 +1830,459 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Mesturando a información sobre paquetes dispoñíbeis"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Chamouse a DropNode nun nodo aínda ligado"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Non foi posíbel atopar o elemento hash"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Non foi posíbel reservar un desvío"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Produciuse un erro interno en AddDiversion"
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Téntase sobrescribir un desvío, %s -> %s e %s/%s"
-
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Desvío %s -> %s engadido dúas veces"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uso: apt-extracttemplates fich1 [fich2 ...]\n"
+"\n"
+"apt-extracttemplates é unha ferramenta para extraer información\n"
+"de configuración e patróns dos paquetes debian\n"
+"\n"
+"Opcións:\n"
+"  -h   Este texto de axuda\n"
+"  -t   Estabelece o directorio temporal\n"
+"  -c=? Le este ficheiro de configuración\n"
+"  -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
+"tmp\n"
 
-#: apt-inst/filelist.cc:549
+#: 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:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Ficheiro de configuración %s/%s duplicado"
+msgid "Unable to write to %s"
+msgstr "Non é posíbel escribir en %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: 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: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: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 "The path %s is too long"
-msgstr "A ruta %s é longa de máis"
+msgid "Error processing directory %s"
+msgstr "Produciuse un erro ao procesar o directorio %s"
 
-#: apt-inst/extract.cc:132
+#: 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:400
+msgid "Error writing header to contents file"
+msgstr "Produciuse un erro ao gravar a cabeceira no ficheiro de contido"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Desempaquetando %s máis dunha vez"
+msgid "Error processing contents %s"
+msgstr "Produciuse un erro ao procesar o contido %s"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Emprego: apt-ftparchive [opcións] orde\n"
+"Ordes: packages rutabinaria [fichoverride [prefixoruta]]\n"
+"       sources rutafontes [fichoverride [prefixoruta]]\n"
+"       contents ruta\n"
+"       release ruta\n"
+"       generate config [grupos]\n"
+"       clean config\n"
+"\n"
+"apt-ftparchive xera ficheiros de índices para arquivos de Debian. Admite\n"
+"varios estilos de xeración, de totalmente automática a substitutos "
+"funcionais\n"
+"de dpkg-scanpackages e dpkg-scansources\n"
+"\n"
+"apt-ftparchive xera ficheiros Packages dunha árbore de .debs. O ficheiro\n"
+"Packages ten o contido de todos os campos de control de cada paquete, así\n"
+"coma a suma MD5 e o tamaño do ficheiro. Admitese un ficheiro de «overrides»\n"
+"para forzar o valor dos campos Priority e Section.\n"
+"\n"
+"De xeito semellante, apt-ftparchive xera ficheiros Sources dunha árbore de\n"
+".dscs. Pódese empregar a opción --source-override para especificar un "
+"ficheiro\n"
+"de «overrides» para fontes.\n"
+"\n"
+"As ordes «packages» e «sources» deberían executarse na raíz da árbore.\n"
+"«Rutabinaria» debería apuntar á base da busca recursiva e o ficheiro\n"
+"«fichoverride» debería conter os modificadores de «override». «Prefixoruta»\n"
+"engádese aos campos de nomes de ficheiros se está presente. Un exemplo\n"
+"de emprego do arquivo de Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opcións:\n"
+"  -h    Este texto de axuda\n"
+"  --md5 Controla a xeración de MD5\n"
+"  -s=?  Ficheiro de «override» de fontes\n"
+"  -q    Non produce ningunha saída por pantalla\n"
+"  -d=?  Escolle a base de datos de caché opcional\n"
+"  --no-delink Activa o modo de depuración de desligado\n"
+"  --contents  Controla a xeración do ficheiro de contido\n"
+"  -c=?  Le este ficheiro de configuración\n"
+"  -o=?  Estabelece unha opción de configuración"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Non coincide ningunha selección"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "O directorio %s está desviado"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Faltan ficheiros no grupo de ficheiros de paquetes «%s»"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "O paquete tenta escribir no destino do desvío %s/%s"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "A base de datos estaba danada, cambiouse o nome do ficheiro a %s.old"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "A ruta do desvío é longa de máis"
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "A base de datos é antiga, tentando anovar %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"O formato da base de datos non é correcto. Se a anovou desde unha versión "
+"antiga de apt, retirea e volva a crear a base de datos"
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Non é posíbel abrir o ficheiro de base de datos %s: %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Non foi posíbel determinar o estado %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Non foi posíbel ler a ligazón %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "O arquivo non ten un rexistro de control"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Non é posíbel obter un cursor"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Non foi posíbel cambiar o nome de %s a %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "A: non é posíbel ler o directorio %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "O directorio %s estase a substituír por algo que non é un directorio"
+msgid "W: Unable to stat %s\n"
+msgstr "A: non é posíbel atopar %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Non foi posíbel atopar o nodo no seu contedor hash"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "A ruta é longa de máis"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "A: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: os erros aplícanse ao ficheiro "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Coincidencia na sobrescritura sen versión para %s"
+msgid "Failed to resolve %s"
+msgstr "Non foi posíbel solucionar %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Fallou o percorrido da árbore"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "O ficheiro %s/%s sobrescribe o do paquete %s"
+msgid "Failed to open %s"
+msgstr "Non foi posíbel abrir %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Non é posíbel determinar o estado %s"
+msgid " DeLink %s [%s]\n"
+msgstr " DesLig %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Non foi posíbel escribir no ficheiro «%s»"
+msgid "Failed to readlink %s"
+msgstr "Non foi posíbel ler a ligazón %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Non foi posíbel pechar o ficheiro %s"
+msgid "Failed to unlink %s"
+msgstr "Non foi posíbel desligar %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Este non é un arquivo DEB correcto, falta o membro «%s»"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Non foi posíbel ligar %s con %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Produciuse un erro interno, non foi posíbel atopar o membro %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Acadouse o límite de desligado de %sB.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Ficheiro de control non analizábel"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "O arquivo non tiña un campo Package"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Sinatura de arquivo incorrecta"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Produciuse un erro ao ler a cabeceira do membro do arquivo"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:712
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "Cabeceira do membro do arquivo incorrecta %s"
+msgid "  %s has no source override entry\n"
+msgstr "  %s non ten unha entrada de «override» de código fonte\n"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Cabeceira do membro do arquivo incorrecta"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "O arquivo é curto de máis"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Non foi posíbel reservar memoria"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Non é posíbel puido abrir %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "«Override» %s liña %lu incorrecta (1)"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Non foi posíbel ler o ficheiro de «override» %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "«Override» %s liña %lu incorrecta (1)"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "«Override» %s liña %lu incorrecta (2)"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "«Override» %s liña %lu incorrecta (3)"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algoritmo de compresión «%s» descoñecido"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "A saída comprimida %s precisa dun conxunto de compresión"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Non foi posíbel crear o FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Non foi posíbel facer a bifurcación"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Non foi posíbel ler as cabeceiras dos arquivos"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Fillo de compresión"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Non foi posíbel crear as canles"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Produciuse un erro interno, non foi posíbel crear %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Non foi posíbel executar gzip "
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Produciuse un fallo na E/S do subproceso/ficheiro"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Arquivo danado"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Non foi posíbel ler ao calcular o MD5"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "A suma de comprobación do arquivo tar non coincide, está danado"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Xurdiu un problema ao desligar %s"
 
-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Tipo de cabeceira TAR %u descoñecido, membro %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:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uso: apt-extracttemplates fich1 [fich2 ...]\n"
+"\n"
+"apt-extracttemplates é unha ferramenta para extraer información\n"
+"de configuración e patróns dos paquetes debian\n"
+"\n"
+"Opcións:\n"
+"  -h   Este texto de axuda\n"
+"  -t   Estabelece o directorio temporal\n"
+"  -c=? Le este ficheiro de configuración\n"
+"  -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
+"tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Rexistro de paquete descoñecido!"
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Emprego: apt-sortpkgs [opcións] fich1 [fich2 ...]\n"
+"\n"
+"apt-sortpkgs é unha ferramenta simple para ordenar ficheiros de paquetes.\n"
+"A opción -s emprégase para indicar o tipo de ficheiro que é.\n"
+"\n"
+"Opcións:\n"
+"  -h   Este texto de axuda\n"
+"  -s   Emprega ordenamento por ficheiros fonte\n"
+"  -c=? Le este ficheiro de configuración\n"
+"  -o=? Estabelece unha opción de configuración; por exemplo, -o dir::cache=/"
+"tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "Executando dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "O sistema de empaquetado «%s» non está admitido"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Non é posíbel determinar un tipo de sistema de empaquetado axeitado"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Escribíronse %i rexistros.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Escribíronse %i rexistros con %i ficheiros que faltan.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Escribíronse %i rexistros con %i ficheiros que non coinciden\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2039,6 +2299,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 ""
@@ -2053,158 +2333,338 @@ 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:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Caché de paquetes baleira"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "PreDepende"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Suxire"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Conflitos"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Substitúe a"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Fai obsoleto a"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Estraga"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Mellora"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "requirido"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "estándar"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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/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:118
+#: 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:169
+#: 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/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/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/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Non é posíbel analizar %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:1196
+#, 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: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/acquire-worker.cc:455
-#, 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/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Recollendo as provisións de ficheiros"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "O tipo de ficheiros de índices «%s» non está admitido"
+#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Construindo a árbore de dependencias"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versións candidatas"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Xeración de dependencias"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: 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/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Non foi posíbel abrir o ficheiro de estado %s"
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s"
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "A sumas «hash» non coinciden"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Os tamaños non coinciden"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Operación incorrecta: %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Produciuse un erro de escritura"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Produciuse un erro durante a verificación da sinatura. O repositorio non foi "
+"actualizado, empregaranse os ficheiros de índice anteriores. Erro de GPG: "
+"%s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: 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"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "O directorio %s está desviado"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2213,45 +2673,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:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Produciuse un erro durante a verificación da sinatura. O repositorio non foi "
-"actualizado, empregaranse os ficheiros de índice anteriores. Erro de GPG: "
-"%s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Produciuse un erro de GPG: %s %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2260,12 +2711,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:1992
+#: 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:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2273,123 +2724,38 @@ msgstr ""
 "Os ficheiros de índices de paquetes están danados. Non hai un campo "
 "Filename: para o paquete %s."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "O tipo de ficheiros de índices «%s» non está admitido"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Non é posíbel analizar %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Produciuse un erro ao procesar %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Lendo as listas de paquetes"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Recollendo as provisións de ficheiros"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Non é posíbel escribir en %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Debe introducir algúns URI «orixe» no seu ficheiro sources.list"
@@ -2417,7 +2783,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2426,12 +2792,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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2442,10 +2808,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"
@@ -2516,11 +2886,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"
 
@@ -2532,7 +2902,7 @@ msgstr ""
 "O paquete %s ten que ser reinstalado, mais non é posíbel atopar o seu "
 "arquivo."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2540,267 +2910,194 @@ msgstr ""
 "Erro, pkgProblemResolver::Resolve xerou interrupcións, isto pode estar "
 "causado por paquetes retidos."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Non é posíbel analizar o ficheiro de paquetes %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Non se puido analizar o ficheiro de publicación %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Non hai seccións no ficheiro de publicación %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, 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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Non se atopou a publicación «%s» de «%s»"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Non se atopou a versión «%s» de «%s»"
 
-#: apt-pkg/cacheset.cc:603
+#: 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:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Non é posíbel seleccionar nin a versión instalada nin a candidata do paquete "
-"«%s» xa que non ten ningunha delas"
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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 ""
+"Non é posíbel seleccionar nin a versión instalada nin a candidata do paquete "
+"«%s» xa que non ten ningunha delas"
+
+#: 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:132
+#, 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:145
+#, 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:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "A entrada «Date» no ficheiro de publicación %s non é válida"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Non se atopou a selección %s"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Non foi posíbel abrir o ficheiro de bloqueo %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Non foi posíbel obter o bloqueo %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 "A lista de ficheiros non pode ser creada como «%s» non é un directorio"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Ignorando «%s» no directorio «%s» xa que non é un ficheiro regular"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "Ignorando o ficheiro «%s» no directorio «%s» xa que non ten extensión de nome"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2808,75 +3105,75 @@ msgstr ""
 "Ignorando o ficheiro «%s» no directorio «%s» xa que ten  unha extensión de "
 "nome incorrecta"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "O subproceso %s recibiu un fallo de segmento."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "O subproceso %s recibiu o sinal %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "O subproceso %s devolveu un código de erro (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "O subproceso %s saíu de xeito inesperado"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Produciuse un problema ao pechar o arquivo gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Non foi posíbel abrir o ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Non foi posíbel abrir o descritor de ficheiro %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Non foi posíbel crear o IPC do subproceso"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Non foi posíbel executar o compresor "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lectura, aínda hai %lu para ler pero non queda ningún"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "escritura, aínda hai %lu para escribir pero non se puido"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Produciuse un problema ao pechar o ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Produciuse un problema ao renomear o ficheiro %s a %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Produciuse un problema ao desligar o ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Produciuse un problema ao sincronizar o ficheiro"
 
@@ -2965,114 +3262,108 @@ 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:519
+#: 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:633
+#: 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:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Non ha ningún chaveiro instalado en %s."
-
-#: 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"
@@ -3082,12 +3373,12 @@ msgstr "Operación incorrecta: %s"
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Retirando %s"
@@ -3108,81 +3399,81 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta o directorio «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparandose para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "Instalouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "Retirouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "Retirouse %s completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependencias - déixase sen configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3190,7 +3481,7 @@ 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:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3198,7 +3489,7 @@ 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:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3206,7 +3497,7 @@ 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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 "
@@ -3215,7 +3506,7 @@ 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3236,422 +3527,186 @@ msgstr ""
 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"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uso: apt-extracttemplates fich1 [fich2 ...]\n"
-"\n"
-"apt-extracttemplates é unha ferramenta para extraer información\n"
-"de configuración e patróns dos paquetes debian\n"
-"\n"
-"Opcións:\n"
-"  -h   Este texto de axuda\n"
-"  -t   Estabelece o directorio temporal\n"
-"  -c=? Le este ficheiro de configuración\n"
-"  -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
-"tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Non é posíbel determinar o estado %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Produciuse un erro ao procesar o directorio %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "A lista de extensións de fontes é longa de máis"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Produciuse un erro ao gravar a cabeceira no ficheiro de contido"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Produciuse un erro ao procesar o contido %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Emprego: apt-ftparchive [opcións] orde\n"
-"Ordes: packages rutabinaria [fichoverride [prefixoruta]]\n"
-"       sources rutafontes [fichoverride [prefixoruta]]\n"
-"       contents ruta\n"
-"       release ruta\n"
-"       generate config [grupos]\n"
-"       clean config\n"
-"\n"
-"apt-ftparchive xera ficheiros de índices para arquivos de Debian. Admite\n"
-"varios estilos de xeración, de totalmente automática a substitutos "
-"funcionais\n"
-"de dpkg-scanpackages e dpkg-scansources\n"
-"\n"
-"apt-ftparchive xera ficheiros Packages dunha árbore de .debs. O ficheiro\n"
-"Packages ten o contido de todos os campos de control de cada paquete, así\n"
-"coma a suma MD5 e o tamaño do ficheiro. Admitese un ficheiro de «overrides»\n"
-"para forzar o valor dos campos Priority e Section.\n"
-"\n"
-"De xeito semellante, apt-ftparchive xera ficheiros Sources dunha árbore de\n"
-".dscs. Pódese empregar a opción --source-override para especificar un "
-"ficheiro\n"
-"de «overrides» para fontes.\n"
-"\n"
-"As ordes «packages» e «sources» deberían executarse na raíz da árbore.\n"
-"«Rutabinaria» debería apuntar á base da busca recursiva e o ficheiro\n"
-"«fichoverride» debería conter os modificadores de «override». «Prefixoruta»\n"
-"engádese aos campos de nomes de ficheiros se está presente. Un exemplo\n"
-"de emprego do arquivo de Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opcións:\n"
-"  -h    Este texto de axuda\n"
-"  --md5 Controla a xeración de MD5\n"
-"  -s=?  Ficheiro de «override» de fontes\n"
-"  -q    Non produce ningunha saída por pantalla\n"
-"  -d=?  Escolle a base de datos de caché opcional\n"
-"  --no-delink Activa o modo de depuración de desligado\n"
-"  --contents  Controla a xeración do ficheiro de contido\n"
-"  -c=?  Le este ficheiro de configuración\n"
-"  -o=?  Estabelece unha opción de configuración"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Non coincide ningunha selección"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Faltan ficheiros no grupo de ficheiros de paquetes «%s»"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "A base de datos estaba danada, cambiouse o nome do ficheiro a %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "A base de datos é antiga, tentando anovar %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"O formato da base de datos non é correcto. Se a anovou desde unha versión "
-"antiga de apt, retirea e volva a crear a base de datos"
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Non é posíbel abrir o ficheiro de base de datos %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Non foi posíbel ler a ligazón %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "O arquivo non ten un rexistro de control"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Non é posíbel obter un cursor"
+"administrador?"
 
-#: ftparchive/writer.cc:91
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: non é posíbel ler o directorio %s\n"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"dpkg interrompeuse, debe executar manualmente «%s» para corrixir o problema. "
 
-#: ftparchive/writer.cc:96
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A: non é posíbel atopar %s\n"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Non está bloqueado"
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Chamouse a DropNode nun nodo aínda ligado"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "A: "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Non foi posíbel atopar o elemento hash"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: os erros aplícanse ao ficheiro "
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Non foi posíbel reservar un desvío"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Non foi posíbel solucionar %s"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Produciuse un erro interno en AddDiversion"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Fallou o percorrido da árbore"
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Téntase sobrescribir un desvío, %s -> %s e %s/%s"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to open %s"
-msgstr "Non foi posíbel abrir %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Desvío %s -> %s engadido dúas veces"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DesLig %s [%s]\n"
+msgid "Duplicate conf file %s/%s"
+msgstr "Ficheiro de configuración %s/%s duplicado"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Non foi posíbel ler a ligazón %s"
+msgid "The path %s is too long"
+msgstr "A ruta %s é longa de máis"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Non foi posíbel desligar %s"
+msgid "Unpacking %s more than once"
+msgstr "Desempaquetando %s máis dunha vez"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Non foi posíbel ligar %s con %s"
+msgid "The directory %s is diverted"
+msgstr "O directorio %s está desviado"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:152
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Acadouse o límite de desligado de %sB.\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "O paquete tenta escribir no destino do desvío %s/%s"
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "O arquivo non tiña un campo Package"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "A ruta do desvío é longa de máis"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s non ten unha entrada de «override»\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "O directorio %s estase a substituír por algo que non é un directorio"
+
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Non foi posíbel atopar o nodo no seu contedor hash"
+
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "A ruta é longa de máis"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  O mantedor de %s é %s, non %s\n"
+msgid "Overwrite package match with no version for %s"
+msgstr "Coincidencia na sobrescritura sen versión para %s"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s non ten unha entrada de «override» de código fonte\n"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "O ficheiro %s/%s sobrescribe o do paquete %s"
 
-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s tampouco ten unha entrada de «override» de binarios\n"
+msgid "Unable to stat %s"
+msgstr "Non é posíbel determinar o estado %s"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Non foi posíbel reservar memoria"
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Non foi posíbel escribir no ficheiro «%s»"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Unable to open %s"
-msgstr "Non é posíbel puido abrir %s"
+msgid "Failed to close file %s"
+msgstr "Non foi posíbel pechar o ficheiro %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "«Override» %s liña %lu incorrecta (1)"
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Este non é un arquivo DEB correcto, falta o membro «%s»"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Non foi posíbel ler o ficheiro de «override» %s"
+msgid "Internal error, could not locate member %s"
+msgstr "Produciuse un erro interno, non foi posíbel atopar o membro %s"
 
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "«Override» %s liña %lu incorrecta (1)"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Ficheiro de control non analizábel"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "«Override» %s liña %lu incorrecta (2)"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Sinatura de arquivo incorrecta"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "«Override» %s liña %lu incorrecta (3)"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Produciuse un erro ao ler a cabeceira do membro do arquivo"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritmo de compresión «%s» descoñecido"
+msgid "Invalid archive member header %s"
+msgstr "Cabeceira do membro do arquivo incorrecta %s"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "A saída comprimida %s precisa dun conxunto de compresión"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Cabeceira do membro do arquivo incorrecta"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Non foi posíbel crear o FILE*"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "O arquivo é curto de máis"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Non foi posíbel facer a bifurcación"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Non foi posíbel ler as cabeceiras dos arquivos"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Fillo de compresión"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Non foi posíbel crear as canles"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Produciuse un erro interno, non foi posíbel crear %s"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Non foi posíbel executar gzip "
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Produciuse un fallo na E/S do subproceso/ficheiro"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Arquivo danado"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Non foi posíbel ler ao calcular o MD5"
+#: 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"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Xurdiu un problema ao desligar %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s"
 
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uso: apt-extracttemplates fich1 [fich2 ...]\n"
-"\n"
-"apt-extracttemplates é unha ferramenta para extraer información\n"
-"de configuración e patróns dos paquetes debian\n"
-"\n"
-"Opcións:\n"
-"  -h   Este texto de axuda\n"
-"  -t   Estabelece o directorio temporal\n"
-"  -c=? Le este ficheiro de configuración\n"
-"  -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
-"tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Espazo total de versións de dependencias: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Rexistro de paquete descoñecido!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Non hai espazo libre abondo en %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Emprego: apt-sortpkgs [opcións] fich1 [fich2 ...]\n"
-"\n"
-"apt-sortpkgs é unha ferramenta simple para ordenar ficheiros de paquetes.\n"
-"A opción -s emprégase para indicar o tipo de ficheiro que é.\n"
-"\n"
-"Opcións:\n"
-"  -h   Este texto de axuda\n"
-"  -s   Emprega ordenamento por ficheiros fonte\n"
-"  -c=? Le este ficheiro de configuración\n"
-"  -o=? Estabelece unha opción de configuración; por exemplo, -o dir::cache=/"
-"tmp\n"
+#~ msgid "Done"
+#~ msgstr "Feito"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Non ha ningún chaveiro instalado en %s."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/hu.po b/po/hu.po
index e65d9789f..313f3a492 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: 2015-01-16 04:37-0500\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,149 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Csomagnevek összesen : "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Csomagstruktúrák összesen: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Normális csomagok: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Teljesen virtuális csomagok: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Egyedi virtuális csomagok: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Vegyes virtuális csomagok: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Hiányzik: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Különböző verziók összesen: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Összes különböző leírás: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Függőségek összesen: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Verzió/Fájl kapcsolatok összesen: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Leírás/Fájl kapcsolatok összesen: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "„Biztosítja” kapcsolatok összesen: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Minták összesen: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Függőségiverzió-terület összesen: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Slack terület összesen: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Nyilvántartott terület összesen: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: 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:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Csomagfájlok:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Rögzített csomagok:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(nem található)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Telepítve: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Jelölt: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(nincs)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Csomagrögzítés: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Verziótáblázat:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -239,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"
@@ -260,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."
 
@@ -295,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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: 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:454
+#: 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:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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."
@@ -345,25 +341,25 @@ msgstr ""
 "Ez a parancs elavult. Használja helyette az „apt-mark auto” és az „apt-mark "
 "auto” parancsokat."
 
-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: 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:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -373,7 +369,7 @@ msgstr ""
 "karbantartva:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -384,80 +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:839
+#: 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"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Nem határozható meg a szabad hely mennyisége itt: %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Nincs elég szabad hely itt: %s"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Forrás letöltése: %s\n"
 
-#: cmdline/apt-get.cc:924
+#: 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:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: 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:968
+#: 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:996
+#: 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:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Hiba a gyermekfolyamatnál"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -466,17 +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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -519,30 +514,30 @@ 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:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Nem sikerült az építési függőségeket feldolgozni"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Változási napló ehhez: %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Támogatott modulok:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -659,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -806,12 +801,12 @@ msgstr "A lemez nem található."
 msgid "File not found"
 msgstr "A fájl nem található"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Nem érhető el"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "A módosítási idő beállítása sikertelen"
 
@@ -820,34 +815,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Érvénytelen URI, helyi URI-k nem kezdődhetnek //-rel"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Bejelentkezés"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Nem lehet a partner nevét megállapítani"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Nem lehet a helyi nevet megállapítani"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "A kiszolgáló visszautasította a kapcsolatot: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Hibás USER, a kiszolgáló üzenete: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Hibás PASS, a kiszolgáló üzenete: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -855,126 +850,126 @@ msgstr ""
 "Meg lett adva proxy kiszolgáló, de nincs bejelentkezési parancsfájl és az "
 "Acquire::ftp::ProxyLogin üres."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "A bejelentkezési parancsfájl „%s” parancsa sikertelen, a kiszolgáló üzenete: "
 "%s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Hibás TYPE, a kiszolgáló üzenete: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Időtúllépés a kapcsolatban"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "A kiszolgáló lezárta a kapcsolatot"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Olvasási hiba"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "A válasz túlcsordította a puffert."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Protokollhiba"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Írási hiba"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Nem lehet létrehozni a foglalatot"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Nem lehet kapcsolódni az adatfoglalathoz, a kapcsolat túllépte az időkorlátot"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Sikertelen"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Nem lehet kapcsolódni a passzív foglalathoz."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "A getaddrinfo nem talált figyelőfoglalatot"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Nem lehet összekapcsolódni a foglalattal"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Nem lehet figyelni a foglalaton"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Nem lehet megállapítani a foglalat nevét"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Nem lehet PORT parancsot küldeni"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ismeretlen címcsalád: %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Hibás EPRT, a kiszolgáló üzenete: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Az adatfoglalathoz kapcsolódás túllépte az időkorlátot"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Nem lehet elfogadni a kapcsolatot"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nem lehet letölteni a fájlt, a kiszolgáló üzenete: „%s”"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Az adatfoglalat túllépte az időkorlátot"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Az adatátvitel sikertelen, a kiszolgáló üzenete: „%s”"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Lekérdezés"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Nem lehet meghívni "
 
@@ -1040,37 +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:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Legalább egy aláírás érvénytelen."
 
-#: methods/gpgv.cc:174
+#: 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?)"
+"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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Ismeretlen apt-key futtatási hiba"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1078,35 +1074,35 @@ msgstr ""
 "Az alábbi aláírások nem ellenőrizhetők, mert a nyilvános kulcs nem érhető "
 "el:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "Az üres fájlok biztosan nem érvényes csomagok"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Hiba a fájl írásakor"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Hiba a kiszolgálóról olvasáskor"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Hiba a fájl írásakor"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "A kiválasztás sikertelen"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Időtúllépés a kapcsolatban"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Hiba a kimeneti fájl írásakor"
 
@@ -1138,291 +1134,30 @@ msgstr "A HTTP-kiszolgáló tartománytámogatása sérült"
 msgid "Unknown date format"
 msgstr "Ismeretlen dátumformátum"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Rossz fejlécadatok"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Sikertelen kapcsolódás"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "Belső hiba"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Csomagokat kellene eltávolítani, de az eltávolítás nem engedélyezett."
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Belső hiba, a rendezés nem fejeződött be"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr "A méretek nem egyeznek, írjon az apt@packages.debian.org címre"
-
-#. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Letöltendő adatmennyisé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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Letöltendő adatmennyiség: %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
-#: apt-private/private-install.cc:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "A művelet után %sB lemezterület kerül felhasználásra.\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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "A művelet után %sB lemezterület szabadul fel.\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Nincs elég szabad hely itt: %s."
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Problémák vannak, és a -y kapcsolót használta --force-yes nélkül"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "A „Trivial Only” meg van adva, de ez nem egy triviális művelet."
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Igen, tedd amit mondok!"
-
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Ártalmasnak tűnő műveletet készül végrehajtani.\n"
-"A folytatáshoz írja be ezt a mondatot: „%s”\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Megszakítva."
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Folytatni akarja?"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Néhány fájlt nem sikerült letölteni"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Nem lehet letölteni néhány archívumot. Próbálja futtatni az „apt-get update” "
-"parancsot, vagy használja a --fix-missing kapcsolót."
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "A --fix-missing és az adathordozó-csere jelenleg nem támogatott"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Nem lehet javítani a hiányzó csomagokat."
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Telepítés megszakítása."
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"A következő csomag eltűnt a rendszerből, mivel\n"
-"az összes fájlt más csomagok fölülírták:"
-msgstr[1] ""
-"A következő csomagok eltűntek a rendszerből, mivel\n"
-"az összes fájlt más csomagok fölülírták:"
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Megjegyzés: ezt a dpkg automatikusan és szándékosan hajtja végre."
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Nem kellene semmit törölni, az AutoRemover nem indítható"
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Úgy tűnik, az AutoRemover hibát okozott, ez nem történhetne meg.\n"
-"Küldjön hibajelentést az apt csomaghoz."
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Az alábbi információk segíthetnek megoldani a problémát:"
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Belső hiba, az AutoRemover sérült"
-
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"A következő csomag automatikusan lett telepítve, és már nincs rá szükség:"
-msgstr[1] ""
-"A következő csomagok automatikusan lettek telepítve, és már nincs rájuk "
-"szükség:"
-
-#: apt-private/private-install.cc:517
+#: methods/server.cc:589
 #, c-format
-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 csomag automatikusan lett telepítve, és már nincs rá szükség.\n"
-msgstr[1] ""
-"%lu csomag automatikusan lett telepítve, és már nincs rájuk szükség.\n"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Ezt az „apt-get autoremove” paranccsal törölheti."
-msgstr[1] "Ezeket az „apt-get autoremove” paranccsal törölheti."
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"Próbálja futtatni az „apt-get -f install” parancsot az alábbiak javításához:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Teljesítetlen függőségek. Próbálja kiadni az „apt-get -f install” parancsot "
-"csomagok nélkül (vagy telepítse a függőségeket is!)."
-
-#: apt-private/private-install.cc:638
 msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Néhány csomagot nem lehetett telepíteni. Ez azt jelentheti, hogy\n"
-"egy lehetetlen állapotot kért, vagy ha az unstable disztribúciót\n"
-"használja, akkor néhány igényelt csomag még nem készült el vagy ki\n"
-"lett mozdítva az Incoming-ból."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Törött csomagok"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Javasolt csomagok:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Ajánlott csomagok:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "%s kihagyása, ez már telepítve van, és a frissítés nincs beállítva.\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "„%s” kihagyása, nincs telepítve, és csak frissítések lettek kérve.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s már a legújabb verzió.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”, a(z) „%s” miatt\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"A(z) „%s” csomag nincs telepítve, így nem lett törölve. Erre gondolt: „%s”?\n"
 
-#: apt-private/private-install.cc:947
-#, c-format
-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"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "Belső hiba"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1430,31 +1165,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "Függőségek javítása..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " sikertelen."
 
-#: apt-private/private-cachefile.cc:99
+#: 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:102
+#: 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:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " Kész"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: 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."
 
@@ -1618,7 +1353,7 @@ msgstr "I"
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: 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"
@@ -1627,7 +1362,7 @@ msgstr "Regex fordítási hiba - %s"
 msgid "The update command takes no arguments"
 msgstr "Az update parancsnak nincsenek argumentumai"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1635,13 +1370,17 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
+#: 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] ""
@@ -1663,27 +1402,303 @@ msgstr ""
 "      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:36
+#: 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!"
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Csomagokat kellene eltávolítani, de az eltávolítás nem engedélyezett."
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Belső hiba, a rendezés nem fejeződött be"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr "A méretek nem egyeznek, írjon az apt@packages.debian.org címre"
+
+#. 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Letöltendő adatmennyisé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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Letöltendő adatmennyiség: %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
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "A művelet után %sB lemezterület kerül felhasználásra.\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 "A művelet után %sB lemezterület szabadul fel.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Problémák vannak, és a -y kapcsolót használta --force-yes nélkül"
+
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "A „Trivial Only” meg van adva, de ez nem egy triviális művelet."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Igen, tedd amit mondok!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Ártalmasnak tűnő műveletet készül végrehajtani.\n"
+"A folytatáshoz írja be ezt a mondatot: „%s”\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Megszakítva."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Folytatni akarja?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Néhány fájlt nem sikerült letölteni"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Nem lehet letölteni néhány archívumot. Próbálja futtatni az „apt-get update” "
+"parancsot, vagy használja a --fix-missing kapcsolót."
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "A --fix-missing és az adathordozó-csere jelenleg nem támogatott"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Nem lehet javítani a hiányzó csomagokat."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Telepítés megszakítása."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"A következő csomag eltűnt a rendszerből, mivel\n"
+"az összes fájlt más csomagok fölülírták:"
+msgstr[1] ""
+"A következő csomagok eltűntek a rendszerből, mivel\n"
+"az összes fájlt más csomagok fölülírták:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Megjegyzés: ezt a dpkg automatikusan és szándékosan hajtja végre."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Nem kellene semmit törölni, az AutoRemover nem indítható"
+
+#: 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 ""
+"Úgy tűnik, az AutoRemover hibát okozott, ez nem történhetne meg.\n"
+"Küldjön hibajelentést az apt csomaghoz."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Az alábbi információk segíthetnek megoldani a problémát:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Belső hiba, az AutoRemover sérült"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"A következő csomag automatikusan lett telepítve, és már nincs rá szükség:"
+msgstr[1] ""
+"A következő csomagok automatikusan lettek telepítve, és már nincs rájuk "
+"szükség:"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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 csomag automatikusan lett telepítve, és már nincs rá szükség.\n"
+msgstr[1] ""
+"%lu csomag automatikusan lett telepítve, és már nincs rájuk szükség.\n"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "Ezt az „apt-get autoremove” paranccsal törölheti."
+msgstr[1] "Ezeket az „apt-get autoremove” paranccsal törölheti."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr ""
+"Próbálja futtatni az „apt-get -f install” parancsot az alábbiak javításához:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Teljesítetlen függőségek. Próbálja kiadni az „apt-get -f install” parancsot "
+"csomagok nélkül (vagy telepítse a függőségeket is!)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Néhány csomagot nem lehetett telepíteni. Ez azt jelentheti, hogy\n"
+"egy lehetetlen állapotot kért, vagy ha az unstable disztribúciót\n"
+"használja, akkor néhány igényelt csomag még nem készült el vagy ki\n"
+"lett mozdítva az Incoming-ból."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Törött csomagok"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Javasolt csomagok:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Ajánlott csomagok:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "%s kihagyása, ez már telepítve van, és a frissítés nincs beállítva.\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "„%s” kihagyása, nincs telepítve, és csak frissítések lettek kérve.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s már a legújabb verzió.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”\n"
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”, a(z) „%s” miatt\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+"A(z) „%s” csomag nincs telepítve, így nem lett törölve. Erre gondolt: „%s”?\n"
+
+#: apt-private/private-install.cc:945
+#, c-format
+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-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "FIGYELMEZTETÉS: Az alábbi csomagok nem hitelesíthetők!"
 
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:98
 msgid "Authentication warning overridden.\n"
 msgstr "A hitelesítési figyelmeztetés felülbírálva.\n"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
 msgid "Some packages could not be authenticated"
 msgstr "Néhány csomag nem hitelesíthető"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 msgid "Install these packages without verification?"
 msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Sikertelen letöltés: %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 "Nem határozható meg a szabad hely mennyisége itt: %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Nincs elég szabad hely itt: %s."
+
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1698,41 +1713,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Frissítés kiszámítása"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Kész"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Találat "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Letöltés:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Mellőz "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Hiba "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Letöltve %sB %s alatt (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Folyamatban]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1745,18 +1752,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1830,205 +1837,457 @@ 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"
 
-#: 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"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "A hash elem nem található!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Nem lehet eltérítést lefoglalni"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Belső hiba az AddDiversion hívásban"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Használat:apt-extracttemplates fájl1 [fájl2 ...]\n"
+"\n"
+"Az apt-extracttemplates egy eszköz konfigurációs- és mintainformációk "
+"debian-\n"
+"csomagokból való kibontására\n"
+"\n"
+"Kapcsolók:\n"
+"  -h   Ez a súgó szöveg\n"
+"  -t   Beállítja az átmeneti könyvtárat\n"
+"  -c=? Ezt a konfigurációs fájlt olvassa be\n"
+"  -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Kísérlet eltérítés felülírására: %s -> %s és %s/%s"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s nem érhető el"
 
-#: apt-inst/filelist.cc:506
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "A(z) %s -> %s eltérítés hozzáadásának duplázása"
+msgid "Unable to write to %s"
+msgstr "Nem lehet írni ebbe: %s"
 
-#: apt-inst/filelist.cc:549
+#: 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: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: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 "Duplicate conf file %s/%s"
-msgstr "Dupla %s/%s konfigurációs fájl"
+msgid "Error processing directory %s"
+msgstr "Hiba a(z) %s könyvtár feldolgozásakor"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: 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:400
+msgid "Error writing header to contents file"
+msgstr "Hiba a tartalomfájl fejlécének írásakor"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "A(z) %s útvonal túl hosszú"
+msgid "Error processing contents %s"
+msgstr "Hiba %s tartalmának feldolgozásakor"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Használat: apt-ftparchive [kapcsolók] parancs\n"
+"Parancsok: packages binarypath [felülbírálófájl [útvonalelőtag]]\n"
+"           sources srcpath [felülbírálófájl [útvonalelőtag]]\n"
+"           contents útvonal\n"
+"           release útvonal\n"
+"           generate konfigfájl [csoportok]\n"
+"           clean konfigfájl\n"
+"\n"
+"Az apt-ftparchive indexfájlokat generál a Debian archívumokhoz. A generálás\n"
+"sok stílusát támogatja, a teljesen automatizálttól kezdve a\n"
+"dpkg-scanpackages és a dpkg-scansources funkcionális helyettesítéséig.\n"
+"\n"
+"Az apt-ftparchive Package fájlokat generál a .deb-ek fájából. A Package\n"
+"fájl minden vezérlő mezőt tartalmaz minden egyes csomagról úgy az MD5\n"
+"hasht mint a fájlméretet. Az override (felülbíráló) fájl támogatott a\n"
+"Prioritás és Szekció mezők értékének kényszerítésére.\n"
+"\n"
+"Hasonlóképpen az apt-ftparchive Sources fájlokat generál .dsc-k fájából.\n"
+"A --source-override opció használható forrás-felülbíráló fájlok megadására\n"
+"\n"
+"A „packages” és „sources” parancsokat a fa gyökeréből kell futtatni.\n"
+"A BinaryPath-nak a rekurzív keresés kiindulópontjára kell mutatnia, és\n"
+"a felülbírálófájlnak a felülbíráló jelzőket kell tartalmaznia. Az "
+"útvonalelőtag\n"
+"hozzáadódik a fájlnév mezőkhöz, ha meg van adva. Felhasználására egy példa "
+"a\n"
+"Debian archívumból:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Kapcsolók:\n"
+"  -h    Ez a súgó szöveg\n"
+"  --md5 MD5 generálás vezérlése\n"
+"  -s=?  Forrás-felülbíráló fájl\n"
+"  -q    Szűkszavú mód\n"
+"  -d=?  Opcionális gyorsítótár-adatbázis kiválasztása\n"
+"  --no-delink „delink” hibakereső mód bekapcsolása\n"
+"  --contents  Tartalom fájl generálásának ellenőrzése\n"
+"  -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:821
+msgid "No selections matched"
+msgstr "Nincs illeszkedő kiválasztás"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "A(z) %s többszöri kicsomagolása"
+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"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "A(z) %s könyvtár eltérítve"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "A DB megsérült, a fájl átnevezve %s.old-ra"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "A csomag megpróbál írni a(z) %s/%s eltérített célpontba"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "A DB régi, kísérlet a következő frissítésére: %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Az eltérített útvonal túl hosszú"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Az adatbázis-formátum érvénytelen. Ha az apt egy korábbi verziójáról "
+"frissített, akkor távolítsa el, és hozza létre újra az adatbázist."
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s elérése sikertelen"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "readlink nem hajtható végre erre: %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Az archívumnak nincs vezérlő rekordja"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Nem sikerült egy mutatóhoz jutni"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "„%s” átnevezése sikertelen erre: %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "A(z) %s könyvtár nem egy könyvtárral lesz helyettesítve"
+msgid "W: Unable to stat %s\n"
+msgstr "F: %s nem érhető el\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Nem sikerült a node helyét megtalálni a hashtárolóban"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "H: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Az útvonal túl hosszú"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "F: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "H: Hibás a fájl "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Csomagtalálat felülírása %s verziója nélkül"
+msgid "Failed to resolve %s"
+msgstr "Nem sikerült feloldani ezt: %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Fabejárás nem sikerült"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt"
+msgid "Failed to open %s"
+msgstr "%s megnyitása sikertelen"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "%s nem érhető el"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "A(z) %s fájl írása sikertelen"
+msgid "Failed to readlink %s"
+msgstr "readlink nem hajtható végre erre: %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "A(z) %s fájl bezárása sikertelen"
+msgid "Failed to unlink %s"
+msgstr "%s törlése sikertelen"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Ez nem egy érvényes DEB archívum, hiányzik a(z) „%s” tag"
+msgid "*** Failed to link %s to %s"
+msgstr "*** %s linkelése sikertelen ehhez: %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Belső hiba, %s tag nem található"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " a DeLink korlátja (%sB) elérve.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Értelmezhetetlen control fájl"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Az archívumnak nem volt csomag mezője"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Érvénytelen archívum-aláírás"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Hiba az archívumtag-fejléc olvasásakor"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:712
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "Érvénytelen archívumtag-fejléc: %s"
+msgid "  %s has no source override entry\n"
+msgstr "  %s nem rendelkezik forrás-felülbíráló bejegyzéssel\n"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Érvénytelen archívumtag-fejléc"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Az archívum túl rövid"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Nem sikerült memóriát lefoglalni"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s megnyitása sikertelen"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "%s felülbírálás deformált a(z) %llu. sorában #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Nem lehet a(z) %s felülbírálófájlt olvasni"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "%s felülbírálás deformált a(z) %llu. sorában #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "%s felülbírálás deformált a(z) %llu. sorában #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "%s felülbírálás deformált a(z) %llu. sorában #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "„%s” tömörítési algoritmus ismeretlen"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "%s tömörített kimenetnek egy tömörítő készletre van szüksége"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Nem sikerült FILE*-ot létrehozni"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Nem sikerült forkolni"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Gyermekfolyamat tömörítése"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Belső hiba, %s létrehozása sikertelen"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "IO az alfolyamathoz/fájlhoz nem sikerült"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Nem sikerült olvasni az archívumfejléceket"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Olvasási hiba az MD5 kiszámításakor"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Nem sikerült adatcsatornákat létrehozni"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Hiba %s törlésekor"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Nem sikerült a gzipet futtatni "
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "„%s” átnevezése sikertelen erre: %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Hibás archívum"
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Használat: apt-internal-solver\n"
+"\n"
+"Az apt-internal-solver felülettel a jelenlegi belső feloldó külső\n"
+"feloldóként használható az APT családhoz hibakeresési vagy hasonló céllal\n"
+"\n"
+"Kapcsolók:\n"
+"   -h  Ez a súgó szöveg.\n"
+"   -q  Naplózható kimenet - nincs folyamatjelző\n"
+"   -c=? Ezt a konfigurációs fájlt olvassa be\n"
+"   -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/"
+"tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérült"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Ismeretlen csomagbejegyzés!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Ismeretlen a(z) %u TAR fejléctípus, %s tag"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Használat: apt-sortpkgs [kapcsolók] fájl1 [fájl2 ...]\n"
+"\n"
+"Az apt-sortpkgs egy egyszerű eszköz csomagfájlok rendezésére. A -s "
+"kapcsolót\n"
+"lehet használni annak jelzésére hogy ez milyen típusú fájl.\n"
+"\n"
+"Kapcsolók:\n"
+"  -h  Ez a súgó szöveg\n"
+"  -s  Forrásfájlrendezést használ\n"
+"  -c=? Ezt a konfigurációs fájlt olvassa be\n"
+"  -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "A dpkg futtatása"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "A(z) „%s” csomagrendszer nem támogatott"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "A megfelelő csomagrendszertípus nem határozható meg"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i rekord kiírva.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i rekord kiírva, %i hiányzó fájllal.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i rekord kiírva %i eltérő fájllal\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 rekord kiírva %i hiányzó és %i eltérő fájllal\n"
@@ -2043,6 +2302,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 ""
@@ -2057,159 +2338,343 @@ 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:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Üres csomaggyorsítótár"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Függ ettől"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Függ ettől (előfüggés)"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Javasolja"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Ajánlja"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Ütközik"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Kicseréli"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Elavulttá teszi"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Töri"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Bővíti"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "fontos"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "szükséges"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "szabványos"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "opcionális"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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/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:118
+#: 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:169
+#: 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:455
+#: 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/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:1196
+#, 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: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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Lehetséges verziók"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Kérés küldése a solvernek"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Függőséggenerálás"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Felkészülés megoldás fogadására"
 
-#: 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/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/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s állapotfájl megnyitása sikertelen"
+#: 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/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s átmeneti állapotfájl írása sikertelen"
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "A Hash Sum nem megfelelő"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "A méret nem megfelelő"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "%s érvénytelen művelet"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Írási hiba"
+
+#: 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:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Hiba történt az aláírás ellenőrzése közben. A tároló nem frissült, és az "
+"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:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG hiba: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "A(z) %s könyvtár eltérítve"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2218,16 +2683,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:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2236,27 +2701,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:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Hiba történt az aláírás ellenőrzése közben. A tároló nem frissült, és az "
-"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:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG hiba: %s: %s"
-
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2265,134 +2722,50 @@ 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:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "A(z) „%s” indexfájltípus nem támogatott"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s nem érhető el."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, 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:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Csomaglisták olvasása"
-
-# FIXME
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "„Biztosítja” kapcsolatok összegyűjtése"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nem lehet írni ebbe: %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: 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:902
+#: 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:904
+#: 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: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"
@@ -2420,7 +2793,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2429,12 +2802,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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2445,10 +2818,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"
@@ -2519,11 +2895,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"
 
@@ -2534,7 +2910,7 @@ msgid ""
 msgstr ""
 "A(z) %s csomagot újra kell telepíteni, de nem található hozzá archívum."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2542,270 +2918,191 @@ msgstr ""
 "Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott "
 "csomagok okozhatják."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr "Kérés küldése a solvernek"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Felkészülés megoldás fogadására"
-
-#: apt-pkg/edsp.cc:327
-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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Külső solver végrehajtása"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "A(z) %s Release fájl nem dolgozható fel"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "A(z) %s Release fájl nem tartalmaz szakaszokat"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, 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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "„%s” kiadás nem található ehhez: „%s”"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "„%s” verzió nem található ehhez: „%s”"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "„%s” feladat nem található"
 
-#: apt-pkg/cacheset.cc:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"„%s” csomagból nem választható sem telepített, sem kiadásra jelölt verzió, "
-"mert egyikkel sem rendelkezik"
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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” csomagból nem választható sem telepített, sem kiadásra jelölt verzió, "
+"mert egyikkel sem rendelkezik"
+
+#: 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:132
+#, 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:145
+#, 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:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Érvénytelen „Date” bejegyzés a(z) %s Release fájlban"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%lip %limp"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%limp"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s kiválasztás nem található"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Nem lesz zárolva a(z) „%s” csak olvasható zárolási fájl"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "%s zárolási fájl nem nyitható meg"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Nem lesz zárolva a(z) %s NFS-csatolású zárolási fájl"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nem sikerült zárolni: %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 "A fájlok listáját nem lehetett létrehozni, mert „%s” nem könyvtár"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 "„%s” figyelmen kívül hagyása a(z) „%s” könyvtárban, mert nem szabályos fájl"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "„%s” fájl figyelmen kívül hagyása a(z) „%s” könyvtárban, mert nincs "
 "fájlkiterjesztése"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2813,75 +3110,75 @@ msgstr ""
 "„%s” fájl figyelmen kívül hagyása a(z) „%s” könyvtárban, mert érvénytelen "
 "fájlkiterjesztése van"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "%s alfolyamat szegmentálási hibát okozott."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "A(z) %s alfolyamat %u számú szignált kapott."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "%s alfolyamat hibakóddal tért vissza (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "%s alfolyamat váratlanul kilépett"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Hiba a(z) %s gzip fájl bezárásakor"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nem lehet megnyitni a(z) %s fájlt"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nem lehet megnyitni a(z) %d fájlleírót"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Nem sikerült az alfolyamat IPC-t létrehozni"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Nem sikerült elindítani a tömörítőt "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "olvasás, még kellene %llu, de már az összes elfogyott"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "írás, még kiírandó %llu, de ez nem lehetséges"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Hiba a(z) %s fájl bezárásakor"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Hiba a(z) %s fájl átnevezésekor erre: %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Hiba a(z) %s fájl törlésekor"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Hiba a fájl szinkronizálásakor"
 
@@ -2970,112 +3267,106 @@ 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:519
+#: 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:633
+#: 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:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Nincs kulcstartó telepítve ide: %s."
-
-#: 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"
@@ -3085,12 +3376,12 @@ msgstr "%s érvénytelen művelet"
 msgid "Installing %s"
 msgstr "%s telepítése"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "%s eltávolítása"
@@ -3111,79 +3402,79 @@ 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:847
+#: 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:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "%s előkészítése"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s kicsomagolása"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: 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:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "%s telepítve"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "%s eltávolítva"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s teljesen eltávolítva"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: 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:1732
+#: 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:1737
+#: 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:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3191,7 +3482,7 @@ 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:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3199,7 +3490,7 @@ msgstr ""
 "Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint megtelt a "
 "lemez"
 
-#: apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3207,7 +3498,7 @@ 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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"
@@ -3215,7 +3506,7 @@ 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3231,424 +3522,190 @@ msgstr ""
 "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"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Használat:apt-extracttemplates fájl1 [fájl2 ...]\n"
-"\n"
-"Az apt-extracttemplates egy eszköz konfigurációs- és mintainformációk "
-"debian-\n"
-"csomagokból való kibontására\n"
-"\n"
-"Kapcsolók:\n"
-"  -h   Ez a súgó szöveg\n"
-"  -t   Beállítja az átmeneti könyvtárat\n"
-"  -c=? Ezt a konfigurációs fájlt olvassa be\n"
-"  -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "%s nem érhető el"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Hiba a(z) %s könyvtár feldolgozásakor"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "A forráskiterjesztések listája túl hosszú"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Hiba a tartalomfájl fejlécének írásakor"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Hiba %s tartalmának feldolgozásakor"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Használat: apt-ftparchive [kapcsolók] parancs\n"
-"Parancsok: packages binarypath [felülbírálófájl [útvonalelőtag]]\n"
-"           sources srcpath [felülbírálófájl [útvonalelőtag]]\n"
-"           contents útvonal\n"
-"           release útvonal\n"
-"           generate konfigfájl [csoportok]\n"
-"           clean konfigfájl\n"
-"\n"
-"Az apt-ftparchive indexfájlokat generál a Debian archívumokhoz. A generálás\n"
-"sok stílusát támogatja, a teljesen automatizálttól kezdve a\n"
-"dpkg-scanpackages és a dpkg-scansources funkcionális helyettesítéséig.\n"
-"\n"
-"Az apt-ftparchive Package fájlokat generál a .deb-ek fájából. A Package\n"
-"fájl minden vezérlő mezőt tartalmaz minden egyes csomagról úgy az MD5\n"
-"hasht mint a fájlméretet. Az override (felülbíráló) fájl támogatott a\n"
-"Prioritás és Szekció mezők értékének kényszerítésére.\n"
-"\n"
-"Hasonlóképpen az apt-ftparchive Sources fájlokat generál .dsc-k fájából.\n"
-"A --source-override opció használható forrás-felülbíráló fájlok megadására\n"
-"\n"
-"A „packages” és „sources” parancsokat a fa gyökeréből kell futtatni.\n"
-"A BinaryPath-nak a rekurzív keresés kiindulópontjára kell mutatnia, és\n"
-"a felülbírálófájlnak a felülbíráló jelzőket kell tartalmaznia. Az "
-"útvonalelőtag\n"
-"hozzáadódik a fájlnév mezőkhöz, ha meg van adva. Felhasználására egy példa "
-"a\n"
-"Debian archívumból:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Kapcsolók:\n"
-"  -h    Ez a súgó szöveg\n"
-"  --md5 MD5 generálás vezérlése\n"
-"  -s=?  Forrás-felülbíráló fájl\n"
-"  -q    Szűkszavú mód\n"
-"  -d=?  Opcionális gyorsítótár-adatbázis kiválasztása\n"
-"  --no-delink „delink” hibakereső mód bekapcsolása\n"
-"  --contents  Tartalom fájl generálásának ellenőrzése\n"
-"  -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
-msgid "No selections matched"
-msgstr "Nincs illeszkedő kiválasztás"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, 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"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "A DB megsérült, a fájl átnevezve %s.old-ra"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "A DB régi, kísérlet a következő frissítésére: %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Az adatbázis-formátum érvénytelen. Ha az apt egy korábbi verziójáról "
-"frissített, akkor távolítsa el, és hozza létre újra az adatbázist."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "readlink nem hajtható végre erre: %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Az archívumnak nincs vezérlő rekordja"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Nem sikerült egy mutatóhoz jutni"
-
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n"
+#, 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?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "F: %s nem érhető el\n"
+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. "
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "H: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Nincs zárolva"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "F: "
+#: 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"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "H: Hibás a fájl "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "A hash elem nem található!"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Nem sikerült feloldani ezt: %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Nem lehet eltérítést lefoglalni"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Fabejárás nem sikerült"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Belső hiba az AddDiversion hívásban"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "%s megnyitása sikertelen"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Kísérlet eltérítés felülírására: %s -> %s és %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "A(z) %s -> %s eltérítés hozzáadásának duplázása"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "readlink nem hajtható végre erre: %s"
+msgid "Duplicate conf file %s/%s"
+msgstr "Dupla %s/%s konfigurációs fájl"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "%s törlése sikertelen"
+msgid "The path %s is too long"
+msgstr "A(z) %s útvonal túl hosszú"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s linkelése sikertelen ehhez: %s"
+msgid "Unpacking %s more than once"
+msgstr "A(z) %s többszöri kicsomagolása"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " a DeLink korlátja (%sB) elérve.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Az archívumnak nem volt csomag mezője"
+msgid "The directory %s is diverted"
+msgstr "A(z) %s könyvtár eltérítve"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nem rendelkezik felülbíráló bejegyzéssel\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "A csomag megpróbál írni a(z) %s/%s eltérített célpontba"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s karbantartója %s, nem %s\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Az eltérített útvonal túl hosszú"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nem rendelkezik forrás-felülbíráló bejegyzéssel\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "A(z) %s könyvtár nem egy könyvtárral lesz helyettesítve"
 
-#: ftparchive/writer.cc:702
-#, 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"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Nem sikerült a node helyét megtalálni a hashtárolóban"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Nem sikerült memóriát lefoglalni"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Az útvonal túl hosszú"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "%s megnyitása sikertelen"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "%s felülbírálás deformált a(z) %llu. sorában #1"
+msgid "Overwrite package match with no version for %s"
+msgstr "Csomagtalálat felülírása %s verziója nélkül"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Nem lehet a(z) %s felülbírálófájlt olvasni"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt"
 
-#: ftparchive/override.cc:166
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "%s felülbírálás deformált a(z) %llu. sorában #1"
+msgid "Unable to stat %s"
+msgstr "%s nem érhető el"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "%s felülbírálás deformált a(z) %llu. sorában #2"
+msgid "Failed to write file %s"
+msgstr "A(z) %s fájl írása sikertelen"
 
-#: ftparchive/override.cc:191
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "%s felülbírálás deformált a(z) %llu. sorában #3"
+msgid "Failed to close file %s"
+msgstr "A(z) %s fájl bezárása sikertelen"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "„%s” tömörítési algoritmus ismeretlen"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Ez nem egy érvényes DEB archívum, hiányzik a(z) „%s” tag"
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "%s tömörített kimenetnek egy tömörítő készletre van szüksége"
+msgid "Internal error, could not locate member %s"
+msgstr "Belső hiba, %s tag nem található"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Nem sikerült FILE*-ot létrehozni"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Értelmezhetetlen control fájl"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Nem sikerült forkolni"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Érvénytelen archívum-aláírás"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Gyermekfolyamat tömörítése"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Hiba az archívumtag-fejléc olvasásakor"
 
-#: ftparchive/multicompress.cc:232
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Belső hiba, %s létrehozása sikertelen"
+msgid "Invalid archive member header %s"
+msgstr "Érvénytelen archívumtag-fejléc: %s"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "IO az alfolyamathoz/fájlhoz nem sikerült"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Érvénytelen archívumtag-fejléc"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Olvasási hiba az MD5 kiszámításakor"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Az archívum túl rövid"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Nem sikerült olvasni az archívumfejléceket"
+
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Nem sikerült adatcsatornákat létrehozni"
+
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Nem sikerült a gzipet futtatni "
+
+#: 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: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:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Hiba %s törlésekor"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Ismeretlen a(z) %u TAR fejléctípus, %s tag"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Használat: apt-internal-solver\n"
-"\n"
-"Az apt-internal-solver felülettel a jelenlegi belső feloldó külső\n"
-"feloldóként használható az APT családhoz hibakeresési vagy hasonló céllal\n"
-"\n"
-"Kapcsolók:\n"
-"   -h  Ez a súgó szöveg.\n"
-"   -q  Naplózható kimenet - nincs folyamatjelző\n"
-"   -c=? Ezt a konfigurációs fájlt olvassa be\n"
-"   -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/"
-"tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Függőségiverzió-terület összesen: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Ismeretlen csomagbejegyzés!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Nincs elég szabad hely itt: %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Használat: apt-sortpkgs [kapcsolók] fájl1 [fájl2 ...]\n"
-"\n"
-"Az apt-sortpkgs egy egyszerű eszköz csomagfájlok rendezésére. A -s "
-"kapcsolót\n"
-"lehet használni annak jelzésére hogy ez milyen típusú fájl.\n"
-"\n"
-"Kapcsolók:\n"
-"  -h  Ez a súgó szöveg\n"
-"  -s  Forrásfájlrendezést használ\n"
-"  -c=? Ezt a konfigurációs fájlt olvassa be\n"
-"  -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Kész"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Nincs kulcstartó telepítve ide: %s."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
@@ -3738,9 +3795,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Nem írható a napló, sikertelen openpty() (a /dev/pts nincs csatolva?)\n"
 
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "A(z) %s fájl nem digitálisan aláírt üzenettel kezdődik"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "A nem létező %s fájl kihagyása"
 
diff --git a/po/it.po b/po/it.po
index 6a096bf62..f45be3013 100644
--- a/po/it.po
+++ b/po/it.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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2014-05-31 17:04+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -25,150 +25,146 @@ msgstr ""
 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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Totale nomi dei pacchetti: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Totale strutture dei pacchetti: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Pacchetti normali: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Pacchetti virtuali puri: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Pacchetti virtuali singoli: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Pacchetti virtuali misti: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Mancante: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Totale versioni distinte: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Totale descrizioni distinte: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Totale dipendenze: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Totale relazioni ver/file: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Totale relazioni desc/file: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Totale corrispondenze fornite: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Totale stringhe globalizzate: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Totale spazio dipendenza di versione: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Totale spazio inutilizzato: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Totale spazio occupato: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: 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:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "File dei pacchetti:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Pacchetti con gancio:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(non trovato)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Installato: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Gancio del pacchetto: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Tabella versione:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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 %s compilato il %s %s\n"
 
-#: cmdline/apt-cache.cc:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -241,20 +237,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"
@@ -268,7 +264,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."
 
@@ -304,48 +300,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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: 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:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossibile trovare il pacchetto %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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,25 +349,25 @@ msgstr ""
 "Questo comando è deprecato. Utilizzare \"apt-mark auto\" e \"apt-mark manual"
 "\" al suo posto."
 
-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Impossibile bloccare la directory di scaricamento"
 
-#: cmdline/apt-get.cc:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -381,7 +377,7 @@ msgstr ""
 "all'interno del sistema di controllo della versione \"%s\" presso:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -393,80 +389,69 @@ msgstr ""
 "per recuperare gli ultimi (forse non rilasciati) aggiornamenti del "
 "pacchetto.\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Impossibile determinare lo spazio libero in %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Lo spazio libero in %s è insufficiente"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Recupero sorgente %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Recupero di alcuni archivi non riuscito."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: 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:968
+#: 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:996
+#: 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:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Creazione processo figlio non riuscita"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -475,17 +460,27 @@ msgstr ""
 "Informazioni sull'architettura non disponibili per %s. Consultare apt."
 "conf(5) APT::Architectures per l'impostazione"
 
-#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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 +489,7 @@ msgstr ""
 "La dipendenza %s per %s non può essere soddisfatta perché %s non è "
 "consentito su pacchetti \"%s\""
 
-#: cmdline/apt-get.cc:1294
+#: 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 ""
 "%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s "
 "non può essere trovato"
 
-#: cmdline/apt-get.cc:1317
+#: 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:1356
+#: cmdline/apt-get.cc:1359
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -519,7 +514,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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -528,30 +523,30 @@ msgstr ""
 "La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s "
 "non ha una versione candidata"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Elaborazione delle dipendenze di generazione non riuscita"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog per %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Moduli supportati:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -649,11 +644,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "È necessario specificare almeno una coppia URL/nome file"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr "Scaricamento non riuscito"
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 #, fuzzy
 msgid ""
 "Usage: apt-helper [options] command\n"
@@ -677,53 +672,53 @@ msgstr ""
 "\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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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:450
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -847,12 +842,12 @@ msgstr "Disco non trovato"
 msgid "File not found"
 msgstr "File non trovato"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Esecuzione di stat non riuscita"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Impostazione della data di modifica non riuscita"
 
@@ -861,34 +856,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI non valido, gli URI locali non devono iniziare con //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Accesso in corso"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Impossibile determinare il nome del nodo"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Impossibile determinare il nome locale"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Il server ha rifiutato la connessione e riporta: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -896,125 +891,125 @@ msgstr ""
 "È stato specificato un server proxy, ma nessuno script di accesso: Acquire::"
 "ftp::ProxyLogin è vuoto."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, 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:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Connessione scaduta"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Il server ha chiuso la connessione"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Errore di lettura"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Una risposta ha superato le dimensioni del buffer."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Protocollo danneggiato"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Impossibile creare un socket"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Impossibile connettersi al socket dati, tempo esaurito per la connessione"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Non riuscito"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Impossibile connettersi alla socket passiva."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Impossibile ottenere un socket in ascolto con getaddrinfo()"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Impossibile eseguire bind() su un socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Impossibile eseguire listen() su un socket"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Impossibile determinare il nome del socket"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Impossibile inviare il comando PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Famiglia di indirizzamento %u (AF_*) sconosciuta"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Connessione al socket dati terminata"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Impossibile accettare connessioni"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 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:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Impossibile recuperare il file, il server riporta: \"%s\""
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Socket dati terminato"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, 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:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Interrogazione"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Impossibile invocare "
 
@@ -1081,25 +1076,25 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr "Impossibile connettersi a %s:%s:"
 
-#: methods/gpgv.cc:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "È stata trovata almeno una firma non valida."
 
-#: methods/gpgv.cc:174
+#: 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1108,15 +1103,15 @@ msgstr ""
 "Il file con la firma in chiaro non è valido, ottenuto \"%s\" (la rete "
 "richiede autenticazione?)"
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Errore sconosciuto durante l'esecuzione di apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1124,35 +1119,35 @@ msgstr ""
 "Le seguenti firme non sono state verificate perché la chiave pubblica non è "
 "disponibile:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "File vuoti non possono essere archivi validi"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Errore nello scrivere sul file"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Errore nel leggere dal server"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Errore nello scrivere su file"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Select non riuscita"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Connessione terminata"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Errore nello scrivere sul file di output"
 
@@ -1184,186 +1179,431 @@ msgstr "Questo server HTTP ha un supporto del range non corretto"
 msgid "Unknown date format"
 msgstr "Formato della data sconosciuto"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Header dati non corretto"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Connessione non riuscita"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr "Ordinamento"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Elencazione"
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-"Errore interno, InstallPackages è stato chiamato con un pacchetto "
-"danneggiato."
+#: 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-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-"I pacchetti devono essere rimossi, ma l'azione di rimozione è disabilitata."
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Correzione delle dipendenze..."
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Errore interno, l'ordinamento non è stato terminato"
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " non riuscita."
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Le dimensioni non corrispondono. Inviare un'email a: apt@packages.debian.org"
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Impossibile correggere le dipendenze"
 
-#. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "È necessario scaricare %sB/%sB di archivi.\n"
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossibile minimizzare l'insieme da aggiornare"
 
-#. 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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "È necessario scaricare %sB di archivi.\n"
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Fatto"
 
-#. 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:167
+#: 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 "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n"
+msgid "[installed,upgradable to: %s]"
+msgstr "[installato, aggiornabile a: %s]"
 
-#. 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:172
+#: 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 "After this operation, %sB disk space will be freed.\n"
-msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n"
+msgid "[upgradable from: %s]"
+msgstr "[aggiornabile da: %s]"
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[configurazione residua]"
 
-#: apt-private/private-install.cc:200
+#: apt-private/private-output.cc:455
 #, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Spazio libero in %s insufficiente."
+msgid "but %s is installed"
+msgstr "ma la versione %s è installata"
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes"
+#: 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-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-"È stata specificata la modalità \"Trivial Only\", ma questa non è "
-"un'operazione banale."
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ma non è installabile"
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Sì, esegui come da richiesta."
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ma è un pacchetto virtuale"
 
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Si sta per compiere un'azione potenzialmente pericolosa.\n"
-"Per continuare scrivere la frase \"%s\"\n"
-" ?] "
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ma non è installato"
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Interrotto."
+#: 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-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Continuare?"
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " oppure"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Scaricamento di alcuni file non riuscito"
+#: 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-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Impossibile scaricare alcuni pacchetti. Potrebbe essere utile eseguire \"apt-"
-"get update\" o provare l'opzione \"--fix-missing\"."
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "I seguenti pacchetti NUOVI saranno installati:"
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing su supporti estraibili non è ancora supportato"
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "I seguenti pacchetti saranno RIMOSSI:"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Impossibile correggere i pacchetti mancanti."
+#: 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-install.cc:330
-msgid "Aborting install."
-msgstr "Interruzione dell'installazione."
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "I seguenti pacchetti saranno aggiornati:"
 
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"Il seguente pacchetto è sparito dal sistema poiché\n"
-"tutti i file sono stati sovrascritti da altri pacchetti:"
-msgstr[1] ""
-"I seguenti pacchetti sono spariti dal sistema poiché\n"
-"tutti i file sono stati sovrascritti da altri pacchetti:"
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "I seguenti pacchetti saranno RETROCESSI:"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Nota: questo viene svolto automaticamente e volutamente da dpkg."
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "I seguenti pacchetti bloccati saranno cambiati:"
 
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-"Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover"
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (a causa di %s) "
 
-#: apt-private/private-install.cc:499
+#: apt-private/private-output.cc:696
 msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
-"Sembra che AutoRemover abbia rovinato qualcosa e questo\n"
-"non doveva accadere. Segnalare un bug riguardo apt."
+"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."
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione:"
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aggiornati, %lu installati, "
 
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Errore interno, AutoRemover ha rovinato qualche cosa"
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstallati, "
 
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
+#: 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-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 ""
+"Errore interno, InstallPackages è stato chiamato con un pacchetto "
+"danneggiato."
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr ""
+"I pacchetti devono essere rimossi, ma l'azione di rimozione è disabilitata."
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Errore interno, l'ordinamento non è stato terminato"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Le dimensioni non corrispondono. Inviare un'email 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "È necessario scaricare %sB/%sB di archivi.\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:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "È necessario scaricare %sB di archivi.\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:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n"
+
+#. 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 "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Si sono verificati dei problemi ed è stata usata -y senza --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 ""
+"È stata specificata la modalità \"Trivial Only\", ma questa non è "
+"un'operazione banale."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Sì, esegui come da richiesta."
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Si sta per compiere un'azione potenzialmente pericolosa.\n"
+"Per continuare scrivere la frase \"%s\"\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Interrotto."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Continuare?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Scaricamento di alcuni file non riuscito"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Impossibile scaricare alcuni pacchetti. Potrebbe essere utile eseguire \"apt-"
+"get update\" o provare l'opzione \"--fix-missing\"."
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing su supporti estraibili non è ancora supportato"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Impossibile correggere i pacchetti mancanti."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Interruzione dell'installazione."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"Il seguente pacchetto è sparito dal sistema poiché\n"
+"tutti i file sono stati sovrascritti da altri pacchetti:"
+msgstr[1] ""
+"I seguenti pacchetti sono spariti dal sistema poiché\n"
+"tutti i file sono stati sovrascritti da altri pacchetti:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Nota: questo viene svolto automaticamente e volutamente da dpkg."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+"Non si è autorizzati a rimuovere nulla, impossibile avviare 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 ""
+"Sembra che AutoRemover abbia rovinato qualcosa e questo\n"
+"non doveva accadere. Segnalare un bug riguardo apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Errore interno, AutoRemover ha rovinato qualche cosa"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1374,7 +1614,7 @@ msgstr[1] ""
 "I seguenti pacchetti sono stati installati automaticamente e non sono più "
 "richiesti:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:492
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1385,18 +1625,18 @@ msgstr[1] ""
 "%lu pacchetti sono stati installati automaticamente e non sono più "
 "richiesti.\n"
 
-#: apt-private/private-install.cc:519
+#: apt-private/private-install.cc:494
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Usare \"apt-get autoremove\" per rimuoverlo."
 msgstr[1] "Usare \"apt-get autoremove\" per rimuoverli."
 
-#: apt-private/private-install.cc:612
+#: apt-private/private-install.cc:587
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "È utile eseguire \"apt-get -f install\" per correggere questi problemi:"
 
-#: apt-private/private-install.cc:614
+#: apt-private/private-install.cc:589
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1404,7 +1644,7 @@ msgstr ""
 "Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti "
 "(o specificare una soluzione)."
 
-#: apt-private/private-install.cc:638
+#: apt-private/private-install.cc:612
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1416,331 +1656,105 @@ msgstr ""
 "usando una distribuzione in sviluppo, che alcuni pacchetti richiesti\n"
 "non sono ancora stati creati o sono stati rimossi da Incoming."
 
-#: apt-private/private-install.cc:659
+#: apt-private/private-install.cc:633
 msgid "Broken packages"
 msgstr "Pacchetti danneggiati"
 
-#: apt-private/private-install.cc:712
+#: apt-private/private-install.cc:710
 msgid "The following extra packages will be installed:"
 msgstr "I seguenti pacchetti saranno inoltre installati:"
 
-#: apt-private/private-install.cc:802
+#: apt-private/private-install.cc:800
 msgid "Suggested packages:"
 msgstr "Pacchetti suggeriti:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:801
 msgid "Recommended packages:"
 msgstr "Pacchetti raccomandati:"
 
-#: apt-private/private-install.cc:825
+#: apt-private/private-install.cc:823
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Viene saltato %s poiché è già installato e l'aggiornamento non è impostato.\n"
 
-#: apt-private/private-install.cc:829
+#: apt-private/private-install.cc:827
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Viene saltato %s poiché non è installato e sono richiesti solo gli "
 "aggiornamenti.\n"
 
-#: apt-private/private-install.cc:841
+#: apt-private/private-install.cc:839
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "La reinstallazione di %s non è possibile, non può essere scaricato.\n"
 
-#: apt-private/private-install.cc:846
+#: apt-private/private-install.cc:844
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s è già alla versione più recente.\n"
 
-#: apt-private/private-install.cc:894
+#: apt-private/private-install.cc:892
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versione \"%s\" (%s) selezionata per \"%s\"\n"
 
-#: apt-private/private-install.cc:899
+#: apt-private/private-install.cc:897
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versione \"%s\" (%s) selezionata per \"%s\" per via di \"%s\"\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
+#: apt-private/private-install.cc:939
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "Il pacchetto \"%s\" non è installato e quindi non è stato rimosso: si "
 "intendeva \"%s\"?\n"
 
-#: apt-private/private-install.cc:947
+#: apt-private/private-install.cc:945
 #, c-format
 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:129
-msgid "Listing"
-msgstr "Elencazione"
-
-#: apt-private/private-list.cc:159
+#: apt-private/private-download.cc:62
 #, 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"
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
 
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Correzione delle dipendenze..."
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati."
 
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " non riuscita."
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "Avviso di autenticazione disabilitato.\n"
 
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Impossibile correggere le dipendenze"
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Alcuni pacchetti non possono essere autenticati"
 
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossibile minimizzare l'insieme da aggiornare"
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Installare questi pacchetti senza verificarli?"
 
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fatto"
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Impossibile recuperare %s  %s\n"
 
-#: apt-private/private-cachefile.cc:108
-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:111
-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
+#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
 #, 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:35
-#, 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:97
-#, 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:101
-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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati."
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Avviso di autenticazione disabilitato.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Alcuni pacchetti non possono essere autenticati"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Installare questi pacchetti senza verificarli?"
+msgid "Couldn't determine free space in %s"
+msgstr "Impossibile determinare lo spazio libero in %s"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:188
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Impossibile recuperare %s  %s\n"
+msgid "You don't have enough free space in %s."
+msgstr "Spazio libero in %s insufficiente."
 
 #: apt-private/private-sources.cc:58
 #, c-format
@@ -1757,42 +1771,34 @@ msgstr ""
 msgid "Full Text Search"
 msgstr "Ricerca sul testo"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Calcolo dell'aggiornamento"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Eseguito"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Trovato "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Scaricamento di:"
 
 # (ndt) questa non so cosa voglia dire
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Recuperati %sB in %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [In lavorazione]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1805,18 +1811,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1895,206 +1901,456 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Unione delle informazioni disponibili"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode invocata su un nodo ancora collegato"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uso: apt-extracttemplates FILE1 [FILE2 ...]\n"
+"\n"
+"apt-extracttemplates è uno strumento per estrarre configurazioni e template\n"
+"dai pacchetti debian\n"
+"\n"
+"Opzioni:\n"
+"  -h   Mostra questo aiuto\n"
+"  -t   Imposta la directory temporanea\n"
+"  -c=? Legge come configurazione il file specificato\n"
+"  -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Localizzazione dell'elemento hash non riuscita."
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Impossibile eseguire mkstemp %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Allocazione della deviazione non riuscita"
+#: 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 "Impossibile scrivere in %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Errore interno in AddDiversion"
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Impossibile trovare la versione di debconf. È installato?"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Tentativo di sovrascrivere una deviazione, %s -> %s e %s/%s"
+#: 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"
 
-#: apt-inst/filelist.cc:506
+#: 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 "Double add of diversion %s -> %s"
-msgstr "Doppia aggiunta di deviazione %s -> %s"
+msgid "Error processing directory %s"
+msgstr "Errore nell'elaborare la directory %s"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "File di configurazione duplicato %s/%s"
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "L'elenco dell'estensione del sorgente è troppo lungo"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: 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:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "Il percorso %s è troppo lungo"
+msgid "Error processing contents %s"
+msgstr "Errore nell'elaborare i contenuti %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Uso: apt-ftparchive [OPZIONI] COMANDO\n"
+"Comandi: packages PERCORSO_AL_BINARIO [FILE_OVERRIDE [PREFISSO_PERCORSO]\n"
+"         sources PERCORSO_AI_SORGENTI [FILE_OVERRIDE [PREFISSO_PERCORSO]\n"
+"         contents PERCORSO\n"
+"         release PERCORSO\n"
+"         generate CONFIGURAZIONE [GRUPPI]\n"
+"         clean CONFIGURAZIONE\n"
+"\n"
+"apt-ftparchive genera file di indice per gli archivi Debian. Supporta\n"
+"molti stili di generazione da completamente automatici ad alternative\n"
+"funzionali per dpkg-scanpackages e dpkg-scansources\n"
+"\n"
+"apt-ftparchive genera file Packages da un albero di \".deb\". Il file\n"
+"Package contiene le informazioni di tutti i campi control da ogni\n"
+"pacchetto, così come l'hash MD5 e la dimensione del file. Un file override\n"
+"è supportato per forzare i valori di priorità e sezione.\n"
+"\n"
+"Similmente, apt-ftparchive genera file Sources da un albero di .dscs.\n"
+"L'opzione --source-override può essere usata per specificare un file\n"
+"di override per i sorgenti\n"
+"\n"
+"I comandi \"packages\" e \"sources\" devono essere eseguiti nella root \n"
+"dell'albero. Il percorso al binario deve puntare alla base della ricerca \n"
+"ricorsiva e il file override deve contenere le opzioni di override.\n"
+"Il prefisso del percorso è aggiunto al campo filename se presente. Esempio\n"
+"di utilizzo dall'archivio Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages \n"
+"\n"
+"Opzioni:\n"
+"  -h          Mostra questo aiuto\n"
+"  --md5       Controlla la generazione dell'MD5\n"
+"  -s=?        File override dei sorgenti\n"
+"  -q          Silenzioso\n"
+"  -d=?        Seleziona il database di cache opzionale\n"
+"  --no-delink Abilita la modalità di debug del delinking\n"
+"  --contents  Controlla la generazione del file \"contents\"\n"
+"  -c=?        Legge come configurazione il file specificato\n"
+"  -o=?        Imposta un'opzione arbitraria di configurazione"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Nessuna selezione corrisponde"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Estrazione di %s eseguita più di una volta"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Mancano alcuni file nel file group di pacchetti \"%s\""
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "La directory %s è deviata"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Il database era danneggiato, il file è stato rinominato in %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Il database è vecchio, tentativo di aggiornamento %s"
+
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
 msgstr ""
-"Il pacchetto sta cercando di scrivere nell'obiettivo di deviazione %s/%s"
+"Il formato del database non è valido. Se è stato eseguito l'aggiornamento da "
+"una vecchia versione di apt, rimuovere e ricreare il database."
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Il percorso della deviazione è troppo lungo"
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Impossibile aprire il file del database %s: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Impossibile eseguire stat su %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Esecuzione di readlink su %s non riuscita"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "L'archivio non ha un campo \"control\""
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Impossibile ottenere un cursore"
+
+# (ndt) messo A per Avviso
+# Inizio con la maiuscola dopo i : perché mi sa che in molti
+# casi molte stringhe sono così
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Rinomina di %s in %s non riuscita"
+msgid "W: Unable to read directory %s\n"
+msgstr "A: Impossibile leggere la directory %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "La directory %s sta per essere sostituita da una non-directory"
+msgid "W: Unable to stat %s\n"
+msgstr "A: Impossibile eseguire stat su %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Localizzazione del nodo nel suo hash bucket non riuscita"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Il percorso è troppo lungo"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "A: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: Gli errori si applicano al file "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Il pacchetto sovrascritto corrisponde senza versione per %s"
+msgid "Failed to resolve %s"
+msgstr "Risoluzione di %s non riuscita"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Visita dell'albero non riuscita"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s"
+msgid "Failed to open %s"
+msgstr "Apertura di %s non riuscita"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Impossibile eseguire stat su %s"
+msgid " DeLink %s [%s]\n"
+msgstr " Delink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Scrittura del file %s non riuscita"
+msgid "Failed to readlink %s"
+msgstr "Esecuzione di readlink su %s non riuscita"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Chiusura del file %s non riuscita"
+msgid "Failed to unlink %s"
+msgstr "Esecuzione di unlink su %s non riuscita"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Questo non è un archivio DEB valido: membro \"%s\" mancante"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Collegamento di %s a %s non riuscito"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Errore interno, impossibile trovare il membro %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Raggiunto il limite di DeLink di %sB.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "File \"control\" non analizzabile"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "L'archivio non ha un campo \"package\""
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Firma dell'archivio non valida"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Errore nel leggere l'intestazione member dell'archivio"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:712
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "Intestazione member dell'archivio %s non valida"
+msgid "  %s has no source override entry\n"
+msgstr "  %s non ha un campo source override\n"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Intestazione member dell'archivio non valida"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "L'archivio è troppo piccolo"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Allocazione della memoria non riuscita"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Lettura delle intestazioni dell'archivio non riuscita"
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Impossibile aprire %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Override %s riga %llu malformato (%s)"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Lettura del file override %s non riuscita"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Override %s riga %llu malformato #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Override %s riga %llu malformato #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Override %s riga %llu malformato #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algoritmo di compressione \"%s\" sconosciuto"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "L'output compresso %s necessita di un insieme di compressione"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Creazione di FILE* non riuscita"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Fork non riuscita"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Sottoprocesso compresso"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Errore interno, creazione di %s non riuscita"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "I/O al sottoprocesso/file non riuscito"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Lettura durante l'elaborazione MD5 non riuscita"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Creazione delle pipe non riuscita"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problema nell'unlink di %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Esecuzione di gzip non riuscita "
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Rinomina di %s in %s non riuscita"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Archivio danneggiato"
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uso: apt-internal-solver\n"
+"\n"
+"apt-internal-solver è un'interfaccia per l'utilizzo del resolver interno\n"
+"come resolver esterno per il debugging degli strumenti APT\n"
+"\n"
+"Opzioni:\n"
+"  -h   Mostra questo aiuto\n"
+"  -q   Output registrabile, nessun indicatore di avanzamento\n"
+"  -c=? Legge come configurazione il file specificato\n"
+"  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Checksum di tar non riuscito, archivio danneggiato"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Record del pacchetto sconosciuto."
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Intestazione TAR di tipo %u sconosciuta, member %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uso: apt-sortpkgs [OPZIONI] FILE1 [FILE2 ...]\n"
+"\n"
+"apt-sortpkgs è uno strumento per ordinare i file dei pacchetti.\n"
+"L'opzione -s è usata per indicare il tipo di file.\n"
+"\n"
+"Opzioni:\n"
+"  -h   Mostra questo aiuto\n"
+"  -s   Ordina per pacchetto sorgente\n"
+"  -c=? Legge come configurazione il file specificato\n"
+"  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr "Avanzamento: [%3i%%]"
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "Esecuzione di dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Il sistema di pacchetti \"%s\" non è supportato"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Scritti %i record.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Scritti %i record con %i file mancanti.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Scritti %i record con %i file senza corrispondenze\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2110,6 +2366,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 ""
@@ -2124,157 +2400,345 @@ msgstr ""
 msgid "The list of sources could not be read."
 msgstr "Impossibile leggere l'elenco dei sorgenti."
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Cache dei pacchetti vuota"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Dipende"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Pre-dipende"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Consiglia"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Raccomanda"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Va in conflitto"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Sostituisce"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Rende obsoleto"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Rompe"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Migliora"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "richiesto"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "opzionale"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Calcolo dell'aggiornamento"
+
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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"
+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/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/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
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
 msgstr "Il file indice di tipo \"%s\" non è supportato"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Generazione albero delle dipendenze"
+#: 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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versioni candidate"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Invia la richiesta al solver"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generazione delle dipendenze"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Preparazione alla ricezione della soluzione"
 
-#: 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/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "Il solver esterno è terminato senza un errore di messaggio"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Apertura del file di stato %s non riuscita"
+#: 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/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Scrittura del file temporaneo di stato %s non riuscita"
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Somma hash non corrispondente"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Le dimensioni non corrispondono"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 msgid "Invalid file format"
 msgstr "Formato file non valido"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Errore di scrittura"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Si è verificato un errore nel verificare la firma. Il repository non è "
+"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:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Errore GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "La directory %s è deviata"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2283,17 +2747,17 @@ msgstr ""
 "Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list "
 "errata o file danneggiato)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2302,27 +2766,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:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Si è verificato un errore nel verificare la firma. Il repository non è "
-"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:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Errore GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2331,14 +2787,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:1992
+#: 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:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2346,125 +2802,39 @@ msgstr ""
 "I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" "
 "per il pacchetto %s."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Il file indice di tipo \"%s\" non è supportato"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Impossibile eseguire stat su %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Si è verificato un errore nell'elaborare %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Lettura elenco dei pacchetti"
-
-# (ndt) non mi convince per niente, ma vediamo cosa salta fuori
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Il file fornisce"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Impossibile scrivere in %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2495,7 +2865,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2505,12 +2875,12 @@ msgstr ""
 "maggiori informazioni, consultare \"man 5 apt.conf\" alla sezione \"APT::"
 "Immediate-Configure\" (%d)."
 
-#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2522,10 +2892,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"
@@ -2596,11 +2969,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"
 
@@ -2612,7 +2985,7 @@ msgstr ""
 "Il pacchetto %s deve essere reinstallato, ma non è possibile trovarne un "
 "archivio."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2620,280 +2993,200 @@ msgstr ""
 "Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo "
 "potrebbe essere causato da pacchetti bloccati."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr "Invia la richiesta al solver"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Preparazione alla ricezione della soluzione"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Il solver esterno è terminato senza un errore di messaggio"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Esecuzione solver esterno"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Impossibile analizzare il file di pacchetto %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Impossibile analizzare il file Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Nessuna sezione nel file Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Nessuna voce Hash nel file Release %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Generazione albero delle dipendenze"
 
-#: 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:139
+msgid "Candidate versions"
+msgstr "Versioni candidate"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Apertura di %s"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generazione delle dipendenze"
 
-#: apt-pkg/sourcelist.cc:371
+#: 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/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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release \"%s\" per \"%s\" non trovato."
 
 # (ndt) dovrebbe essere inteso il Version
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Version \"%s\" per \"%s\" non trovato"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Impossibile trovare il task \"%s\""
 
-#: apt-pkg/cacheset.cc:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Impossibile selezionare la versione installata o la candidata dal pacchetto "
-"\"%s\" poiché non sono presenti"
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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 ""
+"Impossibile selezionare la versione installata o la candidata dal pacchetto "
+"\"%s\" poiché non sono presenti"
+
+#: 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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Nessuna voce Hash nel file Release %s"
+
+#: apt-pkg/indexrecords.cc:145
+#, 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:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Voce \"Date\" nel file Release %s non valida"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selezione %s non trovata"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Blocco disabilitato per il file di blocco in sola lettura %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Impossibile aprire il file di blocco %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Blocco disabilitato per il file di blocco %s montato via nfs"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Impossibile impostare il blocco %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 "L'elenco dei file non può essere creato poiché \"%s\" non è una directory"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 "Viene ignorato \"%s\" nella directory \"%s\" poiché non è un file regolare"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "Viene ignorato il file \"%s\" nella directory \"%s\" poiché non ha "
 "un'estensione"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2901,75 +3194,75 @@ msgstr ""
 "Viene ignorato il file \"%s\" nella directory \"%s\" poiché ha un'estensione "
 "non valida"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Il sottoprocesso %s ha ricevuto il segnale %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Il sottoprocesso %s ha restituito un codice d'errore (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Il sottoprocesso %s è uscito inaspettatamente"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Si è verificato un problema nel chiudere il file gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Impossibile aprire il file %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Impossibile aprire il descrittore del file %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Creazione di un sottoprocesso IPC non riuscita"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Esecuzione non riuscita del compressore "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lettura, ancora %llu da leggere, ma non è stato trovato nulla"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "scrittura, ancora %llu da scrivere, ma non è possibile"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Si è verificato un problema nel chiudere il file %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Si è verificato un problema nel rinominare il file %s in %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Si è verificato un problema nel sincronizzare il file"
 
@@ -3059,116 +3352,110 @@ msgstr "Impossibile eseguire stat sul punto di mount %s"
 msgid "Failed to stat the cdrom"
 msgstr "Esecuzione di stat sul CD-ROM non riuscita"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: 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:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Apertura file di configurazione %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Nessun portachiavi installato in %s."
-
-#: 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"
@@ -3178,12 +3465,12 @@ msgstr "Operazione %s non valida"
 msgid "Installing %s"
 msgstr "Installazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Rimozione di %s"
@@ -3204,81 +3491,81 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directory \"%s\" mancante"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Estrazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparazione alla configurazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "Pacchetto %s installato"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "Pacchetto %s rimosso"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "Pacchetto %s rimosso completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1670
+#: 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:1732
+#: 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:1737
+#: 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:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3286,7 +3573,7 @@ msgstr ""
 "Segnalazione apport non scritta poiché il messaggio di errore indica la "
 "presenza di un fallimento precedente."
 
-#: apt-pkg/deb/dpkgpm.cc:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3294,7 +3581,7 @@ msgstr ""
 "Segnalazione apport non scritta poiché il messaggio di errore indica un "
 "errore per disco pieno."
 
-#: apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3302,7 +3589,7 @@ msgstr ""
 "Segnalazione apport non scritta poiché il messaggio di errore indica un "
 "errore di memoria esaurita."
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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"
@@ -3310,7 +3597,7 @@ msgstr ""
 "Segnalazione apport non scritta poiché il messaggio di errore indica un "
 "errore nel sistema locale."
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3325,426 +3612,194 @@ msgid ""
 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"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uso: apt-extracttemplates FILE1 [FILE2 ...]\n"
-"\n"
-"apt-extracttemplates è uno strumento per estrarre configurazioni e template\n"
-"dai pacchetti debian\n"
-"\n"
-"Opzioni:\n"
-"  -h   Mostra questo aiuto\n"
-"  -t   Imposta la directory temporanea\n"
-"  -c=? Legge come configurazione il file specificato\n"
-"  -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Impossibile eseguire mkstemp %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Errore nell'elaborare la directory %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "L'elenco dell'estensione del sorgente è troppo lungo"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Errore nella scrittura dell'intestazione nel file \"contents\""
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Errore nell'elaborare i contenuti %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Uso: apt-ftparchive [OPZIONI] COMANDO\n"
-"Comandi: packages PERCORSO_AL_BINARIO [FILE_OVERRIDE [PREFISSO_PERCORSO]\n"
-"         sources PERCORSO_AI_SORGENTI [FILE_OVERRIDE [PREFISSO_PERCORSO]\n"
-"         contents PERCORSO\n"
-"         release PERCORSO\n"
-"         generate CONFIGURAZIONE [GRUPPI]\n"
-"         clean CONFIGURAZIONE\n"
-"\n"
-"apt-ftparchive genera file di indice per gli archivi Debian. Supporta\n"
-"molti stili di generazione da completamente automatici ad alternative\n"
-"funzionali per dpkg-scanpackages e dpkg-scansources\n"
-"\n"
-"apt-ftparchive genera file Packages da un albero di \".deb\". Il file\n"
-"Package contiene le informazioni di tutti i campi control da ogni\n"
-"pacchetto, così come l'hash MD5 e la dimensione del file. Un file override\n"
-"è supportato per forzare i valori di priorità e sezione.\n"
-"\n"
-"Similmente, apt-ftparchive genera file Sources da un albero di .dscs.\n"
-"L'opzione --source-override può essere usata per specificare un file\n"
-"di override per i sorgenti\n"
-"\n"
-"I comandi \"packages\" e \"sources\" devono essere eseguiti nella root \n"
-"dell'albero. Il percorso al binario deve puntare alla base della ricerca \n"
-"ricorsiva e il file override deve contenere le opzioni di override.\n"
-"Il prefisso del percorso è aggiunto al campo filename se presente. Esempio\n"
-"di utilizzo dall'archivio Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages \n"
-"\n"
-"Opzioni:\n"
-"  -h          Mostra questo aiuto\n"
-"  --md5       Controlla la generazione dell'MD5\n"
-"  -s=?        File override dei sorgenti\n"
-"  -q          Silenzioso\n"
-"  -d=?        Seleziona il database di cache opzionale\n"
-"  --no-delink Abilita la modalità di debug del delinking\n"
-"  --contents  Controlla la generazione del file \"contents\"\n"
-"  -c=?        Legge come configurazione il file specificato\n"
-"  -o=?        Imposta un'opzione arbitraria di configurazione"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Nessuna selezione corrisponde"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Mancano alcuni file nel file group di pacchetti \"%s\""
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Il database era danneggiato, il file è stato rinominato in %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Il database è vecchio, tentativo di aggiornamento %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Il formato del database non è valido. Se è stato eseguito l'aggiornamento da "
-"una vecchia versione di apt, rimuovere e ricreare il database."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Impossibile aprire il file del database %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Esecuzione di readlink su %s non riuscita"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "L'archivio non ha un campo \"control\""
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Impossibile ottenere un cursore"
-
-# (ndt) messo A per Avviso
-# Inizio con la maiuscola dopo i : perché mi sa che in molti
-# casi molte stringhe sono così
-#: ftparchive/writer.cc:91
+
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: Impossibile leggere la directory %s\n"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"Impossibile acquisire il blocco sulla directory di amministrazione (%s). È "
+"necessario essere root."
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A: Impossibile eseguire stat su %s\n"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"dpkg è stato interrotto. È necessario eseguire \"%s\" per correggere il "
+"problema. "
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Non bloccato"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "A: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode invocata su un nodo ancora collegato"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: Gli errori si applicano al file "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Localizzazione dell'elemento hash non riuscita."
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Risoluzione di %s non riuscita"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Allocazione della deviazione non riuscita"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Visita dell'albero non riuscita"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Errore interno in AddDiversion"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "Apertura di %s non riuscita"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Tentativo di sovrascrivere una deviazione, %s -> %s e %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Delink %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Doppia aggiunta di deviazione %s -> %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Esecuzione di readlink su %s non riuscita"
+msgid "Duplicate conf file %s/%s"
+msgstr "File di configurazione duplicato %s/%s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Esecuzione di unlink su %s non riuscita"
+msgid "The path %s is too long"
+msgstr "Il percorso %s è troppo lungo"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Collegamento di %s a %s non riuscito"
+msgid "Unpacking %s more than once"
+msgstr "Estrazione di %s eseguita più di una volta"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Raggiunto il limite di DeLink di %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "L'archivio non ha un campo \"package\""
+msgid "The directory %s is diverted"
+msgstr "La directory %s è deviata"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s non ha un campo override\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr ""
+"Il pacchetto sta cercando di scrivere nell'obiettivo di deviazione %s/%s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  il responsabile di %s è %s non %s\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Il percorso della deviazione è troppo lungo"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s non ha un campo source override\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "La directory %s sta per essere sostituita da una non-directory"
 
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s non ha neppure un campo binario override\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Localizzazione del nodo nel suo hash bucket non riuscita"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Allocazione della memoria non riuscita"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Il percorso è troppo lungo"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "Impossibile aprire %s"
+msgid "Overwrite package match with no version for %s"
+msgstr "Il pacchetto sovrascritto corrisponde senza versione per %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Override %s riga %llu malformato (%s)"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Lettura del file override %s non riuscita"
+msgid "Unable to stat %s"
+msgstr "Impossibile eseguire stat su %s"
 
-#: ftparchive/override.cc:166
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Override %s riga %llu malformato #1"
+msgid "Failed to write file %s"
+msgstr "Scrittura del file %s non riuscita"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Override %s riga %llu malformato #2"
+msgid "Failed to close file %s"
+msgstr "Chiusura del file %s non riuscita"
 
-#: ftparchive/override.cc:191
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Override %s riga %llu malformato #3"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Questo non è un archivio DEB valido: membro \"%s\" mancante"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritmo di compressione \"%s\" sconosciuto"
+msgid "Internal error, could not locate member %s"
+msgstr "Errore interno, impossibile trovare il membro %s"
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "File \"control\" non analizzabile"
+
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Firma dell'archivio non valida"
+
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Errore nel leggere l'intestazione member dell'archivio"
+
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "L'output compresso %s necessita di un insieme di compressione"
+msgid "Invalid archive member header %s"
+msgstr "Intestazione member dell'archivio %s non valida"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Creazione di FILE* non riuscita"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Intestazione member dell'archivio non valida"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Fork non riuscita"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "L'archivio è troppo piccolo"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Sottoprocesso compresso"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Lettura delle intestazioni dell'archivio non riuscita"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Errore interno, creazione di %s non riuscita"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Creazione delle pipe non riuscita"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "I/O al sottoprocesso/file non riuscito"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Esecuzione di gzip non riuscita "
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Lettura durante l'elaborazione MD5 non riuscita"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Archivio danneggiato"
 
-#: ftparchive/multicompress.cc:359
+#: 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:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Problema nell'unlink di %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Intestazione TAR di tipo %u sconosciuta, member %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uso: apt-internal-solver\n"
-"\n"
-"apt-internal-solver è un'interfaccia per l'utilizzo del resolver interno\n"
-"come resolver esterno per il debugging degli strumenti APT\n"
-"\n"
-"Opzioni:\n"
-"  -h   Mostra questo aiuto\n"
-"  -q   Output registrabile, nessun indicatore di avanzamento\n"
-"  -c=? Legge come configurazione il file specificato\n"
-"  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Totale spazio dipendenza di versione: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Record del pacchetto sconosciuto."
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Lo spazio libero in %s è insufficiente"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uso: apt-sortpkgs [OPZIONI] FILE1 [FILE2 ...]\n"
-"\n"
-"apt-sortpkgs è uno strumento per ordinare i file dei pacchetti.\n"
-"L'opzione -s è usata per indicare il tipo di file.\n"
-"\n"
-"Opzioni:\n"
-"  -h   Mostra questo aiuto\n"
-"  -s   Ordina per pacchetto sorgente\n"
-"  -c=? Legge come configurazione il file specificato\n"
-"  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Eseguito"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Nessun portachiavi installato in %s."
 
 #~ msgid "Is stdout a terminal?"
 #~ msgstr "stdout è un terminale?"
diff --git a/po/ja.po b/po/ja.po
index 10263ade7..6c49f2608 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.9.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-01-16 04:37-0500\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"
@@ -23,149 +23,145 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "パッケージ %s のバージョン %s には解決不可能な依存関係があります:\n"
 
-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "パッケージ名総数: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "パッケージ構造総数: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  通常パッケージ: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  純粋仮想パッケージ: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  単一仮想パッケージ: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  複合仮想パッケージ: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  欠落: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "個別バージョン総数: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "個別説明総数: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "依存関係総数: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "バージョン/ファイル関係総数: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "説明/ファイル関係総数: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "提供マッピング総数: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Glob 文字列の総数: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "総依存関係・バージョン容量: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "総空き容量: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "総占有容量: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "このコマンドは時代遅れです。'apt-mark showauto' を代わりに使用してください。"
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "パッケージ %s が見つかりません"
 
-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "パッケージファイル:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Pin されたパッケージ:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(見つかりません)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  インストールされているバージョン: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  候補: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(なし)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  パッケージ Pin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  バージョンテーブル:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -235,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"
@@ -262,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 セットの残り全部に、この手順を繰り返してください。"
@@ -299,48 +295,48 @@ msgstr ""
 "  -c=? 指定した設定ファイルを読み込む\n"
 "  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224
 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "アーキテクチャ '%s' 用のパッケージは見つかりませんでした"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "パッケージ '%s' のバージョン '%s' は見つかりませんでした"
 
-#: cmdline/apt-get.cc:330
+#: 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:367
+#: 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:423
+#: 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:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "パッケージ %s が見つかりません"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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,25 +344,25 @@ msgstr ""
 "このコマンドは時代遅れです。'apt-mark auto' および 'apt-mark manual' を代わり"
 "に使用してください。"
 
-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部エラー、問題リゾルバが何かを破壊しました"
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "ダウンロードディレクトリをロックできません"
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -376,7 +372,7 @@ msgstr ""
 "ます:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -388,80 +384,69 @@ msgstr ""
 "bzr branch %s\n"
 "を使用してください。\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "%s の空き領域を測定できません"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "%s に充分な空きスペースがありません"
-
 #. 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:895
+#: 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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB のソースアーカイブを取得する必要があります。\n"
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ソース %s を取得\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "いくつかのアーカイブの取得に失敗しました。"
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "展開コマンド '%s' が失敗しました。\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "ビルドコマンド '%s' が失敗しました。\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "子プロセスが失敗しました"
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
 
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -470,17 +455,27 @@ msgstr ""
 "%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt."
 "conf(5) の APT::Architectures を参照してください。"
 
-#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "ビルド依存関係の処理に失敗しました"
+
+#: 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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s にはビルド依存情報が指定されていません。\n"
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -523,30 +518,30 @@ msgstr ""
 "パッケージ %3$s の候補バージョンが存在しないため、%2$s に対する %1$s の依存関"
 "係を満たすことができません"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s のビルド依存関係を満たすことができませんでした。"
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "ビルド依存関係の処理に失敗しました"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) の変更履歴"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "サポートされているモジュール:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -646,11 +641,11 @@ msgstr "引数として URL が 1 つ必要です"
 msgid "Must specify at least one pair url/filename"
 msgstr "少なくとも URL / ファイル名を 1 組指定する必要があります"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr "ダウンロード失敗"
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -674,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -843,12 +838,12 @@ msgstr "ディスクが見つかりません。"
 msgid "File not found"
 msgstr "ファイルが見つかりません"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "状態の取得に失敗しました"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "変更時刻の設定に失敗しました"
 
@@ -857,34 +852,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "不正な URI です。ローカルの URI は // で始まってはいけません"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "ログインしています"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "ピアネームを決定することができません"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "ローカルネームを決定することができません"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "サーバから接続を拒絶されました。応答: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER 失敗、サーバ応答: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS 失敗、サーバ応答: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -892,123 +887,123 @@ msgstr ""
 "プロキシサーバが指定されていますが、ログインスクリプトが設定されていません。"
 "Acquire::ftp::ProxyLogin が空です。"
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "ログインスクリプトのコマンド '%s' 失敗、サーバ応答: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE 失敗、サーバ応答: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "接続タイムアウト"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "サーバが接続を切断しました"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "読み込みエラー"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "レスポンスがバッファをオーバフローさせました。"
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "プロトコルが壊れています"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "書き込みエラー"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "ソケットを作成できません"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "データソケットへ接続できませんでした。接続がタイムアウトしました"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "失敗"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "パッシブソケットに接続できません。"
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo はリスニングソケットを取得できませんでした"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "ソケットをバインドできませんでした"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "ソケットをリスンできませんでした"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "ソケットの名前を特定できませんでした"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "PORT コマンドを送信できません"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "未知のアドレスファミリ %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT に失敗しました。サーバ応答: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "データソケット接続タイムアウト"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "接続を accept できません"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "ファイルのハッシュでの問題"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "ファイルを取得できません。サーバ応答 '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "データソケットタイムアウト"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "データ転送に失敗しました。サーバ応答 '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "問い合わせ"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "呼び出せません"
 
@@ -1074,23 +1069,23 @@ msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました"
 msgid "Unable to connect to %s:%s:"
 msgstr "%s:%s へ接続できません:"
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "少なくとも 1 つの不正な署名が発見されました。"
 
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:164
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
-"署名を検証するための 'apt-key' の実行ができませんでした (gnupg はインストールされ"
-"ていますか?)"
+"署名を検証するための 'apt-key' の実行ができませんでした (gnupg はインストール"
+"されていますか?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1099,49 +1094,49 @@ msgstr ""
 "クリアサインされたファイルが有効ではなく、'%s' を得ました (認証にネットワーク"
 "が必要?)"
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "apt-key の実行中に未知のエラーが発生"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr "以下の署名が無効です:\n"
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "公開鍵を利用できないため、以下の署名は検証できませんでした:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "空のファイルは有効なアーカイブと認められません"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "サーバからの読み込みに失敗しました"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "select に失敗しました"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "接続タイムアウト"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "出力ファイルへの書き込みでエラーが発生しました"
 
@@ -1173,292 +1168,30 @@ msgstr "HTTP サーバのレンジサポートが壊れています"
 msgid "Unknown date format"
 msgstr "不明な日付フォーマットです"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "不正なヘッダです"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "接続失敗"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "内部エラー"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr "ソート中"
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。"
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "内部エラー、調整が終わっていません"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"おっと、サイズがマッチしません。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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of 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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "%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
-#: apt-private/private-install.cc:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "この操作後に追加で %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
-#: apt-private/private-install.cc:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "この操作後に %sB のディスク容量が解放されます。\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "%s に充分な空きスペースがありません。"
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。"
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Yes, do as I say!"
-
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"重大な問題を引き起こす可能性のあることをしようとしています。\n"
-"続行するには、'%s' というフレーズをタイプしてください。\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "中断しました。"
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "続行しますか?"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "いくつかのファイルの取得に失敗しました"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"いくつかのアーカイブを取得できません。apt-get update を実行するか --fix-"
-"missing オプションを付けて試してみてください。"
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "足りないパッケージを直すことができません。"
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "インストールを中断します。"
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"以下のパッケージは、全ファイルが別のパッケージで上書きされたため、\n"
-"システムから消えました:"
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "注意: これは dpkg により自動でわざと行われれます。"
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-"一連のものを削除するようになっていないので、AutoRemover を開始できません"
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"AutoRemover が、本来起きるべきでない何かを壊したようです。\n"
-"apt にバグ報告を送ってください。"
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "内部エラー、AutoRemover が何かを破壊しました"
-
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"以下のパッケージが自動でインストールされましたが、もう必要とされていません:"
-
-#: apt-private/private-install.cc:517
+#: methods/server.cc:589
 #, c-format
-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 つのパッケージが自動でインストールされましたが、もう必要とされていませ"
-"ん:\n"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "これを削除するには 'apt-get autoremove' を利用してください。"
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
-"ません:"
-
-#: apt-private/private-install.cc:614
 msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
-"を明示してください)。"
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"インストールすることができないパッケージがありました。おそらく、あり得\n"
-"ない状況を要求したか、(不安定版ディストリビューションを使用しているの\n"
-"であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
-"動されていないことが考えられます。"
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "壊れたパッケージ"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "以下の追加パッケージがインストールされます:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "提案パッケージ:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "推奨パッケージ:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"%s  はすでにインストール済みで upgrade がセットされていないため、インストール"
-"をスキップします。\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"%s  はインストールされておらず、アップグレードだけの要求なので、インストール"
-"をスキップします。\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "%s はダウンロードできないため、再インストールは不可能です。\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s はすでに最新版です。\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "'%3$s' のバージョン '%1$s' (%2$s) を選択しました\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%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:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"パッケージ '%s' はインストールされていないため削除もされません。削除したかっ"
-"たのは '%s' でしょうか?\n"
 
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "パッケージ '%s' はインストールされていないため、削除もされません\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "内部エラー"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr "一覧表示"
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1466,33 +1199,33 @@ msgid_plural ""
 msgstr[0] ""
 "追加バージョンが %i 件あります。表示するには '-a' スイッチを付けてください。"
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "依存関係を解決しています ..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " 失敗しました。"
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "依存関係を訂正できません"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr "アップグレードセットを最小化できません"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " 完了"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "未解決の依存関係があります。-f オプションを試してください。"
 
@@ -1653,7 +1386,7 @@ msgstr "Y"
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "正規表現の展開エラー - %s"
@@ -1662,7 +1395,7 @@ msgstr "正規表現の展開エラー - %s"
 msgid "The update command takes no arguments"
 msgstr "update コマンドは引数をとりません"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1671,13 +1404,17 @@ msgstr[0] ""
 "アップグレードできるパッケージが %i 個あります。表示するには 'apt list --"
 "upgradable' を実行してください。\n"
 
-#: apt-private/private-update.cc:101
+#: 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"
+#: 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] ""
@@ -1699,27 +1436,304 @@ msgstr ""
 "      ロックが非アクティブであることから、今この時点の状態に妥当性が\n"
 "      あるとは言い切れないことに注意してください!"
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!"
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。"
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "内部エラー、調整が終わっていません"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"おっと、サイズがマッチしません。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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of 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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "%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
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "この操作後に追加で %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
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "この操作後に %sB のディスク容量が解放されます。\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "問題が発生し、-y オプションが --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 が指定されましたが、これは簡単な操作ではありません。"
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Yes, do as I say!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"重大な問題を引き起こす可能性のあることをしようとしています。\n"
+"続行するには、'%s' というフレーズをタイプしてください。\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "中断しました。"
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "続行しますか?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "いくつかのファイルの取得に失敗しました"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"いくつかのアーカイブを取得できません。apt-get update を実行するか --fix-"
+"missing オプションを付けて試してみてください。"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "足りないパッケージを直すことができません。"
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "インストールを中断します。"
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"以下のパッケージは、全ファイルが別のパッケージで上書きされたため、\n"
+"システムから消えました:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "注意: これは dpkg により自動でわざと行われれます。"
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+"一連のものを削除するようになっていないので、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 ""
+"AutoRemover が、本来起きるべきでない何かを壊したようです。\n"
+"apt にバグ報告を送ってください。"
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "内部エラー、AutoRemover が何かを破壊しました"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"以下のパッケージが自動でインストールされましたが、もう必要とされていません:"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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 つのパッケージが自動でインストールされましたが、もう必要とされていませ"
+"ん:\n"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "これを削除するには 'apt-get autoremove' を利用してください。"
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr ""
+"以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
+"ません:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
+"を明示してください)。"
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"インストールすることができないパッケージがありました。おそらく、あり得\n"
+"ない状況を要求したか、(不安定版ディストリビューションを使用しているの\n"
+"であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
+"動されていないことが考えられます。"
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "壊れたパッケージ"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "以下の追加パッケージがインストールされます:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "提案パッケージ:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "推奨パッケージ:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"%s  はすでにインストール済みで upgrade がセットされていないため、インストール"
+"をスキップします。\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"%s  はインストールされておらず、アップグレードだけの要求なので、インストール"
+"をスキップします。\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s はダウンロードできないため、再インストールは不可能です。\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s はすでに最新版です。\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "'%3$s' のバージョン '%1$s' (%2$s) を選択しました\n"
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%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
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+"パッケージ '%s' はインストールされていないため削除もされません。削除したかっ"
+"たのは '%s' でしょうか?\n"
+
+#: apt-private/private-install.cc:945
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "パッケージ '%s' はインストールされていないため、削除もされません\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "警告: 以下のパッケージは認証されていません!"
 
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:98
 msgid "Authentication warning overridden.\n"
 msgstr "認証の警告は上書きされました。\n"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
 msgid "Some packages could not be authenticated"
 msgstr "いくつかのパッケージを認証できませんでした"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 msgid "Install these packages without verification?"
 msgstr "検証なしにこれらのパッケージをインストールしますか?"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%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 "%s の空き領域を測定できません"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "%s に充分な空きスペースがありません。"
+
 #: apt-private/private-sources.cc:58
 #, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1735,41 +1749,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr "全文検索"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "アップグレードパッケージを検出しています"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "完了"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "ヒット "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "取得:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "無視 "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "エラー "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%sB を %s で取得しました (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [処理中]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1782,18 +1788,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1865,206 +1871,453 @@ msgstr "が重要です。これを修正して「導入」を再度実行して
 msgid "Merging available information"
 msgstr "入手可能情報をマージしています"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "リンクされているノードで DropNode が呼ばれました"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "ハッシュ要素を特定することができません!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "diversion の割り当てに失敗しました"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "AddDiversion での内部エラー"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"使用方法: apt-extracttemplates ファイル名1 [ファイル名2 ...]\n"
+"\n"
+"apt-extracttemplates は debian パッケージから設定とテンプレート情報を\n"
+"抽出するためのツールです\n"
+"\n"
+"オプション:\n"
+"  -h   このヘルプを表示する\n"
+"  -t   一時ディレクトリを指定する\n"
+"  -c=? 指定した設定ファイルを読み込む\n"
+"  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
 
-#: apt-inst/filelist.cc:477
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "%s -> %s と %s/%s の diversion を上書きしようとしています"
+msgid "Unable to mkstemp %s"
+msgstr "mkstemp %s を実行できません"
 
-#: apt-inst/filelist.cc:506
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "%s -> %s の diversion が二重に追加されています"
+msgid "Unable to write to %s"
+msgstr "%s に書き込めません"
 
-#: apt-inst/filelist.cc:549
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr ""
+"debconf のバージョンを取得できません。debconf はインストールされていますか?"
+
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "パッケージ拡張子リストが長すぎます"
+
+#: 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 "Duplicate conf file %s/%s"
-msgstr "設定ファイル %s/%s が重複しています"
+msgid "Error processing directory %s"
+msgstr "ディレクトリ %s の処理中にエラーが発生しました"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "ソース拡張子リストが長すぎます"
+
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "パス %s は長すぎます"
+msgid "Error processing contents %s"
+msgstr "Contents %s の処理中にエラーが発生しました"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"使用方法: apt-ftparchive [オプション] コマンド\n"
+"コマンド: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive は Debian アーカイブ用のインデックスファイルを生成しま\n"
+"す。全自動のものから、dpkg-scanpackages と dpkg-scansources の代替機能\n"
+"となるものまで、多くの生成方法をサポートしています。\n"
+"\n"
+"apt-ftparchive は .deb のツリーから Packages ファイルを生成します。\n"
+"Packages ファイルは MD5 ハッシュやファイルサイズに加えて、各パッケージ\n"
+"のすべての制御フィールドの内容を含んでいます。Priority と Section の値\n"
+"を強制するために override ファイルがサポートされています。\n"
+"\n"
+"同様に apt-ftparchive は .dsc のツリーから Sources ファイルを生成しま\n"
+"す。--source-override オプションを使用するとソース override ファイルを\n"
+"指定できます。\n"
+"\n"
+"'packages' および 'sources' コマンドはツリーのルートで実行する必要があ\n"
+"ります。BinaryPath には再帰検索のベースディレクトリを指定し、override \n"
+"ファイルは override フラグを含んでいる必要があります。もし pathprefix \n"
+"が存在すればファイル名フィールドに付加されます。debian アーカイブでの\n"
+"使用方法の例:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"オプション:\n"
+"  -h このヘルプを表示する\n"
+"  --md5 MD5 の生成を制御する\n"
+"  -s=?  ソース override ファイル\n"
+"  -q    表示を抑制する\n"
+"  -d=?  オプションのキャッシュデータベースを選択する\n"
+"  --no-delink delinking デバッグモードを有効にする\n"
+"  --contents  contents ファイルの生成を制御する\n"
+"  -c=? 指定の設定ファイルを読む\n"
+"  -o=? 任意の設定オプションを設定する"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "選択にマッチするものがありません"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "%s を複数回展開しています"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "ディレクトリ %s は divert されています"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB が壊れていたため、ファイル名を %s.old に変更しました"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB が古いため、%s のアップグレードを試みます"
+
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
 msgstr ""
-"このパッケージは diversion のターゲットの %s/%s に書き込もうとしています"
+"DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データ"
+"ベースを削除し、再作成してください。"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "diversion パスが長すぎます"
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "DB ファイル %s を開くことができません: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s の状態を取得するのに失敗しました"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+msgid "Failed to read .dsc"
+msgstr ".dsc の読み取りに失敗しました"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "アーカイブにコントロールレコードがありません"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "カーソルを取得できません"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "%s を %s に名前変更できませんでした"
+msgid "W: Unable to read directory %s\n"
+msgstr "警告: ディレクトリ %s が読めません\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "ディレクトリ %s が非ディレクトリに置換されようとしています"
+msgid "W: Unable to stat %s\n"
+msgstr "警告: %s の状態を取得できません\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "ハッシュバケツ内でノードを特定するのに失敗しました"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "エラー: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "パスが長すぎます"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "警告: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "エラー: エラーが適用されるファイルは "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "%s に対するバージョンのないパッケージマッチを上書きします"
+msgid "Failed to resolve %s"
+msgstr "%s の解決に失敗しました"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "ツリー内での移動に失敗しました"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "ファイル %s/%s がパッケージ %s のものを上書きします"
+msgid "Failed to open %s"
+msgstr "%s のオープンに失敗しました"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "%s の状態を取得できません"
+msgid " DeLink %s [%s]\n"
+msgstr " リンク %s [%s] を外します\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "ファイル %s の書き込みに失敗しました"
+msgid "Failed to readlink %s"
+msgstr "%s のリンク読み取りに失敗しました"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "%s のクローズに失敗しました"
+msgid "Failed to unlink %s"
+msgstr "%s のリンク解除に失敗しました"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "'%s' メンバーがないため、正しい DEB アーカイブではありません"
+msgid "*** Failed to link %s to %s"
+msgstr "*** %s を %s にリンクするのに失敗しました"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "内部エラー、メンバー %s を特定できません"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " リンクを外す制限の %sB に到達しました。\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "解析できないコントロールファイル"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "アーカイブにパッケージフィールドがありませんでした"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "不正なアーカイブ署名"
+#: 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:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %1$s メンテナは %3$s ではなく %2$s です\n"
+
+#: ftparchive/writer.cc:712
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s にソース override エントリがありません\n"
+
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s にバイナリ override エントリがありません\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - メモリの割り当てに失敗しました"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "'%s' をオープンできません"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "不正な override %s %llu 行目 (%s)"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "override ファイル %s を読み込むのに失敗しました"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "不正な override %s %llu 行目 #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "不正な override %s %llu 行目 #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "不正な override %s %llu 行目 #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "'%s' は未知の圧縮アルゴリズムです"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "圧縮出力 %s には圧縮セットが必要です"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "FILE* の作成に失敗しました"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "fork に失敗しました"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "アーカイブメンバーヘッダの読み込みに失敗しました"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "圧縮子プロセス"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/multicompress.cc:232
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "不正なアーカイブメンバーヘッダ %s"
-
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "不正なアーカイブメンバーヘッダ"
+msgid "Internal error, failed to create %s"
+msgstr "内部エラー、%s の作成に失敗しました"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "アーカイブが不足しています"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "子プロセス/ファイルへの IO が失敗しました"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "アーカイブヘッダの読み込みに失敗しました"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "MD5 の計算中に読み込みに失敗しました"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "パイプの生成に失敗しました"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "%s のリンク解除で問題が発生しました"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "gzip の実行に失敗しました"
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "%s を %s に名前変更できませんでした"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "壊れたアーカイブ"
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"使用方法: apt-internal-solver\n"
+"\n"
+"apt-internal-solver は、デバッグなどの用途で、現在の内部リゾルバを\n"
+"APT ファミリの外部リゾルバのように使うためのインターフェイスです。\n"
+"\n"
+"オプション:\n"
+"  -h   このヘルプを表示する\n"
+"  -q   ログファイルに出力可能な形式にする - プログレス表示をしない\n"
+"  -c=? 指定した設定ファイルを読み込む\n"
+"  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "tar チェックサム検証が失敗しました。アーカイブが壊れています"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "不明なパッケージレコードです!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "未知の TAR ヘッダタイプ %u、メンバー %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"使用方法: apt-sortpkgs [オプション] ファイル名1 [ファイル名2 ...]\n"
+"\n"
+"apt-sortpkgs はパッケージファイルをソートするための簡単なツールです。\n"
+"-s オプションはファイルの種類を示すために使用されます。\n"
+"\n"
+"オプション:\n"
+"  -h   このヘルプを表示する\n"
+"  -s   ソースファイルソートを使用する\n"
+"  -c=? 指定した設定ファイルを読み込む\n"
+"  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr "進捗: [%3i%%]"
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "dpkg を実行しています"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "パッケージングシステム '%s' はサポートされていません"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "適切なパッケージシステムタイプを特定できません"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i レコードを書き込みました。\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2081,6 +2334,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 ""
@@ -2097,158 +2372,332 @@ msgstr ""
 msgid "The list of sources could not be read."
 msgstr "ソースのリストを読むことができません。"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "空のパッケージキャッシュ"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr "パッケージキャッシュファイルが壊れています"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr "このパッケージキャッシュファイルは互換性がないバージョンです"
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168
 msgid "The package cache file is corrupted, it is too small"
 msgstr "パッケージキャッシュファイルが壊れています。短かすぎます"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "この APT はバージョニングシステム '%s' をサポートしていません"
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "依存"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "先行依存"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "提案"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "推奨"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "競合"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "置換"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "廃止"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "破壊"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "拡張"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "要求"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "標準"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "任意"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "特別"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "アップグレードパッケージを検出しています"
+
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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/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/sourcelist.cc:217
+#, c-format
+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/pkgrecords.cc:38
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "インデックスファイルのタイプ '%s' はサポートされていません"
+msgid "Couldn't stat source package list %s"
+msgstr "ソースパッケージリスト %s の状態を取得できません"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "候補バージョン"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "ファイル提供情報を収集しています"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "依存関係の生成"
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "状態情報を読み取っています"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "ソルバにシナリオを送信"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "状態ファイル %s のオープンに失敗しました"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "ソルバにリクエストを送信"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "一時状態ファイル %s の書き込みに失敗しました"
+#: 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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:215 apt-pkg/contrib/fileutl.cc:2108
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "名前の変更に失敗しました。%s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "ハッシュサムが適合しません"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "サイズが適合しません"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 msgid "Invalid file format"
 msgstr "不正なファイル形式"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "書き込みエラー"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"署名照合中にエラーが発生しました。リポジトリは更新されず、過去のインデックス"
+"ファイルが使われます。GPG エラー: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG エラー: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "ディレクトリ %s は divert されています"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2257,16 +2706,16 @@ msgstr ""
 "期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った "
 "sources.list エントリか、壊れたファイル)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2275,29 +2724,21 @@ msgstr ""
 "%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新"
 "物は適用されません。"
 
-#: apt-pkg/acquire-item.cc:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"署名照合中にエラーが発生しました。リポジトリは更新されず、過去のインデックス"
-"ファイルが使われます。GPG エラー: %s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG エラー: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2306,12 +2747,12 @@ msgstr ""
 "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
 "で修正する必要があります (存在しないアーキテクチャのため)。"
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2319,119 +2760,38 @@ msgstr ""
 "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
 "フィールドがありません。"
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s を処理中にエラーが発生しました (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "この APT が対応している以上の数のパッケージが指定されました。"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "この APT が対応している以上の数のバージョンが要求されました。"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "この APT が対応している以上の数の説明が要求されました。"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "この APT が対応している以上の数の依存関係が発生しました。"
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "ソースパッケージリスト %s の状態を取得できません"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "パッケージリストを読み込んでいます"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "ファイル提供情報を収集しています"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "%s に書き込めません"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "アーカイブディレクトリ %spartial が見つかりません。"
 
-#: apt-pkg/acquire.cc:99
+#: 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:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "ファイルを取得しています %li/%li (残り %s)"
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "sources.list に 'ソース' URI を指定する必要があります"
@@ -2461,7 +2821,7 @@ msgstr "pin タイプ %s を理解できませんでした"
 msgid "No priority (or zero) specified for pin"
 msgstr "pin で優先度 (または 0) が指定されていません"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2470,12 +2830,12 @@ msgstr ""
 "'%s' の即時設定は動作しません。詳細については man 5 apt.conf の APT::"
 "Immediate-Configure の項を参照してください。(%d)"
 
-#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "'%s' を設定できませんでした。"
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2486,10 +2846,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"
@@ -2560,11 +2923,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"
 
@@ -2576,7 +2939,7 @@ msgstr ""
 "パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見"
 "つけることができませんでした。"
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2584,262 +2947,189 @@ msgstr ""
 "エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー"
 "ジが原因です。"
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr "ソルバにリクエストを送信"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "解決を受け取る準備"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "外部ソルバを実行"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "パッケージファイル %s を解釈することができません (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Release ファイル %s を解釈することができません"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Release ファイル %s にセクションがありません"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Release ファイル %s に Hash エントリがありません"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Release ファイル %s に無効な 'Valid-Until' エントリがあります"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "タスク '%s' が見つかりません"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/cacheset.cc:635
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "正規表現 '%s' ではパッケージは見つかりませんでした"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/cacheset.cc:641
 #, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "'%s' に一致するパッケージは見つかりませんでした"
 
-#: apt-pkg/cacheset.cc:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"パッケージ '%s' のインストール済みまたは候補のバージョンはいずれも存在しない"
-"ので選べません"
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Release ファイル %s に Hash エントリがありません"
+
+#: apt-pkg/indexrecords.cc:145
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Release ファイル %s に無効な 'Valid-Until' エントリがあります"
+
+#: apt-pkg/indexrecords.cc:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Release ファイル %s に無効な 'Date' エントリがあります"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%li分 %li秒"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%li秒"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "選択された %s が見つかりません"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "読み込み専用のロックファイル %s にロックは使用しません"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ロックファイル %s をオープンできません"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "nfs マウントされたロックファイル %s にはロックを使用しません"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "ロック %s が取得できませんでした"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 "'%s' がディレクトリではないため、ファイルの一覧を作成できません"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "ディレクトリ '%2$s' の '%1$s' が通常ファイルではないため、無視します"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "ディレクトリ '%2$s' の '%1$s' がファイル名拡張子を持たないため、無視します"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2847,75 +3137,75 @@ msgstr ""
 "ディレクトリ '%2$s' の '%1$s' が無効なファイル名拡張子を持っているため、無視"
 "します"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "子プロセス %s がセグメンテーション違反を受け取りました。"
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "子プロセス %s がシグナル %u を受け取りました。"
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子プロセス %s がエラーコード (%u) を返しました"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子プロセス %s が予期せず終了しました"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "gzip ファイル %s のクローズ中に問題が発生しました"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "ファイル %s をオープンできませんでした"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "ファイルデスクリプタ %d を開けませんでした"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "子プロセス IPC の生成に失敗しました"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "以下の圧縮ツールの実行に失敗しました: "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "読み込みが %llu 残っているはずですが、何も残っていません"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "あと %llu 書き込む必要がありますが、書き込むことができませんでした"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "ファイル %s のクローズ中に問題が発生しました"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "%s から %s へのファイル名変更中に問題が発生しました"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "ファイル %s の削除中に問題が発生しました"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "ファイルの同期中に問題が発生しました"
 
@@ -3001,111 +3291,105 @@ msgstr "マウントポイント %s の状態を取得できません"
 msgid "Failed to stat the cdrom"
 msgstr "CD-ROM の状態を取得するのに失敗しました"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "理解できない省略形式です: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "設定ファイル %s をオープンできませんでした"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "文法エラー %s:%u: 不正なタグです"
 
-#: apt-pkg/contrib/configuration.cc:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s にキーリングがインストールされていません。"
-
-#: 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"
@@ -3115,12 +3399,12 @@ msgstr "不正な操作 %s"
 msgid "Installing %s"
 msgstr "%s をインストールしています"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "%s を削除しています"
@@ -3141,79 +3425,79 @@ msgid "Running post-installation trigger %s"
 msgstr "インストール後トリガ %s を実行しています"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ディレクトリ '%s' が見つかりません"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "%s を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s を展開しています"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s の設定を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "%s をインストールしました"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s の削除を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "%s を削除しました"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s を完全に削除する準備をしています"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s を完全に削除しました"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr "操作はそれが完了する前に中断されました"
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "依存関係の問題 - 未設定のままにしています"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3221,7 +3505,7 @@ msgstr ""
 "エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート"
 "は書き込まれません。"
 
-#: apt-pkg/deb/dpkgpm.cc:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3229,7 +3513,7 @@ msgstr ""
 "エラーメッセージはディスクフルエラーであることを示しているので、レポートは書"
 "き込まれません。"
 
-#: apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3237,7 +3521,7 @@ msgstr ""
 "エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き"
 "込まれません。"
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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"
@@ -3245,7 +3529,7 @@ msgstr ""
 "エラーメッセージはローカルシステムの問題であることを示しているので、レポート"
 "は書き込まれません。"
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3258,424 +3542,195 @@ 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 "ロックされていません"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"使用方法: apt-extracttemplates ファイル名1 [ファイル名2 ...]\n"
-"\n"
-"apt-extracttemplates は debian パッケージから設定とテンプレート情報を\n"
-"抽出するためのツールです\n"
-"\n"
-"オプション:\n"
-"  -h   このヘルプを表示する\n"
-"  -t   一時ディレクトリを指定する\n"
-"  -c=? 指定した設定ファイルを読み込む\n"
-"  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, c-format
-msgid "Unable to mkstemp %s"
-msgstr "mkstemp %s を実行できません"
-
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr ""
-"debconf のバージョンを取得できません。debconf はインストールされていますか?"
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "ディレクトリ %s の処理中にエラーが発生しました"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "ソース拡張子リストが長すぎます"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Contents %s の処理中にエラーが発生しました"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"使用方法: apt-ftparchive [オプション] コマンド\n"
-"コマンド: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive は Debian アーカイブ用のインデックスファイルを生成しま\n"
-"す。全自動のものから、dpkg-scanpackages と dpkg-scansources の代替機能\n"
-"となるものまで、多くの生成方法をサポートしています。\n"
-"\n"
-"apt-ftparchive は .deb のツリーから Packages ファイルを生成します。\n"
-"Packages ファイルは MD5 ハッシュやファイルサイズに加えて、各パッケージ\n"
-"のすべての制御フィールドの内容を含んでいます。Priority と Section の値\n"
-"を強制するために override ファイルがサポートされています。\n"
-"\n"
-"同様に apt-ftparchive は .dsc のツリーから Sources ファイルを生成しま\n"
-"す。--source-override オプションを使用するとソース override ファイルを\n"
-"指定できます。\n"
-"\n"
-"'packages' および 'sources' コマンドはツリーのルートで実行する必要があ\n"
-"ります。BinaryPath には再帰検索のベースディレクトリを指定し、override \n"
-"ファイルは override フラグを含んでいる必要があります。もし pathprefix \n"
-"が存在すればファイル名フィールドに付加されます。debian アーカイブでの\n"
-"使用方法の例:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"オプション:\n"
-"  -h このヘルプを表示する\n"
-"  --md5 MD5 の生成を制御する\n"
-"  -s=?  ソース override ファイル\n"
-"  -q    表示を抑制する\n"
-"  -d=?  オプションのキャッシュデータベースを選択する\n"
-"  --no-delink delinking デバッグモードを有効にする\n"
-"  --contents  contents ファイルの生成を制御する\n"
-"  -c=? 指定の設定ファイルを読む\n"
-"  -o=? 任意の設定オプションを設定する"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "選択にマッチするものがありません"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB が壊れていたため、ファイル名を %s.old に変更しました"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB が古いため、%s のアップグレードを試みます"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データ"
-"ベースを削除し、再作成してください。"
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "DB ファイル %s を開くことができません: %s"
-
-#: ftparchive/cachedb.cc:332
-msgid "Failed to read .dsc"
-msgstr ".dsc の読み取りに失敗しました"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "アーカイブにコントロールレコードがありません"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "カーソルを取得できません"
+"管理用ディレクトリ (%s) をロックできません。これを使う別のプロセスが動いてい"
+"ませんか?"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "警告: ディレクトリ %s が読めません\n"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"管理用ディレクトリ (%s) をロックできません。root 権限で実行していますか?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "警告: %s の状態を取得できません\n"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"dpkg は中断されました。問題を修正するには '%s' を手動で実行する必要がありま"
+"す。"
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "エラー: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "ロックされていません"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "警告: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "リンクされているノードで DropNode が呼ばれました"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "エラー: エラーが適用されるファイルは "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "ハッシュ要素を特定することができません!"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "%s の解決に失敗しました"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "diversion の割り当てに失敗しました"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "ツリー内での移動に失敗しました"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "AddDiversion での内部エラー"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "%s のオープンに失敗しました"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "%s -> %s と %s/%s の diversion を上書きしようとしています"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " リンク %s [%s] を外します\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "%s -> %s の diversion が二重に追加されています"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "%s のリンク読み取りに失敗しました"
+msgid "Duplicate conf file %s/%s"
+msgstr "設定ファイル %s/%s が重複しています"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "%s のリンク解除に失敗しました"
+msgid "The path %s is too long"
+msgstr "パス %s は長すぎます"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s を %s にリンクするのに失敗しました"
+msgid "Unpacking %s more than once"
+msgstr "%s を複数回展開しています"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " リンクを外す制限の %sB に到達しました。\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "アーカイブにパッケージフィールドがありませんでした"
+msgid "The directory %s is diverted"
+msgstr "ディレクトリ %s は divert されています"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s に override エントリがありません\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr ""
+"このパッケージは diversion のターゲットの %s/%s に書き込もうとしています"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %1$s メンテナは %3$s ではなく %2$s です\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "diversion パスが長すぎます"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s にソース override エントリがありません\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "ディレクトリ %s が非ディレクトリに置換されようとしています"
 
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s にバイナリ override エントリがありません\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "ハッシュバケツ内でノードを特定するのに失敗しました"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - メモリの割り当てに失敗しました"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "パスが長すぎます"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "'%s' をオープンできません"
+msgid "Overwrite package match with no version for %s"
+msgstr "%s に対するバージョンのないパッケージマッチを上書きします"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "不正な override %s %llu 行目 (%s)"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "ファイル %s/%s がパッケージ %s のものを上書きします"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "override ファイル %s を読み込むのに失敗しました"
+msgid "Unable to stat %s"
+msgstr "%s の状態を取得できません"
 
-#: ftparchive/override.cc:166
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "不正な override %s %llu 行目 #1"
+msgid "Failed to write file %s"
+msgstr "ファイル %s の書き込みに失敗しました"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "不正な override %s %llu 行目 #2"
+msgid "Failed to close file %s"
+msgstr "%s のクローズに失敗しました"
 
-#: ftparchive/override.cc:191
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "不正な override %s %llu 行目 #3"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "'%s' メンバーがないため、正しい DEB アーカイブではありません"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "'%s' は未知の圧縮アルゴリズムです"
+msgid "Internal error, could not locate member %s"
+msgstr "内部エラー、メンバー %s を特定できません"
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "解析できないコントロールファイル"
+
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "不正なアーカイブ署名"
+
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "アーカイブメンバーヘッダの読み込みに失敗しました"
+
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "圧縮出力 %s には圧縮セットが必要です"
+msgid "Invalid archive member header %s"
+msgstr "不正なアーカイブメンバーヘッダ %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "FILE* の作成に失敗しました"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "不正なアーカイブメンバーヘッダ"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "fork に失敗しました"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "アーカイブが不足しています"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "圧縮子プロセス"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "アーカイブヘッダの読み込みに失敗しました"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "内部エラー、%s の作成に失敗しました"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "パイプの生成に失敗しました"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "子プロセス/ファイルへの IO が失敗しました"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "gzip の実行に失敗しました"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "MD5 の計算中に読み込みに失敗しました"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "壊れたアーカイブ"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "tar チェックサム検証が失敗しました。アーカイブが壊れています"
+
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "%s のリンク解除で問題が発生しました"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "未知の TAR ヘッダタイプ %u、メンバー %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"使用方法: apt-internal-solver\n"
-"\n"
-"apt-internal-solver は、デバッグなどの用途で、現在の内部リゾルバを\n"
-"APT ファミリの外部リゾルバのように使うためのインターフェイスです。\n"
-"\n"
-"オプション:\n"
-"  -h   このヘルプを表示する\n"
-"  -q   ログファイルに出力可能な形式にする - プログレス表示をしない\n"
-"  -c=? 指定した設定ファイルを読み込む\n"
-"  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "総依存関係・バージョン容量: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "不明なパッケージレコードです!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "%s に充分な空きスペースがありません"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"使用方法: apt-sortpkgs [オプション] ファイル名1 [ファイル名2 ...]\n"
-"\n"
-"apt-sortpkgs はパッケージファイルをソートするための簡単なツールです。\n"
-"-s オプションはファイルの種類を示すために使用されます。\n"
-"\n"
-"オプション:\n"
-"  -h   このヘルプを表示する\n"
-"  -s   ソースファイルソートを使用する\n"
-"  -c=? 指定した設定ファイルを読み込む\n"
-"  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
+#~ msgid "Done"
+#~ msgstr "完了"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "%s にキーリングがインストールされていません。"
 
 #~ msgid "Is stdout a terminal?"
 #~ msgstr "標準出力はターミナルですか?"
diff --git a/po/km.po b/po/km.po
index e8ac36e7b..26bfe4361 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: 2015-01-16 04:37-0500\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,152 +26,148 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "កញ្ចប់ %s កំណែ %s មាន​ភាព​អាស្រ័យ​មិន​ត្រូវ​គ្នា ៖\n"
 
-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "ឈ្មោះ​កញ្ចប់​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "ឈ្មោះ​កញ្ចប់​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  កញ្ចប់​ធម្មតា ៖ "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  កញ្ចប់​និម្មិត​សុទ្ធ ៖ "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  កញ្ចប់​និម្មិត​តែ​មួយ ៖ "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  កញ្ចប់​និម្មិត​លាយ ៖ "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  បាត់បង់ ៖ "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "ភាព​អាស្រ័យ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "ការផ្គូរផ្គង​ការផ្ដល់​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "ខ្សែ​អក្សរ​សរុប​ ៖ "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "ទំហំ​កំណែ​ភាព​អាស្រ័យ​សរុប ៖ "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "ទំហំ slack សរុប ៖"
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "ទំហំ​សរុប​ដែល​ទុក​សម្រាប់ ៖ "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "មិន​អាច​កំណត់​ទីតាំង​កញ្ចប់ %s បានឡើយ"
 
-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "ឯកសារ​កញ្ចប់ ៖"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ខ្ទាស់ ៖"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(រក​មិន​ឃើញ)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  បាន​ដំឡើង ៖ "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  សាកល្បង ៖ "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(គ្មាន)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  ខ្ទាស់​កញ្ចប់ ៖ "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  តារាង​កំណែ ៖"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -244,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"
@@ -266,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 "ធ្វើដំណើរការ​នេះ​ម្តង​ទៀត​ សម្រាប់​ស៊ីឌី​ទាំងអស់​​ក្នុង​សំណុំ​របស់​អ្នក ។"
 
@@ -302,78 +298,78 @@ msgstr ""
 "  -c=? អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ \n"
 "  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: cmdline/apt-get.cc:367
+#: cmdline/apt-get.cc:358
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
 
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ"
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -381,114 +377,113 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ"
-
 #. 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:895
+#: 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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n"
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។"
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​"
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់"
 
-#: cmdline/apt-get.cc:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
+
+#: 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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n"
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: cmdline/apt-get.cc:1359
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -497,37 +492,37 @@ msgstr ""
 "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​"
 "តម្រូវការ​កំណែបានឡើយ"
 
-#: cmdline/apt-get.cc:1362
+#: 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:1385
+#: cmdline/apt-get.cc:1388
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s"
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។"
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -621,11 +616,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -639,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -764,12 +759,12 @@ msgstr "រក​ថាសមិ​ន​ឃើញ​ ។"
 msgid "File not found"
 msgstr "រកឯកសារ​មិន​ឃើញ​"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "បរាជ័យ​ក្នុងការថ្លែង"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​"
 
@@ -778,157 +773,157 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI មិនត្រឹមត្រូវ​ URIS មូលដ្ឋានមិនត្រូវ​ចាប់ផ្តើម​ជាមួយ​ // ឡើយ"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "កំពុង​ចូល​"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "មិន​អាច​កំណត់ឈ្មោះដែលត្រូវបង្ហាញ​បានឡើយ​"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "មិន​អាច​កំណត់ឈ្មោះមូលដ្ឋាន​បានឡើយ"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "ម៉ាស៊ីន​បម្រើបានបដិសេធ​ការតភ្ជាប់ ហើយ​ បាននិយាយ ៖ %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER បរាជ័យ​ ម៉ាស៊ីន​បម្រើបាន​​និយាយ ៖ %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS បានបរាជ័យ​ ម៉ាស៊ីន​បម្រើបាន​​និយាយ ៖ %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 "ម៉ាស៊ីន​បម្រើ​ប្រូកស៊ី​ត្រូវ​បាន​បញ្ជាក់​ ប៉ុន្តែ​គ្មាន​ស្គ្រីប​ចូល​ទេ Acquire::ftp::ProxyLogin គឺ ទទេ ។"
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "ពាក្យ​បញ្ជា​ស្គ្រីប​ចូល​ '%s' បានបរាជ័យ ម៉ាស៊ីន​បម្រើ​បាននិយាយ ៖ %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE បានបរាជ័យ​ ម៉ាស៊ីន​បម្រើ​បាននិយាយ​ ៖ %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់​"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "ការអាន​មានកំហុស"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន​​អស់ចំណុះ ។"
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "ការបង្ខូច​ពិធីការ​"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "ការសរសេរ​មានកំហុស"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "មិន​អាច​បង្កើត​រន្ធបានឡើយ"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "មិន​អាច​តភ្ជាប់​​រន្ធទិន្នន័យ​បានឡើយ អស់​ពេល​ក្នុងការតភ្ជាប់​"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "បាន​បរាជ័យ"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "មិនអាចតភ្ជាប់​​រន្ធអកម្ម​​បានឡើយ ។"
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo មិន​អាច​​ទទួល​យក​រន្ធ​សម្រាប់​ស្តាប់​​បានឡើយ"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "មិន​អាច​ចងរន្ធ​បានបានឡើយ​"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "មិនអាច​ស្ដាប់នៅលើរន្ធ​បានឡើយ"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "មិន​អាច​កំណត់​ឈ្មោះរបស់​រន្ធ​បានឡើយ"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "មិនអាច​ផ្ញើពាក្យ​បញ្ជា​ PORT បានឡើយ"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "មិន​ស្គាល់​អាសយដ្ឋាន​គ្រួសារ​ %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT បរាជ័យ​ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ ៖ %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័បានអស់ពេល​"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "មិន​អាច​ទៅ​ប្រមូល​យក​ឯកសារ​បានឡើយ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "រន្ធ​ទិន្នន័យ​បាន​អស់​ពេល​"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "បរាជ័យក្នុងការ​ផ្ទេរ​ទិន្នន័យ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "សំណួរ​"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "មិន​អាច​ហៅ​ "
 
@@ -994,71 +989,71 @@ msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក
 msgid "Unable to connect to %s:%s:"
 msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖"
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។"
 
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:164
 #, fuzzy
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gnupg ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n"
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "ហត្ថលេខា​ខាងក្រោម​មិន​អាចផ្ទៀងផ្ទាត់បាន​ទេ​ ព្រោះកូនសោ​សាធារណៈមិន​អាច​ប្រើ​បាន​ ៖\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ"
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់"
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "ជ្រើស​បាន​បរាជ័យ​"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "ការតភ្ជាប់​បាន​អស់ពេល​"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល"
 
@@ -1090,281 +1085,30 @@ msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូ
 msgid "Unknown date format"
 msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "ទិន្នន័យ​បឋមកថា​ខូច"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "កំហុស​ខាង​ក្នុង​"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "កំហុស​ខាងក្នុង កញ្ចប់​ដំឡើង​ត្រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​ខូច !"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ចេញ​​ ប៉ុន្តែមិនអនុញ្ញាត​ឲ្យយកចេញឡើយ ។"
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr "យី អី​ក៏​ចម្លែង​ម្លេះ.. ទំហំ​មិន​ដូច​គ្នា​ឡើយ ។ សូម​ផ្ញើ​អ៊ីមែល​ទៅ 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of 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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "ត្រូវ​ការយក​ %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
-#: apt-private/private-install.cc:167
-#, fuzzy, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "បន្ទាប់​ពី​ពន្លា​ %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
-#: apt-private/private-install.cc:172
-#, fuzzy, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "អ្នក​គ្មាន​ទំហំ​​ទំនេរ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។"
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "មាន​បញ្ហា​ ហើយ -y ត្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "បានបញ្ជាក់​តែប្រតិបត្តិការដែលមិនសំខាន់ប៉ុណ្ណោះ ប៉ុន្តែ​នេះមិនមែនជាប្រតិបត្តិការមិនសំខាន់នោះទេ ។"
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "បាទ/ចាស ធ្វើ​ដូច​ដែល​ខ្ញុំ​និយាយ !"
-
-#: apt-private/private-install.cc:222
+#: methods/server.cc:589
 #, c-format
 msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"អ្នកប្រហែល​ជា​ធ្វើ​អ្វីមួយ​ដែល​អាច​បង្ករ​ឲ្យ​មាន​មហន្ដរាយ ។\n"
-"ដើម្បី​បន្ត ​​វាយ​ក្នុង​ឃ្លា​ '%s'\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "បោះបង់ ។"
-
-#: apt-private/private-install.cc:243
-#, fuzzy
-msgid "Do you want to continue?"
-msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? "
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"អនុញ្ញាត​ឲ្យ​ទៅ​ប្រមូល​យក​ប័ណ្ណសារ​មួយ​ចំនួន​ ប្រហែល​ជា​រត់​ភាព​ទាន់​សម័យ apt-get ឬ ព្យាយាមប្រើ​ជាមួយ --"
-"fix- ដែលបាត់ឬ់ ?"
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix- ដែលបាត់​ និង ​ស្វប​មេឌៀ​ដែល​មិនបាន​​គាំទ្រនៅពេល​បច្ចុប្បន្ន​"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "មិន​អាច​កែ​កញ្ចប់​ដែលបាត់បង់​បានឡើយ ។"
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖"
-
-#: apt-private/private-install.cc:506
-#, fuzzy
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
-
-#: apt-private/private-install.cc:513
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
-msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
-
-#: apt-private/private-install.cc:517
-#, fuzzy, c-format
-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] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
-msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ 'apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។"
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"មិនអាច​ដំឡើងកញ្ចប់​មួយចំនួន​បានឡើយ ។ នេះ​មាន​ន័យ​ថា​អ្នក​\n"
-"​បានស្នើរ​ស្ថានភាព​ដែល​មិន​អាច​ធ្វើបានមួយ ឬ ​ប្រសិន​បើ​​អ្នក​កំពុង​ប្រើការចែកចាយ​ពុំ​មាន​លំនឹង​នោះ កញ្ចប់​"
-"ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n"
-" ឬ ​បានយក​ចេញ​ពីការមកដល់ ។"
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "កញ្ចប់​ដែល​បាន​ខូច​"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n"
-
-#: apt-private/private-install.cc:829
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវិញបានទេ វា​មិនអាចត្រូវបាន​ទាញយកបានឡើយ ។\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "កំហុស​ខាង​ក្នុង​"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1372,31 +1116,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " បាន​បរាជ័យ ។"
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " ធ្វើ​រួច"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ -f ។"
 
@@ -1560,7 +1304,7 @@ msgstr "Y"
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex កំហុស​ការចងក្រង​ - %s"
@@ -1569,7 +1313,7 @@ msgstr "Regex កំហុស​ការចងក្រង​ - %s"
 msgid "The update command takes no arguments"
 msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1577,10 +1321,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1601,28 +1349,294 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ព្រមាន​ ៖ មិនអាច​ធ្វើការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់ខាងក្រោមបានឡើយ !"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "កំហុស​ខាងក្នុង កញ្ចប់​ដំឡើង​ត្រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​ខូច !"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "បានបដិសេធ​ការព្រមាន​ការផ្ទៀងផ្ទាត់ភាព​ត្រឹមត្រូវ ។\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ចេញ​​ ប៉ុន្តែមិនអនុញ្ញាត​ឲ្យយកចេញឡើយ ។"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr "យី អី​ក៏​ចម្លែង​ម្លេះ.. ទំហំ​មិន​ដូច​គ្នា​ឡើយ ។ សូម​ផ្ញើ​អ៊ីមែល​ទៅ 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of 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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "ត្រូវ​ការយក​ %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
+#: apt-private/private-install.cc:166
+#, fuzzy, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "បន្ទាប់​ពី​ពន្លា​ %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
+#: apt-private/private-install.cc:171
+#, fuzzy, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "មាន​បញ្ហា​ ហើយ -y ត្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --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 "បានបញ្ជាក់​តែប្រតិបត្តិការដែលមិនសំខាន់ប៉ុណ្ណោះ ប៉ុន្តែ​នេះមិនមែនជាប្រតិបត្តិការមិនសំខាន់នោះទេ ។"
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "បាទ/ចាស ធ្វើ​ដូច​ដែល​ខ្ញុំ​និយាយ !"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"អ្នកប្រហែល​ជា​ធ្វើ​អ្វីមួយ​ដែល​អាច​បង្ករ​ឲ្យ​មាន​មហន្ដរាយ ។\n"
+"ដើម្បី​បន្ត ​​វាយ​ក្នុង​ឃ្លា​ '%s'\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "បោះបង់ ។"
+
+#: apt-private/private-install.cc:218
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? "
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"អនុញ្ញាត​ឲ្យ​ទៅ​ប្រមូល​យក​ប័ណ្ណសារ​មួយ​ចំនួន​ ប្រហែល​ជា​រត់​ភាព​ទាន់​សម័យ apt-get ឬ ព្យាយាមប្រើ​ជាមួយ --"
+"fix- ដែលបាត់ឬ់ ?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix- ដែលបាត់​ និង ​ស្វប​មេឌៀ​ដែល​មិនបាន​​គាំទ្រនៅពេល​បច្ចុប្បន្ន​"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "មិន​អាច​កែ​កញ្ចប់​ដែលបាត់បង់​បានឡើយ ។"
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: 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 ""
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖"
+
+#: apt-private/private-install.cc:481
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
+
+#: apt-private/private-install.cc:488
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
+msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+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] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
+msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ 'apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។"
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"មិនអាច​ដំឡើងកញ្ចប់​មួយចំនួន​បានឡើយ ។ នេះ​មាន​ន័យ​ថា​អ្នក​\n"
+"​បានស្នើរ​ស្ថានភាព​ដែល​មិន​អាច​ធ្វើបានមួយ ឬ ​ប្រសិន​បើ​​អ្នក​កំពុង​ប្រើការចែកចាយ​ពុំ​មាន​លំនឹង​នោះ កញ្ចប់​"
+"ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n"
+" ឬ ​បានយក​ចេញ​ពីការមកដល់ ។"
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "កញ្ចប់​ដែល​បាន​ខូច​"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n"
+
+#: apt-private/private-install.cc:827
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវិញបានទេ វា​មិនអាចត្រូវបាន​ទាញយកបានឡើយ ។\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
+
+#: apt-private/private-install.cc:892
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
+
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %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 "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ព្រមាន​ ៖ មិនអាច​ធ្វើការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់ខាងក្រោមបានឡើយ !"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "បានបដិសេធ​ការព្រមាន​ការផ្ទៀងផ្ទាត់ភាព​ត្រឹមត្រូវ ។\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
 msgstr "មិនអាច​ផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់​មួយចំនួន​បានឡើយ​"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 #, fuzzy
 msgid "Install these packages without verification?"
 msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោយគ្មានការពិនិត្យ​បញ្ជាក់ [y/N] ? "
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %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 "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "អ្នក​គ្មាន​ទំហំ​​ទំនេរ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។"
+
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1637,41 +1651,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "ធ្វើរួច​"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "វាយ​"
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "យក​ ៖"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "បាន​ទៅ​ប្រមូល​ %sB ក្នុង​ %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [កំពុង​ធ្វើការ​]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1684,18 +1690,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1769,205 +1775,455 @@ msgstr "នៅខាងលើ​សារ​នេះ​គឺ​សំខាន
 msgid "Merging available information"
 msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "ទម្លាក់​ថ្នាំង​ដែល​បាន​ហៅ​លើ​ថ្នាំងដែល​នៅតែតភ្ជាប់"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates ជាឧបករណ៍ដើម្បី​ស្រង់​ព័ត៌មាន​ការ​រចនាសម្ព័ន្ធ​​និង​ពុម្ព​\n"
+"ពី​កញ្ចប់​​ដេបៀន \n"
+"\n"
+"ជម្រើស ៖ ​\n"
+"  -h   អត្ថបទ​ជំនួយ​\n"
+"  -t  កំណត់​ថត​បណ្ដោះ​អាសន្ន\n"
+"  -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
+"  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "បរាជ័យ​ក្នុងការ​ដាក់ទីតាំង​ធាតុ​ដែលរាយប៉ាយ !"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "មិន​អាច​ថ្លែង %s បានឡើយ"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "បរាជ័យ​ក្នុងការ​បម្រុងទុក​ការបង្វែរ"
+#: 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"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "កំហុស​ខាងក្នុង នៅក្នុង AddDiversion"
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "មិន​អាច​ទទួល​យក​កំណែ​ debconf  ។ តើ​ debconf បានដំឡើង​ឬ ?"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "កំពុង​ព្យាយាម​សរសេរ​ជាន់​ពីលើ​ការបង្វែរ %s -> %s និង​ %s/%s"
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "បញ្ជី​ផ្នែក​បន្ថែម​កញ្ចប់​វែង​ពេក"
 
-#: apt-inst/filelist.cc:506
+#: 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 "Double add of diversion %s -> %s"
-msgstr "ការបន្ថែម​ស្ទួន នៃការបង្វែរ​ %s -> %s"
+msgid "Error processing directory %s"
+msgstr "​កំហុស​ដំណើរការ​ថត​ %s"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​ស្ទួន​ %s/%s"
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "បញ្ជី​ផ្នែក​បន្ថែម​ប្រភព​វែង​ពេក"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "កំហុស​សរសេរ​បឋម​កថា​ទៅ​ឯកសារ​មាតិកា"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "ផ្លូវ​ %s វែង​ពេក"
+msgid "Error processing contents %s"
+msgstr "កំហុស​ដំណើរការ​មាតិកា​ %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"ការប្រើប្រាស់ ៖ ពាក្យ​បញ្ជា​ apt-ftparchive [ជម្រើស] \n"
+"ពាក្យ​បញ្ជា​ ៖ កញ្ចប់ binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          ផ្លូវ​មាតិកា​\n"
+"          ផ្លូវ​ផ្សាយ​ចេញ \n"
+"          កំណត់​រចនាស្ព័ន្ធបង្កើត​ [groups]\n"
+"          ​​កំណត់​រចនាសម្ព័ន្ធសំអាត​​\n"
+"\n"
+"apt-ftparchive បង្កើត​​ឯកសារ​លិបិក្រម​សម្រាប់​ប័ណ្ណសារ​​ដេបៀន  ។ វា​គាំទ្រ​រចនាប័ទ្ម​នៃ​ការបង្កើតដោយ​"
+"ស្វ័យប្រវត្តិ​\n"
+"ដើម្បី​ធ្វើការ​ជំនួស​\n"
+" dpkg-scanpackages និង dpkg-scansources\n"
+"\n"
+"apt-ftparchive ដែល​បង្កើត​​​​ឯកសារ​ញ្ចប់​ ពី​មែកធាង​ .debs ។ ឯកសារ​កញ្ចប់មាន​\n"
+"​មាតិកា​នៃ វត្ថុបញ្ជា​​វាល​ទាំងអស់ ដែល​បាន​មក​ពី​កញ្ចប់​និមួយ​ៗដូចជា​ MD5 hash និង​ ទំហំ​ឯកសារ​ ។ ឯកសារ​"
+"បដិសេធ​​មិន​គាំទ្រ​ \n"
+"ដើម្បី​បង្ខំ​តម្លៃ​អាទិភាព​និង សម័យ​ ។\n"
+"\n"
+"ភាព​ដូច​គ្នា​នៃ​ apt-ftparchive បង្កើត​ឯកសារ​ប្រភព​ពី​មែកធាង​ .dscs ។\n"
+"ជម្រើស​បដិសេធ​ប្រភព​អាច​ត្រូវ​បាន​ប្រើ​សម្រាប់​បញ្ចាក់ឯកសារ​បដិសេធ src  \n"
+"\n"
+" បញ្ជា​'កញ្ចប់​' និង​ 'ប្រភព' ត្រូវ​​តែ​រត់​ជា​ root \n"
+" ។ BinaryPath ត្រូវ​ចង្អុល​​ទៅ​កាន់​មូលដ្ឋាន​ស្វែងរក​ហៅ​ខ្លួនឯង​ ហើយ​ \n"
+"ឯកសារ​បដិសេធ​ត្រូវមាន​ទង​បដិសេធ  ។  ផ្លូវ​បរិបទ​ត្រូវ​បាន​បន្ថែម​​ទៅ​ក្នុង​វាល​ឈ្មោះ​​ឯកសារ​បើ​វា​មាន​  ។ "
+"ឧទាហរណ៍​ ការប្រើប្រាស់​ពី​ប័ណ្ណសារ​ \n"
+"ដេបៀន  ៖\n"
+"   apt-ftparchive កញ្ចប់​dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"ជម្រើស​ ៖\n"
+"  -h    អត្ថបទ​ជំនួយ​នេះ​\n"
+"  --md5 Control MD5 ការបបង្កើត​\n"
+"  -s=?  ឯកសារ​បដិសេធ​ប្រភព​\n"
+"  -q    Quiet\n"
+"  -d=?  ជ្រើស​ជម្រើសលាក់​ទុ​ក​ទិន្នន័យ​\n"
+"  --គ្មាន​-delink អនុញ្ញាត​ delinking របៀប​បំបាត់​កំហុស​\n"
+"  --មាតិកា  ពិនិត្យ​ការបង្កើត​ឯកសារ​មាតិកា\n"
+"  -c=?  អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ​\n"
+"  -o=?  កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "គ្មាន​ការ​ជ្រើស​​ដែល​ផ្គួផ្គង​"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "កំពុង​ពន្លា​ %s ច្រើន​ជាង​ម្តង​"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "ឯកសារ​មួយ​ចំនួន​បាត់បងពី​ក្រុម​ឯកសារ​កញ្ចប់​ `%s'"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "ថត​ %s ត្រូវបាន​បង្វែរ"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB បាន​ខូច​, ឯកសារ​បាន​ប្តូរ​ឈ្មោះ​ទៅ​ជា​ %s.old ។"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "កញ្ចប់ ​កំពុង​ព្យាយាម​សរសេរ​ទៅកាន់​គោលដៅ​បង្វែរ​ %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB ចាស់​, កំពុង​ព្យាយាម​ធ្វើ​ឲ្យ %s ប្រសើរ​ឡើង"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "ផ្លូវ​បង្វែរ វែងពេក"
+#: ftparchive/cachedb.cc:96
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"ទ្រង់ទ្រាយ​មូលដ្ឋាន​ទិន្នន័យ​មិន​ត្រឹមត្រូវ ។ ប្រសិន​បើ​អ្នក​បាន​ធ្វើ​ឲ្យ​វា​ប្រសើឡើង​ពី​កំណែ​ចាស់​របស់ apt សូម​យក​"
+"មូលដ្ឋាន​ទិន្នន័យ​ចេញ និង​បង្កើត​មូលដ្ឋាន​ទិន្នន័យ​ឡើង​វិញ ។"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "មិន​អាច​បើក​ឯកសារ​ DB បានទេ %s: %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការថ្លែង  %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រា​ត្រួត​ពិនិត្យ​ទេ​"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច​"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: មិន​អាច​អាន​ថត %s បាន​ឡើយ\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "ថត​ %s ត្រូវ​បាន​ជំនួស​ដោយ​មិនមែន​ជា​ថត​"
+msgid "W: Unable to stat %s\n"
+msgstr "W ៖ មិន​អាច​ថ្លែង %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "បរាជ័យ​ក្នុងការ​ដាក់ថ្នាំង​នៅក្នុង​ធុង​រាយប៉ាយ​របស់វា"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "ផ្លូវ​វែង​ពេក"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "W: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: កំហុស​អនុវត្ត​លើ​ឯកសារ​"
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "សរសេរ​ជាន់​លើកញ្ចប់ផ្គួផ្គង​ដោយ​គ្មាន​កំណែ​សម្រាប់ %s"
+msgid "Failed to resolve %s"
+msgstr "បរាជ័យ​ក្នុង​ការ​ដោះស្រាយ %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "មែក​ធាង បាន​បរាជ័យ"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "ឯកសារ​ %s/%s សរសេរជាន់​ពីលើ​មួយ​ក្នុង​កញ្ចប់ %s"
+msgid "Failed to open %s"
+msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "មិន​អាច​ថ្លែង %s បានឡើយ"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
+msgid "Failed to readlink %s"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "បរាជ័យ​ក្នុងការ​បិទឯកសារ %s"
+msgid "Failed to unlink %s"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ដាច់ %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "នេះ​ជាមិនមែនជា​ប័ណ្ណសារ​ DEB ​ត្រឹមត្រូវទេ បាត់បង់សមាជិក​ '%s'​"
+msgid "*** Failed to link %s to %s"
+msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត​ %s ទៅ %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "កំហុស​ខាងក្នុង ​មិន​អាច​កំណត់​ទីតាំង​សមាជិក​ %s បានឡើយ"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "ឯកសារត្រួតពិនិត្យ​ដែលមិនអាច​ញែកបាន"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​"
+
+#: 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:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n"
+
+#: ftparchive/writer.cc:712
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n"
+
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - បរាជ័យ​ក្នុង​ការ​​បម្រុង​​ទុក​សតិ​"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "មិន​អាចបើក​ %s បានឡើយ"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អានឯកសារ​បដិសេធ %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "មិន​ស្គាល់​ក្បួន​ដោះស្រាយ​ការបង្ហាប់​ '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "​ទិន្នផល​ដែល​បាន​បង្ហាប់​​ %s ត្រូវ​ការ​កំណត់​ការបង្ហាប់​"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "ហត្ថលេខា​ប័ណ្ណសា​រមិន​ត្រឹមត្រូវ​"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ FILE*"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "កំហុស​ក្នុងការ​អានបឋមកថា​សមាជិក​ប័ណ្ណសារ"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "បាន​បរាជ័យ​ក្នុងការ​ដាក់ជា​ពីរផ្នែក​"
 
-#: apt-inst/contrib/arfile.cc:96
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "បង្ហាប់កូន"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "កំហុស​ខាងក្នុង​ បរាជ័យ​ក្នុង​ការ​បង្កើត​ %s"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "ប័ណ្ណសារ ខ្លីពេក"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "IO សម្រាប់​ដំណើរការ​រង​/ឯកសារ​ បាន​បរាជ័យ​"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "បរាជ័យ​ក្នុងការ​អាន​បឋមកថា​ប័ណ្ណសារ"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការអាន​ នៅពេល​គណនា MD5"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "បាន​បរាជ័យក្នុង​ការ​បង្កើត​បំពង់​"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "បាន​បរាជ័យក្នុង​ការ​ប្រតិបត្តិ gzip"
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "ប័ណ្ណសារ​បាន​ខូច​"
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates ជាឧបករណ៍ដើម្បី​ស្រង់​ព័ត៌មាន​ការ​រចនាសម្ព័ន្ធ​​និង​ពុម្ព​\n"
+"ពី​កញ្ចប់​​ដេបៀន \n"
+"\n"
+"ជម្រើស ៖ ​\n"
+"  -h   អត្ថបទ​ជំនួយ​\n"
+"  -t  កំណត់​ថត​បណ្ដោះ​អាសន្ន\n"
+"  -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
+"  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar ឆេកសាំ​បាន​បរាជ័យ ប័ណ្ណសារ​បាន​ខូច"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "មិន​ស្គាល់​កំណត់​ត្រា​កញ្ចប់ !"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "មិន​ស្គាល់​ប្រភេទ​បឋមកថា​ TAR  %u ដែលជា​សមាជិក​ %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"ការប្រើប្រាស់ ៖ apt-sortpkgs [ជម្រើស] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs ជា​ឧបករណ៍​ធម្មតា​ដើម្បី​តម្រៀប​ឯកសារ​កញ្ចប់ ។  ជម្រើស​ -s បាន​ប្រើ​\n"
+"សម្រាប់​ចង្អុល​ប្រភេទ​នៃ​​​ឯកសារ​អ្វីមួយដែល​មាន​ ។\n"
+"\n"
+"ជម្រើស​\n"
+"  -h   អត្ថបទ​ជំនួយ​នេះ​\n"
+"  -s   ប្រើ​ការ​តម្រៀប​ឯកសារ​ប្រភព\n"
+"  -c=? អាន​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធនេះ​\n"
+"  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "មិន​គាំទ្រ​ប្រព័ន្ធ​កញ្ចប់'%s' ឡើយ"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "មិនអាច​កំណត់​ប្រភេទ​ប្រព័ន្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "បានសរសេរ %i កំណត់ត្រា ។\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់ ។\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n"
@@ -1982,6 +2238,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 "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថានភាព​មិន​អាចត្រូវបាន​​ញែក ​​ឬ ត្រូវបាន​បើកបានឡើយ​​ ។"
@@ -1994,201 +2270,365 @@ msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់ស
 msgid "The list of sources could not be read."
 msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "ឃ្លាំង​កញ្ចប់​ទទេ​"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr "ឯកសារ​ឃ្លាំងសម្ងាត់​​កញ្ចប់​ជាកំណែ​មិន​ត្រូវគ្នា​"
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT នេះ មិនគាំទ្រ​ប្រព័ន្ធ​ ការធ្វើកំណែនេះទេ​ '%s'"
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "អាស្រ័យ​"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "អាស្រ័យជា​មុន"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "ផ្ដល់យោបល់​"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "ផ្តល់​អនុសាសន៍​"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "ប៉ះទង្គិច"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "ជំនួស​"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "លែង​ប្រើ"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "សំខាន់​"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "បាន​ទាមទារ"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "គំរូ"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "ស្រេចចិត្ត"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "បន្ថែម"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ"
+
+#: 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:118
+#: 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/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 "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: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/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/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/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​"
+msgid "Couldn't stat source package list %s"
+msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "កំណែ​សាកល្បង​"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "ការបង្កើត​ភាពអាស្រ័យ​"
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
+
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "ការសរសេរ​មានកំហុស"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "ថត​ %s ត្រូវបាន​បង្វែរ"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: apt-pkg/acquire-item.cc:2059
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
+"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:1926
+#: 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 "
@@ -2197,131 +2637,49 @@ msgstr ""
 "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ "
 "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​  APT នេះ​ឆបគ្នា​​  ។"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
-
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "មិន​អាច​សរសេរ​ទៅ %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: apt-pkg/acquire.cc:162
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "កំពុង​ទៅ​យក​ឯកសារ %li នៃ %li (នៅសល់ %s)"
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក"
@@ -2347,19 +2705,19 @@ msgstr "មិន​បាន​យល់​ពី​ប្រភេទ​ម្
 msgid "No priority (or zero) specified for pin"
 msgstr "គ្មាន​អទិភាព (ឬ សូន្យ​) បានបញ្ជាក់​សម្រាប់​ម្ជុល​ទេ"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2370,10 +2728,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
@@ -2441,11 +2802,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"
 
@@ -2455,7 +2816,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "កញ្ចប់ %s ត្រូវការឲ្យដំឡើង ប៉ុន្តែ​ ខ្ញុំ​មិន​អាច​រក​ប័ណ្ណសារ​សម្រាប់​វា​បាន​ទេ​ ។"
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2463,326 +2824,258 @@ msgstr ""
 "កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើត នេះ​ប្រហែលជា បង្កដោយកញ្ចប់​"
 "ដែលបាន​ទុក ។"
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (%d) បានឡើយ"
-
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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 "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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+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:139
+msgid "Candidate versions"
+msgstr "កំណែ​សាកល្បង​"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "កំពុង​បើក​ %s"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "ការបង្កើត​ភាពអាស្រ័យ​"
 
-#: apt-pkg/sourcelist.cc:371
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "បន្ទាត់​ Malformed  %u ក្នុង​បញ្ជី​ប្រភព​ %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:375
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
+#: apt-pkg/depcache.cc:252
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/depcache.cc:258
 #, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
+msgid "Failed to write temporary StateFile %s"
+msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
+
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (%d) បានឡើយ"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/cacheset.cc:635
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/cacheset.cc:641
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: apt-pkg/cacheset.cc:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:145
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
+
+#: apt-pkg/indexrecords.cc:164
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "មិន​ប្រើប្រាស់​ការចាក់សោ សម្រាប់តែឯកសារចាក់សោ​ដែលបានតែអានប៉ុណ្ណោះ %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "មិន​អាច​បើក​ឯកសារ​ចាក់សោ​ %s បានឡើយ"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "មិនប្រើ​ការចាក់សោ សម្រាប់ nfs ឯកសារ​ចាក់សោដែលបានម៉ោន%s"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "មិន​អាច​ចាក់សោ %s បានឡើយ"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ "
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ដំណើរការ​រង​ IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ​កម្មវិធី​បង្ហាប់ "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
 
@@ -2868,109 +3161,103 @@ msgstr "មិនអាច​ថ្លែង ចំណុចម៉ោន %s ប
 msgid "Failed to stat the cdrom"
 msgstr "បរាជ័យក្នុងការ​ថ្លែង ស៊ីឌីរ៉ូម"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "មិន​បាន​​ទទួល​ស្គាល់​ប្រភេទ​អក្សរ​សង្ខេប ៖ '%c'"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ ស្លាក​ដែលបាន Malformed"
 
-#: apt-pkg/contrib/configuration.cc:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ សារឥតបានការ​បន្ថែម ដែលនៅខាងចុង​ឯកសារ"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-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' [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"
@@ -2980,12 +3267,12 @@ msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត
 msgid "Installing %s"
 msgstr "បាន​ដំឡើង %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "កំពុង​យក %s ចេញ"
@@ -3006,103 +3293,103 @@ msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "កំពុងរៀបចំ​ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "កំពុង​ស្រាយ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "បាន​ដំឡើង %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចេញ​នៃ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "បាន​យក %s ចេញ"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3117,417 +3404,186 @@ 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 ""
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates ជាឧបករណ៍ដើម្បី​ស្រង់​ព័ត៌មាន​ការ​រចនាសម្ព័ន្ធ​​និង​ពុម្ព​\n"
-"ពី​កញ្ចប់​​ដេបៀន \n"
-"\n"
-"ជម្រើស ៖ ​\n"
-"  -h   អត្ថបទ​ជំនួយ​\n"
-"  -t  កំណត់​ថត​បណ្ដោះ​អាសន្ន\n"
-"  -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
-"  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "មិន​អាច​ថ្លែង %s បានឡើយ"
-
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "មិន​អាច​ទទួល​យក​កំណែ​ debconf  ។ តើ​ debconf បានដំឡើង​ឬ ?"
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "​កំហុស​ដំណើរការ​ថត​ %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "បញ្ជី​ផ្នែក​បន្ថែម​ប្រភព​វែង​ពេក"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "កំហុស​សរសេរ​បឋម​កថា​ទៅ​ឯកសារ​មាតិកា"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "កំហុស​ដំណើរការ​មាតិកា​ %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"ការប្រើប្រាស់ ៖ ពាក្យ​បញ្ជា​ apt-ftparchive [ជម្រើស] \n"
-"ពាក្យ​បញ្ជា​ ៖ កញ្ចប់ binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          ផ្លូវ​មាតិកា​\n"
-"          ផ្លូវ​ផ្សាយ​ចេញ \n"
-"          កំណត់​រចនាស្ព័ន្ធបង្កើត​ [groups]\n"
-"          ​​កំណត់​រចនាសម្ព័ន្ធសំអាត​​\n"
-"\n"
-"apt-ftparchive បង្កើត​​ឯកសារ​លិបិក្រម​សម្រាប់​ប័ណ្ណសារ​​ដេបៀន  ។ វា​គាំទ្រ​រចនាប័ទ្ម​នៃ​ការបង្កើតដោយ​"
-"ស្វ័យប្រវត្តិ​\n"
-"ដើម្បី​ធ្វើការ​ជំនួស​\n"
-" dpkg-scanpackages និង dpkg-scansources\n"
-"\n"
-"apt-ftparchive ដែល​បង្កើត​​​​ឯកសារ​ញ្ចប់​ ពី​មែកធាង​ .debs ។ ឯកសារ​កញ្ចប់មាន​\n"
-"​មាតិកា​នៃ វត្ថុបញ្ជា​​វាល​ទាំងអស់ ដែល​បាន​មក​ពី​កញ្ចប់​និមួយ​ៗដូចជា​ MD5 hash និង​ ទំហំ​ឯកសារ​ ។ ឯកសារ​"
-"បដិសេធ​​មិន​គាំទ្រ​ \n"
-"ដើម្បី​បង្ខំ​តម្លៃ​អាទិភាព​និង សម័យ​ ។\n"
-"\n"
-"ភាព​ដូច​គ្នា​នៃ​ apt-ftparchive បង្កើត​ឯកសារ​ប្រភព​ពី​មែកធាង​ .dscs ។\n"
-"ជម្រើស​បដិសេធ​ប្រភព​អាច​ត្រូវ​បាន​ប្រើ​សម្រាប់​បញ្ចាក់ឯកសារ​បដិសេធ src  \n"
-"\n"
-" បញ្ជា​'កញ្ចប់​' និង​ 'ប្រភព' ត្រូវ​​តែ​រត់​ជា​ root \n"
-" ។ BinaryPath ត្រូវ​ចង្អុល​​ទៅ​កាន់​មូលដ្ឋាន​ស្វែងរក​ហៅ​ខ្លួនឯង​ ហើយ​ \n"
-"ឯកសារ​បដិសេធ​ត្រូវមាន​ទង​បដិសេធ  ។  ផ្លូវ​បរិបទ​ត្រូវ​បាន​បន្ថែម​​ទៅ​ក្នុង​វាល​ឈ្មោះ​​ឯកសារ​បើ​វា​មាន​  ។ "
-"ឧទាហរណ៍​ ការប្រើប្រាស់​ពី​ប័ណ្ណសារ​ \n"
-"ដេបៀន  ៖\n"
-"   apt-ftparchive កញ្ចប់​dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"ជម្រើស​ ៖\n"
-"  -h    អត្ថបទ​ជំនួយ​នេះ​\n"
-"  --md5 Control MD5 ការបបង្កើត​\n"
-"  -s=?  ឯកសារ​បដិសេធ​ប្រភព​\n"
-"  -q    Quiet\n"
-"  -d=?  ជ្រើស​ជម្រើសលាក់​ទុ​ក​ទិន្នន័យ​\n"
-"  --គ្មាន​-delink អនុញ្ញាត​ delinking របៀប​បំបាត់​កំហុស​\n"
-"  --មាតិកា  ពិនិត្យ​ការបង្កើត​ឯកសារ​មាតិកា\n"
-"  -c=?  អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ​\n"
-"  -o=?  កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "គ្មាន​ការ​ជ្រើស​​ដែល​ផ្គួផ្គង​"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "ឯកសារ​មួយ​ចំនួន​បាត់បងពី​ក្រុម​ឯកសារ​កញ្ចប់​ `%s'"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB បាន​ខូច​, ឯកសារ​បាន​ប្តូរ​ឈ្មោះ​ទៅ​ជា​ %s.old ។"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB ចាស់​, កំពុង​ព្យាយាម​ធ្វើ​ឲ្យ %s ប្រសើរ​ឡើង"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"ទ្រង់ទ្រាយ​មូលដ្ឋាន​ទិន្នន័យ​មិន​ត្រឹមត្រូវ ។ ប្រសិន​បើ​អ្នក​បាន​ធ្វើ​ឲ្យ​វា​ប្រសើឡើង​ពី​កំណែ​ចាស់​របស់ apt សូម​យក​"
-"មូលដ្ឋាន​ទិន្នន័យ​ចេញ និង​បង្កើត​មូលដ្ឋាន​ទិន្នន័យ​ឡើង​វិញ ។"
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "មិន​អាច​បើក​ឯកសារ​ DB បានទេ %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រា​ត្រួត​ពិនិត្យ​ទេ​"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច​"
+msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
 
-#: ftparchive/writer.cc:91
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: មិន​អាច​អាន​ថត %s បាន​ឡើយ\n"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
 
-#: ftparchive/writer.cc:96
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W ៖ មិន​អាច​ថ្លែង %s\n"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "ទម្លាក់​ថ្នាំង​ដែល​បាន​ហៅ​លើ​ថ្នាំងដែល​នៅតែតភ្ជាប់"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "W: "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "បរាជ័យ​ក្នុងការ​ដាក់ទីតាំង​ធាតុ​ដែលរាយប៉ាយ !"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: កំហុស​អនុវត្ត​លើ​ឯកសារ​"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "បរាជ័យ​ក្នុងការ​បម្រុងទុក​ការបង្វែរ"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "បរាជ័យ​ក្នុង​ការ​ដោះស្រាយ %s"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "កំហុស​ខាងក្នុង នៅក្នុង AddDiversion"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "មែក​ធាង បាន​បរាជ័យ"
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "កំពុង​ព្យាយាម​សរសេរ​ជាន់​ពីលើ​ការបង្វែរ %s -> %s និង​ %s/%s"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to open %s"
-msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "ការបន្ថែម​ស្ទួន នៃការបង្វែរ​ %s -> %s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Duplicate conf file %s/%s"
+msgstr "ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​ស្ទួន​ %s/%s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s"
+msgid "The path %s is too long"
+msgstr "ផ្លូវ​ %s វែង​ពេក"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ដាច់ %s"
+msgid "Unpacking %s more than once"
+msgstr "កំពុង​ពន្លា​ %s ច្រើន​ជាង​ម្តង​"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត​ %s ទៅ %s"
+msgid "The directory %s is diverted"
+msgstr "ថត​ %s ត្រូវបាន​បង្វែរ"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:152
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "កញ្ចប់ ​កំពុង​ព្យាយាម​សរសេរ​ទៅកាន់​គោលដៅ​បង្វែរ​ %s/%s"
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "ផ្លូវ​បង្វែរ វែងពេក"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "ថត​ %s ត្រូវ​បាន​ជំនួស​ដោយ​មិនមែន​ជា​ថត​"
+
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "បរាជ័យ​ក្នុងការ​ដាក់ថ្នាំង​នៅក្នុង​ធុង​រាយប៉ាយ​របស់វា"
+
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "ផ្លូវ​វែង​ពេក"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n"
+msgid "Overwrite package match with no version for %s"
+msgstr "សរសេរ​ជាន់​លើកញ្ចប់ផ្គួផ្គង​ដោយ​គ្មាន​កំណែ​សម្រាប់ %s"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "ឯកសារ​ %s/%s សរសេរជាន់​ពីលើ​មួយ​ក្នុង​កញ្ចប់ %s"
 
-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n"
+msgid "Unable to stat %s"
+msgstr "មិន​អាច​ថ្លែង %s បានឡើយ"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - បរាជ័យ​ក្នុង​ការ​​បម្រុង​​ទុក​សតិ​"
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Unable to open %s"
-msgstr "មិន​អាចបើក​ %s បានឡើយ"
+msgid "Failed to close file %s"
+msgstr "បរាជ័យ​ក្នុងការ​បិទឯកសារ %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1"
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "នេះ​ជាមិនមែនជា​ប័ណ្ណសារ​ DEB ​ត្រឹមត្រូវទេ បាត់បង់សមាជិក​ '%s'​"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អានឯកសារ​បដិសេធ %s"
+msgid "Internal error, could not locate member %s"
+msgstr "កំហុស​ខាងក្នុង ​មិន​អាច​កំណត់​ទីតាំង​សមាជិក​ %s បានឡើយ"
 
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "ឯកសារត្រួតពិនិត្យ​ដែលមិនអាច​ញែកបាន"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #2"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "ហត្ថលេខា​ប័ណ្ណសា​រមិន​ត្រឹមត្រូវ​"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #3"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "កំហុស​ក្នុងការ​អានបឋមកថា​សមាជិក​ប័ណ្ណសារ"
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "មិន​ស្គាល់​ក្បួន​ដោះស្រាយ​ការបង្ហាប់​ '%s'"
+#: apt-inst/contrib/arfile.cc:96
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "​ទិន្នផល​ដែល​បាន​បង្ហាប់​​ %s ត្រូវ​ការ​កំណត់​ការបង្ហាប់​"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ FILE*"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "ប័ណ្ណសារ ខ្លីពេក"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "បាន​បរាជ័យ​ក្នុងការ​ដាក់ជា​ពីរផ្នែក​"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "បរាជ័យ​ក្នុងការ​អាន​បឋមកថា​ប័ណ្ណសារ"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "បង្ហាប់កូន"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "បាន​បរាជ័យក្នុង​ការ​បង្កើត​បំពង់​"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "កំហុស​ខាងក្នុង​ បរាជ័យ​ក្នុង​ការ​បង្កើត​ %s"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "បាន​បរាជ័យក្នុង​ការ​ប្រតិបត្តិ gzip"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "IO សម្រាប់​ដំណើរការ​រង​/ឯកសារ​ បាន​បរាជ័យ​"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "ប័ណ្ណសារ​បាន​ខូច​"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការអាន​ នៅពេល​គណនា MD5"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar ឆេកសាំ​បាន​បរាជ័យ ប័ណ្ណសារ​បាន​ខូច"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "មិន​ស្គាល់​ប្រភេទ​បឋមកថា​ TAR  %u ដែលជា​សមាជិក​ %s"
 
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates ជាឧបករណ៍ដើម្បី​ស្រង់​ព័ត៌មាន​ការ​រចនាសម្ព័ន្ធ​​និង​ពុម្ព​\n"
-"ពី​កញ្ចប់​​ដេបៀន \n"
-"\n"
-"ជម្រើស ៖ ​\n"
-"  -h   អត្ថបទ​ជំនួយ​\n"
-"  -t  កំណត់​ថត​បណ្ដោះ​អាសន្ន\n"
-"  -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
-"  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "ទំហំ​កំណែ​ភាព​អាស្រ័យ​សរុប ៖ "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "មិន​ស្គាល់​កំណត់​ត្រា​កញ្ចប់ !"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"ការប្រើប្រាស់ ៖ apt-sortpkgs [ជម្រើស] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs ជា​ឧបករណ៍​ធម្មតា​ដើម្បី​តម្រៀប​ឯកសារ​កញ្ចប់ ។  ជម្រើស​ -s បាន​ប្រើ​\n"
-"សម្រាប់​ចង្អុល​ប្រភេទ​នៃ​​​ឯកសារ​អ្វីមួយដែល​មាន​ ។\n"
-"\n"
-"ជម្រើស​\n"
-"  -h   អត្ថបទ​ជំនួយ​នេះ​\n"
-"  -s   ប្រើ​ការ​តម្រៀប​ឯកសារ​ប្រភព\n"
-"  -c=? អាន​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធនេះ​\n"
-"  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "ធ្វើរួច​"
+
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/ko.po b/po/ko.po
index 4c00e7627..5479ab790 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: 2015-01-16 04:37-0500\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,148 +20,144 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "%s 패키지의 %s 버전의 의존성이 맞지 않습니다:\n"
 
-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "전체 패키지 이름 : "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "전체 패키지 구조: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  일반 패키지: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  순수 가상 패키지: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  단일 가상 패키지: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  혼합 가상 패키지: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  빠짐: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "개별 버전 전체: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "개별 설명 전체: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "전체 의존성: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "전체 버전/파일 관계: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "전체 설명/파일 관계: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "전체 제공 매핑: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "전체 패턴 문자열: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "전체 의존성 버전 용량: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "전체 빈 용량: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "차지하는 전체 용량: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "%s 패키지를 찾을 수 없습니다"
 
-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "패키지 파일:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "핀 패키지:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(없음)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  설치: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  후보: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(없음)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  패키지 핀: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  버전 테이블:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -235,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"
@@ -256,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에도 이 과정을 반복하십시오."
 
@@ -292,71 +288,71 @@ msgstr ""
 "  -c=? 해당 설정 파일을 읽습니다\n"
 "  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
 
-#: cmdline/apt-get.cc:367
+#: 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:423
+#: 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:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s 패키지를 찾을 수 없습니다"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "다운로드 디렉터리를 잠글 수 없습니다"
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -365,7 +361,7 @@ msgstr ""
 "알림: '%s' 패키징은 다음 '%s' 버전 컨트롤 시스템에서 관리합니다:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
@@ -376,95 +372,94 @@ msgstr ""
 "다음과 같이 하십시오:\n"
 "bzr get %s\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "%s에 충분한 공간이 없습니다"
-
 #. 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:895
+#: 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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s 소스를 가져옵니다\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "일부 아카이브를 가져오는데 실패했습니다."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다"
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "압축 풀기 명령 '%s' 실패.\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "빌드 명령 '%s' 실패.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "하위 프로세스가 실패했습니다"
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다"
 
-#: cmdline/apt-get.cc:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "빌드 의존성을 처리하는데 실패했습니다"
+
+#: 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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 패키지에 빌드 의존성이 없습니다.\n"
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -507,30 +502,30 @@ msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
 "다"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "빌드 의존성을 처리하는데 실패했습니다"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s(%s)에 연결하는 중입니다"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "지원하는 모듈:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -627,11 +622,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -645,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -770,12 +765,12 @@ msgstr "디스크가 없습니다."
 msgid "File not found"
 msgstr "파일이 없습니다"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "파일 정보를 읽는데 실패했습니다"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "파일 변경 시각을 설정하는데 실패했습니다"
 
@@ -784,34 +779,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI가 틀렸습니다. 로컬 URI는 //로 시작해야 합니다."
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "로그인하는 중입니다"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "상대방의 이름을 알 수 없습니다"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "로컬 이름을 알 수 없습니다"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "서버에서 다음과 같이 연결을 거부했습니다: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER 실패, 서버에서는: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS 실패, 서버에서는: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -819,123 +814,123 @@ msgstr ""
 "프록시 서버를 지정했지만 로그인 스크립트가 없습니다. Acquire::ftp::"
 "ProxyLogin 값이 비어 있습니다."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "로그인 스크립트 명령 '%s' 실패, 서버에서는: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE 실패, 서버에서는: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "연결 시간 초과"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "서버에서 연결을 닫았습니다"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "읽기 오류"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "응답이 버퍼 크기를 넘어갔습니다."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "프로토콜이 틀렸습니다"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "쓰기 오류"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "소켓을 만들 수 없습니다"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "데이터 소켓을 연결할 수 없습니다. 연결 시간이 초과되었습니다"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "실패"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "수동(passive) 소켓을 연결할 수 없습니다."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo에서 소켓에 listen할 수 없습니다"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "소켓을 bind할 수 없습니다"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "소켓에 listen할 수 없습니다"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "소켓의 이름을 알아낼 수 없습니다"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "PORT 명령을 보낼 수 없습니다"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "주소 %u의 종류(AF_*)를 알 수 없습니다"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT 실패, 서버에서는: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "데이터 소켓 연결 시간 초과"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "연결을 받을 수 없습니다"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "파일 해싱에 문제가 있습니다"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "파일을 가져올 수 없습니다. 서버 왈, '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "데이터 소켓에 제한 시간이 초과했습니다"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "데이터 전송 실패, 서버에서는: %s"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "질의"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "다음을 실행할 수 없습니다: "
 
@@ -1001,71 +996,72 @@ msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생
 msgid "Unable to connect to %s:%s:"
 msgstr "%s:%s에 연결할 수 없습니다:"
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "내부 오류: 서명은 올바르지만 키 핑거프린트를 확인할 수 없습니다?!"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "최소한 하나 이상의 서명이 잘못되었습니다."
 
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:164
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
-"서명을 확인하는 'apt-key' 프로그램을 실행할 수 없습니다. (gnupg를 설치했습니까?)"
+"서명을 확인하는 'apt-key' 프로그램을 실행할 수 없습니다. (gnupg를 설치했습니"
+"까?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "apt-key 실행 도중 알 수 없는 오류 발생"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr "다음 서명이 올바르지 않습니다:\n"
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "다음 서명들은 공개키가 없기 때문에 인증할 수 없습니다:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "해당 파일에 쓰는데 오류가 발생했습니다"
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr "서버에서 읽고 연결을 닫는데 오류가 발생했습니다"
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "서버에서 읽는데 오류가 발생했습니다"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "파일에 쓰는데 오류가 발생했습니다"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "select가 실패했습니다"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "연결 시간이 초과했습니다"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "출력 파일에 쓰는데 오류가 발생했습니다"
 
@@ -1097,318 +1093,62 @@ msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
 msgid "Unknown date format"
 msgstr "데이터 형식을 알 수 없습니다"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "헤더 데이터가 잘못되었습니다"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "내부 오류"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습니다!"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "패키지를 제거해야 하지만 제거가 금지되어 있습니다."
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"이상하게도 크기가 서로 다릅니다. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of 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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "%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
-#: apt-private/private-install.cc:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "이 작업 후 %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
-#: apt-private/private-install.cc:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "%s 안에 충분한 여유 공간이 없습니다."
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-"사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 "
-"아닙니다."
-
-# 입력을 받아야 한다.  한글 입력을 못 할 수 있으므로 원문 그대로 사용.
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Yes, do as I say!"
-
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"시스템에 무언가 해가 되는 작업을 하려고 합니다.\n"
-"계속하시려면 다음 문구를 입력하십시오: '%s'\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "중단."
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "계속 하시겠습니까?"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "일부 파일을 받는데 실패했습니다"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-"
-"missing 옵션을 줘서 실행해야 할 것입니다."
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "빠진 패키지를 바로잡을 수 없습니다."
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "설치를 중단합니다."
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"다음 패키지는 패키지의 파일을 모두 다른 패키지가\n"
-"덮어썼기 때문에 사라졌습니다:"
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "주의: dpkg에서 자동으로 의도적으로 수행했습니다."
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다"
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"AutoRemover가 뭔가를 망가뜨린 것으로 보입니다. 이 문제는 실제 일어나서는\n"
-"안 됩니다. apt에 대해 버그 보고를 하십시오."
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "이 상황을 해결하는데 다음 정보가 도움이 될 수도 있습니다:"
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
-
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "다음 패키지가 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
-
-#: apt-private/private-install.cc:517
+#: methods/server.cc:589
 #, c-format
-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개가 자동으로 설치되었지만 더 이상 필요하지 않습니다.\n"
-
-#: apt-private/private-install.cc:519
-#, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "이들을 지우려면 'apt-get autoremove'를 사용하십시오."
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "다음을 바로잡으려면 'apt-get -f install'을 실행해 보십시오:"
-
-# FIXME: specify a solution?  무슨 솔루션?
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 "
-"(아니면 해결 방법을 지정하십시오)."
-
-#: apt-private/private-install.cc:638
 msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"몇몇 패키지를 설치할 수 없습니다. 요청한 상황이 불가능할 수도 있고,\n"
-"불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n"
-"아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "망가진 패키지"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "다음 패키지를 더 설치할 것입니다:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "제안하는 패키지:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "추천하는 패키지:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"%s 패키지를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "%s 패키지를 건너 뜁니다. 설치되지 않았고 업그레이드만 요청합니다.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "%s 패키지를 다시 설치하는 건 불가능합니다. 다운로드할 수 없습니다.\n"
 
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s 패키지는 이미 최신 버전입니다.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "내부 오류"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: 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:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "의존성을 바로잡는 중입니다..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " 실패."
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "의존성을 바로잡을 수 없습니다"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr "업그레이드 집합을 최소화할 수 없습니다"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " 완료"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오."
 
@@ -1572,7 +1312,7 @@ msgstr "Y"
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "정규식 컴파일 오류 - %s"
@@ -1581,17 +1321,21 @@ msgstr "정규식 컴파일 오류 - %s"
 msgid "The update command takes no arguments"
 msgstr "update 명령은 인수를 받지 않습니다"
 
-#: apt-private/private-update.cc:97
+#: 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:101
+#: 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"
@@ -1615,27 +1359,298 @@ msgstr ""
 "      또 잠금 기능을 사용하지 않는 상태이므로, 현재 상황에 의존하지\n"
 "      않도록 하십시오!"
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "경고: 다음 패키지를 인증할 수 없습니다!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습니다!"
 
-#: apt-private/private-download.cc:40
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "패키지를 제거해야 하지만 제거가 금지되어 있습니다."
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"이상하게도 크기가 서로 다릅니다. 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of 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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "%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
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "이 작업 후 %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
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "문제가 발생했고 -y 옵션이 --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) 지정되었지만 이 작업은 사소한 작업이 "
+"아닙니다."
+
+# 입력을 받아야 한다.  한글 입력을 못 할 수 있으므로 원문 그대로 사용.
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Yes, do as I say!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"시스템에 무언가 해가 되는 작업을 하려고 합니다.\n"
+"계속하시려면 다음 문구를 입력하십시오: '%s'\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "중단."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "계속 하시겠습니까?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "일부 파일을 받는데 실패했습니다"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-"
+"missing 옵션을 줘서 실행해야 할 것입니다."
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "빠진 패키지를 바로잡을 수 없습니다."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "설치를 중단합니다."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"다음 패키지는 패키지의 파일을 모두 다른 패키지가\n"
+"덮어썼기 때문에 사라졌습니다:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "주의: dpkg에서 자동으로 의도적으로 수행했습니다."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "삭제를 할 수 없으므로 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 ""
+"AutoRemover가 뭔가를 망가뜨린 것으로 보입니다. 이 문제는 실제 일어나서는\n"
+"안 됩니다. apt에 대해 버그 보고를 하십시오."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "이 상황을 해결하는데 다음 정보가 도움이 될 수도 있습니다:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "다음 패키지가 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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개가 자동으로 설치되었지만 더 이상 필요하지 않습니다.\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'를 사용하십시오."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "다음을 바로잡으려면 'apt-get -f install'을 실행해 보십시오:"
+
+# FIXME: specify a solution?  무슨 솔루션?
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 "
+"(아니면 해결 방법을 지정하십시오)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"몇몇 패키지를 설치할 수 없습니다. 요청한 상황이 불가능할 수도 있고,\n"
+"불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n"
+"아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "망가진 패키지"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "다음 패키지를 더 설치할 것입니다:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "제안하는 패키지:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "추천하는 패키지:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"%s 패키지를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "%s 패키지를 건너 뜁니다. 설치되지 않았고 업그레이드만 요청합니다.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s 패키지를 다시 설치하는 건 불가능합니다. 다운로드할 수 없습니다.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s 패키지는 이미 최신 버전입니다.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+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
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "'%3$s' 패키지의 '%1$s' (%2$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 "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "경고: 다음 패키지를 인증할 수 없습니다!"
+
+#: apt-private/private-download.cc:98
 msgid "Authentication warning overridden.\n"
 msgstr "인증 경고를 무시합니다.\n"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
 msgid "Some packages could not be authenticated"
 msgstr "인증할 수 없는 패키지가 있습니다"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 msgid "Install these packages without verification?"
 msgstr "확인하지 않고 패키지를 설치하시겠습니까?"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%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 "%s의 여유 공간의 크기를 파악할 수 없습니다"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "%s 안에 충분한 여유 공간이 없습니다."
+
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1650,41 +1665,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "업그레이드를 계산하는 중입니다"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "완료"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "기존 "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "받기:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "무시"
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "오류 "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "내려받기 %s바이트, 소요시간 %s (%s바이트/초)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [작업중]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1697,18 +1704,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1781,205 +1788,457 @@ msgstr "오류만 중요합니다. 이 오류를 고친 다음에 설치(I)를 
 msgid "Merging available information"
 msgstr "이용 가능 패키지 정보를 합칩니다"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode가 아직 연결되어 있는 노드에 대해 호출되었습니다"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"사용법: apt-extracttemplates 파일1 [파일2 ...]\n"
+"\n"
+"apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n"
+"도구입니다\n"
+"\n"
+"옵션:\n"
+"  -h   이 도움말\n"
+"  -t   임시 디렉토리 설정\n"
+"  -c=? 설정 파일을 읽습니다\n"
+"  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "해시 항목을 찾는데 실패했습니다"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s의 정보를 읽을 수 없습니다"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "diversion을 할당하는데 실패했습니다"
+#: 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에 쓸 수 없습니다"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "AddDiversion에서 내부 오류"
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "전환된 파일을 덮어 쓰려고 합니다 (%s -> %s 및 %s/%s)"
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "패키지 확장 목록이 너무 깁니다"
 
-#: apt-inst/filelist.cc:506
+#: 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 "Double add of diversion %s -> %s"
-msgstr "전환된 파일을 두 번 추가합니다 (%s -> %s)"
+msgid "Error processing directory %s"
+msgstr "%s 디렉터리를 처리하는데 오류가 발생했습니다"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "%s/%s 설정 파일이 중복되었습니다"
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "소스 확장 목록이 너무 깁니다"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "컨텐츠 파일에 헤더를 쓰는데 오류가 발생했습니다"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "경로 %s이(가) 너무 깁니다"
+msgid "Error processing contents %s"
+msgstr "%s 컨텐츠를 처리하는데 오류가 발생했습니다"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"사용법: apt-ftparchive [옵션] 명령\n"
+"명령: packages 바이너리경로 [override파일 [경로앞부분]]\n"
+"      sources 소스경로 [override파일 [경로앞부분]]\n"
+"      contents 경로\n"
+"      release 경로\n"
+"      generate 설정 [그룹]\n"
+"      clean 설정\n"
+"\n"
+"apt-ftparchive는 데비안 아카이브용 인덱스 파일을 만듭니다. 이 프로그램은\n"
+"여러 종류의 인덱스 파일 만드는 작업을 지원합니다 -- 완전 자동화 작업부터\n"
+"dpkg-scanpackages와 dpkg-scansources의 기능을 대체하기도 합니다.\n"
+"\n"
+"apt-ftparchive는 .deb 파일의 트리에서부터 Package 파일을 만듭니다.\n"
+"Package 파일에는 각 패키지의 모든 제어 필드는 물론 MD5 해시와 파일\n"
+"크기도 들어 있습니다. override 파일을 이용해 Priority와 Section의 값을 \n"
+"강제로 설정할 수 있습니다\n"
+"\n"
+"이와 비슷하게 apt-ftparchive는 .dsc 파일의 트리에서 Sources 파일을\n"
+"만듭니다. --source-override 옵션을 이용해 소스 override 파일을\n"
+"지정할 수 있습니다.\n"
+"\n"
+"'packages'와 'sources' 명령은 해당 트리의 맨 위에서 실행해야 합니다.\n"
+"\"바이너리경로\"는 검색할 때의 기준 위치를 가리키며 \"override파일\"에는\n"
+"override 플래그들을 담고 있습니다. \"경로앞부분\"은 각 파일 이름\n"
+"필드의 앞에 더해 집니다. 데비안 아카이브에 있는 예를 하나 들자면:\n"
+"\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"옵션:\n"
+"  -h    이 도움말\n"
+"  --md5 MD5 만들기 작업을 제어합니다\n"
+"  -s=?  소스 override 파일\n"
+"  -q    조용히\n"
+"  -d=?  캐시 데이터베이스를 직접 설정합니다\n"
+"  --no-delink 디버깅 모드 지우기를 사용합니다\n"
+"  --contents  컨텐츠 파일을 만드는 적업을 제어합니다\n"
+"  -c=?  이 설정 파일을 읽습니다\n"
+"  -o=?  임의의 옵션을 설정합니다"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "맞는 패키지가 없습니다"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "%s을(를) 두 번 이상 풀었습니다"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "`%s' 패키지 파일 그룹에 몇몇 파일이 빠졌습니다"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "%s 디렉터리가 전환되었습니다"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB가 망가졌습니다. 파일 이름을 %s.old로 바꿉니다"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "이 패키지에서 전환된 대상에 쓰려고 합니다 (%s/%s)"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "전환하는 경로가 너무 깁니다"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"DB 형식이 잘못되었습니다. APT 예전 버전에서 업그레이드했다면, 데이터베이스를 "
+"지우고 다시 만드십시오."
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "DB 파일, %s 파일을 열 수 없습니다: %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s의 정보를 읽는데 실패했습니다"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "%s 파일에 readlink하는데 실패했습니다"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "아카이브에 컨트롤 기록이 없습니다"
+
+# FIXME: 왠 커서??
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "커서를 가져올 수 없습니다"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
+msgid "W: Unable to read directory %s\n"
+msgstr "경고: %s 디렉터리를 읽을 수 없습니다\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "%s 디렉터리를 디렉터리가 아닌 파일로 덮어쓰려고 합니다"
+msgid "W: Unable to stat %s\n"
+msgstr "경고: %s의 정보를 읽을 수 없습니다\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "해시 버킷에서 노드를 찾는데 실패했습니다"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "오류: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "경로가 너무 깁니다"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "경고: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "오류: 다음 파일에 적용하는데 오류가 발생했습니다: "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "덮어 쓰는 패키지가 %s 패키지의 어떤 버전과도 맞지 않습니다"
+msgid "Failed to resolve %s"
+msgstr "%s의 경로를 알아내는데 실패했습니다"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "트리에서 이동이 실패했습니다"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "%s/%s 파일은 %s 패키지에 있는 파일을 덮어 씁니다"
+msgid "Failed to open %s"
+msgstr "%s 파일을 여는데 실패했습니다"
 
-#: apt-inst/extract.cc:498
+# FIXME: ??
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "%s의 정보를 읽을 수 없습니다"
+msgid " DeLink %s [%s]\n"
+msgstr " 링크 %s [%s] 없애기\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "%s 파일을 쓰는데 실패했습니다"
+msgid "Failed to readlink %s"
+msgstr "%s 파일에 readlink하는데 실패했습니다"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "%s 파일을 닫는데 실패했습니다"
+msgid "Failed to unlink %s"
+msgstr "%s 파일을 지우는데 실패했습니다"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "올바른 DEB 아카이브가 아닙니다. '%s' 멤버가 없습니다"
+msgid "*** Failed to link %s to %s"
+msgstr "*** %s 파일을 %s에 링크하는데 실패했습니다"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "내부 오류, %s 멤버를 찾을 수 없습니다"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "control 파일을 파싱할 수 없습니다"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "아카이브에 패키지 필드가 없습니다"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "아카이브 서명이 틀렸습니다"
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s에는 override 항목이 없습니다\n"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "아카이브 멤버 헤더를 읽는데 오류가 발생했습니다"
+#: 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:712
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s에는 source override 항목이 없습니다\n"
+
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s에는 binary override 항목이 없습니다\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - 메모리를 할당하는데 실패했습니다"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s 열 수 없습니다"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "%s override 파일을 읽는데 실패했습니다"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "override %s의 %lu번 줄 #2가 잘못되었습니다"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "'%s' 압축 알고리즘을 알 수 없습니다"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/multicompress.cc:103
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "아카이브 멤버 헤더 %s이(가) 잘못되었습니다"
+msgid "Compressed output %s needs a compression set"
+msgstr "압축된 출력물 %s에는 압축 세트가 필요합니다"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "아카이브 멤버 헤더가 잘못되었습니다"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "FILE*를 만드는데 실패했습니다"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "아카이브 길이가 너무 짧습니다"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "fork하는데 실패했습니다"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "아카이브 헤더를 읽는데 실패했습니다"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "압축 하위 프로세스"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "파이프 만들기가 실패했습니다"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "내부 오류, %s 만드는데 실패했습니다"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "gzip 실행이 실패했습니다"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "하위 프로세스/파일에 입출력하는데 실패했습니다"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "아카이브가 손상되었습니다"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "MD5를 계산하는 동안 읽는데 실패했습니다"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "tar 체크섬 실패, 아카이브가 손상되었습니다"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "%s의 링크를 해제하는데 문제가 있습니다"
 
-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "알 수 없는 TAR 헤더 타입 %u, 멤버 %s"
+msgid "Failed to rename %s to %s"
+msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
+
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"사용법: apt-extracttemplates 파일1 [파일2 ...]\n"
+"\n"
+"apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n"
+"도구입니다\n"
+"\n"
+"옵션:\n"
+"  -h   이 도움말\n"
+"  -t   임시 디렉토리 설정\n"
+"  -c=? 설정 파일을 읽습니다\n"
+"  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "알 수 없는 패키지 기록!"
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"사용법: apt-sortpkgs [옵션] 파일1 [파일2 ...]\n"
+"\n"
+"apt-sortpkgs는 패키지 파일을 정렬하는 간단한 도구입니다. -s 옵션은 무슨 파일"
+"인지\n"
+"알아 내는데 쓰입니다.\n"
+"\n"
+"옵션:\n"
+"  -h   이 도움말\n"
+"  -s   소스 파일 정렬을 사용합니다\n"
+"  -c=? 이 설정 파일을 읽습니다\n"
+"  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "dpkg 실행하는 중입니다"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "'%s' 패키지 시스템을 지원하지 않습니다"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "올바른 패키지 시스템 타입을 알아낼 수 없습니다"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "레코드 %i개를 썼습니다.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n"
@@ -1994,6 +2253,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 "패키지 목록이나 상태 파일을 파싱할 수 없거나 열 수 없습니다."
@@ -2006,202 +2286,366 @@ msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습
 msgid "The list of sources could not be read."
 msgstr "소스 목록을 읽을 수 없습니다."
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "패키지 캐시가 비어 있습니다"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr "패키지 캐시 파일이 손상되었습니다"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr "패키지 캐시 파일이 호환되지 않는 버전입니다"
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "패키지 캐시 파일이 손상되었습니다"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "이 APT는 '%s' 버전 시스템을 지원하지 않습니다"
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "의존"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "미리의존"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "제안"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "추천"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "충돌"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "대체"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "없앰"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "망가뜨림"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "향상"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "중요"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "필수"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "표준"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "옵션"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "별도"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "업그레이드를 계산하는 중입니다"
+
+#: 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:118
+#: 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/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/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/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
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다."
 
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 넣고 Enter를 누르십시오."
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다"
+msgid "Couldn't stat source package list %s"
+msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "후보 버전"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "파일에서 제공하는 것을 모으는 중입니다"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "의존성 만들기"
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "상태 정보를 읽는 중입니다"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "상태파일 %s 여는데 실패했습니다"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "임시 상태파일 %s 쓰는데 실패했습니다"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "해시 합이 맞지 않습니다"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "크기가 맞지 않습니다"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "잘못된 작업 %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "쓰기 오류"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"디지털 서명 확인에 오류가 발생했습니다. 저장고를 업데이트하지 않고\n"
+"예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG 오류: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "%s 디렉터리가 전환되었습니다"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"디지털 서명 확인에 오류가 발생했습니다. 저장고를 업데이트하지 않고\n"
-"예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG 오류: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2210,132 +2654,50 @@ msgstr ""
 "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
 "니다. (아키텍쳐가 빠졌기 때문입니다)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "패키지 목록을 읽는 중입니다"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "파일에서 제공하는 것을 모으는 중입니다"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "%s에 쓸 수 없습니다"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "아카이브 디렉터리 %spartial이 빠졌습니다."
 
-#: apt-pkg/acquire.cc:99
+#: 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "sources.list에 '소스' URI를 써 넣어야 합니다"
@@ -2361,7 +2723,7 @@ msgstr "핀 타입 %s이(가) 무엇인지 이해할 수 없습니다"
 msgid "No priority (or zero) specified for pin"
 msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2370,12 +2732,12 @@ msgstr ""
 "'%s'에 대해 즉시 설정을 할 수 없습니다. 자세한 설명은 man 5 apt.conf 페이지에"
 "서 APT::Immediate-Configure 항목을 보십시오. (%d)"
 
-#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "'%s' 파일을 열 수 없습니다"
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2386,10 +2748,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"
@@ -2458,11 +2824,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"
 
@@ -2473,7 +2839,7 @@ msgid ""
 msgstr ""
 "%s 패키지를 다시 설치해야 하지만, 이 패키지의 아카이브를 찾을 수 없습니다."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2481,167 +2847,87 @@ msgstr ""
 "오류, pkgProblemResolver::Resolve가 망가졌습니다. 고정 패키지때문에 발생할 수"
 "도 있습니다."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Release 파일 %s에 섹션이 없습니다"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Release 파일 %s에 Hash 항목이 없습니다"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "'%s' 작업을 찾을 수 없습니다"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/cacheset.cc:635
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/cacheset.cc:641
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
 
-#: apt-pkg/cacheset.cc:626
+#: 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:633 apt-pkg/cacheset.cc:640
+#: 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:727
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보가 없습니다."
+
+#: 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:743 apt-pkg/cacheset.cc:751
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -2650,160 +2936,170 @@ msgstr ""
 "'%s' 패키지에서 설치한 버전이나 후보 버전을 선택할 수 없습니다. 둘 다 아닙니"
 "다."
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/indexrecords.cc:83
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "'%s' 패키지에서 최신 버전을 선택할 수 없습니다. 가상 패키지입니다."
+msgid "Unable to parse Release file %s"
+msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/indexrecords.cc:91
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보가 없습니다."
+msgid "No sections in Release file %s"
+msgstr "Release 파일 %s에 섹션이 없습니다"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/indexrecords.cc:132
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr "'%s' 패키지에서 설치한 버전을 선택할 수 없습니다. 설치하지 않았습니다."
+msgid "No Hash entry in Release file %s"
+msgstr "Release 파일 %s에 Hash 항목이 없습니다"
+
+#: apt-pkg/indexrecords.cc:145
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다"
+
+#: apt-pkg/indexrecords.cc:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다"
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%li분 %li초"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%li초"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "선택한 %s이(가) 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습니다"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "잠금 파일 %s 파일을 열 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "%s 잠금 파일을 얻을 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "하위 프로세스 %s 프로세스가 %u번 시그널을 받았습니다."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "%s gzip 파일을 닫는데 문제가 있습니다"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s 파일을 열 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "%d 파일 디스크립터를 열 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "하위 프로세스 IPC를 만드는데 실패했습니다"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "다음 압축 프로그램을 실행하는데 실패했습니다: "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "%s 파일을 닫는데 문제가 있습니다"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "%s 파일을 %s(으)로 이름을 바꾸는데 문제가 있습니다"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "%s 파일을 삭제하는데 문제가 있습니다"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "파일을 동기화하는데 문제가 있습니다"
 
@@ -2889,109 +3185,103 @@ msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다"
 msgid "Failed to stat the cdrom"
 msgstr "CD-ROM의 정보를 읽을 수 없습니다"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "이 타입 줄임말을 알 수 없습니다: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "설정 파일 %s 파일을 여는 중입니다"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "문법 오류 %s:%u: 태그의 형식이 잘못되었습니다"
 
-#: apt-pkg/contrib/configuration.cc:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s에 키 모음을 설치하지 않았습니다."
-
-#: 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"
@@ -3001,12 +3291,12 @@ msgstr "잘못된 작업 %s"
 msgid "Installing %s"
 msgstr "%s 설치하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "%s 패키지를 지우는 중입니다"
@@ -3027,79 +3317,79 @@ msgid "Running post-installation trigger %s"
 msgstr "설치 후 트리거 %s 실행하는 중입니다"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "디렉터리 '%s' 없습니다."
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "%s 준비 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s 푸는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s 패키지를 설정할 준비하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "%s 설치"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s 패키지를 지울 준비하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "%s 지움"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s 패키지를 완전히 지웠습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3107,20 +3397,20 @@ msgstr ""
 "보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수"
 "적인 오류입니다."
 
-#: apt-pkg/deb/dpkgpm.cc:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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 "
@@ -3128,7 +3418,7 @@ msgid ""
 msgstr ""
 "보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3146,420 +3436,186 @@ msgstr ""
 #: 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 "잠기지 않음"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"사용법: apt-extracttemplates 파일1 [파일2 ...]\n"
-"\n"
-"apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n"
-"도구입니다\n"
-"\n"
-"옵션:\n"
-"  -h   이 도움말\n"
-"  -t   임시 디렉토리 설정\n"
-"  -c=? 설정 파일을 읽습니다\n"
-"  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "%s의 정보를 읽을 수 없습니다"
-
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?"
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "%s 디렉터리를 처리하는데 오류가 발생했습니다"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "소스 확장 목록이 너무 깁니다"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "컨텐츠 파일에 헤더를 쓰는데 오류가 발생했습니다"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "%s 컨텐츠를 처리하는데 오류가 발생했습니다"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"사용법: apt-ftparchive [옵션] 명령\n"
-"명령: packages 바이너리경로 [override파일 [경로앞부분]]\n"
-"      sources 소스경로 [override파일 [경로앞부분]]\n"
-"      contents 경로\n"
-"      release 경로\n"
-"      generate 설정 [그룹]\n"
-"      clean 설정\n"
-"\n"
-"apt-ftparchive는 데비안 아카이브용 인덱스 파일을 만듭니다. 이 프로그램은\n"
-"여러 종류의 인덱스 파일 만드는 작업을 지원합니다 -- 완전 자동화 작업부터\n"
-"dpkg-scanpackages와 dpkg-scansources의 기능을 대체하기도 합니다.\n"
-"\n"
-"apt-ftparchive는 .deb 파일의 트리에서부터 Package 파일을 만듭니다.\n"
-"Package 파일에는 각 패키지의 모든 제어 필드는 물론 MD5 해시와 파일\n"
-"크기도 들어 있습니다. override 파일을 이용해 Priority와 Section의 값을 \n"
-"강제로 설정할 수 있습니다\n"
-"\n"
-"이와 비슷하게 apt-ftparchive는 .dsc 파일의 트리에서 Sources 파일을\n"
-"만듭니다. --source-override 옵션을 이용해 소스 override 파일을\n"
-"지정할 수 있습니다.\n"
-"\n"
-"'packages'와 'sources' 명령은 해당 트리의 맨 위에서 실행해야 합니다.\n"
-"\"바이너리경로\"는 검색할 때의 기준 위치를 가리키며 \"override파일\"에는\n"
-"override 플래그들을 담고 있습니다. \"경로앞부분\"은 각 파일 이름\n"
-"필드의 앞에 더해 집니다. 데비안 아카이브에 있는 예를 하나 들자면:\n"
-"\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"옵션:\n"
-"  -h    이 도움말\n"
-"  --md5 MD5 만들기 작업을 제어합니다\n"
-"  -s=?  소스 override 파일\n"
-"  -q    조용히\n"
-"  -d=?  캐시 데이터베이스를 직접 설정합니다\n"
-"  --no-delink 디버깅 모드 지우기를 사용합니다\n"
-"  --contents  컨텐츠 파일을 만드는 적업을 제어합니다\n"
-"  -c=?  이 설정 파일을 읽습니다\n"
-"  -o=?  임의의 옵션을 설정합니다"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "맞는 패키지가 없습니다"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "`%s' 패키지 파일 그룹에 몇몇 파일이 빠졌습니다"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB가 망가졌습니다. 파일 이름을 %s.old로 바꿉니다"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"DB 형식이 잘못되었습니다. APT 예전 버전에서 업그레이드했다면, 데이터베이스를 "
-"지우고 다시 만드십시오."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "DB 파일, %s 파일을 열 수 없습니다: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "%s 파일에 readlink하는데 실패했습니다"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "아카이브에 컨트롤 기록이 없습니다"
-
-# FIXME: 왠 커서??
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "커서를 가져올 수 없습니다"
+msgstr "관리 디렉터리를 (%s) 잠글 수 없습니다. 루트 사용자가 맞습니까?"
 
-#: ftparchive/writer.cc:91
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "경고: %s 디렉터리를 읽을 수 없습니다\n"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"dpkg가 중단되었습니다. 수동으로 '%s' 명령을 실행해 문제점을 바로잡으십시오."
 
-#: ftparchive/writer.cc:96
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "경고: %s의 정보를 읽을 수 없습니다\n"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "잠기지 않음"
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "오류: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode가 아직 연결되어 있는 노드에 대해 호출되었습니다"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "경고: "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "해시 항목을 찾는데 실패했습니다"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "오류: 다음 파일에 적용하는데 오류가 발생했습니다: "
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "diversion을 할당하는데 실패했습니다"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "%s의 경로를 알아내는데 실패했습니다"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "AddDiversion에서 내부 오류"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "트리에서 이동이 실패했습니다"
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "전환된 파일을 덮어 쓰려고 합니다 (%s -> %s 및 %s/%s)"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to open %s"
-msgstr "%s 파일을 여는데 실패했습니다"
+msgid "Double add of diversion %s -> %s"
+msgstr "전환된 파일을 두 번 추가합니다 (%s -> %s)"
 
-# FIXME: ??
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " 링크 %s [%s] 없애기\n"
+msgid "Duplicate conf file %s/%s"
+msgstr "%s/%s 설정 파일이 중복되었습니다"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "%s 파일에 readlink하는데 실패했습니다"
+msgid "The path %s is too long"
+msgstr "경로 %s이(가) 너무 깁니다"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "%s 파일을 지우는데 실패했습니다"
+msgid "Unpacking %s more than once"
+msgstr "%s을(를) 두 번 이상 풀었습니다"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s 파일을 %s에 링크하는데 실패했습니다"
+msgid "The directory %s is diverted"
+msgstr "%s 디렉터리가 전환되었습니다"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:152
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "이 패키지에서 전환된 대상에 쓰려고 합니다 (%s/%s)"
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "아카이브에 패키지 필드가 없습니다"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "전환하는 경로가 너무 깁니다"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s에는 override 항목이 없습니다\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "%s 디렉터리를 디렉터리가 아닌 파일로 덮어쓰려고 합니다"
+
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "해시 버킷에서 노드를 찾는데 실패했습니다"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "경로가 너무 깁니다"
+
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s 관리자가 %s입니다 (%s 아님)\n"
+msgid "Overwrite package match with no version for %s"
+msgstr "덮어 쓰는 패키지가 %s 패키지의 어떤 버전과도 맞지 않습니다"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s에는 source override 항목이 없습니다\n"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "%s/%s 파일은 %s 패키지에 있는 파일을 덮어 씁니다"
 
-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s에는 binary override 항목이 없습니다\n"
+msgid "Unable to stat %s"
+msgstr "%s의 정보를 읽을 수 없습니다"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 메모리를 할당하는데 실패했습니다"
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "%s 파일을 쓰는데 실패했습니다"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Unable to open %s"
-msgstr "%s 열 수 없습니다"
+msgid "Failed to close file %s"
+msgstr "%s 파일을 닫는데 실패했습니다"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다"
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "올바른 DEB 아카이브가 아닙니다. '%s' 멤버가 없습니다"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "%s override 파일을 읽는데 실패했습니다"
+msgid "Internal error, could not locate member %s"
+msgstr "내부 오류, %s 멤버를 찾을 수 없습니다"
 
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "control 파일을 파싱할 수 없습니다"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "override %s의 %lu번 줄 #2가 잘못되었습니다"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "아카이브 서명이 틀렸습니다"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "아카이브 멤버 헤더를 읽는데 오류가 발생했습니다"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "'%s' 압축 알고리즘을 알 수 없습니다"
+msgid "Invalid archive member header %s"
+msgstr "아카이브 멤버 헤더 %s이(가) 잘못되었습니다"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "압축된 출력물 %s에는 압축 세트가 필요합니다"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "아카이브 멤버 헤더가 잘못되었습니다"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "FILE*를 만드는데 실패했습니다"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "아카이브 길이가 너무 짧습니다"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "fork하는데 실패했습니다"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "아카이브 헤더를 읽는데 실패했습니다"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "압축 하위 프로세스"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "파이프 만들기가 실패했습니다"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "내부 오류, %s 만드는데 실패했습니다"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "gzip 실행이 실패했습니다"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "하위 프로세스/파일에 입출력하는데 실패했습니다"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "아카이브가 손상되었습니다"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "MD5를 계산하는 동안 읽는데 실패했습니다"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "tar 체크섬 실패, 아카이브가 손상되었습니다"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "%s의 링크를 해제하는데 문제가 있습니다"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "알 수 없는 TAR 헤더 타입 %u, 멤버 %s"
 
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"사용법: apt-extracttemplates 파일1 [파일2 ...]\n"
-"\n"
-"apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n"
-"도구입니다\n"
-"\n"
-"옵션:\n"
-"  -h   이 도움말\n"
-"  -t   임시 디렉토리 설정\n"
-"  -c=? 설정 파일을 읽습니다\n"
-"  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "전체 의존성 버전 용량: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "알 수 없는 패키지 기록!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "%s에 충분한 공간이 없습니다"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"사용법: apt-sortpkgs [옵션] 파일1 [파일2 ...]\n"
-"\n"
-"apt-sortpkgs는 패키지 파일을 정렬하는 간단한 도구입니다. -s 옵션은 무슨 파일"
-"인지\n"
-"알아 내는데 쓰입니다.\n"
-"\n"
-"옵션:\n"
-"  -h   이 도움말\n"
-"  -s   소스 파일 정렬을 사용합니다\n"
-"  -c=? 이 설정 파일을 읽습니다\n"
-"  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "완료"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "%s에 키 모음을 설치하지 않았습니다."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/ku.po b/po/ku.po
index bc4e14204..c14ca94bd 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: 2015-01-16 04:37-0500\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,152 +24,148 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Navên paketan bi giştî :"
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Navên paketan bi giştî :"
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Pakêtên normal:"
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Pakêtên farazî yên safî:"
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Pakêta tenê ya farazî:"
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Pakêtên hevbeş yên farazî:"
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Winda: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Guhertoyên vekirî yên giştî:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Guhertoyên vekirî yên giştî:"
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Bindestên giştî:"
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Guhertoyên vekirî yên giştî:"
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Cihê giştî yê sist:"
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Cihê giştî yê veqetandî: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Pelgehên Pakêt:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(nehate dîtin)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Sazkirî: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Berendam: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(ne tiştek)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Destika pakêtê:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Tabloya guhertoyan:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -206,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"
@@ -228,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 ""
 
@@ -264,78 +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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: cmdline/apt-get.cc:358
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nikarî pakêta %s bibîne"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Pelrêça daxistinê nayê quflekirin"
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -343,151 +339,150 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Nikarî cihê vala li %s tesbît bike"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Cihê vala li %s têre nake"
-
 #. 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:895
+#: 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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Çavkanîna %s bîne\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Anîna çend arşîvan biserneket."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:968
+#: cmdline/apt-get.cc:943
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: 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:1385
+#: cmdline/apt-get.cc:1388
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Girêdan bi %s (%s) re pêk tê"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -541,11 +536,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -559,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -682,13 +677,13 @@ msgstr "Dîsk nehate dîtin."
 msgid "File not found"
 msgstr "Pel nehate dîtin"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 #, fuzzy
 msgid "Failed to stat"
 msgstr "%s venebû"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr ""
 
@@ -697,156 +692,156 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Têketin"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr ""
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Nikare navê herêmî tesbît bike"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr ""
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Çewiya xwendinê"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr ""
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Çewtiya nivîsînê"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Serneket"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr ""
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, fuzzy, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Danegira %s nehate vekirin: %s"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Lêpirsîn"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 #, fuzzy
 msgid "Unable to invoke "
 msgstr "%s venebû"
@@ -913,71 +908,71 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr "Nikare bi %s re girêdan pêk bîne %s:"
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:174
+#: 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Di xebitandina apt-key de çewtiya nenas"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Dema li pelî dihate nivîsîn çewtî"
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Dema li pelî dihate nivîsîn çewtî"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Hilbijartin neserketî"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 #, fuzzy
 msgid "Error writing to output file"
 msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
@@ -1010,269 +1005,30 @@ msgstr ""
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Girêdan pêk nehatiye"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "Çewtiya hundirîn"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr ""
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Anîna %sB/%sB ji arşîvan pêwist e.\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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Anîna %sB ji arşîvan pêwist e.\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:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\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
-#: apt-private/private-install.cc:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Cihê vala li %s têre nake."
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr ""
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Erê, wusa bike!"
-
-#: apt-private/private-install.cc:222
+#: methods/server.cc:589
 #, c-format
 msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Betal."
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Dixwazî bidomînî?"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Daxistina çend pelan biserneket"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr ""
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Sazkirin tê betalkirin."
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
-
-#: apt-private/private-install.cc:513
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:"
-msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
-
-#: apt-private/private-install.cc:517
-#, fuzzy, c-format
-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] "Ev pakêtên NÛ dê werine sazkirin:"
-msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Paketên şikestî"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr ""
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Paketên tên pêşniyaz kirin:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Paketên tên tawsiyê kirin:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s jixwe guhertoya nûtirîn e.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
 
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "Çewtiya hundirîn"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1280,31 +1036,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "Bindestî tên serrastkirin..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " neserketî."
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "Nikare bindestiyan rast kirin"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " Temam"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr ""
 
@@ -1467,7 +1223,7 @@ msgstr "E"
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
@@ -1476,7 +1232,7 @@ msgstr ""
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1484,10 +1240,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1508,33 +1268,287 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#. 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
+#: apt-private/private-install.cc:154
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Anîna %s %s biserneket\n"
-
-#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "%s ji hev nehate veçirandin"
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Anîna %sB/%sB ji arşîvan pêwist e.\n"
 
-#: apt-private/private-sources.cc:70
+#. 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:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Anîna %sB ji arşîvan pêwist e.\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:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\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
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr ""
+
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr ""
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Erê, wusa bike!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Betal."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Dixwazî bidomînî?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Daxistina çend pelan biserneket"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr ""
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr ""
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Sazkirin tê betalkirin."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: 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 ""
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+
+#: apt-private/private-install.cc:488
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:"
+msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+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] "Ev pakêtên NÛ dê werine sazkirin:"
+msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr ""
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Paketên şikestî"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr ""
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Paketên tên pêşniyaz kirin:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Paketên tên tawsiyê kirin:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s jixwe guhertoya nûtirîn e.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr ""
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr ""
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+
+#: apt-private/private-install.cc:945
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr ""
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr ""
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr ""
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Anîna %s %s biserneket\n"
+
+#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "Nikarî cihê vala li %s tesbît bike"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Cihê vala li %s têre nake."
+
+#: apt-private/private-sources.cc:58
+#, fuzzy, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "%s ji hev nehate veçirandin"
+
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
@@ -1543,41 +1557,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Bilindkirin tê hesibandin"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Temam"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr ""
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Anîn:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr ""
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Çewt"
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, fuzzy, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%s hatine anîn..."
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Dixebite]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1587,18 +1593,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1670,443 +1676,613 @@ msgstr ""
 msgid "Merging available information"
 msgstr ""
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr ""
+#: 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"
 
-#: apt-inst/filelist.cc:459
-#, fuzzy
-msgid "Failed to allocate diversion"
-msgstr "%s venebû"
+#: 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"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr ""
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr ""
+#: 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"
 
-#: apt-inst/filelist.cc:506
+#: 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 "Double add of diversion %s -> %s"
-msgstr ""
+msgid "Error processing directory %s"
+msgstr "Di şixulandina pêrista %s de çewtî"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr ""
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
-#, c-format
-msgid "The path %s is too long"
-msgstr "Rêça %s zêde dirêj e"
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "Unpacking %s more than once"
+msgid "Error processing contents %s"
+msgstr "Dema şixulandina naveroka %s çewtî"
+
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
-#: apt-inst/extract.cc:142
-#, c-format
-msgid "The directory %s is diverted"
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
 msgstr ""
 
-#: apt-inst/extract.cc:152
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr ""
+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"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-#, fuzzy
-msgid "The diversion path is too long"
-msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
+#: ftparchive/cachedb.cc:67
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB xerabe ye, navê dosyeyê weke %s.old hate guherandin"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "Failed to stat %s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide"
+
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
 msgstr ""
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:101
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr ""
+msgid "Unable to open DB file %s: %s"
+msgstr "Danegira %s nehate vekirin: %s"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
+msgid "Failed to stat %s"
 msgstr ""
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr ""
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Rakirina %s biserneket"
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Rêç zêde dirêj e"
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Tomara kontrola arşîvê tuneye"
 
-#: apt-inst/extract.cc:421
-#, c-format
-msgid "Overwrite package match with no version for %s"
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
 msgstr ""
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr ""
-
-#: apt-inst/extract.cc:498
-#, fuzzy, c-format
-msgid "Unable to stat %s"
-msgstr "Nivîsandin ji bo %s ne pêkane"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: pelrêça %s nayê xwendin\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Nivîsîna pelê %s biserneket"
+msgid "W: Unable to stat %s\n"
+msgstr ""
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Girtina pelê %s biserneket"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr ""
+msgid "Failed to resolve %s"
+msgstr "%s ji hev nehate veçirandin"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr ""
+#: ftparchive/writer.cc:232
+#, c-format
+msgid "Failed to open %s"
+msgstr "%s venebû"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
+#: ftparchive/writer.cc:291
+#, c-format
+msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Invalid archive member header %s"
+msgid "Failed to readlink %s"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
+#: ftparchive/writer.cc:303
+#, c-format
+msgid "Failed to unlink %s"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Arşîv zêde kin e"
-
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
+#: ftparchive/writer.cc:311
+#, c-format
+msgid "*** Failed to link %s to %s"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:124
-#, fuzzy
-msgid "Failed to create pipes"
-msgstr "%s ji hev nehate veçirandin"
+#: ftparchive/writer.cc:321
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Xebitandina gzip biserneket"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Di arşîvê de qada pakêtê tuneye"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
+#, c-format
+msgid "  %s has no override entry\n"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/writer.cc:712
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
+msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:57
+#: ftparchive/writer.cc:716
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "  %s has no binary override entry either\n"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
 #, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr ""
+msgid "Unable to open %s"
+msgstr "%s venebû"
 
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
-msgid "Wrote %i records.\n"
-msgstr "%i tomar hatin nivîsîn.\n"
+msgid "Failed to read the override file %s"
+msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: ftparchive/override.cc:166
 #, c-format
-msgid "Wrote %i records with %i missing files.\n"
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: ftparchive/override.cc:178
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+msgid "Malformed override %s line %llu #2"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: ftparchive/override.cc:191
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgid "Malformed override %s line %llu #3"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:515
+#: ftparchive/multicompress.cc:73
 #, c-format
-msgid "Can't find authentication record for: %s"
+msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:521
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Hash Sum li hev nayên"
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:169
-msgid "The package cache file is corrupted, it is too small"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:174
+#: ftparchive/multicompress.cc:359
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
+msgid "Problem unlinking %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "Bindest"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "PêşBindest"
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Bikaranîn: apt-config [vebijark] ferman\n"
+"apt-config, amûra xwendina dosyeya mîhengên APTê ye\n"
+"\n"
+"Ferman\n"
+"  shell - moda shell\n"
+"  dump - Mîhengan nîşan dide\n"
+"\n"
+"Vebijark:\n"
+"  -h Ev dosyeya alîkariyê ye.\n"
+"  -c=? Dosyeya mîhengan nîşan dide\n"
+"  -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:91
+msgid "Unknown package record!"
+msgstr ""
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:59
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/init.cc:156
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr ""
+
+#: apt-pkg/init.cc:172
+msgid "Unable to determine a suitable packaging system type"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "%i tomar hatin nivîsîn.\n"
+
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""
+
+#: 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 ""
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+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 ""
+
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr ""
+
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:154
+msgid "Empty package cache"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
+msgid "The package cache file is corrupted"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:165
+msgid "The package cache file is an incompatible version"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:168
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:175
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:185
+#, c-format
+msgid "The package cache was built for different architectures: %s vs %s"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
+msgid "Depends"
+msgstr "Bindest"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "PreDepends"
+msgstr "PêşBindest"
+
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Pêşniyaz dike"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Tawsiye dike"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Nakokî"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Dikeve şunve"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Kevin dike"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Dişkîne"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "girîng"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "pêwist"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "opsiyonel"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "ekstra"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
+#: 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:118
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Is the package %s installed?"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/sourcelist.cc:127
 #, c-format
-msgid "Method %s did not start correctly"
+msgid "Malformed stanza %u in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Guhartoyên berendam"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Vekirina StateFile %s biserneket"
-
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s ji hev nehate veçirandin"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "nav guherandin biserneket, %s (%s -> %s)"
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Hash Sum li hev nayên"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Mezinahî li hev nayên"
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
+msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1656
-#, 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:1698
-msgid "There is no public key available for the following key IDs:\n"
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid ""
-"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"
-msgstr ""
+msgid "Opening %s"
+msgstr "%s tê vekirin"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "GPG error: %s: %s"
+msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371
 #, 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)"
+msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:416
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
 #, c-format
 msgid "Clean of %s is not supported"
 msgstr ""
@@ -2116,107 +2292,229 @@ msgstr ""
 msgid "Unable to stat %s."
 msgstr "Nivîsandin ji bo %s ne pêkane"
 
-#: apt-pkg/pkgcachegen.cc:93
+#: 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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: 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:257
+#: apt-pkg/pkgcachegen.cc:273
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:276
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:263
+#: apt-pkg/pkgcachegen.cc:279
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:266
+#: apt-pkg/pkgcachegen.cc:282
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+#: 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:1316
+#: apt-pkg/pkgcachegen.cc:1301
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
 msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/vendorlist.cc:85
+#: 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: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:240
+msgid "Hash Sum mismatch"
+msgstr "Hash Sum li hev nayên"
+
+#: apt-pkg/acquire-item.cc:245
+msgid "Size mismatch"
+msgstr "Mezinahî li hev nayên"
+
+#: apt-pkg/acquire-item.cc:250
+msgid "Invalid file format"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Çewtiya nivîsînê"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Rêça %s zêde dirêj e"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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: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:1999
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+
+#: 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:2059
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: 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: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:2315
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2351
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+
+#: apt-pkg/vendorlist.cc:83
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/acquire.cc:87 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:91
+#: 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:99
+#: 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:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2242,19 +2540,19 @@ msgstr ""
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2262,9 +2560,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
@@ -2332,11 +2631,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 ""
 
@@ -2346,332 +2645,263 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1088
+#: 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"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Guhartoyên berendam"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
 msgstr ""
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Vekirina StateFile %s biserneket"
 
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/depcache.cc:258
 #, fuzzy, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Pakêt nehate dîtin %s"
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s ji hev nehate veçirandin"
 
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
+msgid "Unable to parse package file %s (%d)"
 msgstr "Pakêt nehate dîtin %s"
 
-#: apt-pkg/indexrecords.cc:86
+#: apt-pkg/cacheset.cc:501
 #, c-format
-msgid "No sections in Release file %s"
+msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:117
+#: apt-pkg/cacheset.cc:504
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+#: apt-pkg/cacheset.cc:629
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Peywira %s nehate dîtin"
 
-#: apt-pkg/indexrecords.cc:149
+#: apt-pkg/cacheset.cc:635
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Pakêt nehate dîtin %s"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Nikarî pakêta %s bibîne"
 
-#: apt-pkg/sourcelist.cc:127
+#: 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:680
 #, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/cacheset.cc:719
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:173
+#: apt-pkg/cacheset.cc:727
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:184
+#: apt-pkg/cacheset.cc:735
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:193
+#: 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 "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgid "No sections in Release file %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/indexrecords.cc:132
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/indexrecords.cc:145
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/indexrecords.cc:164
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Pakêt nehate dîtin %s"
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:217
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:224
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:335
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
-msgid "Opening %s"
-msgstr "%s tê vekirin"
+msgid "%lis"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr ""
+msgid "Selection %s not found"
+msgstr "Hilbijartina %s nehatiye dîtin"
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr ""
+msgid "Could not open lock file %s"
+msgstr "Nikarî qufila pelê %s veke"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
-msgid "Release '%s' for '%s' was not found"
+msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
-msgid "Version '%s' for '%s' was not found"
+msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Peywira %s nehate dîtin"
-
-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Nikarî pakêta %s bibîne"
+#: 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 ""
 
-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Nikarî pakêta %s bibîne"
+#: apt-pkg/contrib/fileutl.cc:400
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1258
-#, c-format
-msgid "Selection %s not found"
-msgstr "Hilbijartina %s nehatiye dîtin"
-
-#: apt-pkg/contrib/fileutl.cc:190
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:195
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Nikarî qufila pelê %s veke"
-
-#: apt-pkg/contrib/fileutl.cc:218
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:223
-#, c-format
-msgid "Could not get lock %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:394
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:412
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:421
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:824
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:826
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Di girtina pelî de pirsgirêkek derket"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nikarî pelê %s veke"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nikarî pelê %s veke"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Di girtina pelî de pirsgirêkek derket"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Di girtina pelî de pirsgirêkek derket"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Di girtina pelî de pirsgirêkek derket"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr ""
 
@@ -2757,109 +2987,103 @@ msgstr "Nivîsandin ji bo %s ne pêkane"
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:801
+#: apt-pkg/contrib/configuration.cc:804
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:837
+#: apt-pkg/contrib/configuration.cc:840
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:877
+#: 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:884
+#: apt-pkg/contrib/configuration.cc:887
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Sazkirin tê betalkirin."
-
-#: 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 ""
@@ -2869,12 +3093,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "%s hatine sazkirin"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "%s tê rakirin"
@@ -2895,103 +3119,103 @@ msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Peldanka '%s' kêm e"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "%s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s tê derxistin"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Mîhengkirina %s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "%s hatine sazkirin"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Rakirina %s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "%s hatine rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s bi tevahî hatine rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3020,343 +3244,172 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Di şixulandina pêrista %s de çewtî"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Dema şixulandina naveroka %s çewtî"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Di koma pelgehên pakêta '%s' de hin pelgeh kêm in"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB xerabe ye, navê dosyeyê weke %s.old hate guherandin"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Danegira %s nehate vekirin: %s"
-
-#: ftparchive/cachedb.cc:332
+#: apt-inst/filelist.cc:459
 #, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Rakirina %s biserneket"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Tomara kontrola arşîvê tuneye"
+msgid "Failed to allocate diversion"
+msgstr "%s venebû"
 
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
 msgstr ""
 
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: pelrêça %s nayê xwendin\n"
-
-#: ftparchive/writer.cc:96
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "%s ji hev nehate veçirandin"
-
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
+msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: ftparchive/writer.cc:219
-#, c-format
-msgid "Failed to open %s"
-msgstr "%s venebû"
-
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid " DeLink %s [%s]\n"
+msgid "Duplicate conf file %s/%s"
 msgstr ""
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to readlink %s"
-msgstr ""
+msgid "The path %s is too long"
+msgstr "Rêça %s zêde dirêj e"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to unlink %s"
+msgid "Unpacking %s more than once"
 msgstr ""
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "*** Failed to link %s to %s"
+msgid "The directory %s is diverted"
 msgstr ""
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:152
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
+msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Di arşîvê de qada pakêtê tuneye"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+#, fuzzy
+msgid "The diversion path is too long"
+msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no override entry\n"
+msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Rêç zêde dirêj e"
+
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s has no source override entry\n"
+msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no binary override entry either\n"
+msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr ""
+#: apt-inst/extract.cc:498
+#, fuzzy, c-format
+msgid "Unable to stat %s"
+msgstr "Nivîsandin ji bo %s ne pêkane"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Unable to open %s"
-msgstr "%s venebû"
+msgid "Failed to write file %s"
+msgstr "Nivîsîna pelê %s biserneket"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr ""
+msgid "Failed to close file %s"
+msgstr "Girtina pelê %s biserneket"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Failed to read the override file %s"
+msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
-#: ftparchive/override.cc:166
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Malformed override %s line %llu #1"
+msgid "Internal error, could not locate member %s"
 msgstr ""
 
-#: ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %llu #2"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
 msgstr ""
 
-#: ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %llu #3"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
 msgstr ""
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
 msgstr ""
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Compressed output %s needs a compression set"
+msgid "Invalid archive member header %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
 msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr ""
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arşîv zêde kin e"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
 msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:128
+#, fuzzy
+msgid "Failed to create pipes"
+msgstr "%s ji hev nehate veçirandin"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Xebitandina gzip biserneket"
+
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
 msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
 msgstr ""
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
+msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Bikaranîn: apt-config [vebijark] ferman\n"
-"apt-config, amûra xwendina dosyeya mîhengên APTê ye\n"
-"\n"
-"Ferman\n"
-"  shell - moda shell\n"
-"  dump - Mîhengan nîşan dide\n"
-"\n"
-"Vebijark:\n"
-"  -h Ev dosyeya alîkariyê ye.\n"
-"  -c=? Dosyeya mîhengan nîşan dide\n"
-"  -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. "
-"mînak -o dir::cache=/tmp\n"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Cihê vala li %s têre nake"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr ""
+#~ msgid "Done"
+#~ msgstr "Temam"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Sazkirin tê betalkirin."
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s ne paketeke DEB ya derbasdar e."
diff --git a/po/lt.po b/po/lt.po
index 821c28db7..b85a0fbe1 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: 2015-01-16 04:37-0500\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,151 +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:277
+#: cmdline/apt-cache.cc:320
 #, fuzzy
 msgid "Total package names: "
 msgstr "Visi paketų pavadinimai: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Visi paketų pavadinimai: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Normalūs paketai: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Virtualūs paketai: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Pavieniai virtualūs paketai: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Mišrūs virtualūs paketai: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Trūksta: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Viso skirtingų versijų: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Viso skirtingų aprašymų: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Viso priklausomybių: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Viso versijų/failų santykių yra: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Viso aprašymų/failų santykių yra: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Paketų failai:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Surišti paketai:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(nerasta)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Įdiegta: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Kandidatas: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(nėra)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Paketo susiejimai: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Versijų lentelė:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -206,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"
@@ -227,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."
 
@@ -263,78 +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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: cmdline/apt-get.cc:358
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nepavyko rasti paketo %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Nepavyko užrakinti parsiuntimų aplanko"
 
-#: cmdline/apt-get.cc:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -342,95 +338,94 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Nepavyko nustatyti %s laisvos vietos"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Neturite pakankamai laisvos vietos %s"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Parsiunčiamas archyvas %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Nepavyko gauti kai kurių arhcyvų."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: 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:968
+#: 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:996
+#: 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:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Klaida procese-palikuonyje"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -470,30 +465,30 @@ msgid ""
 msgstr ""
 "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Jungiamasi prie %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Palaikomi moduliai:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -566,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -689,12 +684,12 @@ msgstr "Diskas nerastas."
 msgid "File not found"
 msgstr "Failas nerastas"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr ""
 
@@ -703,156 +698,156 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Jungiamasi"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr ""
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr ""
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Jungiamasi per ilgai"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Skaitymo klaida"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr ""
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Rašymo klaida"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Nepavyko"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr ""
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nepavyko atsiųsti failo, serveris atsakė „%s“"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Užklausti"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr ""
 
@@ -918,70 +913,70 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr "Nepavyko prisijungti prie %s %s:"
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:174
+#: 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Nežinoma klaida kviečiant apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "Šių parašų nebuvo galima patikrinti, nes nėra viešojo rakto:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Klaida bandant rašyti į failą"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Prisijungimo laiko limitas baigėsi"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr ""
 
@@ -1013,283 +1008,30 @@ msgstr ""
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Prisijungti nepavyko"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "Vidinė klaida"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Reikia pašalinti paketus, tačiau šalinimas išjungtas."
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr ""
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr "Keista... Dydis neatitinka, Parašykite laišką apt@packages.debian.org"
-
-#. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Reikia parsiųsti %sB/%sB 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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Reikia parsiųsti %sB 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
-#: apt-private/private-install.cc:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Po šios operacijos bus naudojama %sB papildomos disko vietos.\n"
-
-#. 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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Po šios operacijos bus atlaisvinta %sB disko vietos.\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "%s nėra pakankamai laisvos vietos."
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Taip, daryk kaip liepiu!"
-
-#: apt-private/private-install.cc:222
+#: methods/server.cc:589
 #, c-format
 msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Bandote atlikti tikėtinai pavojingą veiksmą.\n"
-"Jei norite tęsti, įveskite frazę „%s“\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Nutraukti."
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Ar norite tęsti?"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Nepavyko parsiųsti kai kurių failų"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Nepavyko parsiųsti kai kurių archyvų, pabandykite paleisti „apt-get update“ "
-"arba pabandykite su parametru --fix-missing?"
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing bei laikmenų apkeitimas nepalaikomas"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Nepavyko pataisyti dingusių paketų."
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Diegimas nutraukiamas."
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Ši informacija gali padėti išspręsti šią situaciją:"
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
-
-#: apt-private/private-install.cc:513
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
-msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
-
-#: apt-private/private-install.cc:517
-#, fuzzy, c-format
-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] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
-msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
-
-#: apt-private/private-install.cc:519
-#, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
-msgstr[1] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Jūs galite norėti paleisti 'apt-get -f install\" klaidų taisymui:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be "
-"nurodytų paketų (arba nurodykite išeitį)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"Nepavyko įdiegti kai kurių paketų. Tai gali reikšti, kad jūs\n"
-"paprašėte neįmanomo dalyko, arba, jei jūs naudojate nestabilų\n"
-"leidimą, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n"
-"pašalinti iš \"Incoming\" aplanko."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Sugadinti paketai"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Bus įdiegti šie papildomi paketai:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Siūlomi paketai:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Rekomenduojami paketai:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
-
-#: apt-private/private-install.cc:829
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ir taip jau yra naujausias.\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Pažymėta versija %s (%s) paketui %s\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Pažymėta versija %s (%s) paketui %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "Vidinė klaida"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1297,32 +1039,32 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "Taisomos priklausomybės..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " nepavyko."
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "Nepavyko patenkinti priklausomybių"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 #, fuzzy
 msgid "Unable to minimize the upgrade set"
 msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " Įvykdyta"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -f."
 
@@ -1486,7 +1228,7 @@ msgstr "T"
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
@@ -1495,7 +1237,7 @@ msgstr ""
 msgid "The update command takes no arguments"
 msgstr "Atnaujinimo komandai argumentų nereikia"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1503,10 +1245,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1527,27 +1273,295 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "DĖMESIO: Šie paketai negali būti autentifikuoti!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Reikia pašalinti paketus, tačiau šalinimas išjungtas."
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr ""
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr "Keista... Dydis neatitinka, Parašykite laišką apt@packages.debian.org"
+
+#. 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Reikia parsiųsti %sB/%sB 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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Reikia parsiųsti %sB 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
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Po šios operacijos bus naudojama %sB papildomos disko vietos.\n"
+
+#. 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 "Po šios operacijos bus atlaisvinta %sB disko vietos.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Atsirado problemų ir -y buvo panaudotas be --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 ""
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Taip, daryk kaip liepiu!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Bandote atlikti tikėtinai pavojingą veiksmą.\n"
+"Jei norite tęsti, įveskite frazę „%s“\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Nutraukti."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Ar norite tęsti?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Nepavyko parsiųsti kai kurių failų"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Nepavyko parsiųsti kai kurių archyvų, pabandykite paleisti „apt-get update“ "
+"arba pabandykite su parametru --fix-missing?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing bei laikmenų apkeitimas nepalaikomas"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Nepavyko pataisyti dingusių paketų."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Diegimas nutraukiamas."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: 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 ""
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Ši informacija gali padėti išspręsti šią situaciją:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+
+#: apt-private/private-install.cc:488
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
+msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+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] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
+msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
+
+#: 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] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
+msgstr[1] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Jūs galite norėti paleisti 'apt-get -f install\" klaidų taisymui:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be "
+"nurodytų paketų (arba nurodykite išeitį)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Nepavyko įdiegti kai kurių paketų. Tai gali reikšti, kad jūs\n"
+"paprašėte neįmanomo dalyko, arba, jei jūs naudojate nestabilų\n"
+"leidimą, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n"
+"pašalinti iš \"Incoming\" aplanko."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Sugadinti paketai"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Bus įdiegti šie papildomi paketai:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Siūlomi paketai:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Rekomenduojami paketai:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
+
+#: apt-private/private-install.cc:827
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s ir taip jau yra naujausias.\n"
+
+#: apt-private/private-install.cc:892
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Pažymėta versija %s (%s) paketui %s\n"
+
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Pažymėta versija %s (%s) paketui %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 "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+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-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "DĖMESIO: Šie paketai negali būti autentifikuoti!"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
 msgstr "Nepavyko autentikuoti kai kurių paketų"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 msgid "Install these packages without verification?"
 msgstr "Įdiegti šiuos paketus be patvirtinimo?"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Nepavyko parsiųsti %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 "Nepavyko nustatyti %s laisvos vietos"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "%s nėra pakankamai laisvos vietos."
+
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1562,41 +1576,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Skaičiuojami atnaujinimai"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Įvykdyta"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Imamas "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Gauti:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ignoruotas "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Klaida "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Parsiųsta %sB iš %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Vykdoma]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1609,18 +1615,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1698,205 +1704,463 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Sujungiama turima informaija"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n"
+"\n"
+"apt-extracttemplates tai įrankis skirtas konfigūracijų, bei šablonų "
+"informacijos išskleidimui\n"
+"iš debian paketų\n"
+"\n"
+"Parametrai:\n"
+"  -h Šis pagalbos tekstas\n"
+"  -t Nustatyti laikinąjį aplanką\n"
+"  -c=? Nuskaityti šį konfigūracijų failą\n"
+"  -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr ""
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Nepavyko sukurti %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr ""
+#: 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"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr ""
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Nepavyko sužinoti debconf versijos. Ar įdiegtas debconf?"
 
-#: apt-inst/filelist.cc:477
+#: 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: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 "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr ""
+msgid "Error processing directory %s"
+msgstr "Klaida apdorojant aplanką %s"
 
-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Šaltinio plėtinys yra per ilgas"
+
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "Klaida įrašant antraštę į turinio failą"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "Double add of diversion %s -> %s"
+msgid "Error processing contents %s"
+msgstr "Klaida apdorojant turinį %s"
+
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
 msgstr ""
+"Naudojimas: apt-ftparchive [parametrai] komanda\n"
+"Komandos: dvejatainių paketų kelias [perrašomasfailas [keliopriešdėlis]]\n"
+"          sources aplankas [perrašomasfailas [kelippriešdėlis]]\n"
+"          contents kelias\n"
+"          release kelias\n"
+"          generate parametras [grupės]\n"
+"          clean parametras\n"
+"\n"
+"apt-ftparchive generuoja indeksų failus, skirtus Debian archyvams. Palaikomi "
+"keli \n"
+"generavimo stiliai, įskaitant nuo pilnai automatizuoto iki funkcinių "
+"pakeitimų\n"
+"skirtų dpkg-scanpackages ir dpkg-scansources\n"
+"\n"
+"apt-ftparchive sugeneruoja paketų failus iš .debs medžio. Paketo failas turi "
+"visus\n"
+"kontrolinius kiekvieno paketo laukus, o taip pat ir MD5 hešą bei failų "
+"dydžius. Perrašomasis\n"
+"failas palaikomas tam, kad būtų priverstinai nustatytos Pirmenybių bei "
+"Sekcijų reikšmės.\n"
+"\n"
+"Panašiai apt-ftparchive sugeneruoja ir Išeities failus iš .dscs medžio.\n"
+"--source-override nuostata gali būti naudojama nustatant išeities "
+"perrašomąjį failą\n"
+"\n"
+"\"Paketų\" bei \"Išeičių\" komandos turėtų būti paleistos failų medžio "
+"šaknyje. BinaryPath turėtų\n"
+"nurodyti kelią į rekursinės paieškos pagrindą bei perrašytas failas turėtų "
+"turėti perrašymo žymes.\n"
+"Keliopriešdėlis tai yra prirašomas prie failo vardų laikų jei tokių yra. "
+"Vartosenos pavyzdys\n"
+"naudojant Debian archyvą:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Nuostatos:\n"
+"  -h Šis pagalbos tekstas\n"
+"  --md5 Valdyti MD5 generavimą\n"
+"  -s=? Šaltinio perrašomas failas\n"
+"  -q Tylėti\n"
+"  -d=? Pasirinkti papildomą kešo duomenų bazę\n"
+"  --no-delink Įjungti atjungiamąjį derinimo rėžimą\n"
+"  -c=? Perskaityti šį nuostatų failą\n"
+"  -o=? Nustatyti savarankišką konfigūracijos nuostatą"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Nėra atitikmenų"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr ""
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Kai kurių failų nėra paketų grupėje „%s“"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The path %s is too long"
-msgstr "Kelias %s per ilgas"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Duomenų bazė pažeista, failas pervardintas į %s.old"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "Unpacking %s more than once"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Duomenų bazė yra sena, bandoma atnaujinti %s"
+
+#: ftparchive/cachedb.cc:96
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
 msgstr ""
+"Duomenų bazės formatas yra netinkamas. Jei jūs atsinaujinote iš senesnės "
+"versijos, prašome pašalinkite ir perkurkite duomenų bazę."
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:101
 #, c-format
-msgid "The directory %s is diverted"
-msgstr ""
+msgid "Unable to open DB file %s: %s"
+msgstr "Nepavyko atverti DB failo %s: %s"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
+msgid "Failed to stat %s"
+msgstr "Nepavyko patikrinti %s"
+
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Nepavyko nuskaityti nuorodos %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
 msgstr ""
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
 msgstr ""
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to stat %s"
-msgstr "Nepavyko patikrinti %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "Į: Nepavyko perskaityti aplanko %s\n"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Nepavyko pervadinti %s į %s"
+msgid "W: Unable to stat %s\n"
+msgstr "Į: Nepavyko patikrinti %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "K: "
+
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "Į: "
+
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "K: Klaidos failui "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr ""
+msgid "Failed to resolve %s"
+msgstr "Nepavyko išspręsti %s"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr ""
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Judesys medyje nepavyko"
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Kelias per ilgas"
+#: ftparchive/writer.cc:232
+#, c-format
+msgid "Failed to open %s"
+msgstr "Nepavyko atverti %s"
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Overwrite package match with no version for %s"
+msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr ""
+msgid "Failed to readlink %s"
+msgstr "Nepavyko nuskaityti nuorodos %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Unable to stat %s"
-msgstr ""
+msgid "Failed to unlink %s"
+msgstr "Nepavyko atsieti nuorodos %s"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "Failed to write file %s"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Nepavyko susieti %s su %s"
+
+#: ftparchive/writer.cc:321
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Archyvas neturėjo paketo lauko"
+
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
 #, c-format
-msgid "Failed to close file %s"
+msgid "  %s has no override entry\n"
+msgstr "  %s neturi perrašymo įrašo\n"
+
+#: 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:712
+#, c-format
+msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:716
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "  %s has no binary override entry either\n"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Nepavyko išskirti atminties"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Nepavyko atverti %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Nepavyko nuskaityti perrašymo failo %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Nežinomas suspaudimo algoritmas „%s“"
+
+#: ftparchive/multicompress.cc:103
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Vidinė klaida, nepavyko aptikti nario %s"
+msgid "Compressed output %s needs a compression set"
+msgstr "Suspaustai išvesčiai %s reikia suspaudimo rinkinio"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr ""
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Nepavyko sukurti FILE*"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/multicompress.cc:232
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr ""
+msgid "Internal error, failed to create %s"
+msgstr "Vidinė klaida, nepavyko sukurti  %s"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Archyvas per trumpas"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Nepavyko Nusk/Įraš į subprocesą/failą"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Nepavyko perskaityti archyvo antraščių"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Skaitymo klaida skaičiuojant MD5"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr ""
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Nepavyko pervadinti %s į %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Sugadintas archyvas"
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n"
+"\n"
+"apt-extracttemplates tai įrankis skirtas konfigūracijų, bei šablonų "
+"informacijos išskleidimui\n"
+"iš debian paketų\n"
+"\n"
+"Parametrai:\n"
+"  -h Šis pagalbos tekstas\n"
+"  -t Nustatyti laikinąjį aplanką\n"
+"  -c=? Nuskaityti šį konfigūracijų failą\n"
+"  -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar kontrolinė suma klaidinga, archyvas sugadintas"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Nežinomas paketo įrašas!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Nežinomas TAR antraštės tipas %u. narys %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Naudojimas: apt-sortpkgs [parametrai] byla1 [byla2 ...]\n"
+"\n"
+"apt-sortpkgs - tai paprastas įrankis skirtas paketų rūšiavimui. -s nuostata "
+"naudojama\n"
+"norint nusakyti bylos tipą.\n"
+"\n"
+"Parametrai:\n"
+"  -h Šis pagalbos tekstas\n"
+"  -s Naudoti išeities kodo bylos rūšiavimą\n"
+"  -c=? Nuskaityti šią konfigūracijos bylą\n"
+"  -o=? Nurodyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -1911,6 +2175,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."
@@ -1925,185 +2209,296 @@ msgstr ""
 msgid "The list of sources could not be read."
 msgstr "Nepavyko perskaityti šaltinių sąrašo."
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168
 msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: apt-pkg/pkgcache.cc:185
+#, c-format
+msgid "The package cache was built for different architectures: %s vs %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Priklauso"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Priešpriklauso"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Siūlo"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Rekomenduoja"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Konfliktuoja"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Pakeičia"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Pakeičia"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Sugadina"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "Svarbu"
 
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "privaloma"
+#: apt-pkg/pkgcache.cc:335
+msgid "required"
+msgstr "privaloma"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "standard"
+msgstr "standartinis"
+
+#: apt-pkg/pkgcache.cc:336
+msgid "optional"
+msgstr "nebūtinas"
+
+#: apt-pkg/pkgcache.cc:336
+msgid "extra"
+msgstr "papildomas"
+
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Skaičiuojami atnaujinimai"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+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)"
+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 "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/pkgcache.cc:334
-msgid "standard"
-msgstr "standartinis"
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "nebūtinas"
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "papildomas"
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
-msgid "The method driver %s could not be found."
+msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
-
-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Method %s did not start correctly"
+msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:455
-#, 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/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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Konstruojamas priklausomybių medis"
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr ""
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Galimos versijos"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Priklausomybių generavimas"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+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/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Maišos sumos nesutapimas"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Neatitinka dydžiai"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Klaidingas veiksmas %s"
 
-#: apt-pkg/acquire-item.cc:1640
-#, 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:1656
-#, 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:1698
-msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1736
-#, 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:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Rašymo klaida"
 
-#: apt-pkg/acquire-item.cc:1758
-#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:1584
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2111,143 +2506,114 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG klaida: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
-#, 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:1992
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Kelias %s per ilgas"
 
-#: apt-pkg/acquire-item.cc:2050
-#, c-format
+#: apt-pkg/acquire-item.cc:1714
 msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
 msgstr ""
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
 #, c-format
-msgid "Clean of %s is not supported"
+msgid ""
+"The data from '%s' is not signed. Packages from that repository can not be "
+"authenticated."
 msgstr ""
 
-#: apt-pkg/clean.cc:64
+#: apt-pkg/acquire-item.cc:1956
 #, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
 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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
+#: apt-pkg/acquire-item.cc:1975
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Klaida apdorojant turinį %s"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Nepavyko atverti DB failo %s: %s"
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: apt-pkg/acquire-item.cc:1999
+msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: 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/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-item.cc:2059
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid ""
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-item.cc:2249
 #, c-format
-msgid "Couldn't stat source package list %s"
+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/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Skaitomi paketų sąrašai"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
+#: apt-pkg/acquire-item.cc:2315
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Nepavyko įrašyti į %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
 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:87 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:91
+#: 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:99
+#: 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2273,19 +2639,19 @@ msgstr ""
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2293,10 +2659,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"
@@ -2363,346 +2733,277 @@ 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
-msgid "Source list entries for this disc are:\n"
-msgstr ""
-
-#: apt-pkg/algorithms.cc:265
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-
-#: apt-pkg/algorithms.cc:1088
-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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nepavyko atverti DB failo %s: %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Pastaba: pažymimas %s vietoje %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Pastaba: pažymimas %s vietoje %s\n"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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 ""
+msgstr "Rašomas naujas šaltinių sąrašas\n"
 
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
+#: apt-pkg/cdrom.cc:877
+msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
+#: apt-pkg/algorithms.cc:1090
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
+#: apt-pkg/algorithms.cc:1092
+msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Konstruojamas priklausomybių medis"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Atveriama %s"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Galimos versijos"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Priklausomybių generavimas"
+
+#: 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/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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Nebuvo rasta „%s“ versija paketui „%s“"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Nepavyko rasti užduoties %s"
 
-#: apt-pkg/cacheset.cc:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:145
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Pastaba: pažymimas %s vietoje %s\n"
+
+#: apt-pkg/indexrecords.cc:164
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nepavyko atverti DB failo %s: %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nepavyko atverti rakinimo failo %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nepavyko rezervuoti rakinimo failo %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Procesas %s gavo segmentavimo klaidą"
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Procesas %s gavo segmentavimo klaidą"
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Procesas %s grąžino klaidos kodą (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Procesas %s netikėtai išėjo"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Klaida užveriant failą"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nepavyko atverti failo %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nepavyko atverti failo %s"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Nepavyko sukurti subproceso IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Nepavyko paleisti suspaudėjo "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Klaida užveriant failą"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Klaida sinchronizuojant failą"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Klaida užveriant failą"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Klaida sinchronizuojant failą"
 
@@ -2788,109 +3089,103 @@ msgstr ""
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:801
+#: apt-pkg/contrib/configuration.cc:804
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:837
+#: apt-pkg/contrib/configuration.cc:840
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:877
+#: 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:884
+#: apt-pkg/contrib/configuration.cc:887
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Diegimas nutraukiamas."
-
-#: 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"
@@ -2900,12 +3195,12 @@ msgstr "Klaidingas veiksmas %s"
 msgid "Installing %s"
 msgstr "Įdiegta %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Šalinamas %s"
@@ -2926,103 +3221,103 @@ msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Trūksta aplanko „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Ruošiamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Išpakuojamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Ruošiamasi konfigūruoti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "Įdiegta %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "Pašalintas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "Visiškai pašalintas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3039,423 +3334,181 @@ msgstr ""
 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 ""
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n"
-"\n"
-"apt-extracttemplates tai įrankis skirtas konfigūracijų, bei šablonų "
-"informacijos išskleidimui\n"
-"iš debian paketų\n"
-"\n"
-"Parametrai:\n"
-"  -h Šis pagalbos tekstas\n"
-"  -t Nustatyti laikinąjį aplanką\n"
-"  -c=? Nuskaityti šį konfigūracijų failą\n"
-"  -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Nepavyko sukurti %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Klaida apdorojant aplanką %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Šaltinio plėtinys yra per ilgas"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Klaida įrašant antraštę į turinio failą"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Klaida apdorojant turinį %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Naudojimas: apt-ftparchive [parametrai] komanda\n"
-"Komandos: dvejatainių paketų kelias [perrašomasfailas [keliopriešdėlis]]\n"
-"          sources aplankas [perrašomasfailas [kelippriešdėlis]]\n"
-"          contents kelias\n"
-"          release kelias\n"
-"          generate parametras [grupės]\n"
-"          clean parametras\n"
-"\n"
-"apt-ftparchive generuoja indeksų failus, skirtus Debian archyvams. Palaikomi "
-"keli \n"
-"generavimo stiliai, įskaitant nuo pilnai automatizuoto iki funkcinių "
-"pakeitimų\n"
-"skirtų dpkg-scanpackages ir dpkg-scansources\n"
-"\n"
-"apt-ftparchive sugeneruoja paketų failus iš .debs medžio. Paketo failas turi "
-"visus\n"
-"kontrolinius kiekvieno paketo laukus, o taip pat ir MD5 hešą bei failų "
-"dydžius. Perrašomasis\n"
-"failas palaikomas tam, kad būtų priverstinai nustatytos Pirmenybių bei "
-"Sekcijų reikšmės.\n"
-"\n"
-"Panašiai apt-ftparchive sugeneruoja ir Išeities failus iš .dscs medžio.\n"
-"--source-override nuostata gali būti naudojama nustatant išeities "
-"perrašomąjį failą\n"
-"\n"
-"\"Paketų\" bei \"Išeičių\" komandos turėtų būti paleistos failų medžio "
-"šaknyje. BinaryPath turėtų\n"
-"nurodyti kelią į rekursinės paieškos pagrindą bei perrašytas failas turėtų "
-"turėti perrašymo žymes.\n"
-"Keliopriešdėlis tai yra prirašomas prie failo vardų laikų jei tokių yra. "
-"Vartosenos pavyzdys\n"
-"naudojant Debian archyvą:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Nuostatos:\n"
-"  -h Šis pagalbos tekstas\n"
-"  --md5 Valdyti MD5 generavimą\n"
-"  -s=? Šaltinio perrašomas failas\n"
-"  -q Tylėti\n"
-"  -d=? Pasirinkti papildomą kešo duomenų bazę\n"
-"  --no-delink Įjungti atjungiamąjį derinimo rėžimą\n"
-"  -c=? Perskaityti šį nuostatų failą\n"
-"  -o=? Nustatyti savarankišką konfigūracijos nuostatą"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Nėra atitikmenų"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Kai kurių failų nėra paketų grupėje „%s“"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Duomenų bazė pažeista, failas pervardintas į %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Duomenų bazė yra sena, bandoma atnaujinti %s"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
 msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
-"Duomenų bazės formatas yra netinkamas. Jei jūs atsinaujinote iš senesnės "
-"versijos, prašome pašalinkite ir perkurkite duomenų bazę."
 
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nepavyko atverti DB failo %s: %s"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
 
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Nepavyko nuskaityti nuorodos %s"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr ""
 
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
 msgstr ""
 
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "Į: Nepavyko perskaityti aplanko %s\n"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr ""
 
-#: ftparchive/writer.cc:96
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "Į: Nepavyko patikrinti %s\n"
-
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "K: "
-
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "Į: "
-
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "K: Klaidos failui "
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr ""
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "Nepavyko išspręsti %s"
+msgid "Double add of diversion %s -> %s"
+msgstr ""
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Judesys medyje nepavyko"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr ""
 
-#: ftparchive/writer.cc:219
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to open %s"
-msgstr "Nepavyko atverti %s"
+msgid "The path %s is too long"
+msgstr "Kelias %s per ilgas"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/extract.cc:132
 #, c-format
-msgid " DeLink %s [%s]\n"
+msgid "Unpacking %s more than once"
 msgstr ""
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Nepavyko nuskaityti nuorodos %s"
+msgid "The directory %s is diverted"
+msgstr ""
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Nepavyko atsieti nuorodos %s"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr ""
 
-#: ftparchive/writer.cc:298
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Nepavyko susieti %s su %s"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr ""
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:249
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
+msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Archyvas neturėjo paketo lauko"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr ""
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s neturi perrašymo įrašo\n"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Kelias per ilgas"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s prižiūrėtojas yra %s, o ne %s\n"
+msgid "Overwrite package match with no version for %s"
+msgstr ""
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no source override entry\n"
+msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no binary override entry either\n"
+msgid "Unable to stat %s"
 msgstr ""
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Nepavyko išskirti atminties"
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr ""
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Unable to open %s"
-msgstr "Nepavyko atverti %s"
+msgid "Failed to close file %s"
+msgstr ""
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1"
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Nepavyko nuskaityti perrašymo failo %s"
+msgid "Internal error, could not locate member %s"
+msgstr "Vidinė klaida, nepavyko aptikti nario %s"
 
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr ""
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr ""
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr ""
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Nežinomas suspaudimo algoritmas „%s“"
+msgid "Invalid archive member header %s"
+msgstr ""
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Suspaustai išvesčiai %s reikia suspaudimo rinkinio"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Nepavyko sukurti FILE*"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Archyvas per trumpas"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr ""
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Nepavyko perskaityti archyvo antraščių"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
 msgstr ""
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Vidinė klaida, nepavyko sukurti  %s"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Nepavyko Nusk/Įraš į subprocesą/failą"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Sugadintas archyvas"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Skaitymo klaida skaičiuojant MD5"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar kontrolinė suma klaidinga, archyvas sugadintas"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr ""
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Nežinomas TAR antraštės tipas %u. narys %s"
 
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n"
-"\n"
-"apt-extracttemplates tai įrankis skirtas konfigūracijų, bei šablonų "
-"informacijos išskleidimui\n"
-"iš debian paketų\n"
-"\n"
-"Parametrai:\n"
-"  -h Šis pagalbos tekstas\n"
-"  -t Nustatyti laikinąjį aplanką\n"
-"  -c=? Nuskaityti šį konfigūracijų failą\n"
-"  -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Neturite pakankamai laisvos vietos %s"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Nežinomas paketo įrašas!"
+#~ msgid "Done"
+#~ msgstr "Įvykdyta"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Naudojimas: apt-sortpkgs [parametrai] byla1 [byla2 ...]\n"
-"\n"
-"apt-sortpkgs - tai paprastas įrankis skirtas paketų rūšiavimui. -s nuostata "
-"naudojama\n"
-"norint nusakyti bylos tipą.\n"
-"\n"
-"Parametrai:\n"
-"  -h Šis pagalbos tekstas\n"
-"  -s Naudoti išeities kodo bylos rūšiavimą\n"
-"  -c=? Nuskaityti šią konfigūracijos bylą\n"
-"  -o=? Nurodyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Diegimas nutraukiamas."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/mr.po b/po/mr.po
index afc83c869..286c5d859 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: 2015-01-16 04:37-0500\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,150 +22,146 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "पॅकेज %s आवृती %s मध्ये एक अनोळखी डीईपी:आहे\n"
 
-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "पॅकेजची सर्व नांवे: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "पॅकेजची सर्व नांवे: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr " सामान्य पॅकेजेस्: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr " शुध्द आभासी पॅकेजेस्:"
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr " एकमेव आभासी पॅकेजेस्:"
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "मिश्रित आभासी पॅकेजेस्:"
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr " हरवलेले/गहाळ: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "एकूण स्पष्ट आवृत्या: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "एकूण स्पष्ट विवरणे: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "एकूण निर्भरता:"
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "एकूण व्हीईआर/संचिका परस्पर संबंध:"
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "एकूण विव/संचिका परस्पर संबंध:"
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "एकूण मॅपींगस् तरतूद: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "एकूण एकत्रित अक्षरसंच:"
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "एकूण परावलंबित आवृत्ती अवकाश:"
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "एकूण दुर्लक्षित अवकाश:"
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "हिशेबात घेतलेली एकूण अवकाश(जागा):"
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "पॅकेज %s शोधण्यास असमर्थ आहे"
 
-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "पॅकेज संचिका:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "एकत्रित पॅकेजेस:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(मिळाले नाही)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "अधिष्ठापित केले:"
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "उमेदवार:"
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(कोणताच नाही)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "पॅकेज (पिन):"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "आवृत्ती कोष्टक:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -238,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"
@@ -260,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 "तुमच्या संचामधील सर्व सीडीजसाठी याच कृतीची पुनरावृत्ती करा(हीच कृती करा)"
 
@@ -296,78 +292,78 @@ msgstr ""
 " -c= ?  ही संरचना संचिका वाचा \n"
 " -o=?  एखदा अहेतुक संरचना पर्याय निर्धारित करा, उदा।eg -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
-#: cmdline/apt-get.cc:367
+#: cmdline/apt-get.cc:358
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
 
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले"
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ"
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -375,114 +371,113 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "%s मध्ये पुरेशी जागा नाही"
-
 #. 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:895
+#: 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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n"
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s उगम घ्या\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "काही अर्काईव्हज आणण्यास असमर्थ."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती"
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n"
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "चाईल्ड प्रक्रिया अयशस्वी"
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे"
 
-#: cmdline/apt-get.cc:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ "
+
+#: 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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n"
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: cmdline/apt-get.cc:1359
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -491,37 +486,37 @@ msgstr ""
 "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s "
 "डिपेंडन्सी पूर्ण होऊ शकत नाही"
 
-#: cmdline/apt-get.cc:1362
+#: 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:1385
+#: cmdline/apt-get.cc:1388
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s"
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही."
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ "
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) ला जोडत आहे"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -617,11 +612,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -635,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -760,12 +755,12 @@ msgstr "डिस्क सापडत नाही"
 msgid "File not found"
 msgstr "फाईल सापडली नाही"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "स्टॅट करण्यास असमर्थ"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ"
 
@@ -774,34 +769,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "अवैध यू आर एल, स्थानिक यू आर आय एस सुरू होऊ नये यापासून //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "लॉग इन करत आहे"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "पिअर नाव सांगण्यास/सापडण्यास असमर्थ"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "स्थानिक नाव सांगण्यास असमर्थ"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "सर्व्हर ने संबंध जोडण्यास नकार दिला व सांगितले: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "सर्व्हरने %s सांगितले,यूजर असमर्थ:"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "सर्व्हरने %s सांगितले, पास असमर्थ:"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -809,123 +804,123 @@ msgstr ""
 "प्रॉक्सी सर्व्हर निर्देशित केला पण लॉगीन स्क्रिप्ट नाही, प्राप्त केलेले ::ftp:: प्रॉक्सीलॉगीन "
 "निरर्थक आहे."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "सर्व्हरने %s सांगितले, '%s' लॉग इन स्क्रिप्ट आज्ञावली असमर्थ:"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "सर्व्हरने %s सांगितले: टाईप असमर्थ:"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "वेळेअभावी संबंध जोडता येत नाही"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "सर्व्हरने संबंध जोडणी बंद केली"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "त्रुटी वाचा"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "प्रतिसाधाने बफर भरुन गेले."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "प्रोटोकॉल खराब झाले"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "लिहिण्यात त्रुटी"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "सॉकेट तयार करू शकत नाही"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "डेटा सॉकेट जोडू शकत नाही,जोडणी वेळेअभावी बंद केली"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "असमर्थ"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "पॅसिव्ह सॉकेट जोडता येत नाही"
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "गेटऍड्रेसइनफो लिसनिंग सॉकेट घेण्यास असमर्थ होते"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "सॉकेट चिकटवता येत नाही"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "सॉकेट वर ऐकता येत नाही"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "सॉकेटचे नाव सांगता येत नाही"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "पोर्ट आज्ञा पाठवता येत नाही/पोर्ट आज्ञा  पाठविण्यास असमर्थ"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "माहित नसलेला पत्ता फॅमिली %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "ई.पी.आर.टी. चुकले,सर्व्हरने %s सांगितले"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "डेटा सॉकेट जोडणी वेळेअभावी तुटली"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "जोडणी स्विकारण्यास असमर्थ"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "फाईल हॅश करण्यात त्रुटी"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "सर्व्हरने %s सांगितले, फाईल मिळवण्यास असमर्थ"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "डेटा सॉकेट वेळेअभावी तुटले"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "सर्व्हरने %s सांगितले, डेटा स्थानांतरण चुकले"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "प्रश्न"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "जारी करण्यास करण्यास असमर्थ"
 
@@ -991,72 +986,72 @@ msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना क
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s ला जोडण्यास असमर्थ:"
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "किमान एक अवैध सही सापडली."
 
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:164
 #, fuzzy
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
 "सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gnupg संस्थापित केले आहे का?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "apt-key कार्यान्वित होत असताना अपरिचित त्रुटी"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr "खालील सह्या अवैध आहेत:\n"
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "खालील सह्यांची खात्री करता येत नाही कारण सार्वजनिक कीउपलब्ध नाही:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी"
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "सर्व्हर मधून वाचण्यात चूक"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "चुकले/असमर्थ निवड करा"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "जोडणी वेळेअभावी तुटली"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक"
 
@@ -1088,287 +1083,30 @@ msgstr "HTTP सर्व्हरने विस्तार तांत्
 msgid "Unknown date format"
 msgstr "अपरिचित दिनांक प्रकार/स्वरूप "
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "चुकीचा शीर्षक डाटा"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "जोडणी अयशस्वी"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "अंतर्गत त्रुटी"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "अंतर्गत त्रुटी, तुटलेल्या पॅकेजेस बरोबर  संस्थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "पॅकेजेस कायमची काढायची आहेत पण रिमूव्ह अकार्यक्षम केले आहे"
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr "किती विचित्र...आकार जुळत नाहीत, ईमेल 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of 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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "अर्काईव्हज%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
-#: apt-private/private-install.cc:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "या क्रियेनंतर, %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
-#: apt-private/private-install.cc:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "%s मध्ये तुमच्याकडे पुरेशी जागा नाही."
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "क्षुल्लक फक्त निर्देशित केले आहे पण हे क्षुल्लक कृति/ऑपरेशन नाही."
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "हो, मी म्ह्टल्याप्रमाणे करा!"
-
-#: apt-private/private-install.cc:222
+#: methods/server.cc:589
 #, c-format
 msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"तुम्ही संभाव्य काहीतरी नुकसानकारक करणार होतात.\n"
-"पुढे '%s' उक्ती मध्ये लिहिणार \n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "व्यत्यय/बंद करा."
-
-#: apt-private/private-install.cc:243
-#, fuzzy
-msgid "Do you want to continue?"
-msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? "
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"काही आर्काइव्हज आणण्यास असमर्थ, कदाचित apt-get रन करुन अद्ययावत करा किंवा --fix- "
-"बरोबर प्रयत्न कराहरवलेले/गहाळ?"
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
-"--fix- सापडत नाही आणि माध्यम/मिडिया अदलाबदल हे सध्या तांत्रिक मदत देऊ शकत नाही"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "न सापडणारी पॅकेजेस नीट करण्यास असमर्थ."
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "संस्थापन खंडित करत आहे."
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही"
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"हूं,  AutoRemover ने काहीतरी नष्ट केल्याचे दिसतेय, खरेतर असे व्हायला नको\n"
-"कृपया apt कडे बग रिपोर्ट दाखल करा. "
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:"
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले"
-
-#: apt-private/private-install.cc:513
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
-msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
-
-#: apt-private/private-install.cc:517
-#, fuzzy, c-format
-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] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
-msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
-
-#: apt-private/private-install.cc:519
-#, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
-msgstr[1] "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"तुम्हाला कदाचित 'apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा "
-"लागेल'यात बदल करण्यासाठी:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन ('apt-get -f install') पॅकेजशिवाय प्रयत्न करा "
-"(किंवा पर्याय सांगा)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"काही पॅकेजेस संस्थापित होत नाहीत. याचा अर्थ असा आहे की तुम्ही\n"
-"अशक्य परिस्थितीची विनंती केली होती. किंवा जर तुम्ही अस्थिर\n"
-"विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n"
-"किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "तुटलेली पॅकेजेस"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "सुचवलेली पॅकेजेस:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "शिफारस केलेली पॅकेजेस:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n"
-
-#: apt-private/private-install.cc:829
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "%s चे पुनर्संस्थापन शक्य नाही, हे डाऊनलोड करता येत नाही.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n"
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "अंतर्गत त्रुटी"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1376,31 +1114,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr "अयशस्वी/चूकीचे झाले."
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे "
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr "झाले"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा "
 
@@ -1564,7 +1302,7 @@ msgstr "होय"
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
@@ -1573,7 +1311,7 @@ msgstr "रिजेक्स कंपायलेशन त्रुटी -%s
 msgid "The update command takes no arguments"
 msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ    शकत नाही."
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1581,10 +1319,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1605,28 +1347,300 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! "
-
-#: apt-private/private-download.cc:40
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "अंतर्गत त्रुटी, तुटलेल्या पॅकेजेस बरोबर  संस्थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!"
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "पॅकेजेस कायमची काढायची आहेत पण रिमूव्ह अकार्यक्षम केले आहे"
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr "किती विचित्र...आकार जुळत नाहीत, ईमेल 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of 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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "अर्काईव्हज%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
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "या क्रियेनंतर, %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
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला"
+
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "क्षुल्लक फक्त निर्देशित केले आहे पण हे क्षुल्लक कृति/ऑपरेशन नाही."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "हो, मी म्ह्टल्याप्रमाणे करा!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"तुम्ही संभाव्य काहीतरी नुकसानकारक करणार होतात.\n"
+"पुढे '%s' उक्ती मध्ये लिहिणार \n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "व्यत्यय/बंद करा."
+
+#: apt-private/private-install.cc:218
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? "
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"काही आर्काइव्हज आणण्यास असमर्थ, कदाचित apt-get रन करुन अद्ययावत करा किंवा --fix- "
+"बरोबर प्रयत्न कराहरवलेले/गहाळ?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr ""
+"--fix- सापडत नाही आणि माध्यम/मिडिया अदलाबदल हे सध्या तांत्रिक मदत देऊ शकत नाही"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "न सापडणारी पॅकेजेस नीट करण्यास असमर्थ."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "संस्थापन खंडित करत आहे."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही"
+
+#: 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 ""
+"हूं,  AutoRemover ने काहीतरी नष्ट केल्याचे दिसतेय, खरेतर असे व्हायला नको\n"
+"कृपया apt कडे बग रिपोर्ट दाखल करा. "
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले"
+
+#: apt-private/private-install.cc:488
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
+msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+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] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
+msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
+
+#: 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[1] "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr ""
+"तुम्हाला कदाचित 'apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा "
+"लागेल'यात बदल करण्यासाठी:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन ('apt-get -f install') पॅकेजशिवाय प्रयत्न करा "
+"(किंवा पर्याय सांगा)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"काही पॅकेजेस संस्थापित होत नाहीत. याचा अर्थ असा आहे की तुम्ही\n"
+"अशक्य परिस्थितीची विनंती केली होती. किंवा जर तुम्ही अस्थिर\n"
+"विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n"
+"किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "तुटलेली पॅकेजेस"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "सुचवलेली पॅकेजेस:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "शिफारस केलेली पॅकेजेस:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n"
+
+#: apt-private/private-install.cc:827
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s चे पुनर्संस्थापन शक्य नाही, हे डाऊनलोड करता येत नाही.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
+
+#: apt-private/private-install.cc:892
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n"
+
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "%s साठी %s (%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 "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! "
+
+#: apt-private/private-download.cc:98
 msgid "Authentication warning overridden.\n"
 msgstr "प्रमाणीकरणाची धोक्याची सूचना दुर्लक्षित करा.\n"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
 msgid "Some packages could not be authenticated"
 msgstr "काही पॅकेजेसचे प्रमाणिकरण होऊ शकत नाही"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 #, fuzzy
 msgid "Install these packages without verification?"
 msgstr "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]?"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%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 "%s मध्ये रिकामी जागा सांगू शकत नाही"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "%s मध्ये तुमच्याकडे पुरेशी जागा नाही."
+
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1641,41 +1655,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "पुढिल आवृत्तीची गणती करीत आहे"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "झाले"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "दाबा"
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "मिळवा:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "आय.जी.एन."
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "दोष इ.आर.आर."
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%s (%sB/s) मध्ये %sB मिळविला\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr "[काम करत आहे]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1688,18 +1694,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1774,205 +1780,456 @@ msgstr ""
 msgid "Merging available information"
 msgstr "उपलब्ध माहितीचे एकत्रीकरण करत आहे"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "सुटा करण्यासाठी बोलावलेला/आणलेला सांधा(ड्रापनोड)अजुनही जुळलेलाच सांधा(लिंकनोड) आहे"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "हॅश एलिमेंट शोधूने काढण्यास असमर्थ!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "नेमून दिलेल्यात फेरबदल करण्यास अयशस्वी"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "AddDiversion/ऍड डायव्हर्जन मध्ये आंतरिक दोष"
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "डायव्हर्जन पुनः लिहिण्यास प्रयत्न करत आहे,%s -> %s and %s/%s"
-
-#: apt-inst/filelist.cc:506
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n"
+" \n"
+"ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n"
+"डेबियन पॅकेजेस मधून \n"
+"\n"
+"पर्याय : \n"
+" -h    हा साह्याकारी मजकूर \n"
+" -t     टेंप डिर निर्धारित करा \n"
+"  -c=?  ही संरचना संचिका वाचा \n"
+" -o=?  एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे-  -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s स्टॅट करण्यास असमर्थ"
+
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "%s -> %s डायव्हर्जन दुप्पट मिळवा"
+msgid "Unable to write to %s"
+msgstr "%s मध्ये लिहिण्यास असमर्थ "
 
-#: apt-inst/filelist.cc:549
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "debconf आवृत्ती मिळू शकत नाही,debconf अधिष्ठापित झाली काय?"
+
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "पॅकेजेसची विस्तारित यादी खूप मोठी आहे"
+
+#: 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 "Duplicate conf file %s/%s"
-msgstr "%s/%s संचिरित संचिकाची दुसरी प्रत/नक्कल"
+msgid "Error processing directory %s"
+msgstr "त्रुटी प्रक्रिया मार्गदर्शिका%s "
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "उगमस्थानाची विस्तारित यादी खूप मोठी आहे"
+
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "शीर्षक संचिकेमधून मजकूर संचिकेत लिहिण्यात त्रुटी"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "मार्ग %s हा खूप लांब आहे"
+msgid "Error processing contents %s"
+msgstr "त्रुटी प्रक्रिया मजकूर %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"वापर:  apt-ftparchive [options] command\n"
+"आज्ञा: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive डेबियन फाईलसंचासाठी अनुक्रम संचिका निर्माण करतो.तो\n"
+" dpkg-scanpackages व dpkg-scansources करिता निर्मितीच्या संपूर्ण\n"
+" स्वंयंचलित ते कार्यकारी बदलावांपर्यंत अनेक शैलींना पाठबळ देतो\n"
+"\n"
+"apt-ftparchive हा .debsच्या तरुरचनेपासून पॅकेज संचिका निर्माण करतो \n"
+"पॅकेज संचिकेमध्ये प्रत्येक पॅकेज तसेच MD5 हॅश व संचिकाआकारामधील सर्व \n"
+" नियंत्रक क्षेत्रांची माहिती असते.अग्रक्रम आणि विभाग यांच्या मूल्यांचा प्रभाव \n"
+"वाढविण्यासाठी ओव्हरराईड संचिकेला पुष्टि दिलेली असते \n"
+"\n"
+"तसेच apt-ftparchive हा .dscs च्या तरूरचनेपासून उगमस्थान संचिका निर्माण करतो \n"
+"--source-override पर्यायाचा उपयोग एखाद्या src ओव्हरराईड संचिका नेमकेपणाने दाखविण्यास "
+"होतो \n"
+"\n"
+" 'packages' आणि  'sources' आज्ञावली तरूरचनेच्या मुळाशी दिल्या जाव्यात \n"
+"द्वयंक मार्गाचा निर्देश पुनरावर्ती शोधाच्या पाऱ्याकडे केलेला असावा आणि \n"
+" ओव्हरराईड संचिकेमध्ये ओव्हरराईड संकेत (फ्लॅग्ज) असावेत आणि \n"
+" संचिकानामक्षेत्रे असल्यास Pathprefix त्यांना जोडलेले असावेत.\n"
+"डेबियन archiveमधील नमुन्यादाखल उपयोग : \n"
+"apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"पर्याय : \n"
+"  -h   हा साह्याकारी मजकूर \n"
+"--md5  MD5  ची निर्मिती नियंत्रित करा \n"
+"  -s=    उगमस्थान ओव्हरराईड संचिका \n"
+" -q     शांत \n"
+"  -d=    पर्यायी दृतिकादायी डेटाबेस निवडा \n"
+" --no-delink दुवा तोडणारा डिबग मार्ग समर्थ करा \n"
+" ---contents  माहिती संचिकेची निर्मिती नियंत्रित करा \n"
+"  -c=?   ही संरचना संचिका वाचा \n"
+"  -o=?  एखादा अहेतुक संरचना पर्याय निर्धारित करा"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "निवडक भाग जुळत नाही"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "%s एकापेक्षा जास्त वेळा उघडत आहे"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "`%s' पॅकेज संचिका समुहातील काही संचिका गहाळ आहेत"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "%s संचिका डायव्हर्ट केली आहे/वळवली आहे"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB खराब झाली होती, संचिका %s.old म्हणून पुनर्नामांकित केली"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "डायव्हर्जन इच्छित %s/%s मध्ये लिहिण्याचा पॅकेज प्रयत्न करत आहे"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB जुने आहे,%s पुढच्या आवृतीसाठी प्रयत्न करत आहे"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "डायव्हर्जन मार्ग हा खूप लांब आहे"
+#: ftparchive/cachedb.cc:96
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"DB स्वरुप वैध नाही. जर तुम्ही apt च्या जुन्या आवृत्तीपासून पुढिल आवृत्तीकृत करत असाल तर, "
+"कृपया माहितीसंच काढून टाका आणि पुनर्निर्मित करा"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "%s: %s DB संचिका उघडण्यास असमर्थ"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s स्टेट करण्यास असमर्थ"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "%s वाचणारा दुवा असमर्थ"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "अर्काईव्ह मध्ये नियंत्रण माहिती संच नाही"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "संकेतक घेण्यास असमर्थ"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
+msgid "W: Unable to read directory %s\n"
+msgstr "धोक्याची सूचना:%s संचयिका वाचण्यास असमर्थ \n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "%s संचिका ही संचिका नसलेल्या संचिकेबरोबर बदललेली आहे"
+msgid "W: Unable to stat %s\n"
+msgstr "धो.सू.:%s स्टेट करण्यास असमर्थ\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "नोडचे त्याच्या हॅश बकेटमध्ये/बादलीत स्थान निश्चित करण्यास असमर्थ"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E:"
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "मार्ग खूप लांब आहे"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "धो.सू.:"
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "ई: संचिकेला लागू होणाऱ्या चुका"
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "%s च्या आवृत्तीशी पुनः लिहिलेल्या पॅकेज जुळत नाही"
+msgid "Failed to resolve %s"
+msgstr "%s सोडवण्यास असमर्थ"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "ट्री चालणे असमर्थ"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "File %s/%s, %s पॅकेज मधल्या एका वर पुनर्लिखित होते"
+msgid "Failed to open %s"
+msgstr "%s उघडण्यास असमर्थ"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "%s स्टॅट करण्यास असमर्थ"
+msgid " DeLink %s [%s]\n"
+msgstr "%s [%s] डी दुवा\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "%s फाईल मध्ये लिहिण्यास असमर्थ"
+msgid "Failed to readlink %s"
+msgstr "%s वाचणारा दुवा असमर्थ"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "%s फाईल बंद करण्यास असमर्थ"
+msgid "Failed to unlink %s"
+msgstr "%s दुवा काढण्यास असमर्थ"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "हा वैध DEB अर्काईव्ह नाही,'%s' मेंबर उपलब्ध नाही"
+msgid "*** Failed to link %s to %s"
+msgstr "%s चा %s दुवा साधण्यास असमर्थ"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "अंतर्गत त्रुटी,%s मेंबर शोधू शकत नाही"
+msgid " DeLink limit of %sB hit.\n"
+msgstr "%sB हीट ची डिलींक मर्यादा\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "अनपार्सेबल नियंत्रण फाईल"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "अर्काईव्ह ला पॅकेज जागा नाही"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "अयोग्य अर्काईव्ह ओळख सही"
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "अर्काईव्ह मेंबर शीर्षक वाचण्यास त्रुटी"
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:712
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n"
+
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc-स्मरणस्थळ शोधण्यास असमर्थ"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s उघडण्यास असमर्थ"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
 #, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक"
+msgid "Malformed override %s line %llu (%s)"
+msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "%s दुर्लक्षित संचिका वाचण्यास असमर्थ"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "माहित नसलेली/ले संक्षेप पद्धती/अलगोरिथम '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "%s संकलित आऊटपुट/निर्गत साठी संक्षेप संचाची गरज"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "संचिका * तयार करण्यास असमर्थ"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "अर्काईव्ह खूप छोटे आहे"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "नविन प्रक्रिया(प्रोसेस) निर्माण करण्यास असमर्थ"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "अर्काईव्ह शीर्षके वाचणे असफल"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "चॉईल्ड(प्रोसेस)ला संकलित करा"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "पाईप तयार करण्यास असमर्थ"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "अंतर्गत त्रुटी, %s तयार करण्यास असमर्थ"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "exec gzip करण्यास असमर्थ"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "IO ची उपक्रिया/संचिका असमर्थ "
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "बिघडलेली अर्काईव्हज"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "MD5 कामप्युटींग करतांना वाचण्यासाठी असमर्थ"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "टार(टेपअर्काईव्ह) चेकसम चुकला, बिघडलेली अर्काईव्ह"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "%s दुवा मोकळा/सुटा करण्यास अडचण"
 
-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "अपरिचित TAR शीर्षक प्रकार %u, मेंबर %s"
+msgid "Failed to rename %s to %s"
+msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
+
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n"
+" \n"
+"ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n"
+"डेबियन पॅकेजेस मधून \n"
+"\n"
+"पर्याय : \n"
+" -h    हा साह्याकारी मजकूर \n"
+" -t     टेंप डिर निर्धारित करा \n"
+"  -c=?  ही संरचना संचिका वाचा \n"
+" -o=?  एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे-  -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "अनोळखी पॅकेज माहिती संच!"
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"वापर:apt-sortpkgs [पर्याय] फाईल१[फाईल २...]\n"
+"\n"
+" apt-sortpkgs हे पॅकेज फाईल्सचं वर्गीकरण करणारी एक साधी आज्ञावली आहे. -s  पर्याय हा "
+"फाईल\n"
+"कुठल्या प्रकारची आहे हे दाखवण्यासाठी वापरतात.\n"
+"\n"
+"पर्याय\n"
+"   -h     हा मदत मजकूर\n"
+"   -s     उगमस्थान फाईल वापरा\n"
+"   -c=?   ही संरचना फाईल वाचा\n"
+"   -o=?-  अनियंत्रित संरचना पर्याय निश्चित करा,eg -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "'%s' पॅकेजींग प्रणाली सहाय्यकारी नाही"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "योग्य असा पॅकेजिंग प्रणाली प्रकार निश्चित करण्यास असमर्थ "
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i माहितीसंच लिहिले.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच  लिहिले.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n"
@@ -1987,6 +2244,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 "पॅकेजच्या याद्या किंवा संचिकेची स्थिती स्पष्ट होऊ शकत नाही किंवा ती उघडू शकत नाही."
@@ -1999,199 +2276,368 @@ msgstr "तुम्ही ह्या समस्यांचे निवा
 msgid "The list of sources could not be read."
 msgstr "उगमांच्या याद्या वाचता येणार नाहीत."
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "पॅकेज अस्थाई स्मृतिकोष"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल ही विजोड आवृत्ती आहे"
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "'%s' आवृत्तीकरण प्रणालीला हे APT तांत्रिक मदत देऊ शकत नाही"
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "अवलंबित"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "पूर्व अवलंबित"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "सुचवणे"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "शिफारस"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "परस्परविरोध"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "परत त्याठिकाणी आणा"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "अप्रचलित"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "तोडले"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "अत्यावश्यक"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "आवश्यक"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "मानक"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "एच्छिक"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "अधिक"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "पुढिल आवृत्तीची गणती करीत आहे"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही"
+
+#: 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/sourcelist.cc:211
+#, c-format
+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/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
+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 "The method driver %s could not be found."
-msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. "
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही "
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
+msgid "Couldn't stat source package list %s"
+msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
 
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "कृपया '%s' लेबल असलेली डिस्क '%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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "अवलंबित रचना बांधणी करत आहे"
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे"
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "कंॅडिडेट आवृत्त्या"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "अवलंबित/विसंबून असलेले उत्पादन "
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "स्थिती माहिती वाचत आहे"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s StateFile उघडणे असफल"
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "हॅश बेरीज जुळत नाही"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "आकार जुळतनाही"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "%s अवैध क्रिया"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "लिहिण्यात त्रुटी"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "%s संचिका डायव्हर्ट केली आहे/वळवली आहे"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: apt-pkg/acquire-item.cc:2059
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
+"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:1926
+#: 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 "
@@ -2200,12 +2646,12 @@ msgstr ""
 "मी %s पॅकेजकरीता संचिका शोधण्यास  समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते "
 "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) "
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2213,125 +2659,38 @@ msgstr ""
 "पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/"
 "ठिकाण %s."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही पॅकेज नांवांच्या संख्येची मर्यादा ओलांडली "
-"आहे."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही आवृत्त्या संख्येची मर्यादा ओलांडली आहे."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "अरेवा!, तुम्ही तर ह्या ऍप्टच्या कार्यक्षमतेपेक्षाही विवरण संख्येची मर्यादा ओलांडली आहे."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा "
-"ओलांडली आहे."
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही "
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "पॅकेज याद्या वाचत आहोत"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "%s मध्ये लिहिण्यास असमर्थ "
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: apt-pkg/acquire.cc:162
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "%li ची %li(%s राहिलेले) संचिका पुन:प्राप्त करीत आहे"
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "तुम्ही तुमच्या उगमस्थान यादीत URI घाला"
@@ -2357,19 +2716,19 @@ msgstr "%s पिनचा प्रकार समजलेला नाही
 msgid "No priority (or zero) specified for pin"
 msgstr "पिन करिता प्राधान्य/अग्रक्रम (किंवा शून्य)निर्देशीत केलेला नाही"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "%s फाईल उघडता येत नाही"
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2380,10 +2739,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"
@@ -2452,11 +2815,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"
 
@@ -2467,7 +2830,7 @@ msgid ""
 msgstr ""
 "%s पॅकेज पुनः:अधिष्ठापित करण्याची गरज आहे, परंतु मला त्यासाठी ऑर्काइव्ह सापडू शकले नाही."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2475,326 +2838,257 @@ msgstr ""
 "दोष,पॅकेज समस्या निवारक::निवारण  करतांना अडथळा निर्माण झाला, ह्याचे कारण स्थगित  "
 "पॅकेजेस असू शकते."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "%s पॅकेज फाईल पार्स करण्यात असमर्थ (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "%s कार्य सापडू शकले नाही"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/cacheset.cc:635
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/cacheset.cc:641
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
-#: apt-pkg/cacheset.cc:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:145
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
+
+#: apt-pkg/indexrecords.cc:164
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s निवडक भाग सापडत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "फक्त वाचण्यासाठी कुलूप संचिका %s साठी कुलूपबंदचा वापर करीत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "%s कुलूप फाईल उघडता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "%s nfs(नेटवर्क फाईल सिस्टीम) माऊंटेड कुलुप फाईल ला कुलुप /बंद करता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "%s कुलुप मिळवता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "%s उपक्रिया अचानकपणे बाहेर पडली"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "फाईल बंद करण्यात अडचण"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s फाईल उघडता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "%s साठी पाईप उघडता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "आयपीसी उपक्रिया तयार करण्यास असमर्थ"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "दाबक(संकलितकर्ता) कर्यान्वित करण्यास असमर्थ"
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "फाईल बंद करण्यात अडचण"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "संचिकेची syncing समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "फाईल अनलिंकिंग करण्यात अडचण"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "संचिकेची syncing समस्या"
 
@@ -2879,109 +3173,103 @@ msgstr "%s माऊंट पॉईंट स्टॅट करण्यास
 msgid "Failed to stat the cdrom"
 msgstr "सीडी-रॉम स्टॅट करण्यास असमर्थ"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "संक्षिप्तरुपाचा माहित नसलेला प्रकार: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "%s संरचना फाईल उघडत आहे"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "रचनेच्या नियमांचा दोष : %s:%u: मालफॉर्मड् टॅग"
 
-#: apt-pkg/contrib/configuration.cc:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "नियम रचनेचा दोष %s:%u: फाईलच्या अंती अधिक जंक"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-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 "आदेश रेखा पर्याय %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 अवैध क्रिया"
@@ -2991,12 +3279,12 @@ msgstr "%s अवैध क्रिया"
 msgid "Installing %s"
 msgstr "%s संस्थापित होत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "%s काढून टाकत आहे"
@@ -3017,103 +3305,103 @@ msgid "Running post-installation trigger %s"
 msgstr "संस्थापना-पश्चात ट्रिगर %s चालवत आहे"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "'%s' संचयिका गहाळ आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "%s तयार करित आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s सुटे/मोकळे करीत आहे "
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s संरचने साठी तयार करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "%s संस्थापित झाले"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "%s काढून टाकले"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s संपूर्ण काढून टाकले"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3130,416 +3418,184 @@ msgstr ""
 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 ""
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n"
-" \n"
-"ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n"
-"डेबियन पॅकेजेस मधून \n"
-"\n"
-"पर्याय : \n"
-" -h    हा साह्याकारी मजकूर \n"
-" -t     टेंप डिर निर्धारित करा \n"
-"  -c=?  ही संरचना संचिका वाचा \n"
-" -o=?  एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे-  -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "%s स्टॅट करण्यास असमर्थ"
-
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "debconf आवृत्ती मिळू शकत नाही,debconf अधिष्ठापित झाली काय?"
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "त्रुटी प्रक्रिया मार्गदर्शिका%s "
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "उगमस्थानाची विस्तारित यादी खूप मोठी आहे"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "शीर्षक संचिकेमधून मजकूर संचिकेत लिहिण्यात त्रुटी"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "त्रुटी प्रक्रिया मजकूर %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"वापर:  apt-ftparchive [options] command\n"
-"आज्ञा: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive डेबियन फाईलसंचासाठी अनुक्रम संचिका निर्माण करतो.तो\n"
-" dpkg-scanpackages व dpkg-scansources करिता निर्मितीच्या संपूर्ण\n"
-" स्वंयंचलित ते कार्यकारी बदलावांपर्यंत अनेक शैलींना पाठबळ देतो\n"
-"\n"
-"apt-ftparchive हा .debsच्या तरुरचनेपासून पॅकेज संचिका निर्माण करतो \n"
-"पॅकेज संचिकेमध्ये प्रत्येक पॅकेज तसेच MD5 हॅश व संचिकाआकारामधील सर्व \n"
-" नियंत्रक क्षेत्रांची माहिती असते.अग्रक्रम आणि विभाग यांच्या मूल्यांचा प्रभाव \n"
-"वाढविण्यासाठी ओव्हरराईड संचिकेला पुष्टि दिलेली असते \n"
-"\n"
-"तसेच apt-ftparchive हा .dscs च्या तरूरचनेपासून उगमस्थान संचिका निर्माण करतो \n"
-"--source-override पर्यायाचा उपयोग एखाद्या src ओव्हरराईड संचिका नेमकेपणाने दाखविण्यास "
-"होतो \n"
-"\n"
-" 'packages' आणि  'sources' आज्ञावली तरूरचनेच्या मुळाशी दिल्या जाव्यात \n"
-"द्वयंक मार्गाचा निर्देश पुनरावर्ती शोधाच्या पाऱ्याकडे केलेला असावा आणि \n"
-" ओव्हरराईड संचिकेमध्ये ओव्हरराईड संकेत (फ्लॅग्ज) असावेत आणि \n"
-" संचिकानामक्षेत्रे असल्यास Pathprefix त्यांना जोडलेले असावेत.\n"
-"डेबियन archiveमधील नमुन्यादाखल उपयोग : \n"
-"apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"पर्याय : \n"
-"  -h   हा साह्याकारी मजकूर \n"
-"--md5  MD5  ची निर्मिती नियंत्रित करा \n"
-"  -s=    उगमस्थान ओव्हरराईड संचिका \n"
-" -q     शांत \n"
-"  -d=    पर्यायी दृतिकादायी डेटाबेस निवडा \n"
-" --no-delink दुवा तोडणारा डिबग मार्ग समर्थ करा \n"
-" ---contents  माहिती संचिकेची निर्मिती नियंत्रित करा \n"
-"  -c=?   ही संरचना संचिका वाचा \n"
-"  -o=?  एखादा अहेतुक संरचना पर्याय निर्धारित करा"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "निवडक भाग जुळत नाही"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "`%s' पॅकेज संचिका समुहातील काही संचिका गहाळ आहेत"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB खराब झाली होती, संचिका %s.old म्हणून पुनर्नामांकित केली"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB जुने आहे,%s पुढच्या आवृतीसाठी प्रयत्न करत आहे"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"DB स्वरुप वैध नाही. जर तुम्ही apt च्या जुन्या आवृत्तीपासून पुढिल आवृत्तीकृत करत असाल तर, "
-"कृपया माहितीसंच काढून टाका आणि पुनर्निर्मित करा"
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "%s: %s DB संचिका उघडण्यास असमर्थ"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "%s वाचणारा दुवा असमर्थ"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "अर्काईव्ह मध्ये नियंत्रण माहिती संच नाही"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "संकेतक घेण्यास असमर्थ"
-
-#: ftparchive/writer.cc:91
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "धोक्याची सूचना:%s संचयिका वाचण्यास असमर्थ \n"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
 
-#: ftparchive/writer.cc:96
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "धो.सू.:%s स्टेट करण्यास असमर्थ\n"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E:"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "सुटा करण्यासाठी बोलावलेला/आणलेला सांधा(ड्रापनोड)अजुनही जुळलेलाच सांधा(लिंकनोड) आहे"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "धो.सू.:"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "हॅश एलिमेंट शोधूने काढण्यास असमर्थ!"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "ई: संचिकेला लागू होणाऱ्या चुका"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "नेमून दिलेल्यात फेरबदल करण्यास अयशस्वी"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "%s सोडवण्यास असमर्थ"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "AddDiversion/ऍड डायव्हर्जन मध्ये आंतरिक दोष"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "ट्री चालणे असमर्थ"
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "डायव्हर्जन पुनः लिहिण्यास प्रयत्न करत आहे,%s -> %s and %s/%s"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to open %s"
-msgstr "%s उघडण्यास असमर्थ"
+msgid "Double add of diversion %s -> %s"
+msgstr "%s -> %s डायव्हर्जन दुप्पट मिळवा"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "%s [%s] डी दुवा\n"
+msgid "Duplicate conf file %s/%s"
+msgstr "%s/%s संचिरित संचिकाची दुसरी प्रत/नक्कल"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "%s वाचणारा दुवा असमर्थ"
+msgid "The path %s is too long"
+msgstr "मार्ग %s हा खूप लांब आहे"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "%s दुवा काढण्यास असमर्थ"
+msgid "Unpacking %s more than once"
+msgstr "%s एकापेक्षा जास्त वेळा उघडत आहे"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "%s चा %s दुवा साधण्यास असमर्थ"
+msgid "The directory %s is diverted"
+msgstr "%s संचिका डायव्हर्ट केली आहे/वळवली आहे"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:152
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "%sB हीट ची डिलींक मर्यादा\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "डायव्हर्जन इच्छित %s/%s मध्ये लिहिण्याचा पॅकेज प्रयत्न करत आहे"
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "अर्काईव्ह ला पॅकेज जागा नाही"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "डायव्हर्जन मार्ग हा खूप लांब आहे"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "%s संचिका ही संचिका नसलेल्या संचिकेबरोबर बदललेली आहे"
+
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "नोडचे त्याच्या हॅश बकेटमध्ये/बादलीत स्थान निश्चित करण्यास असमर्थ"
+
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "मार्ग खूप लांब आहे"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n"
+msgid "Overwrite package match with no version for %s"
+msgstr "%s च्या आवृत्तीशी पुनः लिहिलेल्या पॅकेज जुळत नाही"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "File %s/%s, %s पॅकेज मधल्या एका वर पुनर्लिखित होते"
 
-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n"
+msgid "Unable to stat %s"
+msgstr "%s स्टॅट करण्यास असमर्थ"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc-स्मरणस्थळ शोधण्यास असमर्थ"
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "%s फाईल मध्ये लिहिण्यास असमर्थ"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Unable to open %s"
-msgstr "%s उघडण्यास असमर्थ"
+msgid "Failed to close file %s"
+msgstr "%s फाईल बंद करण्यास असमर्थ"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1"
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "हा वैध DEB अर्काईव्ह नाही,'%s' मेंबर उपलब्ध नाही"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "%s दुर्लक्षित संचिका वाचण्यास असमर्थ"
+msgid "Internal error, could not locate member %s"
+msgstr "अंतर्गत त्रुटी,%s मेंबर शोधू शकत नाही"
 
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "अनपार्सेबल नियंत्रण फाईल"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #2"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "अयोग्य अर्काईव्ह ओळख सही"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #3"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "अर्काईव्ह मेंबर शीर्षक वाचण्यास त्रुटी"
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "माहित नसलेली/ले संक्षेप पद्धती/अलगोरिथम '%s'"
+#: apt-inst/contrib/arfile.cc:96
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "%s संकलित आऊटपुट/निर्गत साठी संक्षेप संचाची गरज"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "संचिका * तयार करण्यास असमर्थ"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "अर्काईव्ह खूप छोटे आहे"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "नविन प्रक्रिया(प्रोसेस) निर्माण करण्यास असमर्थ"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "अर्काईव्ह शीर्षके वाचणे असफल"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "चॉईल्ड(प्रोसेस)ला संकलित करा"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "पाईप तयार करण्यास असमर्थ"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "अंतर्गत त्रुटी, %s तयार करण्यास असमर्थ"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "exec gzip करण्यास असमर्थ"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "IO ची उपक्रिया/संचिका असमर्थ "
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "बिघडलेली अर्काईव्हज"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "MD5 कामप्युटींग करतांना वाचण्यासाठी असमर्थ"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "टार(टेपअर्काईव्ह) चेकसम चुकला, बिघडलेली अर्काईव्ह"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "%s दुवा मोकळा/सुटा करण्यास अडचण"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "अपरिचित TAR शीर्षक प्रकार %u, मेंबर %s"
 
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n"
-" \n"
-"ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n"
-"डेबियन पॅकेजेस मधून \n"
-"\n"
-"पर्याय : \n"
-" -h    हा साह्याकारी मजकूर \n"
-" -t     टेंप डिर निर्धारित करा \n"
-"  -c=?  ही संरचना संचिका वाचा \n"
-" -o=?  एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे-  -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "एकूण परावलंबित आवृत्ती अवकाश:"
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "अनोळखी पॅकेज माहिती संच!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "%s मध्ये पुरेशी जागा नाही"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"वापर:apt-sortpkgs [पर्याय] फाईल१[फाईल २...]\n"
-"\n"
-" apt-sortpkgs हे पॅकेज फाईल्सचं वर्गीकरण करणारी एक साधी आज्ञावली आहे. -s  पर्याय हा "
-"फाईल\n"
-"कुठल्या प्रकारची आहे हे दाखवण्यासाठी वापरतात.\n"
-"\n"
-"पर्याय\n"
-"   -h     हा मदत मजकूर\n"
-"   -s     उगमस्थान फाईल वापरा\n"
-"   -c=?   ही संरचना फाईल वाचा\n"
-"   -o=?-  अनियंत्रित संरचना पर्याय निश्चित करा,eg -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "झाले"
+
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "संस्थापन खंडित करत आहे."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/nb.po b/po/nb.po
index 088f17fa8..07247be4f 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: 2015-01-16 04:37-0500\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,149 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Antall pakkenavn: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Antall pakkestrukturer: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Vanlige pakker: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Rent virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Enkle virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Sammensatte virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Mangler: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Antall unike versjoner: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Antall unike beskrivelser: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Antall avhengighetsforhold: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Antall forhold versjon/fil: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Antall forhold beskrivelse/fil: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Antall tilbudte tilknyttinger: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Antall utvidede strenger: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Total plass for avhengighetsforhold/versjoner: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Plass brukt av slark: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Samlet mengde redegjort plass: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Låste pakker:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(ikke funnet)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Installert: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Pakke låst til: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -244,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"
@@ -265,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."
 
@@ -301,71 +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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: 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:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Klarte ikke å finne pakken %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Klarer ikke å låse nedlastingsmappa"
 
-#: cmdline/apt-get.cc:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -374,7 +370,7 @@ msgstr ""
 "MERK: «%s»-pakker blir vedlikeholdt i versjonskontrollsystemet «%s» på:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
@@ -385,116 +381,115 @@ msgstr ""
 "bzr get %s\n"
 "for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hopper over allerede nedlastet fil «%s»\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Klarte ikke bestemme ledig plass i %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Du har ikke nok ledig plass i %s"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Skaffer kildekode %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikke å skaffe alle arkivene."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggekommandoen «%s» mislyktes.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Barneprosessen mislyktes"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen avhengigheter.\n"
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: cmdline/apt-get.cc:1359
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -503,37 +498,37 @@ 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:1362
+#: 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:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikke å behandle forutsetningene for bygging"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Kobler til %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Støttede moduler:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -649,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -776,12 +771,12 @@ msgstr "Disk ikke funnet."
 msgid "File not found"
 msgstr "Fant ikke fila"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Klarte ikke å få status"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Klarte ikke å sette endringstidspunkt"
 
@@ -790,34 +785,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ugyldig adresse. Lokale adresser kan ikke starte med //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Logger inn"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Klarte ikke å fastslå navnet på motparten"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Klarte ikke å fastslå det lokale navnet"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Tjeneren nektet oss å kople til og sa: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER mislykkes, tjeneren sa: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS mislykkes, tjeneren sa: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -825,123 +820,123 @@ msgstr ""
 "En mellomtjener er oppgitt, men ikke noe innloggingsskript. Feltet «Acquire::"
 "ftp::ProxyLogin» er tomt."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Kommandoen «%s» i innlogginsskriptet mislykkes, tjeneren sa: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE mislykkes, tjeneren sa: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Tidsavbrudd på forbindelsen"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Tjeneren lukket forbindelsen"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Lesefeil"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Et svar oversvømte bufferen."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Protokollødeleggelse"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Skrivefeil"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Klarte ikke å opprette en sokkel"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Klarte ikke å kople til datasokkelen, tidsavbrudd på forbindelsen"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Mislyktes"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Klarte ikke å koble til en passiv sokkel."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo klarte ikke å opprette en lyttesokkel"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Klarte ikke å binde til sokkel"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Klarte ikke å lytte til sokkel"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Klarte ikke å avgjøre sokkelnavnet"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Klarte ikke å sende PORT-kommandoen"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ukjent adressefamilie %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT mislykkes, tjeneren sa: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Tidsavbrudd på tilkoblingen til datasokkelen"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Klarte ikke å godta tilkoblingen"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Klarte ikke å hente fila, tjeneren sa «%s»"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Tidsavbrudd på datasokkelen"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataoverføringen mislykkes, tjeneren sa «%s»"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Spørring"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Klarte ikke å starte"
 
@@ -1007,37 +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:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ugyldig signatur ble funnet."
 
-#: methods/gpgv.cc:174
+#: 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?)"
+"Klarte ikke kjøre «apt-key» for å verifisere signaturen (er gnupg "
+"installert?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Ukjent feil ved kjøring av apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1045,35 +1041,35 @@ msgstr ""
 "De følgende signaturene kunne ikke verifiseres fordi den offentlige nøkkelen "
 "ikke er tilgjengelig:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Feil ved lesing fra tjeneren"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Utvalget mislykkes"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Tidsavbrudd på forbindelsen"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
@@ -1105,294 +1101,30 @@ msgstr "Denne HTTP-tjeneren har ødelagt støtte for område"
 msgid "Unknown date format"
 msgstr "Ukjent datoformat"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Ødelagte hodedata"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkes"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "Intern feil"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Pakker trenges å fjernes, men funksjonen er slått av."
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Intern feil, sortering fullførte ikke"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Så rart ... Størrelsene stemmer ikke overens, send en e-post til "
-"apt@packages.debian.org"
-
-#. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Må hente %sB/%sB med arkiver.\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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Må hente %sB med arkiver.\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:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Dessverre, ikke nok ledig plass i %s"
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-"«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring."
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Ja, gjør som jeg sier!"
-
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Du er iferd med å utføre en mulig skadelig handling.\n"
-"For å fortsette skriv inn teksten «%s»\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Avbryter."
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Vil du fortsette?"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Klarte ikke laste ned alle filene"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller "
-"«--fix-missing»."
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "«--fix-missing» og bytte av media støttes nå ikke"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Klarer ikke å rette på manglende pakker."
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Avbryter installasjonen."
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"Den følgende pakken forsvant fra systemet ditt siden\n"
-"alle filene er overskrevet av andre pakker:"
-msgstr[1] ""
-"De følgende pakkene forsvant fra systemet ditt siden\n"
-"alle filene er overskrevet av andre pakker:"
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Merk: Dette er gjort automatisk og med hensikt av dpkg."
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)"
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Hmm, det ser ut som auto-fjerneren (AutoRemover) ødela noe, og det skal\n"
-"virkelig ikke skje. Send inn en feilmelding til apt-utviklerne."
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe"
-
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"Følgende pakke ble automatisk installert og er ikke lenger påkrevet:"
-msgstr[1] ""
-"Følgende pakker ble automatisk installert og er ikke lenger påkrevet:"
-
-#: apt-private/private-install.cc:517
+#: methods/server.cc:589
 #, c-format
-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 pakke ble automatisk installert og er ikke lenger påkrevet.\n"
-msgstr[1] "%lu pakker ble automatisk installert og er ikke lenger påkrevet.\n"
-
-#: apt-private/private-install.cc:519
-#, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Bruk «apt-get autoremove» for å fjerne dem."
-msgstr[1] "Bruk «apt-get autoremove» for å fjerne dem."
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller "
-"angi en løsning)."
-
-#: apt-private/private-install.cc:638
 msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Noen pakker ble ikke installeres. Dette kan bety at du har bedt om\n"
-"en umulig tilstand eller, hvis du bruker den ustabile utgaven av Debian,\n"
-"at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
-"distribusjonen."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Ødelagte pakker"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Følgende ekstra pakker vil bli installert."
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Foreslåtte pakker:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Anbefalte pakker"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"Hopper over %s siden den ikke er installert eller kun oppgraderinger er "
-"ønsket.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s er allerede nyeste versjon.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
 
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "Intern feil"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1400,31 +1132,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "Retter på avhengighetsforhold ..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " mislyktes."
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "Klarer ikke å rette på avhengighetsforholdene"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr "Klarer ikke å minimere oppgraderingsettet"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " Utført"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»."
 
@@ -1588,7 +1320,7 @@ msgstr "J"
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: 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"
@@ -1597,7 +1329,7 @@ msgstr "Kompileringsfeil i regulært uttrykk - %s"
 msgid "The update command takes no arguments"
 msgstr "Oppdaterings-kommandoen tar ingen argumenter"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1605,10 +1337,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1633,27 +1369,306 @@ msgstr ""
 "      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:36
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Pakker trenges å fjernes, men funksjonen er slått av."
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Intern feil, sortering fullførte ikke"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Så rart ... Størrelsene stemmer ikke overens, send en e-post til "
+"apt@packages.debian.org"
+
+#. 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Må hente %sB/%sB med arkiver.\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:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Må hente %sB med arkiver.\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:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\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 "Etter denne operasjonen vil %sB diskplass bli ledig.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Det oppsto problemer og «-y» ble brukt uten «--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 ""
+"«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Ja, gjør som jeg sier!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Du er iferd med å utføre en mulig skadelig handling.\n"
+"For å fortsette skriv inn teksten «%s»\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Avbryter."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Vil du fortsette?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Klarte ikke laste ned alle filene"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller "
+"«--fix-missing»."
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "«--fix-missing» og bytte av media støttes nå ikke"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Klarer ikke å rette på manglende pakker."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Avbryter installasjonen."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"Den følgende pakken forsvant fra systemet ditt siden\n"
+"alle filene er overskrevet av andre pakker:"
+msgstr[1] ""
+"De følgende pakkene forsvant fra systemet ditt siden\n"
+"alle filene er overskrevet av andre pakker:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Merk: Dette er gjort automatisk og med hensikt av dpkg."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (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 ""
+"Hmm, det ser ut som auto-fjerneren (AutoRemover) ødela noe, og det skal\n"
+"virkelig ikke skje. Send inn en feilmelding til apt-utviklerne."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"Følgende pakke ble automatisk installert og er ikke lenger påkrevet:"
+msgstr[1] ""
+"Følgende pakker ble automatisk installert og er ikke lenger påkrevet:"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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 pakke ble automatisk installert og er ikke lenger påkrevet.\n"
+msgstr[1] "%lu pakker ble automatisk installert og er ikke lenger påkrevet.\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] "Bruk «apt-get autoremove» for å fjerne dem."
+msgstr[1] "Bruk «apt-get autoremove» for å fjerne dem."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller "
+"angi en løsning)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Noen pakker ble ikke installeres. Dette kan bety at du har bedt om\n"
+"en umulig tilstand eller, hvis du bruker den ustabile utgaven av Debian,\n"
+"at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
+"distribusjonen."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Ødelagte pakker"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Følgende ekstra pakker vil bli installert."
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Foreslåtte pakker:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Anbefalte pakker"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Hopper over %s siden den ikke er installert eller kun oppgraderinger er "
+"ønsket.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s er allerede nyeste versjon.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
+
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Utvalgt versjon «%s» (%s) for «%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 "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+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-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!"
 
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:98
 msgid "Authentication warning overridden.\n"
 msgstr "Autentiseringsadvarsel overstyrt.\n"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
 msgid "Some packages could not be authenticated"
 msgstr "Noen pakker ble ikke autentisert"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 msgid "Install these packages without verification?"
 msgstr "Installer disse pakkene uten verifikasjon?"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikke å skaffe %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 "Klarte ikke bestemme ledig plass i %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Dessverre, ikke nok ledig plass i %s"
+
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1668,41 +1683,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Beregner oppgradering"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Utført"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Funnet "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Hent:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Feil "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Hentet %sB på %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Arbeider]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1715,18 +1722,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1801,205 +1808,457 @@ msgstr "av betydning. Sett dem i stand dem og kjør [I]nstall igjen."
 msgid "Merging available information"
 msgstr "Fletter tilgjengelig informasjon"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode ble startet på et knutepunkt som ennå er lenket"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Fant ikke nøkkelelementet."
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Klarte ikke å tildele avledning"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Intern feil i AddDiversion"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
+"\n"
+"apt-extracttemplates er et verktøy til å hente ut informasjon om "
+"innstillinger\n"
+"og maler fra debianpakker.\n"
+"\n"
+"Innstillinger:\n"
+"  -h   Denne hjelpeteksten\n"
+"  -t   Lag en midlertidig mappe\n"
+"  -c=? Les denne innstillingsfila.\n"
+"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Prøver å skrive over en avledning, %s -> %s og %s/%s"
+#: 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"
 
-#: apt-inst/filelist.cc:506
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Dobbel tillegging av avledning %s -> %s"
+msgid "Unable to write to %s"
+msgstr "Kan ikke skrive til %s"
 
-#: apt-inst/filelist.cc:549
+#: 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:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "Lista over pakkeutvidelser er for lang"
+
+#: 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 "Duplicate conf file %s/%s"
-msgstr "Dobbel oppsettsfil %s/%s"
+msgid "Error processing directory %s"
+msgstr "Feil ved lesing av katalogen %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Lista over kildeutvidelser er for lang"
+
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "Feil ved skriving av topptekst til innholdsfila"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "Stien %s er for lang"
+msgid "Error processing contents %s"
+msgstr "Det oppsto en feil ved lesing av %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Bruk: apt-ftparchive [innstillinger] kommando\n"
+"Kommandoer: packages binærsti [overstyringsfil [sti-prefiks]]\n"
+"          sources kildesti [overstyringsfil [sti-prefiks]]\n"
+"          contents sti\n"
+"          release sti\n"
+"          generate config [grupper]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive oppretter indeksfiler for debianarkiver. Mange ulike\n"
+"metoder er støttet - fra helautomatiske til funksjonelle\n"
+"erstatninger for dpkg-scanpackages og dpkg-scansources.\n"
+"\n"
+"apt-ftparchive oppretter «Packages»-filer fra et tre med debianpakker.\n"
+"«Packages»-fila inneholder alle kontrollfeltene fra hver pakke i tillegg "
+"til\n"
+"MD5-nøkkel og filstørrelse. Du kan bruke en overstyringsfil for å tvinge\n"
+"gjennom verdier for prioritet og kategori.\n"
+"\n"
+"apt-ftparchive kan på samme måte opprette kildefiler fra et tre\n"
+"med .dsc-filer. Du kan bruke en overstyringsfil med --source-override.\n"
+"\n"
+"Kommandoene «packages» og «sources» skal kjøres i rota av katalogtreet.\n"
+"«Binærsti» skal peke til toppkatalogen for det rekursive søket, og\n"
+"overstyringsfila skal inneholde innstillinger for overstyring.\n"
+"Sti-prefikset blir lagt til feltene for filnavn, dersom det er oppgitt. Her "
+"er\n"
+"et eksempel på bruk i debianarkivet:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Innstillinger:\n"
+"  -h    Vis denne hjelpeteksten.\n"
+"  --md5 Styrer MD5-opprettelsen\n"
+"  -s=?  Overstyringsfil for kildekode.\n"
+"  -q    Stille.\n"
+"  -d=?  Velger om du vil bruke en mellomlagerdatabase.\n"
+"  --no-delink Bruk avlusingsmodus med «delinking».\n"
+"  --contents  Styrer opprettelse av innholdsfila.\n"
+"  -c=?  Les denne oppsettsfila.\n"
+"  -o=? Setter en vilkårlig innstilling"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Ingen utvalg passet"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Pakker ut %s mer enn en gang"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Enkelte filer mangler i pakkegruppa «%s»"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Katalogen %s er avledet"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Databasen er ødelagt. Filnavnet er endret til %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Pakken prøver å skrive til avledningsmålet %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Databasen er gammel, forsøker å oppgradere %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Avledningsstien er for lang"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, "
+"fjern og så gjenopprett databasen."
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Klarte ikke å åpne Databasefila %s: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Klarte ikke å få statusen på %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Klarte ikke å lese lenken %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Arkivet har ingen kontrollpost"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Klarte ikke å finne en peker"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Klarte ikke å endre navnet på %s til %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "A: Klarte ikke å lese katalogen %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Mappa %s blir byttet ut med noe som ikke er en mappe"
+msgid "W: Unable to stat %s\n"
+msgstr "A: Klarte ikke å få statusen på %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Fant ikke knutepunktet i dens hash-spann"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "F:"
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Stien er for lang"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "A:"
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "F: Det er feil ved fila"
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Skriver over pakketreff uten versjon for %s"
+msgid "Failed to resolve %s"
+msgstr "Klarte ikke å slå opp %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Klarte ikke å finne fram i treet"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s"
+msgid "Failed to open %s"
+msgstr "Klarte ikke å åpne %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Klarte ikke å få statusen på %s"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Klarte ikke å skrive fila %s"
+msgid "Failed to readlink %s"
+msgstr "Klarte ikke å lese lenken %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Klarte ikke å lukke fila %s"
+msgid "Failed to unlink %s"
+msgstr "Klarte ikke å oppheve lenken %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Dette er ikke et gyldig DEB-arkiv, mangler «%s»-medlemmet"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Klarte ikke å lenke %s til %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Intern feil, fant ikke medlemmet %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink-grensa på %s B er nådd.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Kontrollfila kan ikke tolkes"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Arkivet har ikke noe pakkefelt"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Ugyldig arkivsignatur"
+#: 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:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr " %s-vedlikeholderen er %s, ikke %s\n"
+
+#: ftparchive/writer.cc:712
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s har ingen kildeoverstyringsoppføring\n"
+
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s har ingen binæroverstyringsoppføring heller\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Klarte ikke å tildele minne"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Klarte ikke å åpne %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Ugyldig overstyring %s linje %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Klarte ikke å lese overstyringsfila %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Ugyldig overstyring %s linje %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Ugyldig overstyring %s linje %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Ugyldig overstyring %s linje %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Ukjent komprimeringsalgoritme «%s»"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Komprimert utdata %s trenger et komprimeringssett"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Klarte ikke å opprette FILE*"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Feil ved lesing av arkivmedlemshode"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Klarte ikke å forgreine prosess"
 
-#: apt-inst/contrib/arfile.cc:96
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Ugyldig arkivmedlemshode %s"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Komprimer barneprosess"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Ugyldig arkivmedlemshode"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Intern feil, klarte ikke å opprette %s"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Arkivet er for kort"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Klarte ikke å kommunisere med underprosess/fil"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Klarte ikke å lese arkivhodene"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Klarte ikke å lese under utregning av MD5"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Klarte ikke å opprette rør"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problem ved oppheving av lenken til %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Klarte ikke å kjøre gzip "
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Klarte ikke å endre navnet på %s til %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Ødelagt arkiv"
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
+"\n"
+"apt-extracttemplates er et verktøy til å hente ut informasjon om "
+"innstillinger\n"
+"og maler fra debianpakker.\n"
+"\n"
+"Innstillinger:\n"
+"  -h   Denne hjelpeteksten\n"
+"  -t   Lag en midlertidig mappe\n"
+"  -c=? Les denne innstillingsfila.\n"
+"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Ukjent pakkeoppføring"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Ukjent TAR-hode: type %u, medlem %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Bruk: apt-sortpkgs [innstillinger] fil1 [fil2 ...]\n"
+"\n"
+"apt-sortpkgs er et enkelt redskap til å sortere pakkefiler. Innstillingen\n"
+"-s brukes til å angi hvilken filtype det er.\n"
+"\n"
+"Innstillinger:\n"
+"  -h   Denne hjelpeteksten\n"
+"  -s   Bruk filsortering\n"
+"  -c=? Les denne innstillingsfila.\n"
+"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "Kjører dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakkesystemet «%s» støttes ikke"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Klarer ikke bestemme en passende pakkesystemtype"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skrev %i poster med %i manglende filer.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Skrev %i poster med %i feile filer.\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 "Skrev %i poster med %i manglende filer og %i feile filer.\n"
@@ -2014,6 +2273,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."
@@ -2027,202 +2306,366 @@ msgstr ""
 msgid "The list of sources could not be read."
 msgstr "Kan ikke lese kildlista."
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Tomt pakkelager"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Avhenger av"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Forutsetter"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Foreslår"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Anbefaler"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Er i konflikt med"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Erstatter"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Nuller"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Ødelegger"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Forbedrer"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "viktig"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "påkrevet"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "vanlig"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "valgfri"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "tillegg"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Beregner oppgradering"
+
+#: 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:118
+#: 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:169
+#: 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/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/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/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Klarer ikke finne informasjonom %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/acquire-worker.cc:455
+#: apt-pkg/pkgcachegen.cc:1196
 #, 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 "Couldn't stat source package list %s"
+msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Oversiktsfil av typen «%s» støttes ikke"
+#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Skaper oversikt over avhengighetsforhold"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Samler inn filtilbud"
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versjons-kandidater"
+#: 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/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Oppretter avhengighetsforhold"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Leser tilstandsinformasjon"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Klarte ikke å åpne StateFile %s"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Klarte ikke å skrive midlertidig StateFile %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
+
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Hashsummen stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Feil størrelse"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Ugyldig operasjon %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Skrivefeil"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"En feil oppstod under signaturverifisering. Depotet er ikke oppdatert og den "
+"forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG-feil: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Katalogen %s er avledet"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"En feil oppstod under signaturverifisering. Depotet er ikke oppdatert og den "
-"forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG-feil: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2231,131 +2674,49 @@ 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:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Oversiktsfil av typen «%s» støttes ikke"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Klarer ikke finne informasjonom %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Feil oppsto under behandling av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Leser pakkelister"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samler inn filtilbud"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Kan ikke skrive til %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2382,7 +2743,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2391,12 +2752,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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2407,10 +2768,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"
@@ -2481,11 +2846,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"
 
@@ -2496,7 +2861,7 @@ msgid ""
 msgstr ""
 "Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2504,333 +2869,264 @@ msgstr ""
 "Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker "
 "som holdes tilbake."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Klarer ikke å fortolke pakkefila %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Klarer ikke å fortolke Release-fila %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Ingen avsnitt i Release-fila %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ingen sjekksumoppføring i Release-fila %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Skaper oversikt over avhengighetsforhold"
 
-#: 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:139
+msgid "Candidate versions"
+msgstr "Versjons-kandidater"
 
-#: 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:168
+msgid "Dependency generation"
+msgstr "Oppretter avhengighetsforhold"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Åpner %s"
+#: 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:371
+#: apt-pkg/depcache.cc:252
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Feil på %u i kildelista %s (type)"
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikke å åpne 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 ukjent i linje %u i kildelista %s"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikke å skrive midlertidig StateFile %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/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "Klarer ikke å fortolke pakkefila %s (%d)"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Utgave «%s» av «%s» ble ikke funnet"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versjon «%s» av «%s» ble ikke funnet"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Klarte ikke å finne oppgave «%s»"
 
-#: apt-pkg/cacheset.cc:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den "
-"har ingen av dem"
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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 ""
+"Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den "
+"har ingen av dem"
+
+#: 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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Ingen sjekksumoppføring i Release-fila %s"
+
+#: apt-pkg/indexrecords.cc:145
+#, 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:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ugyldig «Date»-oppføring i Release-fila %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%lim %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Fant ikke utvalget %s"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Bruker ikke låsing for den skrivebeskyttede låsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Klarte ikke åpne låsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Bruker ikke låsing på den nfs-monterte låsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Får ikke låst %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprosessen %s mottok et minnefeilsignal."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprosessen %s mottok signalet %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprosessen %s ga en feilkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprosessen %s avsluttet uventet"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problem ved låsing av gzip-fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Klarte ikke åpne fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Klarte ikke åpne fildeskriptor %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Klarte ikke å opprette underprosessen IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Klarte ikke å kjøre komprimeringen"
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem ved låsing av fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem ved endring av navn på fila %s til %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem ved oppheving av lenke til fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Problem ved oppdatering av fila"
 
@@ -2919,109 +3215,103 @@ 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:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Ukjent typeforkortelse: «%c»"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Åpner oppsettsfila %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nøkkelring installert i %s."
-
-#: 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"
@@ -3031,12 +3321,12 @@ msgstr "Ugyldig operasjon %s"
 msgid "Installing %s"
 msgstr "Installerer %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Fjerner %s"
@@ -3057,79 +3347,79 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mappa «%s» mangler"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Forbereder %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Pakker ut %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Forbereder oppsett av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "Installerte %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Forbereder fjerning av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "Fjernet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Forbereder å fullstendig slette %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "Fjernet %s fullstendig"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "avhengighetsproblemer - lar den være uoppsatt"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3137,7 +3427,7 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en "
 "følgefeil fra en tidligere feil."
 
-#: apt-pkg/deb/dpkgpm.cc:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3145,7 +3435,7 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
 "feil"
 
-#: apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3153,7 +3443,7 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for "
 "minne»-feil"
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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 "
@@ -3162,7 +3452,7 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
 "feil"
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3176,422 +3466,188 @@ msgid ""
 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"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
-"\n"
-"apt-extracttemplates er et verktøy til å hente ut informasjon om "
-"innstillinger\n"
-"og maler fra debianpakker.\n"
-"\n"
-"Innstillinger:\n"
-"  -h   Denne hjelpeteksten\n"
-"  -t   Lag en midlertidig mappe\n"
-"  -c=? Les denne innstillingsfila.\n"
-"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Klarte ikke å få statusen på %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Feil ved lesing av katalogen %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Lista over kildeutvidelser er for lang"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Feil ved skriving av topptekst til innholdsfila"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Det oppsto en feil ved lesing av %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Bruk: apt-ftparchive [innstillinger] kommando\n"
-"Kommandoer: packages binærsti [overstyringsfil [sti-prefiks]]\n"
-"          sources kildesti [overstyringsfil [sti-prefiks]]\n"
-"          contents sti\n"
-"          release sti\n"
-"          generate config [grupper]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive oppretter indeksfiler for debianarkiver. Mange ulike\n"
-"metoder er støttet - fra helautomatiske til funksjonelle\n"
-"erstatninger for dpkg-scanpackages og dpkg-scansources.\n"
-"\n"
-"apt-ftparchive oppretter «Packages»-filer fra et tre med debianpakker.\n"
-"«Packages»-fila inneholder alle kontrollfeltene fra hver pakke i tillegg "
-"til\n"
-"MD5-nøkkel og filstørrelse. Du kan bruke en overstyringsfil for å tvinge\n"
-"gjennom verdier for prioritet og kategori.\n"
-"\n"
-"apt-ftparchive kan på samme måte opprette kildefiler fra et tre\n"
-"med .dsc-filer. Du kan bruke en overstyringsfil med --source-override.\n"
-"\n"
-"Kommandoene «packages» og «sources» skal kjøres i rota av katalogtreet.\n"
-"«Binærsti» skal peke til toppkatalogen for det rekursive søket, og\n"
-"overstyringsfila skal inneholde innstillinger for overstyring.\n"
-"Sti-prefikset blir lagt til feltene for filnavn, dersom det er oppgitt. Her "
-"er\n"
-"et eksempel på bruk i debianarkivet:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Innstillinger:\n"
-"  -h    Vis denne hjelpeteksten.\n"
-"  --md5 Styrer MD5-opprettelsen\n"
-"  -s=?  Overstyringsfil for kildekode.\n"
-"  -q    Stille.\n"
-"  -d=?  Velger om du vil bruke en mellomlagerdatabase.\n"
-"  --no-delink Bruk avlusingsmodus med «delinking».\n"
-"  --contents  Styrer opprettelse av innholdsfila.\n"
-"  -c=?  Les denne oppsettsfila.\n"
-"  -o=? Setter en vilkårlig innstilling"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Ingen utvalg passet"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Enkelte filer mangler i pakkegruppa «%s»"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Databasen er ødelagt. Filnavnet er endret til %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Databasen er gammel, forsøker å oppgradere %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, "
-"fjern og så gjenopprett databasen."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Klarte ikke å åpne Databasefila %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Klarte ikke å lese lenken %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arkivet har ingen kontrollpost"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Klarte ikke å finne en peker"
-
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: Klarte ikke å lese katalogen %s\n"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Klarte ikke låse den administrative mappen (%s). Er du root?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A: Klarte ikke å få statusen på %s\n"
+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,"
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "F:"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Ikke låst"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "A:"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode ble startet på et knutepunkt som ennå er lenket"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "F: Det er feil ved fila"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Fant ikke nøkkelelementet."
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Klarte ikke å slå opp %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Klarte ikke å tildele avledning"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Klarte ikke å finne fram i treet"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Intern feil i AddDiversion"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "Klarte ikke å åpne %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Prøver å skrive over en avledning, %s -> %s og %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Dobbel tillegging av avledning %s -> %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Klarte ikke å lese lenken %s"
+msgid "Duplicate conf file %s/%s"
+msgstr "Dobbel oppsettsfil %s/%s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Klarte ikke å oppheve lenken %s"
+msgid "The path %s is too long"
+msgstr "Stien %s er for lang"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Klarte ikke å lenke %s til %s"
+msgid "Unpacking %s more than once"
+msgstr "Pakker ut %s mer enn en gang"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink-grensa på %s B er nådd.\n"
+msgid "The directory %s is diverted"
+msgstr "Katalogen %s er avledet"
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arkivet har ikke noe pakkefelt"
+#: apt-inst/extract.cc:152
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Pakken prøver å skrive til avledningsmålet %s/%s"
+
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Avledningsstien er for lang"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s har ingen overstyringsoppføring\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Mappa %s blir byttet ut med noe som ikke er en mappe"
+
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Fant ikke knutepunktet i dens hash-spann"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Stien er for lang"
+
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr " %s-vedlikeholderen er %s, ikke %s\n"
+msgid "Overwrite package match with no version for %s"
+msgstr "Skriver over pakketreff uten versjon for %s"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s har ingen kildeoverstyringsoppføring\n"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s"
 
-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s har ingen binæroverstyringsoppføring heller\n"
+msgid "Unable to stat %s"
+msgstr "Klarte ikke å få statusen på %s"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Klarte ikke å tildele minne"
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Klarte ikke å skrive fila %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Unable to open %s"
-msgstr "Klarte ikke å åpne %s"
+msgid "Failed to close file %s"
+msgstr "Klarte ikke å lukke fila %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Ugyldig overstyring %s linje %lu #1"
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Dette er ikke et gyldig DEB-arkiv, mangler «%s»-medlemmet"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Klarte ikke å lese overstyringsfila %s"
+msgid "Internal error, could not locate member %s"
+msgstr "Intern feil, fant ikke medlemmet %s"
 
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Ugyldig overstyring %s linje %lu #1"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Kontrollfila kan ikke tolkes"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Ugyldig overstyring %s linje %lu #2"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Ugyldig arkivsignatur"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Ugyldig overstyring %s linje %lu #3"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Feil ved lesing av arkivmedlemshode"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Ukjent komprimeringsalgoritme «%s»"
+msgid "Invalid archive member header %s"
+msgstr "Ugyldig arkivmedlemshode %s"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimert utdata %s trenger et komprimeringssett"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Ugyldig arkivmedlemshode"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Klarte ikke å opprette FILE*"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arkivet er for kort"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Klarte ikke å forgreine prosess"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Klarte ikke å lese arkivhodene"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Komprimer barneprosess"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Klarte ikke å opprette rør"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Intern feil, klarte ikke å opprette %s"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Klarte ikke å kjøre gzip "
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Klarte ikke å kommunisere med underprosess/fil"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Ødelagt arkiv"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Klarte ikke å lese under utregning av MD5"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem ved oppheving av lenken til %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Ukjent TAR-hode: type %u, medlem %s"
 
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
-"\n"
-"apt-extracttemplates er et verktøy til å hente ut informasjon om "
-"innstillinger\n"
-"og maler fra debianpakker.\n"
-"\n"
-"Innstillinger:\n"
-"  -h   Denne hjelpeteksten\n"
-"  -t   Lag en midlertidig mappe\n"
-"  -c=? Les denne innstillingsfila.\n"
-"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Total plass for avhengighetsforhold/versjoner: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Ukjent pakkeoppføring"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Du har ikke nok ledig plass i %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Bruk: apt-sortpkgs [innstillinger] fil1 [fil2 ...]\n"
-"\n"
-"apt-sortpkgs er et enkelt redskap til å sortere pakkefiler. Innstillingen\n"
-"-s brukes til å angi hvilken filtype det er.\n"
-"\n"
-"Innstillinger:\n"
-"  -h   Denne hjelpeteksten\n"
-"  -s   Bruk filsortering\n"
-"  -c=? Les denne innstillingsfila.\n"
-"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Utført"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Ingen nøkkelring installert i %s."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/ne.po b/po/ne.po
index 09b9858f7..54dd771b4 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: 2015-01-16 04:37-0500\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,152 +22,148 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "प्याकेज %s संस्करण %s संग एउटा नभेटिएको dep छ:\n"
 
-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "कूल प्याकेज नामहरू :"
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "कूल प्याकेज नामहरू :"
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  सामान्य प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "शुद्ध अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  एकल अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  मिश्रित अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  हराइरहेको:"
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "कूल भिन्न संस्करणहरू:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "कूल भिन्न संस्करणहरू:"
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "कूल निर्भरताहरू:"
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "जम्मा ver/file सम्बन्धहरू: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "जम्मा ver/file सम्बन्धहरू: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "कूल उपलब्ध मानचित्रणहरू:"
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "कूल विश्वव्यापी स्ट्रिङ्गहरू:"
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "कूल निर्भरता संस्करण खाली ठाऊँ:"
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "कूल शिथिल खाली ठाऊँ:"
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "को लागि कूल खाली ठाऊँ लेखांकन:"
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "प्याकेज %s तोक्न असक्षम भयो"
 
-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "प्याकेज फाइलहरू:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "पिन गरिएका प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(फेला परेन)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  स्थापना भयो:"
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  उमेद्वार:"
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(कुनै पनि होइन)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "प्याकेज पिन:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  संस्करण तालिका:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -241,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"
@@ -263,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 "तपाईँको सेटमा बाँकी सि डि हरुको लागि यो प्रक्रिया फेरी गर्नुहोस् । "
 
@@ -299,78 +295,78 @@ msgstr ""
 "  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
 "  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: cmdline/apt-get.cc:367
+#: cmdline/apt-get.cc:358
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
 
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम"
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -378,114 +374,113 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन"
-
 #. 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:895
+#: 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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n"
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "स्रोत फड्काउनुहोस् %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "केही संग्रह फड्काउन असफल भयो ।"
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ"
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n"
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "अनप्याक आदेश '%s' असफल भयो ।\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "निर्माण आदेश '%s' असफल भयो ।\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "शाखा प्रक्रिया असफल भयो"
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ"
 
-#: cmdline/apt-get.cc:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
+
+#: 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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n"
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: cmdline/apt-get.cc:1359
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -494,37 +489,37 @@ msgstr ""
 "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण "
 "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
 
-#: cmdline/apt-get.cc:1362
+#: 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:1385
+#: cmdline/apt-get.cc:1388
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s"
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) मा जडान गरिदैछ"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "समर्थित मोड्युलहरू:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -618,11 +613,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -636,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -761,12 +756,12 @@ msgstr "डिस्क फेला परेन ।"
 msgid "File not found"
 msgstr "फाइल फेला परेन "
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "स्थिर गर्न असफल भयो"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "परिमार्जन समय सेट असफल भयो"
 
@@ -775,34 +770,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "अवैध URl, स्थानिय URIS // संग सुरू हुन सक्दैन"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "लगइन भइरहेछ"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "समान नाम निर्धारण गर्न असक्षम भयो"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "स्थानिय नाम निर्धारण गर्न असक्षम भयो"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "सर्भरले जडान अस्वीकार गर्यो र भन्यो: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "प्रयोगकर्ता असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "पास असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -810,123 +805,123 @@ msgstr ""
 "प्रोक्सी सर्भर निर्दिष्ट गरियो तर कुनै स्क्रिफ्ट लगइन भएन, Acquire::ftp::ProxyLogin  "
 "खाली छ ।"
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "लगइन स्क्रिफ्ट आदेश '%s' असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "टाइप असफल भयो: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "जडान समय सकियो"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "सर्भरले जडान बन्द गर्यो"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "त्रुटि पढ्नुहोस्"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "एउटा प्रतिक्रियाले बफर अधिप्रवाह गर्यो"
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "प्रोटोकल दूषित"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "त्रुटि लेख्नुहोस्"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "एउटा सकेट सिर्जना गर्न सकेन"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "डेटा सकेट जडान गर्न सकिएन, जडान समय सकियो"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "असफल भयो"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "निस्क्रिय सकेट जडान गर्न सकिएन"
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo सुन्ने सकेट प्राप्त गर्न असक्षम भयो"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "सकेट बाँध्न सकिएन"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "सकेटमा सुन्न सकिएन"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "सकेट नाम निर्धारण गर्न सकिएन"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "पोर्ट आदेश पठाउन असक्षम भयो"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "अज्ञात ठेगाना परिवार %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "डेटा सकेटको जडान समय सकियो"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "जडान स्वीकार गर्न असक्षम भयो"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "समस्या द्रुतान्वेषण फाइल"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "फाइल तान्न असक्षम भयो, सर्भरले भन्यो '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "डेटा सकेट समय सकियो"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "डेटा स्थान्तरण असफल भयो, सर्भरले भन्यो '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "क्वेरी"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "आह्वान गर्न असक्षम भयो"
 
@@ -992,71 +987,71 @@ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s मा जडान गर्न असफल भयो:"
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
 
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:164
 #, fuzzy
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gnupg स्थापना भयो?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "apt-key कार्यन्वयन गर्दा अज्ञात त्रुटि"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n"
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "निम्न हस्ताक्षरहरू रूजू हुन सक्दैन किन भने सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान"
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "सर्भरबाट त्रुटि पढिदैछ"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "असफल चयन गर्नुहोस्"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "जडान समय सकियो"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ"
 
@@ -1088,283 +1083,30 @@ msgstr "HTTP सर्भर संग भाँचिएको दायरा
 msgid "Unknown date format"
 msgstr "अज्ञात मिति ढाँचा"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "खराब हेडर डेटा"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "जडान असफल भयो"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "आन्तरिक त्रुटि"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "आन्तरिक त्रुटि, स्थापना प्याकेजहरुलाई भाँचिएको प्याकेज भनिन्थ्यो!"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "प्याकेजहरू हट्न चाहदैछन् तर हटाई अक्षम भइरहेछ ।"
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr "कस्तो नमिलेको.. साइजहरू मेल खाएन, 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of 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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "संग्रहहरुको %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
-#: apt-private/private-install.cc:167
-#, fuzzy, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "अनप्याक गरिसके पछि थप डिस्क खाली ठाउँको %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
-#: apt-private/private-install.cc:172
-#, fuzzy, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।"
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "त्रिभियल मात्र निर्दिष्ट गरिएको छ तर यो त्रिभियल सञ्चालन होइन ।"
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "हो,मैले भने जस्तै गर्नुहोस्!"
-
-#: apt-private/private-install.cc:222
+#: methods/server.cc:589
 #, c-format
 msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"तपाईँले केही संभवत: हानिकारक काम गर्नुपर्छ ।\n"
-"निरन्तरता दिन '%s' वाक्यांशमा टाइप गर्नुहोस् \n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "परित्याग गर्नुहोस् ।"
-
-#: apt-private/private-install.cc:243
-#, fuzzy
-msgid "Do you want to continue?"
-msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? "
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"केही संग्रहहरू तान्न असक्षम भयो,apt-get अद्यावधिक चलिरहेछ वा हराइरहेको --fix-संगै प्रयास "
-"गर्नुहुन्छ ?"
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "हराइरहेको --fix-र स्वाप भइरहेको मेडिया हाल समर्थित भइरहेको छैन"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "हराइरहेको प्याकेजहरू सुधार्न असक्षम भयो ।"
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "स्थापना परित्याग गरिदैछ ।"
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: "
-
-#: apt-private/private-install.cc:506
-#, fuzzy
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
-
-#: apt-private/private-install.cc:513
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
-msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
-
-#: apt-private/private-install.cc:517
-#, fuzzy, c-format
-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] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
-msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "तपाईँ यसलाई सुधार गर्न 'apt-get -f install' चलाउन चाहनुहुन्छ:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा "
-"समाधान निर्दिष्ट गर्नुहोस्) ।"
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"केही प्याकेजहरू स्थापना हुन सक्दैन । यसको मतलब तपाईँले\n"
-" एउटा असम्भव अवास्थाको अनुरोध गर्नु भएको छ वा यदि तपाईँले प्रयोग गर्नु भइरहेको केहि "
-"प्याकेजहरुको आवश्यकता पर्ने अस्थिर\n"
-" वितरण अहिले सम्म सिर्जना\n"
-" भएको छैन वा आवगमन विनानै सर्यो ।"
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "भाँचिएका प्याकेजहरू"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "सुझाव दिएका प्याकेजहरू:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "सिफारिस गरिएका प्याकेजहरू:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
-
-#: apt-private/private-install.cc:829
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr " %s को पुन: स्थापना सम्भव छैन, यो डाउनलोड हुन सक्दैन ।\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "आन्तरिक त्रुटि"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1372,31 +1114,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "निर्भरताहरू सुधार गरिदैछ..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr "असफल भयो ।"
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr "काम भयो"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।"
 
@@ -1560,7 +1302,7 @@ msgstr ""
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
@@ -1569,7 +1311,7 @@ msgstr "संकलन त्रुटि रिजेक्स गर्नु
 msgid "The update command takes no arguments"
 msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1577,10 +1319,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1601,28 +1347,296 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "चेतावनी: निम्न प्याकलेजहरू प्रणाणीकरण हुन सक्दैन! "
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "प्रमाणिकरण चेतावनी अधिलेखन भयो ।\n"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "आन्तरिक त्रुटि, स्थापना प्याकेजहरुलाई भाँचिएको प्याकेज भनिन्थ्यो!"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "प्याकेजहरू हट्न चाहदैछन् तर हटाई अक्षम भइरहेछ ।"
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr "कस्तो नमिलेको.. साइजहरू मेल खाएन, 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of 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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "संग्रहहरुको %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
+#: apt-private/private-install.cc:166
+#, fuzzy, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "अनप्याक गरिसके पछि थप डिस्क खाली ठाउँको %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
+#: apt-private/private-install.cc:171
+#, fuzzy, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो"
+
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "त्रिभियल मात्र निर्दिष्ट गरिएको छ तर यो त्रिभियल सञ्चालन होइन ।"
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "हो,मैले भने जस्तै गर्नुहोस्!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"तपाईँले केही संभवत: हानिकारक काम गर्नुपर्छ ।\n"
+"निरन्तरता दिन '%s' वाक्यांशमा टाइप गर्नुहोस् \n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "परित्याग गर्नुहोस् ।"
+
+#: apt-private/private-install.cc:218
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? "
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"केही संग्रहहरू तान्न असक्षम भयो,apt-get अद्यावधिक चलिरहेछ वा हराइरहेको --fix-संगै प्रयास "
+"गर्नुहुन्छ ?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "हराइरहेको --fix-र स्वाप भइरहेको मेडिया हाल समर्थित भइरहेको छैन"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "हराइरहेको प्याकेजहरू सुधार्न असक्षम भयो ।"
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "स्थापना परित्याग गरिदैछ ।"
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: 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 ""
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: "
+
+#: apt-private/private-install.cc:481
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
+
+#: apt-private/private-install.cc:488
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
+msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+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] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
+msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "तपाईँ यसलाई सुधार गर्न 'apt-get -f install' चलाउन चाहनुहुन्छ:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा "
+"समाधान निर्दिष्ट गर्नुहोस्) ।"
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"केही प्याकेजहरू स्थापना हुन सक्दैन । यसको मतलब तपाईँले\n"
+" एउटा असम्भव अवास्थाको अनुरोध गर्नु भएको छ वा यदि तपाईँले प्रयोग गर्नु भइरहेको केहि "
+"प्याकेजहरुको आवश्यकता पर्ने अस्थिर\n"
+" वितरण अहिले सम्म सिर्जना\n"
+" भएको छैन वा आवगमन विनानै सर्यो ।"
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "भाँचिएका प्याकेजहरू"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "सुझाव दिएका प्याकेजहरू:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "सिफारिस गरिएका प्याकेजहरू:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
+
+#: apt-private/private-install.cc:827
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr " %s को पुन: स्थापना सम्भव छैन, यो डाउनलोड हुन सक्दैन ।\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
+
+#: apt-private/private-install.cc:892
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
+
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "%s को लागि चयन भएको संस्करण %s (%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 "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "चेतावनी: निम्न प्याकलेजहरू प्रणाणीकरण हुन सक्दैन! "
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "प्रमाणिकरण चेतावनी अधिलेखन भयो ।\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
 msgid "Some packages could not be authenticated"
 msgstr "केही प्याकेजहरू प्रमाणीकरण हुन सक्दैन"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 #, fuzzy
 msgid "Install these packages without verification?"
 msgstr "यी प्याकेजहरू रूजू बिना स्थापना गर्नुहुन्छ [y/N]? "
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%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 " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।"
+
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1637,41 +1651,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "स्तर वृद्धि गणना गरिदैछ"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "काम भयो"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "हान्नुहोस्"
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "प्राप्त गर्नुहोस्:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%s (%sB/s) मा %sB मा तानियो\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [काम गरिरहेको]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1684,18 +1690,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1771,205 +1777,454 @@ msgstr ""
 msgid "Merging available information"
 msgstr "उपलब्ध सूचना गाँभिदैछ"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "अहिलेसम्म लिङ्क गरिएको नोडमा बोलाइएको ड्रपनोड"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"उपयोग: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n"
+"\n"
+"\n"
+"विकल्पहरू:\n"
+"  -h   यो मद्दत पाठ\n"
+"  -t   टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n"
+"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
+"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "ह्यास तत्व तोक्न असफल भयो"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "%s स्थिर गर्न असक्षम भयो"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "मोड बाँड्न असफल भयो"
+#: 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 मा लेख्न असक्षम"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "थपमोडमा आन्तरिक त्रुटि"
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? "
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "मोड अधिलेखन गर्ने प्यास गरिदै, %s -> %s र %s/%s"
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "प्याकेज विस्तार सूचि अति लामो छ"
 
-#: apt-inst/filelist.cc:506
+#: 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 "Double add of diversion %s -> %s"
-msgstr "मोडको डबल थप %s -> %s"
+msgid "Error processing directory %s"
+msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "नक्कली कनफिगगरेसन फाइल %s/%s"
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "स्रोत विस्तार सूचि अति लामो छ"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "सामाग्री फाइलहरुमा हेडर लेख्दा त्रुटि"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "बाटो %s अति लामो छ "
+msgid "Error processing contents %s"
+msgstr "सामग्री %sप्रक्रिया गर्दा त्रुटि"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"उपयोग: apt-ftparchive [विकल्पहरू] आदेश\n"
+"आदेशहरू: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive ले डेवियन संग्रहहरुको लागि अनुक्रमणिका फाइलहरू सिर्जना गर्दछ । यसले "
+"समर्थन गर्दछ\n"
+"dpkg-scanpackages र dpkg-scansources को लागि कार्यात्मक प्रतिस्थापनमा पुरै "
+"स्वचालितबाट सिर्जनाको धेरै शैलीहरू\n"
+" \n"
+"\n"
+"apt-ftparchive ले debs को ट्रीबाट प्याकेज फाइलहरू सिर्जना गर्दछ । प्याकेज\n"
+"फाइलहरुले प्रत्येक प्याकेजबाट सबै नियन्त्रण फाँटहरुको सामग्रीहरू साथ साथै MD5 hash र "
+"filesize समावेश गर्दछ ।\n"
+"एउटा अधिलेखन फाइल\n"
+"प्राथमिकता र सेक्सनको मान जोड गर्न समर्थित हुन्छ ।\n"
+"\n"
+"त्यस्तै गरी apt-ftparchive ले .dscs को ट्रीबाट स्रोत फाइलहरू सिर्जना गर्दछ ।\n"
+"स्रोत--अधिलेखन--विकल्प src अधीलेखन फाइल निर्दिष्ट गर्न प्रयोग गर्न सकिन्छ\n"
+"\n"
+"'packages' and 'sources' आदेश ट्रीको मूलमा चलाउन सकिन्छ ।\n"
+" विनारी मार्ग फेरी हुने खोजीको विन्दुमा आधारित हुन्छ र \n"
+"अधिलेखन फाइलले अधिलेखन झण्डाहरू समाविष्ट गर्दछ । यदि उपस्थित छ भने बाटो उपसर्ग\n"
+"फाइलनाम फाँटहरुमा थपिन्छ । उदाहरणको लागि \n"
+"डेवियन संग्रहबाट उपयोग:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"विकल्पहरू:\n"
+"  -h    यो मद्दत पाठ\n"
+"  --md5 नियन्त्रण MD5 सिर्जना\n"
+"  -s=?  स्रोत अधिलेखन फाइल\n"
+"  -q    बन्द गर्नुहोस्\n"
+"  -d=?  वैकल्पिक क्यासिङ डेटाबेस चयन गर्नुहोस्\n"
+"  --no-delink delinking डिबग मोड सक्षम गर्नुहोस्\n"
+"  --सामग्रीहरू  सामग्री फाइल सिर्जना नियन्त्रण गर्नुहोस्\n"
+"  -c=?  यो कनफिगरेसन फाइल पढ्नुहोस्\n"
+"  -o=?  एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "कुनै चयनहरू मेल खाएन"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "एक भन्दा बढी %s अनप्याक गरिदैछ"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "केही फाइलहरू प्याकेज फाइल समूह `%s' मा हराइरहेको छ"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "डाइरेक्ट्री %s फेरियो "
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB दूषित थियो, फाइल %s.पुरानो मा पुन:नामकरण गर्नुहोस्"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "प्याकेज लक्षित मोडमा लेख्ने प्यास गर्दैछ %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB पुरानो छ, %s स्तरवृद्धि गर्न प्रयास गरिदैछ"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "घुम्ती बाटो अति लामो छ"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "DB फाइल %s असक्षम भयो: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr " %s स्थिर गर्न असफल"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "लिङ्क पढ्न असफल %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "संग्रह संग नियन्त्रण रेकर्ड छैन"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "कर्सर प्राप्त गर्न असक्षम भयो"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: डाइरेक्ट्री %s पढ्न असक्षम\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "डाइरेक्ट्री %s डाइरेक्ट्री विहिन द्वारा बदलिदैछ"
+msgid "W: Unable to stat %s\n"
+msgstr "W: %s स्थिर गर्न असक्षम\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "यसको ह्यास बाल्टीमा नोड स्थित गर्न असफल भयो"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "बाटो अति लामो छ"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "W: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस्"
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr " %s को लागि संस्करन बिना अधिलेखन प्याकेज मेल खायो"
+msgid "Failed to resolve %s"
+msgstr "%s हल गर्न असफल भयो"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "ट्री हिडाईँ असफल भयो"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा अधिलेखन गर्दछ"
+msgid "Failed to open %s"
+msgstr "%s खोल्न असफल"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "%s स्थिर गर्न असक्षम भयो"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "फाइल %s लेख्न असफल भयो"
+msgid "Failed to readlink %s"
+msgstr "लिङ्क पढ्न असफल %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "%s फाइल बन्द गर्न असफल भयो"
+msgid "Failed to unlink %s"
+msgstr "अनलिङ्क गर्न असफल %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "यो वैध DEB संग्रह होइन, '%s' सदस्य हराइरहेछ"
+msgid "*** Failed to link %s to %s"
+msgstr "*** %s मा %s लिङ्क असफल भयो"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "आन्तरीक त्रुटि, सदस्य तोक्न सक्दैन  %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr "यस %sB हिटको डि लिङ्क सिमा।\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "पद वर्णन गर्न नसकिने नियन्त्रण फाइल"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "संग्रह संग कुनै प्याकेज फाँट छैन"
+
+#: 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:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s संभारकर्ता %s हो %s होइन\n"
+
+#: ftparchive/writer.cc:712
+#, fuzzy, c-format
+msgid "  %s has no source override entry\n"
+msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
+
+#: ftparchive/writer.cc:716
+#, fuzzy, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - स्मृति बाँडफाँड गर्न असफल भयो"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s खोल्न असफल"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "अधिलेखन फाइल पढ्न असफल %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #२"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #३"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "अज्ञात सङ्कुचन अल्गोरिद्म '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "सङ्कुचन गरिएको निर्गात %s लाई सङ्कुचन सेटको आवश्यक्ता पर्दछ"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "अवैध संग्रह हस्ताक्षर"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "FILE* सिर्जना गर्न असफल"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "संग्रह सदस्य हेडर पढ्दा त्रुटि "
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "काँटा गर्न असफल"
 
-#: apt-inst/contrib/arfile.cc:96
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "अवैध संग्रह सदस्य हेडर"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "सङ्कुचन शाखा"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "अवैध संग्रह सदस्य हेडर"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "आन्तरीक त्रुटि, %s सिर्जना गर्न असफल"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "संग्रह अति छोटो छ"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "सहायक प्रक्रिया/फाइलमा IO असफल भयो"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "संग्रह हेडरहरू पढ्न असफल"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "MD5 गणना गर्दा पढ्न असफल भयो"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "पाइपहरू सिर्जना गर्न असफल"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "समस्या अनलिङ्क भइरहेछ %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "gzip कार्यन्वयन गर्न असफल"
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "संग्रह दूषित भयो"
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"उपयोग: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n"
+"\n"
+"\n"
+"विकल्पहरू:\n"
+"  -h   यो मद्दत पाठ\n"
+"  -t   टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n"
+"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
+"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "टार चेकसम असफल भयो, संग्रह दूषित भयो"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "अज्ञात प्याकेज रेकर्ड!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"उपयोग: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs प्याकेज फाइलहरू क्रमबद्ध गर्ने साधारण उपकरण हो । -s विकल्प कस्तो खालको "
+"फाइल हो भनी इंकित गर्न प्रयोग गरिन्छ ।\n"
+"\n"
+"विकल्पहरू:\n"
+"  -h   यो मद्दत पाठ\n"
+"  -s   क्रमबद्ध स्रोत फाइल प्रयोग गर्नुहोस्\n"
+"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
+"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "प्याकिङ्ग प्रणाली '%s' समर्थित छैन"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "उपयुक्त प्याकिङ्ग प्रणाली प्रकार निर्धारन गर्न असक्षम भयो"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i रेकर्डहरू लेखियो ।\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
@@ -1984,6 +2239,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 "प्याकेज सूचीहरू वा वस्तुस्थिति फाइल पद वर्णन गर्न वा खोल्न सकिएन ।"
@@ -1996,201 +2271,365 @@ msgstr "यो समस्याहरू सुधार्न तपाईँ
 msgid "The list of sources could not be read."
 msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "खाली प्याकेज क्यास"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr "प्याकेज क्यास फाइल दूषित भयो "
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr "प्याकेज क्यास फाइल एउटा अमिल्दो संस्करण हो"
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "प्याकेज क्यास फाइल दूषित भयो "
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "यो APT ले संस्करण प्रणालीलाई समर्थन गर्दैन '%s'"
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "आधारित"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "पुन:आधारित"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "सुझाव दिन्छ"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "सिफारिस गर्दछ"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "द्वन्दहरू"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "बदल्छ"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "वेकायमहरू"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "महत्वपूर्ण"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "आवश्यक"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "मानक"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "वैकल्पिक"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "अतिरिक्त"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "स्तर वृद्धि गणना गरिदैछ"
+
+#: 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:118
+#: 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/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/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/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/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "विधि %s सही रुपले सुरू हुन सकेन"
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन"
+msgid "Couldn't stat source package list %s"
+msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "उमेद्वार संस्करणहरू"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "निर्भरता सिर्जना"
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "उपलब्ध सूचना गाँभिदैछ"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s खोल्न असफल"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "फाइल %s लेख्न असफल भयो"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum मेल भएन"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "साइज मेल खाएन"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "अवैध सञ्चालन  %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "त्रुटि लेख्नुहोस्"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "डाइरेक्ट्री %s फेरियो "
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: apt-pkg/acquire-item.cc:2059
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
+"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:1926
+#: 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 "
@@ -2199,132 +2638,49 @@ msgstr ""
 "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
 "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) "
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "प्याकेज सूचिहरू पढिदैछ"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr " %s मा लेख्न असक्षम"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: apt-pkg/acquire.cc:162
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ (%s बाँकी छ)"
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्"
@@ -2350,19 +2706,19 @@ msgstr "पिन टाइप %s बुझ्न सकिएन "
 msgid "No priority (or zero) specified for pin"
 msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "फाइल %s खोल्न सकिएन"
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2373,10 +2729,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
@@ -2444,348 +2804,280 @@ 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
-msgid "Source list entries for this disc are:\n"
-msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n"
-
-#: apt-pkg/algorithms.cc:265
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "प्याकेज %s पुन:स्थापना हुन चाहन्छ, तर यसको लागि मैले एउटा संग्रह फेला पार्न सकिन ।"
-
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"त्रुटि, pkgProblemResolver:: समाधानले विच्छेदन सिर्जना गर्दछ, यो भइरहेको प्याकेजहरुको "
-"कारणले गर्दा हो ।"
-
-#: apt-pkg/algorithms.cc:1088
-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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "द्रष्टब्य, %s को सट्टा  %s चयन भइरहेछ\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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/cdrom.cc:877
+msgid "Source list entries for this disc are:\n"
+msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n"
 
-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "प्याकेज %s पुन:स्थापना हुन चाहन्छ, तर यसको लागि मैले एउटा संग्रह फेला पार्न सकिन ।"
 
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)"
+#: apt-pkg/algorithms.cc:1090
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"त्रुटि, pkgProblemResolver:: समाधानले विच्छेदन सिर्जना गर्दछ, यो भइरहेको प्याकेजहरुको "
+"कारणले गर्दा हो ।"
 
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)"
+#: apt-pkg/algorithms.cc:1092
+msgid "Unable to correct problems, you have held broken packages."
+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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "निर्भरता ट्री निर्माण गरिदैछ"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "%s खोलिदैछ"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "उमेद्वार संस्करणहरू"
 
-#: apt-pkg/sourcelist.cc:371
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "निर्भरता सिर्जना"
 
-#: 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/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "उपलब्ध सूचना गाँभिदैछ"
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/depcache.cc:252
 #, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
+msgid "Failed to open StateFile %s"
+msgstr "%s खोल्न असफल"
+
+#: apt-pkg/depcache.cc:258
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "फाइल %s लेख्न असफल भयो"
+
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (%d)"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/cacheset.cc:635
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/cacheset.cc:641
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: apt-pkg/cacheset.cc:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:145
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
+
+#: apt-pkg/indexrecords.cc:164
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "चयन %s फेला पार्न सकिएन"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "ताल्चा मारिएको फाइल मात्र पढ्नको लागि ताल्चा मार्न प्रयोग गरिएको छैन %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ताल्चा मारिएको फाइल खोल्न सकिएन %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "nfs माउन्ट गरिएको लक फाइलको लागि लक प्रयोग गरिएको छैन %s"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "ताल्चा प्राप्त गर्न सकिएन %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "फाइल बन्द गर्दा समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "फाइल %s खोल्न सकिएन"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "%s को लागि पाइप खोल्न सकिएन"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "सहायक प्रक्रिया IPC सिर्जना गर्न असफल"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "सङ्कुचनकर्ता कार्यान्वयन गर्न असफल भयो"
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन "
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "फाइल बन्द गर्दा समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "फाइल गुप्तिकरण गर्दा समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "फाइल अनलिङ्क गर्दा समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "फाइल गुप्तिकरण गर्दा समस्या"
 
@@ -2871,109 +3163,103 @@ msgstr "माउन्ट बिन्दु %s स्थिर गर्न 
 msgid "Failed to stat the cdrom"
 msgstr "सिडी रोम स्थिर गर्न असफल भयो"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "नचिनिएको टाइप संक्षिप्त रुप: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "वाक्य संरचना त्रुटि %s:%u: वैरुप गरिएको ट्याग"
 
-#: apt-pkg/contrib/configuration.cc:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "वाक्य संरचना त्रुटि %s:%u:फाइलको अन्त्यमा अतिरिक्त जंक"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-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 "आदेश लाइन विकल्प %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"
@@ -2983,12 +3269,12 @@ msgstr "अवैध सञ्चालन  %s"
 msgid "Installing %s"
 msgstr " %s स्थापना भयो"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr " %s हटाइदैछ"
@@ -3009,103 +3295,103 @@ msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr " %s तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr " %s अनप्याक गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr " %s कनफिगर गर्न तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr " %s स्थापना भयो"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr " %s हटाउन तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr " %s हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr " %s पूर्ण रुपले हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3134,402 +3420,172 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"उपयोग: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n"
-"\n"
-"\n"
-"विकल्पहरू:\n"
-"  -h   यो मद्दत पाठ\n"
-"  -t   टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n"
-"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
-"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "%s स्थिर गर्न असक्षम भयो"
-
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? "
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "स्रोत विस्तार सूचि अति लामो छ"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "सामाग्री फाइलहरुमा हेडर लेख्दा त्रुटि"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "सामग्री %sप्रक्रिया गर्दा त्रुटि"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "अहिलेसम्म लिङ्क गरिएको नोडमा बोलाइएको ड्रपनोड"
 
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"उपयोग: apt-ftparchive [विकल्पहरू] आदेश\n"
-"आदेशहरू: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive ले डेवियन संग्रहहरुको लागि अनुक्रमणिका फाइलहरू सिर्जना गर्दछ । यसले "
-"समर्थन गर्दछ\n"
-"dpkg-scanpackages र dpkg-scansources को लागि कार्यात्मक प्रतिस्थापनमा पुरै "
-"स्वचालितबाट सिर्जनाको धेरै शैलीहरू\n"
-" \n"
-"\n"
-"apt-ftparchive ले debs को ट्रीबाट प्याकेज फाइलहरू सिर्जना गर्दछ । प्याकेज\n"
-"फाइलहरुले प्रत्येक प्याकेजबाट सबै नियन्त्रण फाँटहरुको सामग्रीहरू साथ साथै MD5 hash र "
-"filesize समावेश गर्दछ ।\n"
-"एउटा अधिलेखन फाइल\n"
-"प्राथमिकता र सेक्सनको मान जोड गर्न समर्थित हुन्छ ।\n"
-"\n"
-"त्यस्तै गरी apt-ftparchive ले .dscs को ट्रीबाट स्रोत फाइलहरू सिर्जना गर्दछ ।\n"
-"स्रोत--अधिलेखन--विकल्प src अधीलेखन फाइल निर्दिष्ट गर्न प्रयोग गर्न सकिन्छ\n"
-"\n"
-"'packages' and 'sources' आदेश ट्रीको मूलमा चलाउन सकिन्छ ।\n"
-" विनारी मार्ग फेरी हुने खोजीको विन्दुमा आधारित हुन्छ र \n"
-"अधिलेखन फाइलले अधिलेखन झण्डाहरू समाविष्ट गर्दछ । यदि उपस्थित छ भने बाटो उपसर्ग\n"
-"फाइलनाम फाँटहरुमा थपिन्छ । उदाहरणको लागि \n"
-"डेवियन संग्रहबाट उपयोग:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"विकल्पहरू:\n"
-"  -h    यो मद्दत पाठ\n"
-"  --md5 नियन्त्रण MD5 सिर्जना\n"
-"  -s=?  स्रोत अधिलेखन फाइल\n"
-"  -q    बन्द गर्नुहोस्\n"
-"  -d=?  वैकल्पिक क्यासिङ डेटाबेस चयन गर्नुहोस्\n"
-"  --no-delink delinking डिबग मोड सक्षम गर्नुहोस्\n"
-"  --सामग्रीहरू  सामग्री फाइल सिर्जना नियन्त्रण गर्नुहोस्\n"
-"  -c=?  यो कनफिगरेसन फाइल पढ्नुहोस्\n"
-"  -o=?  एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "ह्यास तत्व तोक्न असफल भयो"
 
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "कुनै चयनहरू मेल खाएन"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "मोड बाँड्न असफल भयो"
 
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "केही फाइलहरू प्याकेज फाइल समूह `%s' मा हराइरहेको छ"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "थपमोडमा आन्तरिक त्रुटि"
 
-#: ftparchive/cachedb.cc:65
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB दूषित थियो, फाइल %s.पुरानो मा पुन:नामकरण गर्नुहोस्"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "मोड अधिलेखन गर्ने प्यास गरिदै, %s -> %s र %s/%s"
 
-#: ftparchive/cachedb.cc:83
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB पुरानो छ, %s स्तरवृद्धि गर्न प्रयास गरिदैछ"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
+msgid "Double add of diversion %s -> %s"
+msgstr "मोडको डबल थप %s -> %s"
 
-#: ftparchive/cachedb.cc:99
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "DB फाइल %s असक्षम भयो: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "लिङ्क पढ्न असफल %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "संग्रह संग नियन्त्रण रेकर्ड छैन"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "कर्सर प्राप्त गर्न असक्षम भयो"
+msgid "Duplicate conf file %s/%s"
+msgstr "नक्कली कनफिगगरेसन फाइल %s/%s"
 
-#: ftparchive/writer.cc:91
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: डाइरेक्ट्री %s पढ्न असक्षम\n"
+msgid "The path %s is too long"
+msgstr "बाटो %s अति लामो छ "
 
-#: ftparchive/writer.cc:96
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: %s स्थिर गर्न असक्षम\n"
+msgid "Unpacking %s more than once"
+msgstr "एक भन्दा बढी %s अनप्याक गरिदैछ"
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-inst/extract.cc:142
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "डाइरेक्ट्री %s फेरियो "
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "W: "
+#: apt-inst/extract.cc:152
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "प्याकेज लक्षित मोडमा लेख्ने प्यास गर्दैछ %s/%s"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस्"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "घुम्ती बाटो अति लामो छ"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "%s हल गर्न असफल भयो"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "डाइरेक्ट्री %s डाइरेक्ट्री विहिन द्वारा बदलिदैछ"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "ट्री हिडाईँ असफल भयो"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "यसको ह्यास बाल्टीमा नोड स्थित गर्न असफल भयो"
 
-#: ftparchive/writer.cc:219
-#, c-format
-msgid "Failed to open %s"
-msgstr "%s खोल्न असफल"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "बाटो अति लामो छ"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/extract.cc:421
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Overwrite package match with no version for %s"
+msgstr " %s को लागि संस्करन बिना अधिलेखन प्याकेज मेल खायो"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "लिङ्क पढ्न असफल %s"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा अधिलेखन गर्दछ"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "अनलिङ्क गर्न असफल %s"
+msgid "Unable to stat %s"
+msgstr "%s स्थिर गर्न असक्षम भयो"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s मा %s लिङ्क असफल भयो"
+msgid "Failed to write file %s"
+msgstr "फाइल %s लेख्न असफल भयो"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "यस %sB हिटको डि लिङ्क सिमा।\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "संग्रह संग कुनै प्याकेज फाँट छैन"
+msgid "Failed to close file %s"
+msgstr "%s फाइल बन्द गर्न असफल भयो"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "यो वैध DEB संग्रह होइन, '%s' सदस्य हराइरहेछ"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s संभारकर्ता %s हो %s होइन\n"
-
-#: ftparchive/writer.cc:698
-#, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-
-#: ftparchive/writer.cc:702
-#, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - स्मृति बाँडफाँड गर्न असफल भयो"
+msgid "Internal error, could not locate member %s"
+msgstr "आन्तरीक त्रुटि, सदस्य तोक्न सक्दैन  %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
-#, c-format
-msgid "Unable to open %s"
-msgstr "%s खोल्न असफल"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "पद वर्णन गर्न नसकिने नियन्त्रण फाइल"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "अवैध संग्रह हस्ताक्षर"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "अधिलेखन फाइल पढ्न असफल %s"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "संग्रह सदस्य हेडर पढ्दा त्रुटि "
 
-#: ftparchive/override.cc:166
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
+msgid "Invalid archive member header %s"
+msgstr "अवैध संग्रह सदस्य हेडर"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #२"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "अवैध संग्रह सदस्य हेडर"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #३"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "संग्रह अति छोटो छ"
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "अज्ञात सङ्कुचन अल्गोरिद्म '%s'"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "संग्रह हेडरहरू पढ्न असफल"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "सङ्कुचन गरिएको निर्गात %s लाई सङ्कुचन सेटको आवश्यक्ता पर्दछ"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "पाइपहरू सिर्जना गर्न असफल"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "FILE* सिर्जना गर्न असफल"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "gzip कार्यन्वयन गर्न असफल"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "काँटा गर्न असफल"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "संग्रह दूषित भयो"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "सङ्कुचन शाखा"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "टार चेकसम असफल भयो, संग्रह दूषित भयो"
 
-#: ftparchive/multicompress.cc:232
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Internal error, failed to create %s"
-msgstr "आन्तरीक त्रुटि, %s सिर्जना गर्न असफल"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "सहायक प्रक्रिया/फाइलमा IO असफल भयो"
+#~ msgid "Total dependency version space: "
+#~ msgstr "कूल निर्भरता संस्करण खाली ठाऊँ:"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "MD5 गणना गर्दा पढ्न असफल भयो"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन"
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "समस्या अनलिङ्क भइरहेछ %s"
+#~ msgid "Done"
+#~ msgstr "काम भयो"
 
-#: cmdline/apt-internal-solver.cc:49
 #, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"उपयोग: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n"
-"\n"
-"\n"
-"विकल्पहरू:\n"
-"  -h   यो मद्दत पाठ\n"
-"  -t   टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n"
-"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
-"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "अज्ञात प्याकेज रेकर्ड!"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"उपयोग: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs प्याकेज फाइलहरू क्रमबद्ध गर्ने साधारण उपकरण हो । -s विकल्प कस्तो खालको "
-"फाइल हो भनी इंकित गर्न प्रयोग गरिन्छ ।\n"
-"\n"
-"विकल्पहरू:\n"
-"  -h   यो मद्दत पाठ\n"
-"  -s   क्रमबद्ध स्रोत फाइल प्रयोग गर्नुहोस्\n"
-"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
-"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
+#~ msgid "No keyring installed in %s."
+#~ msgstr "स्थापना परित्याग गरिदैछ ।"
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/nl.po b/po/nl.po
index eaae16e51..8d226dfef 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@ 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: 2015-01-16 04:37-0500\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"
@@ -27,151 +27,147 @@ msgstr ""
 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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Totaal aantal pakketnamen: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Totaal aantal pakketstructuren: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Normale pakketten: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr " Zuiver virtuele pakketten: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Losstaande virtuele pakketten: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Gemengde virtuele pakketten: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Ontbrekend: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Totaal aantal verschillende versies: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Totaal aantal verschillende beschrijvingen: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Totaal aantal vereisten: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Totaal aantal versie/bestand-relaties: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Totaal aantal Beschrijving/bestand-relaties: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Totaal aantal 'Voorziet'-toewijzingen: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Totaal aantal geglobde strings: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Totale hoeveelheid vereisten-versieruimte: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Totale onbenutte ruimte: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Totale hoeveelheid verantwoorde ruimte: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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 minstens één zoekpatroon op te geven"
 
-#: cmdline/apt-cache.cc:1421
+#: 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:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Pakketbestanden:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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, kruisverwijzing naar pakketbestand lukt niet"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Vastgepinde pakketten:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(niet gevonden)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Geïnstalleerd: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Kandidaat: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(geen)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Pakketpin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Versietabel:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -242,22 +238,22 @@ msgstr ""
 "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"
@@ -271,7 +267,7 @@ msgstr ""
 "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."
 
@@ -308,48 +304,48 @@ msgstr ""
 "  -c=? Lees dit configuratiebestand\n"
 "  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224
 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Kan geen pakket vinden voor architectuur '%s'"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Kan geen pakket '%s' vinden met versienummer '%s'"
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Kan geen pakket '%s' vinden uit de uitgave '%s'"
 
-#: cmdline/apt-get.cc:367
+#: cmdline/apt-get.cc:358
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "'%s' wordt als bronpakket genomen in plaats van '%s'\n"
 
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Kan versie '%s' van pakket '%s' niet vinden"
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kon pakket %s niet vinden"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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 staat ingesteld op handmatig geïnstalleerd.\n"
 
-#: cmdline/apt-get.cc:461 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 staat ingesteld op automatische geïnstalleerd.\n"
 
-#: cmdline/apt-get.cc:469 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."
@@ -357,26 +353,26 @@ msgstr ""
 "Dit commando is verouderd. Gelieve in de plaats 'apt-mark auto' en 'apt-mark "
 "manual' te gebruiken."
 
-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Kon de ophaalmap niet vergrendelen"
 
-#: cmdline/apt-get.cc:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -386,7 +382,7 @@ msgstr ""
 "'%s' op:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -398,80 +394,69 @@ msgstr ""
 "om de nieuwste (mogelijk nog niet uitgebrachte) bijwerkingen van het pakket "
 "op te halen.\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "U heeft niet voldoende vrije schijfruimte op %s"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Ophalen bron %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Ophalen van sommige archieven is mislukt."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uitpakopdracht '%s' is mislukt.\n"
 
-#: cmdline/apt-get.cc:968
+#: cmdline/apt-get.cc:943
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Gelieve na te gaan of het pakket 'dpkg-dev' geïnstalleerd is.\n"
 
-#: cmdline/apt-get.cc:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Bouwopdracht '%s' is mislukt.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Dochterproces is mislukt"
 
-#: cmdline/apt-get.cc:1034
+#: 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 er de bouwvereisten van te "
 "controleren"
 
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -480,17 +465,27 @@ msgstr ""
 "Er is geen architectuurinformatie beschikbaar voor %s. Raadpleeg apt.conf(5) "
 "APT::Architectures om dit te configureren"
 
-#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s heeft geen bouwvereisten.\n"
 
-#: cmdline/apt-get.cc:1276
+#: cmdline/apt-get.cc:1279
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -499,7 +494,7 @@ msgstr ""
 "De vereiste %s van %s kan niet voldaan worden omdat %s niet toegestaan is "
 "voor de pakketten van '%s'"
 
-#: cmdline/apt-get.cc:1294
+#: cmdline/apt-get.cc:1297
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -507,14 +502,14 @@ msgid ""
 msgstr ""
 "De vereiste %s van %s kan niet voldaan worden omdat pakket %s onvindbaar is"
 
-#: cmdline/apt-get.cc:1317
+#: 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 %s is mislukt: geïnstalleerd pakket %s is te "
 "nieuw"
 
-#: cmdline/apt-get.cc:1356
+#: cmdline/apt-get.cc:1359
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -523,7 +518,7 @@ msgstr ""
 "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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -532,30 +527,30 @@ msgstr ""
 "De vereiste %s van %s kan niet voldaan worden omdat er geen geschikte versie "
 "is van pakket %s"
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1388
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Voldoen van de vereiste %s van %s is mislukt: %s"
 
-#: cmdline/apt-get.cc:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Verwerken van de bouwvereisten is mislukt"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Logbestand met veranderingen aan %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Ondersteunde modules:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -654,11 +649,11 @@ msgstr "Heb een URL als argument nodig"
 msgid "Must specify at least one pair url/filename"
 msgstr "U dient minstens 1 paar van url/bestandsnaam op te geven"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr "Ophalen mislukt"
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -682,53 +677,53 @@ msgstr ""
 "\n"
 "                       Deze APT-helper heeft Super Koekracht.\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 niet gemarkeerd worden want het is niet geïnstalleerd.\n"
 
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s was reeds ingesteld als handmatig geïnstalleerd.\n"
 
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s was reeds ingesteld als automatisch geïnstalleerd.\n"
 
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s was reeds ingesteld op tegenhouden.\n"
 
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s was reeds ingesteld op niet tegenhouden.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
-#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s is ingesteld op tegenhouden.\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 "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 "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"
@@ -851,12 +846,12 @@ msgstr "Schijf niet gevonden."
 msgid "File not found"
 msgstr "Bestand niet gevonden"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Kon status niet bepalen"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Instellen van de aanpassingstijd is mislukt"
 
@@ -865,34 +860,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ongeldige URI. Lokale URI's mogen niet beginnen met //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Bezig met aanmelden"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Kan de naam van de peer niet vaststellen"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Kan de lokale naam niet vaststellen"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "De verbinding is door de server geweigerd met bericht: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER (gebruiker) mislukt; bericht van de server: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS (wachtwoord) mislukt; bericht van de server: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -900,124 +895,124 @@ msgstr ""
 "Er was een proxy-server opgegeven, maar geen aanmeldscript. Acquire::ftp::"
 "ProxyLogin is leeg."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "Opdracht '%s' uit het aanmeldscript is mislukt; bericht van de server: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE mislukt; bericht van de server: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "De verbinding is verlopen"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "De verbinding is verbroken door de server"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Leesfout"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Een reactie deed de buffer overlopen."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Protocolcorruptie"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Schrijffout"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Kon geen socket aanmaken"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Kon de datasocket niet verbinden. De verbinding verliep"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Mislukt"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Kon de passieve socket niet verbinden."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo kon geen luistersocket verkrijgen"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Kon geen socket binden"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Kon niet luisteren op de socket"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Kon de socketnaam niet vaststellen"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Kan PORT-commando niet verzenden"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Onbekende adresfamilie %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT is mislukt; bericht van de server: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Verbinding met de datasocket is verlopen"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Kan de verbinding niet aanvaarden"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Probleem bij het frommelen van het bestand"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Kan het bestand niet ophalen; bericht van de server: %s"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Datasocket verliep"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Datatransfer is mislukt; bericht van de server: %s"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Zoekopdracht"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Mislukking bij aanroepen van "
 
@@ -1083,25 +1078,25 @@ msgstr "Er gebeurde iets raars bij het omzetten van '%s:%s' (%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "Kan geen verbinding maken met %s:%s:"
 
-#: methods/gpgv.cc:168
+#: 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 "
 "niet bepalen?!"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Er is tenminste één ongeldige ondertekening gevonden."
 
-#: methods/gpgv.cc:174
+#: 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1110,15 +1105,15 @@ msgstr ""
 "Bestand met niet-versleutelde ondertekening is ongeldig; kreeg '%s' (vereist "
 "het netwerk authenticatie?)"
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Onbekende fout bij het uitvoeren van apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1126,36 +1121,36 @@ msgstr ""
 "De volgende ondertekeningen konden niet geverifieerd worden omdat de "
 "publieke sleutel niet beschikbaar is:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "Lege bestanden kunnen geen geldige archieven zijn"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Fout bij het schrijven naar het bestand"
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Fout bij het lezen van de server. De andere kant heeft de verbinding gesloten"
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Fout bij het lezen van de server"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Fout bij het schrijven naar bestand"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Selectie is mislukt"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Verbinding verliep"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Fout bij het schrijven naar uitvoerbestand"
 
@@ -1187,433 +1182,163 @@ msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
 msgid "Unknown date format"
 msgstr "Onbekend datumformaat"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Foute koptekstdata"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Interne fout"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr "Bezig met sorteren"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Bezig met oplijsten"
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Interne fout. InstallPackages is aangeroepen met defecte pakketten!"
+#: 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-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Vereisten worden gecorrigeerd..."
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Interne fout. Rangschikken is niet voltooid"
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " mislukt."
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Merkwaardig... De groottes kwamen niet overeen. Gelieve apt@packages.debian."
-"org te mailen"
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Kan vereisten niet corrigeren"
 
-#. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n"
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
 
-#. 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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Er moeten %sB aan archieven opgehaald worden.\n"
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Klaar"
 
-#. 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:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Na deze bewerking zal er %sB extra schijfruimte gebruikt worden.\n"
+#: 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."
 
-#. 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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Na deze bewerking zal er %sB schijfruimte vrijkomen.\n"
+#: 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-install.cc:200
+#: apt-private/private-output.cc:265
 #, c-format
-msgid "You don't have enough free space in %s."
-msgstr "U heeft onvoldoende vrije schijfruimte op %s."
+msgid "[installed,upgradable to: %s]"
+msgstr "[geïnstalleerd,opwaardeerbaar naar: %s]"
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes"
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr "[geïnstalleerd,lokaal]"
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "'Trivial Only' is opgegeven. Dit is echter geen triviale bewerking."
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[geïnstalleerd,automatisch verwijderbaar]"
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Ja, doe wat ik zeg!"
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr "[geïnstalleerd,automatisch]"
 
-#: apt-private/private-install.cc:222
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr "[geïnstalleerd]"
+
+#: apt-private/private-output.cc:277
 #, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"U staat op het punt om iets te doen wat mogelijk schadelijk is.\n"
-"Als u wilt doorgaan, dient u de zin '%s' in te typen.\n"
-" ?] "
+msgid "[upgradable from: %s]"
+msgstr "[opwaardeerbaar van: %s]"
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Afbreken."
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[overgebleven configuratie]"
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Wilt u doorgaan?"
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "maar %s is geïnstalleerd"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Ophalen van sommige bestanden is mislukt"
+#: 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-install.cc:320
-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' "
-"uitvoeren of het met '--fix-missing' proberen?"
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "maar het is niet installeerbaar"
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund"
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "maar het is een virtueel pakket"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Geen oplossing gevonden voor de ontbrekende pakketten."
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "maar het is niet geïnstalleerd"
 
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Installatie wordt afgebroken."
+#: 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-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"Het volgende pakket is van uw systeem verdwenen omdat\n"
-"alle bestanden zijn overschreven door andere pakketten:"
-msgstr[1] ""
-"De volgende pakketten zijn van uw systeem verdwenen omdat\n"
-"alle bestanden zijn overschreven door andere pakketten:"
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " of"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Let op: dit wordt automatisch en bewust gedaan door dpkg."
+#: 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-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten"
+#: 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-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Hmm, het lijkt erop dat de AutoRemover iets vernietigd heeft. Dit zou\n"
-"niet mogen kunnen. Gelieve een bug-rapport voor apt in te sturen."
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "De volgende pakketten zullen VERWIJDERD worden:"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "De volgende informatie kan misschien helpen de situatie op te lossen:"
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "De volgende pakketten zijn achtergehouden:"
 
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Interne fout. AutoRemover heeft dingen stukgemaakt"
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "De volgende pakketten zullen opgewaardeerd worden:"
 
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"Het volgende pakket is automatisch geïnstalleerd en is niet langer nodig:"
-msgstr[1] ""
-"De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer "
-"nodig:"
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
 
-#: apt-private/private-install.cc:517
-#, c-format
-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 was automatisch geïnstalleerd en is niet langer nodig.\n"
-msgstr[1] ""
-"%lu pakketten waren automatisch geïnstalleerd en zijn niet langer nodig.\n"
+#: 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-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-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:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"U wilt waarschijnlijk 'apt-get -f install' uitvoeren om de volgende zaken op "
-"te lossen:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren "
-"zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Sommige pakketten konden niet geïnstalleerd worden. Dit kan betekenen\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:659
-msgid "Broken packages"
-msgstr "Niet-werkende pakketten"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Voorgestelde pakketten:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Aanbevolen pakketten:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet "
-"gevraagd.\n"
-
-#: apt-private/private-install.cc:829
-#, 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 er is alleen om "
-"opwaarderingen gevraagd.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-"Herinstalleren van %s is niet mogelijk omdat het niet opgehaald kan worden.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s is reeds de nieuwste versie.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%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:941
-#, 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. Bedoelde u "
-"'%s'?\n"
-
-#: apt-private/private-install.cc:947
-#, 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:129
-msgid "Listing"
-msgstr "Bezig met oplijsten"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Vereisten worden gecorrigeerd..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " mislukt."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Kan vereisten niet corrigeren"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Klaar"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (vanwege %s) "
 
 #: apt-private/private-output.cc:696
 msgid ""
@@ -1674,7 +1399,7 @@ msgstr "J"
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex-compilatiefout - %s"
@@ -1683,7 +1408,7 @@ msgstr "Regex-compilatiefout - %s"
 msgid "The update command takes no arguments"
 msgstr "De opdracht 'update' aanvaardt geen argumenten"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1695,10 +1420,14 @@ msgstr[1] ""
 "%i pakketten kunnen opgewaardeerd worden. Voer 'apt list --upgradable' uit "
 "om ze te zien.\n"
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1725,77 +1454,354 @@ msgstr ""
 "    Houd er ook rekening mee dat vergrendeling is uitgeschakeld.\n"
 "    Steun dus niet op haar relevantie voor de huidige concrete situatie!"
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr ""
-"WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Interne fout. InstallPackages is aangeroepen met defecte pakketten!"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Authenticiteitswaarschuwing werd genegeerd.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Sommige pakketten konden niet geauthenticeerd worden"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Interne fout. Rangschikken is niet voltooid"
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Wilt u deze pakketten installeren zonder verificatie?"
+#: 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."
+"org te mailen"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#. 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
+#: apt-private/private-install.cc:154
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Ophalen van %s is mislukt  %s\n"
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n"
 
-#: apt-private/private-sources.cc:58
+#. 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:159
 #, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "Verwerken van %s is mislukt. Opnieuw bewerken? "
+msgid "Need to get %sB of archives.\n"
+msgstr "Er moeten %sB aan archieven opgehaald worden.\n"
 
-#: apt-private/private-sources.cc:70
+#. 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:166
 #, c-format
-msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr "Uw bestand '%s' is gewijzigd. Voer 'apt-get update' uit."
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Na deze bewerking zal er %sB extra schijfruimte gebruikt worden.\n"
 
-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
-msgstr "Volledige tekst doorzoeken"
+#. 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 "Na deze bewerking zal er %sB schijfruimte vrijkomen.\n"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Opwaardering wordt doorgerekend"
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+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."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Ja, doe wat ik zeg!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"U staat op het punt om iets te doen wat mogelijk schadelijk is.\n"
+"Als u wilt doorgaan, dient u de zin '%s' in te typen.\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Afbreken."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Wilt u doorgaan?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Ophalen van sommige bestanden is mislukt"
+
+#: apt-private/private-install.cc:295
+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' "
+"uitvoeren of het met '--fix-missing' proberen?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+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 gevonden voor de ontbrekende pakketten."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Installatie wordt afgebroken."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"Het volgende pakket is van uw systeem verdwenen omdat\n"
+"alle bestanden zijn overschreven door andere pakketten:"
+msgstr[1] ""
+"De volgende pakketten zijn van uw systeem verdwenen omdat\n"
+"alle bestanden zijn overschreven door andere pakketten:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+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"
+msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten"
+
+#: 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 ""
+"Hmm, het lijkt erop dat de AutoRemover iets vernietigd heeft. Dit zou\n"
+"niet mogen kunnen. Gelieve een bug-rapport voor apt in te sturen."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: 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 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"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"Het volgende pakket is automatisch geïnstalleerd en is niet langer nodig:"
+msgstr[1] ""
+"De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer "
+"nodig:"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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 was automatisch geïnstalleerd en is niet langer nodig.\n"
+msgstr[1] ""
+"%lu pakketten waren automatisch geïnstalleerd en zijn niet langer nodig.\n"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+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 de volgende zaken op "
+"te lossen:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren "
+"zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Sommige pakketten konden niet geïnstalleerd worden. Dit kan betekenen\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"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Voorgestelde pakketten:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Aanbevolen pakketten:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet "
+"gevraagd.\n"
+
+#: apt-private/private-install.cc:827
+#, 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 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 ""
+"Herinstalleren van %s is niet mogelijk omdat het niet opgehaald kan worden.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s is reeds de nieuwste versie.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n"
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%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
+#, 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. Bedoelde u "
+"'%s'?\n"
+
+#: apt-private/private-install.cc:945
+#, 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-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr ""
+"WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden!"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\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 geauthenticeerd worden"
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Wilt u deze pakketten installeren zonder verificatie?"
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Ophalen van %s is mislukt  %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 "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "U heeft onvoldoende vrije schijfruimte op %s."
+
+#: apt-private/private-sources.cc:58
+#, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "Verwerken van %s is mislukt. Opnieuw bewerken? "
 
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Klaar"
+#: apt-private/private-sources.cc:70
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr "Uw bestand '%s' is gewijzigd. Voer 'apt-get update' uit."
+
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr "Volledige tekst doorzoeken"
 
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Geraakt "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Ophalen:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Genegeerd "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Fout "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%sB opgehaald in %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Bezig]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1808,18 +1814,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1899,205 +1905,455 @@ msgstr ""
 msgid "Merging available information"
 msgstr "De beschikbare informatie wordt samengevoegd"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode werd aangeroepen voor een nog steeds aangekoppeld punt"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Situeren van het hash-element is mislukt!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Toewijzen van de omleiding is mislukt"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-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"
-
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Dubbele toevoeging van de omleiding %s -> %s"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Gebruik: apt-extracttemplates bestand1 [bestand2 ...]\n"
+"\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"
+"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:549
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Dubbel configuratiebestand %s/%s"
+msgid "Unable to mkstemp %s"
+msgstr "Kan tijdelijk bestand %s niet aanmaken"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "The path %s is too long"
-msgstr "Het pad %s is te lang"
+msgid "Unable to write to %s"
+msgstr "Kan niet naar %s schrijven"
 
-#: apt-inst/extract.cc:132
+#: 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:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "Pakket-extensielijst is te lang"
+
+#: 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 "Unpacking %s more than once"
-msgstr "%s wordt meer dan eens uitgepakt"
+msgid "Error processing directory %s"
+msgstr "Fout bij het verwerken van map %s"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Bron-extensielijst is te lang"
+
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "Fout bij het wegschrijven van de koptekst naar het inhoudsbestand"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "De map %s is al omgeleid"
+msgid "Error processing contents %s"
+msgstr "Fout bij het verwerken van de inhoud van %s"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"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"
+"            release <pad>\n"
+"            generate config [groepen]\n"
+"            clean config\n"
+"\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 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"
+"Op overeenkomstige wijze genereert apt-ftparchive de 'Sources'-bestanden\n"
+"van een boom met .dscs. De '--source-override'-optie kan gebruikt worden\n"
+"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\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 het aanmaken van de MD5\n"
+"  -s=?        Bronvoorrangsbestand\n"
+"  -q          Stille uitvoer\n"
+"  -d=?        Selecteert de optionele caching database\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:821
+msgid "No selections matched"
+msgstr "Geen van de selecties kwam overeen"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Het pakket probeert om weg te schrijven naar het omleidingsdoel %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Het omleidingspad is te lang"
+#: ftparchive/cachedb.cc:67
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB is beschadigd, bestand hernoemd naar %s.old"
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd"
+
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"DB-formaat is ongeldig. Als u opgewaardeerd heeft van een oudere versie van "
+"apt, dient u de database te verwijderen en opnieuw aan te maken."
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Kan het DB-bestand %s niet openen: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Opvragen van de status van %s is mislukt"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+msgid "Failed to read .dsc"
+msgstr "Lezen van .dsc is mislukt"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Archief heeft geen 'control'-record"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Kan geen cursor verkrijgen"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Hernoemen van %s naar %s is mislukt"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Kon map %s niet lezen\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "De map %s wordt vervangen door een niet-map"
+msgid "W: Unable to stat %s\n"
+msgstr "W: Kon de status van %s niet opvragen\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Vinden van de knoop in de hash-emmer is mislukt"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "F: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Het pad is te lang"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "W: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "F: Er zijn fouten van toepassing op het bestand "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Pakket-overeenkomst wordt overschreven zonder een versie voor %s"
+msgid "Failed to resolve %s"
+msgstr "Oplossen van %s is mislukt"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Doorlopen boomstructuur is mislukt"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s"
+msgid "Failed to open %s"
+msgstr "Openen van %s is mislukt"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Kan de status van %s niet opvragen"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Wegschrijven van bestand %s is mislukt"
+msgid "Failed to readlink %s"
+msgstr "Opdracht readlink %s is mislukt"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Sluiten van bestand %s is mislukt"
+msgid "Failed to unlink %s"
+msgstr "Ontkoppelen van %s is mislukt"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Dit is geen geldig DEB-archief, het onderdeel '%s' mankeert"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Koppelen van %s aan %s is mislukt"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Interne fout, kon onderdeel %s niet vinden"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink-limiet van %sB bereikt.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Niet-ontleedbaar 'control'-bestand"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Archief heeft geen 'package'-veld"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Ongeldige archiefondertekening"
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr " %s heeft geen voorrangsingang\n"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Fout bij het lezen van de koptekst van het archiefonderdeel"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:712
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "Ongeldige koptekst voor archiefonderdeel %s"
+msgid "  %s has no source override entry\n"
+msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Ongeldige koptekst in archiefonderdeel"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Archief is te kort"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Geheugentoewijzing is mislukt"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Lezen van de archiefkopteksten is mislukt"
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Kan %s niet openen"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Niet juist gevormde voorrangsingang %s op regel %llu (%s)"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Lezen van het voorrangsbestand %s is mislukt"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Niet juist gevormde voorrangsingang %s op regel %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Niet juist gevormde voorrangsingang %s op regel %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Niet juist gevormde voorrangsingang %s op regel %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Onbekend compressie-algoritme '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Gecomprimeerde uitvoer %s vereist dat een compressie ingesteld is"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Aanmaken van FILE* is mislukt"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Vorken van proces is mislukt"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Comprimeer kind"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Interne fout, aanmaken van %s is mislukt"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "IO naar subproces/bestand is mislukt"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Aanmaken van pijpen is mislukt"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Lezen tijdens het berekenen van de MD5 is mislukt"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Uitvoeren van gzip is mislukt "
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Probleem bij het ontkoppelen van %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Beschadigd archief"
+#: 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"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar controlesom klopt niet, het pakket is beschadigd"
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Gebruik: apt-internal-solver\n"
+"\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   Logbare uitvoer - geen voortgangsaanduiding\n"
+"  -c=? Lees dit configuratiebestand\n"
+"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Onbekend TAR-kopteksttype %u, onderdeel %s"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Onbekend pakketrecord!"
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Gebruik: apt-sortpkgs [opties] bestand1 [bestand2 ...]\n"
+"\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 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:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr "Voortgang: [%3i%%]"
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "dpkg wordt uitgevoerd"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Kan geen geschikt pakketbeheersysteemtype bepalen"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i records weggeschreven.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: 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 ontbrekende bestanden.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: 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-overeenstemmende bestanden\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2114,6 +2370,28 @@ msgstr "Kan geen authenticiteitsrecord vinden voor: %s"
 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 ""
@@ -2129,158 +2407,342 @@ msgstr ""
 msgid "The list of sources could not be read."
 msgstr "De lijst van bronnen kon niet gelezen worden."
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Lege pakketcache"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: apt-pkg/pkgcache.cc:168
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Het pakketcachebestand is beschadigd. Het is te klein"
 
-#: apt-pkg/pkgcache.cc:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Vereisten"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Voor-Vereisten"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Suggesties"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Aanbevelingen"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Conflicteert met"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Vervangt"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Doet in onbruik geraken"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Breekt"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Vult aan"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "belangrijk"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "noodzakelijk"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "standaard"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "optioneel"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Opwaardering wordt doorgerekend"
+
+#: 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/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:118
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Is the package %s installed?"
-msgstr "Is het pakket %s geïnstalleerd?"
+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:169
+#: apt-pkg/sourcelist.cc:173
 #, 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] too short)"
+msgstr "Niet juist gevormde regel %lu in bronlijst %s ([optie] te kort)"
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+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/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/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/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/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Niet juist gevormde regel %lu in bronlijst %s (absolute dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidaat-versies"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Scenario naar de oplosser sturen"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Genereren van vereisten"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Verzoek naar de oplosser sturen"
 
-#: 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/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Instellen op het ontvangen van een oplossing"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Openen van StateFile %s is mislukt"
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "Externe oplosser faalde zonder passende foutmelding"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "het hernoemen is mislukt, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Hash-som komt niet overeen"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Grootte komt niet overeen"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 msgid "Invalid file format"
 msgstr "Ongeldig bestandsformaat"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Schrijffout"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Er is een fout opgetreden bij de handtekeningcontrole. De pakketbron is niet "
+"bijgewerkt en de oude indexbestanden zullen worden gebruikt. GPG-fout: %s: "
+"%s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG-fout: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "De map %s is al omgeleid"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2289,17 +2751,17 @@ 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:1656
+#: apt-pkg/acquire-item.cc:1975
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Kon de hash-som voor '%s' niet vinden in het Release-bestand"
 
-#: apt-pkg/acquire-item.cc:1698
+#: 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-ID's:\n"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2308,28 +2770,19 @@ msgstr ""
 "Het Release-bestand voor %s is vervallen (ongeldig sinds %s). Bijwerkingen "
 "voor deze pakketbron zullen niet uitgevoerd worden."
 
-#: apt-pkg/acquire-item.cc:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Er is een fout opgetreden bij de handtekeningcontrole. De pakketbron is niet "
-"bijgewerkt en de oude indexbestanden zullen worden gebruikt. GPG-fout: %s: "
-"%s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG-fout: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2338,12 +2791,12 @@ msgstr ""
 "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
 "dit pakket handmatig moet repareren (wegens ontbrekende architectuur)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/acquire-item.cc:2315
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "Kan geen bron vinden om versie '%s' van '%s' op te halen"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2351,128 +2804,38 @@ msgstr ""
 "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
 "pakket %s."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fout tijdens verwerken van %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Pakketlijsten worden ingelezen"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Voorziene bestanden worden verzameld"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Kan niet naar %s schrijven"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bron-cache"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Leveranciersblok %s bevat geen vingerafdruk"
 
-#: apt-pkg/acquire.cc:87 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:91
+#: 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:99
+#: 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:902
+#: 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:904
+#: 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
-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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2503,7 +2866,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2512,12 +2875,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:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "Kon '%s' niet configureren. "
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2529,10 +2892,13 @@ msgstr ""
 "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"
@@ -2603,11 +2969,11 @@ msgstr ""
 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-elementen voor deze schijf zijn:\n"
 
@@ -2619,7 +2985,7 @@ msgstr ""
 "Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor "
 "gevonden worden."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2627,269 +2993,196 @@ msgstr ""
 "Fout, pkgProblemResolver::Resolve leverde defecten op. Dit kan veroorzaakt "
 "worden door vastgehouden pakketten."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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 "Scenario naar de oplosser sturen"
-
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Verzoek naar de oplosser sturen"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Instellen op het ontvangen van een oplossing"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Externe oplosser faalde zonder passende foutmelding"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Externe oplosser uitvoeren"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Kon pakketbestand %s niet ontleden (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Kon Release-bestand %s niet ontleden"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Geen secties in Release-bestand %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Geen Hash-vermelding in Release-bestand %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ongeldige 'Valid-Until'-vermelding in Release-bestand %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ongeldige 'Date'-vermelding in Release-bestand %s"
-
-#: 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/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Niet juist gevormde 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 "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 ""
-"Niet juist gevormde 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 ""
-"Niet juist gevormde 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 ""
-"Niet juist gevormde 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 "Niet juist gevormde regel %lu in bronlijst %s (URI)"
-
-#: 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/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/sourcelist.cc:217
-#, c-format
-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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Boom van vereisten wordt opgebouwd"
 
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Niet juist gevormde regel %lu in bronlijst %s (ontleding van dist)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidaat-versies"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "%s wordt geopend"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Genereren van vereisten"
 
-#: apt-pkg/sourcelist.cc:371
+#: 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/depcache.cc:252
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Niet juist gevormde regel %u in bronlijst %s (type)"
+msgid "Failed to open StateFile %s"
+msgstr "Openen van StateFile %s is mislukt"
 
-#: 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 "Type '%s' op regel %u in bronlijst %s is onbekend"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
 
-#: 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 "Type '%s' van element %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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release '%s' voor '%s' is niet gevonden"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versie '%s' voor '%s' is niet gevonden"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Kon taak '%s' niet vinden"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/cacheset.cc:635
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Kon geen enkel pakket vinden via regex '%s'"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/cacheset.cc:641
 #, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Kon geen enkel pakket vinden via glob '%s'"
 
-#: apt-pkg/cacheset.cc:626
+#: 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 het puur virtueel is"
 
-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, 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 geen van beide er zijn"
-
-#: apt-pkg/cacheset.cc:647
+#: 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 het puur "
 "virtueel is"
 
-#: apt-pkg/cacheset.cc:655
+#: 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 het geen "
 "kandidaat heeft"
 
-#: apt-pkg/cacheset.cc:663
+#: 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 het "
 "niet geïnstalleerd is"
 
+#: 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 geen van beide er zijn"
+
+#: 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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Geen Hash-vermelding in Release-bestand %s"
+
+#: apt-pkg/indexrecords.cc:145
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ongeldige 'Valid-Until'-vermelding in Release-bestand %s"
+
+#: apt-pkg/indexrecords.cc:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ongeldige 'Date'-vermelding in Release-bestand %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selectie %s niet gevonden"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Er wordt geen vergrendeling gebruikt voor het alleen-lezen-"
 "vergrendelingsbestand %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Kon het vergrendelingsbestand %s niet openen"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Kon vergrendeling %s niet verkrijgen"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 "Bestandenlijst kan niet aangemaakt worden, omdat '%s' geen map is"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Negeren van '%s' in map '%s' omdat het geen gewoon bestand is"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: 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:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2897,75 +3190,75 @@ msgstr ""
 "Negeren van bestand '%s' in map '%s' omdat het een ongeldige "
 "bestandsextensie heeft"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Subproces %s ontving een segmentatiefout."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Subproces %s ontving signaal %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: 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 een foutcode terug (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Subproces %s sloot onverwacht af"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Probleem bij het sluiten van het gzip-bestand %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Kon het bestand %s niet openen"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Kon de bestandsindicator %d niet openen"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Aanmaken IPC-subproces is mislukt"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Uitvoeren van de compressor is mislukt "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lezen; moet er nog %lu lezen, maar er schieten er geen meer over"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "schrijven; de laatste %lu konden niet weggeschreven worden"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Probleem bij het sluiten van het bestand %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Probleem bij het hernoemen van het bestand %s naar %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Probleem bij het ontkoppelen van het bestand %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Probleem bij het synchroniseren van het bestand"
 
@@ -3054,115 +3347,109 @@ msgstr "Kan de status van het aanhechtpunt %s niet opvragen"
 msgid "Failed to stat the cdrom"
 msgstr "Opvragen van de status van de cd-rom is mislukt"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Onbekende type-afkorting: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Configuratiebestand %s wordt geopend"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: apt-pkg/contrib/configuration.cc:804
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntactische fout %s:%u: blok start zonder naam."
 
-#: apt-pkg/contrib/configuration.cc:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntactische fout %s:%u: verkeerd gevormde markering"
 
-#: apt-pkg/contrib/configuration.cc:837
+#: apt-pkg/contrib/configuration.cc:840
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntactische fout %s:%u: extra rommel na waarde"
 
-#: apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/contrib/configuration.cc:880
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Syntactische fout %s:%u: richtlijnen kunnen enkel op het hoogste niveau "
 "gegeven worden"
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/contrib/configuration.cc:887
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntactische fout %s:%u: teveel geneste invoegingen"
 
-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntactische fout %s:%u: vanaf hier ingevoegd"
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntactische fout %s:%u: niet-ondersteunde richtlijn '%s'"
 
-#: apt-pkg/contrib/configuration.cc:900
+#: apt-pkg/contrib/configuration.cc:903
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Syntactische fout %s:%u: de richtlijn 'clear' vereist een optieboom als "
 "argument"
 
-#: apt-pkg/contrib/configuration.cc:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntactische fout %s:%u: extra rommel aan het einde van het bestand"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Geen sleutelring geïnstalleerd in %s."
-
-#: 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 "
 "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 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 "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 bewerking %s"
@@ -3172,12 +3459,12 @@ msgstr "Ongeldige bewerking %s"
 msgid "Installing %s"
 msgstr "%s wordt geïnstalleerd"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "%s wordt verwijderd"
@@ -3198,81 +3485,81 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Map '%s' ontbreekt"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "%s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s wordt uitgepakt"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Configuratie van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "%s is geïnstalleerd"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "%s is verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s is volledig verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1670
+#: 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:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemen met vereisten - wordt niet geconfigureerd"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3280,7 +3567,7 @@ 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:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3288,7 +3575,7 @@ msgstr ""
 "Er is geen apport-verslag weggeschreven omdat de foutmelding als oorzaak een "
 "volle schijf opgeeft."
 
-#: apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3296,7 +3583,7 @@ msgstr ""
 "Er is geen apport-verslag weggeschreven omdat de foutmelding als oorzaak "
 "onvoldoende-geheugen opgeeft."
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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"
@@ -3304,7 +3591,7 @@ msgstr ""
 "Er is geen apport-verslag weggeschreven omdat de foutmelding een probleem op "
 "het lokale systeem signaleert."
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3314,427 +3601,195 @@ msgstr ""
 #: 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"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Gebruik: apt-extracttemplates bestand1 [bestand2 ...]\n"
-"\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"
-"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Kan tijdelijk bestand %s niet aanmaken"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Fout bij het verwerken van map %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Bron-extensielijst is te lang"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Fout bij het wegschrijven van de koptekst naar het inhoudsbestand"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Fout bij het verwerken van de inhoud van %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"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"
-"            release <pad>\n"
-"            generate config [groepen]\n"
-"            clean config\n"
-"\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 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"
-"Op overeenkomstige wijze genereert apt-ftparchive de 'Sources'-bestanden\n"
-"van een boom met .dscs. De '--source-override'-optie kan gebruikt worden\n"
-"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\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 het aanmaken van de MD5\n"
-"  -s=?        Bronvoorrangsbestand\n"
-"  -q          Stille uitvoer\n"
-"  -d=?        Selecteert de optionele caching database\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
-msgid "No selections matched"
-msgstr "Geen van de selecties kwam overeen"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB is beschadigd, bestand hernoemd naar %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"DB-formaat is ongeldig. Als u opgewaardeerd heeft van een oudere versie van "
-"apt, dient u de database te verwijderen en opnieuw aan te maken."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Kan het DB-bestand %s niet openen: %s"
-
-#: ftparchive/cachedb.cc:332
-msgid "Failed to read .dsc"
-msgstr "Lezen van .dsc is mislukt"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Archief heeft geen 'control'-record"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Kan geen cursor verkrijgen"
+"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?"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Kon map %s niet lezen\n"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Kan de beheersmap (%s) niet vergrendelen. Heeft u beheerdersrechten?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Kon de status van %s niet opvragen\n"
+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. "
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "F: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Niet vergrendeld"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "W: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode werd aangeroepen voor een nog steeds aangekoppeld punt"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "F: Er zijn fouten van toepassing op het bestand "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Situeren van het hash-element is mislukt!"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Oplossen van %s is mislukt"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Toewijzen van de omleiding is mislukt"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Doorlopen boomstructuur is mislukt"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Interne fout in AddDiversion"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "Openen van %s is mislukt"
+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"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Dubbele toevoeging van de omleiding %s -> %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Opdracht readlink %s is mislukt"
+msgid "Duplicate conf file %s/%s"
+msgstr "Dubbel configuratiebestand %s/%s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Ontkoppelen van %s is mislukt"
+msgid "The path %s is too long"
+msgstr "Het pad %s is te lang"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Koppelen van %s aan %s is mislukt"
+msgid "Unpacking %s more than once"
+msgstr "%s wordt meer dan eens uitgepakt"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink-limiet van %sB bereikt.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Archief heeft geen 'package'-veld"
+msgid "The directory %s is diverted"
+msgstr "De map %s is al omgeleid"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr " %s heeft geen voorrangsingang\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Het pakket probeert om weg te schrijven naar het omleidingsdoel %s/%s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s beheerder is %s, niet %s\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Het omleidingspad is te lang"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "De map %s wordt vervangen door een niet-map"
 
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Vinden van de knoop in de hash-emmer is mislukt"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Geheugentoewijzing is mislukt"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Het pad is te lang"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "Kan %s niet openen"
+msgid "Overwrite package match with no version for %s"
+msgstr "Pakket-overeenkomst wordt overschreven zonder een versie voor %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Niet juist gevormde voorrangsingang %s op regel %llu (%s)"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Lezen van het voorrangsbestand %s is mislukt"
+msgid "Unable to stat %s"
+msgstr "Kan de status van %s niet opvragen"
 
-#: ftparchive/override.cc:166
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Niet juist gevormde voorrangsingang %s op regel %llu #1"
+msgid "Failed to write file %s"
+msgstr "Wegschrijven van bestand %s is mislukt"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Niet juist gevormde voorrangsingang %s op regel %llu #2"
+msgid "Failed to close file %s"
+msgstr "Sluiten van bestand %s is mislukt"
 
-#: ftparchive/override.cc:191
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Niet juist gevormde voorrangsingang %s op regel %llu #3"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Dit is geen geldig DEB-archief, het onderdeel '%s' mankeert"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Onbekend compressie-algoritme '%s'"
+msgid "Internal error, could not locate member %s"
+msgstr "Interne fout, kon onderdeel %s niet vinden"
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Niet-ontleedbaar 'control'-bestand"
+
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Ongeldige archiefondertekening"
+
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Fout bij het lezen van de koptekst van het archiefonderdeel"
+
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Gecomprimeerde uitvoer %s vereist dat een compressie ingesteld is"
+msgid "Invalid archive member header %s"
+msgstr "Ongeldige koptekst voor archiefonderdeel %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Aanmaken van FILE* is mislukt"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Ongeldige koptekst in archiefonderdeel"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Vorken van proces is mislukt"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Archief is te kort"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Comprimeer kind"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Lezen van de archiefkopteksten is mislukt"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Interne fout, aanmaken van %s is mislukt"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Aanmaken van pijpen is mislukt"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "IO naar subproces/bestand is mislukt"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Uitvoeren van gzip is mislukt "
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Lezen tijdens het berekenen van de MD5 is mislukt"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Beschadigd archief"
 
-#: ftparchive/multicompress.cc:359
+#: 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:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Probleem bij het ontkoppelen van %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Onbekend TAR-kopteksttype %u, onderdeel %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Gebruik: apt-internal-solver\n"
-"\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   Logbare uitvoer - geen voortgangsaanduiding\n"
-"  -c=? Lees dit configuratiebestand\n"
-"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Totale hoeveelheid vereisten-versieruimte: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Onbekend pakketrecord!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "U heeft niet voldoende vrije schijfruimte op %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Gebruik: apt-sortpkgs [opties] bestand1 [bestand2 ...]\n"
-"\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 hulptekst\n"
-"  -s   Sorteer bronbestanden\n"
-"  -c=? Lees dit configuratiebestand\n"
-"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Klaar"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Geen sleutelring geïnstalleerd in %s."
 
 #~ msgid "Is stdout a terminal?"
 #~ msgstr "Is stdout een terminal?"
diff --git a/po/nn.po b/po/nn.po
index dcb3d55d6..b3622b6cd 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: 2015-01-16 04:37-0500\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,152 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Tal p pakkenamn: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Tal p pakkenamn: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Vanlege pakkar: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Reine virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Enkle virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Samansette virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Manglar: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Tal p einskildversjonar: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Tal p einskildversjonar: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Tal p krav: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Tal p ver./fil-forhold: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Tal p ver./fil-forhold: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Tal p tilbyr-forhold: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Tal p strengar med jokerteikn: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Storleik p kravs- og versjonsrom: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Slingringsmon: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Brukt plass i alt: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Spikra pakkar:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(ikkje funne)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Installert: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Pakke spikra til: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -243,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 ""
@@ -255,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"
@@ -268,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 ""
 
@@ -304,79 +300,79 @@ msgstr ""
 "  -c=? Les denne oppsettsfila.\n"
 "  -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
 
-#: cmdline/apt-get.cc:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Fann ikkje pakken %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Klarte ikkje lsa nedlastingskatalogen"
 
-#: cmdline/apt-get.cc:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -384,115 +380,114 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: 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"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, fuzzy, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Du har ikkje nok ledig plass i %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Du har ikkje nok ledig plass i %s"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hent kjeldekode %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikkje henta nokre av arkiva."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen %s mislukkast.\n"
 
-#: cmdline/apt-get.cc:968
+#: cmdline/apt-get.cc:943
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggjekommandoen %s mislukkast.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Barneprosessen mislukkast"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen byggjekrav.\n"
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: cmdline/apt-get.cc:1359
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -501,37 +496,37 @@ 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:1362
+#: 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:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikkje behandla byggjekrava"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Koplar til %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Sttta modular:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -644,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -771,12 +766,12 @@ msgstr "Fann ikkje fila"
 msgid "File not found"
 msgstr "Fann ikkje fila"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Klarte ikkje f status"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Klarte ikkje setja endringstidspunkt"
 
@@ -785,34 +780,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ugyldig URI. Lokale URI-ar kan ikkje starta med //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Loggar inn"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Klarte ikkje avgjera namnet p motparten"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Klarte ikkje avgjera det lokale namnet"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Tenaren nekta oss  kopla til, og sa: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -820,123 +815,123 @@ msgstr ""
 "Ein mellomtenar er oppgitt, men ikkje noko innloggingsskript. Feltet "
 "Acquire::ftp::ProxyLogin er tomt."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Kommandoen %s i innlogginsskriptet mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Tidsavbrot p samband"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Tenaren lukka sambandet"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Lesefeil"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Eit svar flaumde over bufferen."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Protokollydeleggjing"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Skrivefeil"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Klarte ikkje oppretta sokkel"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Klarte ikkje kopla til datasokkel, tidsavbrot p sambandet"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Mislukkast"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Klarte ikkje kopla til passiv sokkel."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo klarte ikkje oppretta ein lyttesokkel"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Klarte ikkje binda til sokkel"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Klarte ikkje lytta til sokkel"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Klarte ikkje avgjera sokkelnamnet"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Klarte ikkje senda PORT-kommandoen"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ukjend adressefamilie %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Tidsavbrot p tilkopling til datasokkel"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Klarte ikkje godta tilkoplinga"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Klarte ikkje henta fila, tenaren sa %s"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Tidsavbrot p datasokkelen"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataoverfringa mislukkast, tenaren sa %s"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Sprjing"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Klarte ikkje starta "
 
@@ -1002,71 +997,71 @@ msgstr "Det hende noko dumt ved oppslag av 
 msgid "Unable to connect to %s:%s:"
 msgstr "Klarte ikkje kopla til %s %s:"
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:174
+#: 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr ""
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Feil ved lesing fr tenaren"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Utvalet mislukkast"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Tidsavbrot p sambandet"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
@@ -1098,288 +1093,30 @@ msgstr "Denne HTTP-tenaren har 
 msgid "Unknown date format"
 msgstr "Ukjend datoformat"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "ydelagde hovuddata"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Sambandet mislukkast"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "Intern feil"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Nokre pakkar m fjernast, men fjerning er sltt av."
-
-#: apt-private/private-install.cc:110
-#, fuzzy
-msgid "Internal error, Ordering didn't finish"
-msgstr "Intern feil ved tilleggjing av avleiing"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "M henta %sB/%sB med arkiv.\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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "M henta %sB med arkiv.\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:167
-#, fuzzy, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
-
-#. 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:172
-#, fuzzy, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
-
-#: apt-private/private-install.cc:200
+#: methods/server.cc:589
 #, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Du har ikkje nok ledig plass i %s."
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Det oppstod problem, og -y vart brukt utan --force-yes"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-"Trivial Only var spesifisert, men dette er ikkje noka triviell handling."
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Ja, gjer som eg seier!"
-
-#: apt-private/private-install.cc:222
-#, fuzzy, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Du er i ferd med  utfra ei handling som kan vera skadeleg.\n"
-"For  halda fram, m du skriva nyaktig %s.\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Avbryt."
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Vil du halda fram?"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Klarte ikkje henta nokre av filene"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Klarte ikkje henta nokre av arkiva. Du kan prva med apt-get update eller "
-"--fix-missing."
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing og byte av medium er ikkje sttta for tida"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Klarte ikkje retta opp manglande pakkar."
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Avbryt installasjon."
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Flgjande informasjon kan hjelpa med  lysa situasjonen:"
-
-#: apt-private/private-install.cc:506
-#, fuzzy
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Intern feil. AllUpgrade ydelagde noko"
-
-#: apt-private/private-install.cc:513
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "Dei flgjande NYE pakkane vil verta installerte:"
-msgstr[1] "Dei flgjande NYE pakkane vil verta installerte:"
-
-#: apt-private/private-install.cc:517
-#, fuzzy, c-format
-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] "Dei flgjande NYE pakkane vil verta installerte:"
-msgstr[1] "Dei flgjande NYE pakkane vil verta installerte:"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:612
-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-install.cc:614
 msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja "
-"ei lysing)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Nokre av pakkane kunne ikkje installerast. Dette kan koma av at du har\n"
-"valt ein umogleg situasjon. Dersom du brukar den ustabile utgva av\n"
-"distribusjonen, kan det g henda at nokre av pakkane som trengst ikkje\n"
-"er laga enno eller at dei framleis ligg i Incoming."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "ydelagde pakkar"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Fresltte pakkar:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Tilrdde pakkar"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Hoppar over %s, for den er installert fr fr og ikkje sett til "
-"oppgradering.\n"
-
-#: apt-private/private-install.cc:829
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"Hoppar over %s, for den er installert fr fr og ikkje sett til "
-"oppgradering.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "%s kan ikkje installerast p nytt, for pakken kan ikkje lastast ned.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "Den nyaste versjonen av %s er installert fr fr.\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Vald versjon %s (%s) for %s\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Vald versjon %s (%s) for %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "Intern feil"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1387,32 +1124,32 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "Rettar p krav ..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " mislukkast."
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "Klarte ikkje retta p krav"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr "Klarte ikkje minimera oppgraderingsmengda"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " Ferdig"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nokre krav er ikkje oppfylte. Prv med -f."
 
@@ -1577,7 +1314,7 @@ msgstr "J"
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex-kompileringsfeil - %s"
@@ -1586,7 +1323,7 @@ msgstr "Regex-kompileringsfeil - %s"
 msgid "The update command takes no arguments"
 msgstr "Oppdateringskommandoen tek ingen argument"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1594,10 +1331,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1618,27 +1359,300 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Nokre pakkar m fjernast, men fjerning er sltt av."
+
+#: apt-private/private-install.cc:109
+#, fuzzy
+msgid "Internal error, Ordering didn't finish"
+msgstr "Intern feil ved tilleggjing av avleiing"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "M henta %sB/%sB med arkiv.\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:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "M henta %sB med arkiv.\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:166
+#, fuzzy, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
+
+#. 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
+#, fuzzy, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Det oppstod problem, og -y vart brukt utan --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 var spesifisert, men dette er ikkje noka triviell handling."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Ja, gjer som eg seier!"
+
+#: apt-private/private-install.cc:197
+#, fuzzy, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Du er i ferd med  utfra ei handling som kan vera skadeleg.\n"
+"For  halda fram, m du skriva nyaktig %s.\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Avbryt."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Vil du halda fram?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Klarte ikkje henta nokre av filene"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Klarte ikkje henta nokre av arkiva. Du kan prva med apt-get update eller "
+"--fix-missing."
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing og byte av medium er ikkje sttta for tida"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Klarte ikkje retta opp manglande pakkar."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Avbryt installasjon."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: 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 ""
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Flgjande informasjon kan hjelpa med  lysa situasjonen:"
+
+#: apt-private/private-install.cc:481
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Intern feil. AllUpgrade ydelagde noko"
+
+#: apt-private/private-install.cc:488
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "Dei flgjande NYE pakkane vil verta installerte:"
+msgstr[1] "Dei flgjande NYE pakkane vil verta installerte:"
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+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] "Dei flgjande NYE pakkane vil verta installerte:"
+msgstr[1] "Dei flgjande NYE pakkane vil verta installerte:"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:587
+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-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja "
+"ei lysing)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Nokre av pakkane kunne ikkje installerast. Dette kan koma av at du har\n"
+"valt ein umogleg situasjon. Dersom du brukar den ustabile utgva av\n"
+"distribusjonen, kan det g henda at nokre av pakkane som trengst ikkje\n"
+"er laga enno eller at dei framleis ligg i Incoming."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "ydelagde pakkar"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Fresltte pakkar:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Tilrdde pakkar"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Hoppar over %s, for den er installert fr fr og ikkje sett til "
+"oppgradering.\n"
+
+#: apt-private/private-install.cc:827
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Hoppar over %s, for den er installert fr fr og ikkje sett til "
+"oppgradering.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s kan ikkje installerast p nytt, for pakken kan ikkje lastast ned.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "Den nyaste versjonen av %s er installert fr fr.\n"
+
+#: apt-private/private-install.cc:892
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Vald versjon %s (%s) for %s\n"
+
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Vald versjon %s (%s) for %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 "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+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-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "TVARING: Klarer ikkje autentisere desse pakkane."
 
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:98
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
 msgid "Some packages could not be authenticated"
 msgstr "Nokre pakkar kunne ikkje bli autentisert"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 msgid "Install these packages without verification?"
 msgstr "Installer desse pakkane utan verifikasjon?"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikkje henta %s  %s\n"
 
+#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
+#, fuzzy, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "Du har ikkje nok ledig plass i %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Du har ikkje nok ledig plass i %s."
+
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1653,41 +1667,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Reknar ut oppgradering"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Ferdig"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Treff "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Hent:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Feil "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Henta %sB p %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Arbeider]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1700,18 +1706,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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,205 +1791,451 @@ msgstr "er viktige. Rett opp dei feila og [i]nstaller p
 msgid "Merging available information"
 msgstr "Flettar informasjon om tilgjengelege pakkar"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode vart kalla p ein node som framleis er lenkja"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Fann ikkje nkkelelementet."
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Klarte ikkje tildela avleiing"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Intern feil i AddDiversion"
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Prver  skriva over ei avleiing, %s -> %s og %s/%s"
-
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Dobbel tilleggjing av avleiing %s -> %s"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
+"\n"
+"apt-extracttemplates er eit verkty for  henta ut informasjon om\n"
+"oppsett og malar fr Debian-pakkar.\n"
+"\n"
+"Val:\n"
+"  -h   Vis denne hjelpeteksten\n"
+"  -t   Vel mellombels katalog\n"
+"  -c=? Les denne innstillingsfila.\n"
+"  -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
 
-#: apt-inst/filelist.cc:549
+#: 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:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Dobbel oppsettsfil %s/%s"
+msgid "Unable to write to %s"
+msgstr "Klarte ikkje skriva til %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: 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:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "Lista over pakkeutvidingar er for lang"
+
+#: 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 "The path %s is too long"
-msgstr "Stigen %s er for lang"
+msgid "Error processing directory %s"
+msgstr "Feil ved lesing av katalogen %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Lista over kjeldeutvidingar er for lang"
+
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "Feil ved skriving av topptekst til innhaldsfila"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Pakkar ut %s meir enn in gong"
+msgid "Error processing contents %s"
+msgstr "Feil ved lesing av %s"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/apt-ftparchive.cc:625
+#, fuzzy
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Bruk: apt-ftparchive [val] kommando\n"
+"Kommandoar: packages binrstig [overstyringsfil [stigprefiks]]\n"
+"          sources kjeldesti [overstyringsfil [stiprefiks]]\n"
+"          contents sti\n"
+"          generate config [grupper]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive opprettar indeksfiler for Debian-arkiv. Mange ulike\n"
+"mtar kan brukast, fr heilautomatiske til funksjonelle erstattingar\n"
+"for dpkg-scanpackages og dpkg-scansources.\n"
+"\n"
+"apt-ftparchive opprettar Package-filer fr eit tre med .debs-filer.\n"
+"Package-fila inneheld alle kontrollfelta fr kvar pakke i tillegg til\n"
+"MD5-nkkel og filstorleik. Du kan bruka ei overstyringsfil for  tvinga\n"
+"gjennom verdiar for prioritet og kategori.\n"
+"\n"
+"apt-ftparchive kan p same mten oppretta Sources-filer fr eit tre\n"
+"med .dscs-filer. Du kan bruka ei overstyringsfil med --source-override.\n"
+"\n"
+"Kommandoane packages og sources skal kyrast i rota av katalogtreet.\n"
+"Binrstien skal peika til toppkatalogen i det rekursive sket, og\n"
+"overstyringsfila skal innehalda innstillingar for overstyring.\n"
+"Stiprefikset vert lagt til filnamnfelta dersom det er oppgjeve. Her er\n"
+"eit dme p bruk i Debian-arkivet:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Val:\n"
+"  -h    Vis denne hjelpeteksten.\n"
+"  --md5 Styrer MD5-genereringa.\n"
+"  -s=?  Overstyringsfil for kjeldekode.\n"
+"  -q    Stille.\n"
+"  -d=?  Vel ein anna mellomlagerdatabase.\n"
+"  --no-delink Bruk avlusingsmodus med delinking.\n"
+"  --contents  Styrer opprettinga av innhaldsfila.\n"
+"  -c=?  Les denne oppsettsfila.\n"
+"  -o=? Set ei vilkrleg innstilling."
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Ingen utval passa"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Katalogen %s er avleidd"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Enkelte filer manglar i pakkefilgruppa %s"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Pakken prver  skriva til avleiingsmlet %s/%s"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Databasen er ydelagd. Filnamnet er endra til %s.old"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Avleiingsstigen er for lang"
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB er for gammal, forskjer  oppgradere %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Klarte ikkje opna DB-fila %s: %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Klarte ikkje f status til %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Klarte ikkje lesa lenkja %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Arkivet har ingen kontrollpost"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Klarte ikkje f peikar"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Klarte ikkje endra namnet p %s til %s"
+msgid "W: Unable to read directory %s\n"
+msgstr ": Klarte ikkje lesa katalogen %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Katalogen %s vert bytt ut med ein ikkje-katalog"
+msgid "W: Unable to stat %s\n"
+msgstr ": Klarte ikkje f status til %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Fann ikkje noden i nkkelbtta"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "F: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Stigen er for lang"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr ": "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "F: Det er feil ved fila "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Skriv over pakketreff utan versjon for %s"
+msgid "Failed to resolve %s"
+msgstr "Klarte ikkje sl opp %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Treklatring mislukkast"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s"
+msgid "Failed to open %s"
+msgstr "Klarte ikkje opna %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Klarte ikkje f status til %s"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
-#, fuzzy, c-format
-msgid "Failed to write file %s"
-msgstr "Klarte ikkje skriva fila %s"
+#: ftparchive/writer.cc:299
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Klarte ikkje lesa lenkja %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Klarte ikkje lukka fila %s"
+msgid "Failed to unlink %s"
+msgstr "Klarte ikkje oppheva lenkja %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Dette er ikkje eit gyldig DEB-arkiv, manglar %s-medlemmen"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Klarte ikkje lenkja %s til %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Intern feil, fann ikkje medlemmen %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink-grensa p %sB er ndd.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Kontrollfila kan ikkje tolkast"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Arkivet har ikkje noko pakkefelt"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Ugyldig arkivsignatur"
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s har inga overstyringsoppfring\n"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Feil ved lesing av arkivmedlemshovud"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:712
 #, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Ugyldig arkivmedlemshovud"
+msgid "  %s has no source override entry\n"
+msgstr "  %s har inga overstyringsoppfring\n"
+
+#: ftparchive/writer.cc:716
+#, fuzzy, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s har inga overstyringsoppfring\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Klarte ikkje tildela minne"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Klarte ikkje opna %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Misforma overstyring %s linje %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Klarte ikkje lesa overstyringsfila %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Misforma overstyring %s linje %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Misforma overstyring %s linje %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Misforma overstyring %s linje %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Ukjend komprimeringsalgoritme %s"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Komprimert utdata %s treng eit komprimeringssett"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Ugyldig arkivmedlemshovud"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Klarte ikkje oppretta FILE*"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Arkivet er for kort"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Klarte ikkje gafla"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Klarte ikkje lesa arkivhovuda"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Komprimer barn"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Klarte ikkje oppretta ryr"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Intern feil, klarte ikkje oppretta %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Klarte ikkje kyra gzip "
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Klarte ikkje kommunisera med underprosess/fil"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "ydelagt arkiv"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Klarte ikkje lesa under utrekning av MD5"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar-sjekksummen mislukkast, arkivet er ydelagt"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problem ved oppheving av lenkje til %s"
 
-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Ukjend TAR-hovud type %u, medlem %s"
+msgid "Failed to rename %s to %s"
+msgstr "Klarte ikkje endra namnet p %s til %s"
+
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
+"\n"
+"apt-extracttemplates er eit verkty for  henta ut informasjon om\n"
+"oppsett og malar fr Debian-pakkar.\n"
+"\n"
+"Val:\n"
+"  -h   Vis denne hjelpeteksten\n"
+"  -t   Vel mellombels katalog\n"
+"  -c=? Les denne innstillingsfila.\n"
+"  -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
+
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Ukjend pakkeoppslag"
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Bruk: apt-sortpkgs [val] fil1 [fil2 ...]\n"
+"\n"
+"apt-sortpkgs er eit enkelt verkty for  sortera pakkefiler. Innstillinga\n"
+"-s vert brukt til  velja kva for ein type fil det er snakk om.\n"
+"\n"
+"Val:\n"
+"  -h   Vis denne hjelpeteksten.\n"
+"  -s   Bruk kjeldefilsortering.\n"
+"  -c=? Les denne oppsettsfila.\n"
+"  -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakkesystemet %s er ikkje sttta"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skreiv %i postar.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skreiv %i postar med %i manglande filer.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n"
@@ -1998,6 +2250,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."
@@ -2011,204 +2286,365 @@ msgstr ""
 msgid "The list of sources could not be read."
 msgstr "Kjeldelista kan ikkje lesast."
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Tomt pakkelager"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Krav"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Forkrav"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Forslag"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Tilrdingar"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Konflikt"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Byter ut"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Foreldar"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "viktig"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "pkravd"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "vanleg"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "valfri"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "tillegg"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Reknar ut oppgradering"
+
+#: 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/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/acquire-worker.cc:118
+#: 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/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"
+
+#: 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/sourcelist.cc:371
+#, 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"
+
+#: 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/acquire-worker.cc:169
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s starta ikkje rett"
+msgid "Couldn't stat source package list %s"
+msgstr "Klarte ikkje f status p kjeldepakkelista %s"
 
-#: apt-pkg/acquire-worker.cc:455
-#, 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/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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indeksfiltypen %s er ikkje sttta"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Samlar inn filtilbod"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Byggjer kravtre"
+#: 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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidatversjonar"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Genererer kravforhold"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: 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/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Klarte ikkje opna %s"
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Klarte ikkje skriva fila %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Feil MD5-sum"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Feil storleik"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Ugyldig operasjon %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Skrivefeil"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Katalogen %s er avleidd"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: apt-pkg/acquire-item.cc:2059
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2217,133 +2653,50 @@ msgstr ""
 "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv "
 "(fordi arkitekturen manglar)."
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Feil ved behandling av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-#, 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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Klarte ikkje f status p kjeldepakkelista %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Les pakkelister"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samlar inn filtilbod"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Klarte ikkje skriva til %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: apt-pkg/acquire.cc:162
 #, fuzzy, c-format
 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:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Du m leggja nokre kjelde-URI-ar i fila sources.list."
@@ -2369,19 +2722,19 @@ msgstr "Skj
 msgid "No priority (or zero) specified for pin"
 msgstr "Ingen prioritet (eller null) oppgitt for spiker"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2393,10 +2746,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"
@@ -2463,11 +2820,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"
 
@@ -2477,7 +2834,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:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2485,327 +2842,259 @@ msgstr ""
 "Feil, pkgProblemResolver::Resolve har laga brot. Dette kan skuldast pakkar "
 "som er haldne tilbake."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Klarte ikkje tolka pakkefila %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Klarte ikkje tolka pakkefila %s (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Merk, vel %s i staden for %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ugyldig linje i avleiingsfila: %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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 "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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Byggjer kravtre"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Opnar %s"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidatversjonar"
 
-#: 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:168
+msgid "Dependency generation"
+msgstr "Genererer kravforhold"
 
-#: apt-pkg/sourcelist.cc:375
+#: 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/depcache.cc:252
 #, 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"
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikkje opna %s"
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/depcache.cc:258
 #, 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 "Failed to write temporary StateFile %s"
+msgstr "Klarte ikkje skriva fila %s"
+
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "Klarte ikkje tolka pakkefila %s (%d)"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Fann ikkje utgva %s av %s"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Fann ikkje versjonen %s av %s"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Fann ikkje pakken %s"
 
-#: apt-pkg/cacheset.cc:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:145
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ugyldig linje i avleiingsfila: %s"
+
+#: apt-pkg/indexrecords.cc:164
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Klarte ikkje tolka pakkefila %s (1)"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Fann ikkje utvalet %s"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Brukar ikkje lsing for den skrivebeskytta lsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Klarte ikkje opna lsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Brukar ikkje lsing for den nfs-monterte lsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Klarte ikkje lsa %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprosessen %s returnerte ein feilkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprosessen %s avslutta uventa"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problem ved lsing av fila"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Klarte ikkje opna fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Klarte ikkje opna ryr for %s"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Klarte ikkje oppretta underprosessen IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Klarte ikkje kyra komprimeringa "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lese, har framleis %lu att  lesa, men ingen att"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "skrive, har framleis %lu att  skrive, men klarte ikkje"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem ved lsing av fila"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem ved synkronisering av fila"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem ved oppheving av lenkje til fila"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Problem ved synkronisering av fila"
 
@@ -2891,109 +3180,103 @@ msgstr "Klarte ikkje f
 msgid "Failed to stat the cdrom"
 msgstr "Klarte ikkje f status til CD-ROM"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Ukjend typeforkorting: %c"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Avbryt installasjon."
-
-#: 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"
@@ -3003,12 +3286,12 @@ msgstr "Ugyldig operasjon %s"
 msgid "Installing %s"
 msgstr "  Installert: "
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Opnar %s"
@@ -3029,103 +3312,103 @@ msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Listekatalogen %spartial manglar."
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Installert: "
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Tilrdingar"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Klarte ikkje fjerna %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3140,413 +3423,186 @@ 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 ""
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
-"\n"
-"apt-extracttemplates er eit verkty for  henta ut informasjon om\n"
-"oppsett og malar fr Debian-pakkar.\n"
-"\n"
-"Val:\n"
-"  -h   Vis denne hjelpeteksten\n"
-"  -t   Vel mellombels katalog\n"
-"  -c=? Les denne innstillingsfila.\n"
-"  -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Klarte ikkje f status til %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Feil ved lesing av katalogen %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Lista over kjeldeutvidingar er for lang"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Feil ved skriving av topptekst til innhaldsfila"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Feil ved lesing av %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-#, fuzzy
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Bruk: apt-ftparchive [val] kommando\n"
-"Kommandoar: packages binrstig [overstyringsfil [stigprefiks]]\n"
-"          sources kjeldesti [overstyringsfil [stiprefiks]]\n"
-"          contents sti\n"
-"          generate config [grupper]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive opprettar indeksfiler for Debian-arkiv. Mange ulike\n"
-"mtar kan brukast, fr heilautomatiske til funksjonelle erstattingar\n"
-"for dpkg-scanpackages og dpkg-scansources.\n"
-"\n"
-"apt-ftparchive opprettar Package-filer fr eit tre med .debs-filer.\n"
-"Package-fila inneheld alle kontrollfelta fr kvar pakke i tillegg til\n"
-"MD5-nkkel og filstorleik. Du kan bruka ei overstyringsfil for  tvinga\n"
-"gjennom verdiar for prioritet og kategori.\n"
-"\n"
-"apt-ftparchive kan p same mten oppretta Sources-filer fr eit tre\n"
-"med .dscs-filer. Du kan bruka ei overstyringsfil med --source-override.\n"
-"\n"
-"Kommandoane packages og sources skal kyrast i rota av katalogtreet.\n"
-"Binrstien skal peika til toppkatalogen i det rekursive sket, og\n"
-"overstyringsfila skal innehalda innstillingar for overstyring.\n"
-"Stiprefikset vert lagt til filnamnfelta dersom det er oppgjeve. Her er\n"
-"eit dme p bruk i Debian-arkivet:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Val:\n"
-"  -h    Vis denne hjelpeteksten.\n"
-"  --md5 Styrer MD5-genereringa.\n"
-"  -s=?  Overstyringsfil for kjeldekode.\n"
-"  -q    Stille.\n"
-"  -d=?  Vel ein anna mellomlagerdatabase.\n"
-"  --no-delink Bruk avlusingsmodus med delinking.\n"
-"  --contents  Styrer opprettinga av innhaldsfila.\n"
-"  -c=?  Les denne oppsettsfila.\n"
-"  -o=? Set ei vilkrleg innstilling."
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Ingen utval passa"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Enkelte filer manglar i pakkefilgruppa %s"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Databasen er ydelagd. Filnamnet er endra til %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB er for gammal, forskjer  oppgradere %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Klarte ikkje opna DB-fila %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Klarte ikkje lesa lenkja %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arkivet har ingen kontrollpost"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Klarte ikkje f peikar"
-
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr ": Klarte ikkje lesa katalogen %s\n"
+msgstr "Klarte ikkje lsa listekatalogen"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr ": Klarte ikkje f status til %s\n"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "F: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr ": "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode vart kalla p ein node som framleis er lenkja"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "F: Det er feil ved fila "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Fann ikkje nkkelelementet."
+
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Klarte ikkje tildela avleiing"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Intern feil i AddDiversion"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "Klarte ikkje sl opp %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Prver  skriva over ei avleiing, %s -> %s og %s/%s"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Treklatring mislukkast"
+#: apt-inst/filelist.cc:506
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Dobbel tilleggjing av avleiing %s -> %s"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to open %s"
-msgstr "Klarte ikkje opna %s"
+msgid "Duplicate conf file %s/%s"
+msgstr "Dobbel oppsettsfil %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "The path %s is too long"
+msgstr "Stigen %s er for lang"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Klarte ikkje lesa lenkja %s"
+msgid "Unpacking %s more than once"
+msgstr "Pakkar ut %s meir enn in gong"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Klarte ikkje oppheva lenkja %s"
+msgid "The directory %s is diverted"
+msgstr "Katalogen %s er avleidd"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Klarte ikkje lenkja %s til %s"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Pakken prver  skriva til avleiingsmlet %s/%s"
+
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Avleiingsstigen er for lang"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:249
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink-grensa p %sB er ndd.\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Katalogen %s vert bytt ut med ein ikkje-katalog"
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arkivet har ikkje noko pakkefelt"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Fann ikkje noden i nkkelbtta"
+
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Stigen er for lang"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s har inga overstyringsoppfring\n"
+msgid "Overwrite package match with no version for %s"
+msgstr "Skriv over pakketreff utan versjon for %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s-vedlikehaldaren er %s, ikkje %s\n"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s"
 
-#: ftparchive/writer.cc:698
-#, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s har inga overstyringsoppfring\n"
+#: apt-inst/extract.cc:498
+#, c-format
+msgid "Unable to stat %s"
+msgstr "Klarte ikkje f status til %s"
 
-#: ftparchive/writer.cc:702
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s har inga overstyringsoppfring\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Klarte ikkje tildela minne"
+msgid "Failed to write file %s"
+msgstr "Klarte ikkje skriva fila %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Unable to open %s"
-msgstr "Klarte ikkje opna %s"
+msgid "Failed to close file %s"
+msgstr "Klarte ikkje lukka fila %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Misforma overstyring %s linje %lu #1"
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Dette er ikkje eit gyldig DEB-arkiv, manglar %s-medlemmen"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Klarte ikkje lesa overstyringsfila %s"
+msgid "Internal error, could not locate member %s"
+msgstr "Intern feil, fann ikkje medlemmen %s"
 
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Misforma overstyring %s linje %lu #1"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Kontrollfila kan ikkje tolkast"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Misforma overstyring %s linje %lu #2"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Ugyldig arkivsignatur"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Misforma overstyring %s linje %lu #3"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Feil ved lesing av arkivmedlemshovud"
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Ukjend komprimeringsalgoritme %s"
+#: apt-inst/contrib/arfile.cc:96
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "Ugyldig arkivmedlemshovud"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimert utdata %s treng eit komprimeringssett"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Ugyldig arkivmedlemshovud"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Klarte ikkje oppretta FILE*"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arkivet er for kort"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Klarte ikkje gafla"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Klarte ikkje lesa arkivhovuda"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Komprimer barn"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Klarte ikkje oppretta ryr"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Intern feil, klarte ikkje oppretta %s"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Klarte ikkje kyra gzip "
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Klarte ikkje kommunisera med underprosess/fil"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "ydelagt arkiv"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Klarte ikkje lesa under utrekning av MD5"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar-sjekksummen mislukkast, arkivet er ydelagt"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem ved oppheving av lenkje til %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Ukjend TAR-hovud type %u, medlem %s"
 
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
-"\n"
-"apt-extracttemplates er eit verkty for  henta ut informasjon om\n"
-"oppsett og malar fr Debian-pakkar.\n"
-"\n"
-"Val:\n"
-"  -h   Vis denne hjelpeteksten\n"
-"  -t   Vel mellombels katalog\n"
-"  -c=? Les denne innstillingsfila.\n"
-"  -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Storleik p kravs- og versjonsrom: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Ukjend pakkeoppslag"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Du har ikkje nok ledig plass i %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Bruk: apt-sortpkgs [val] fil1 [fil2 ...]\n"
-"\n"
-"apt-sortpkgs er eit enkelt verkty for  sortera pakkefiler. Innstillinga\n"
-"-s vert brukt til  velja kva for ein type fil det er snakk om.\n"
-"\n"
-"Val:\n"
-"  -h   Vis denne hjelpeteksten.\n"
-"  -s   Bruk kjeldefilsortering.\n"
-"  -c=? Les denne oppsettsfila.\n"
-"  -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
+#~ msgid "Done"
+#~ msgstr "Ferdig"
+
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Avbryt installasjon."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/pl.po b/po/pl.po
index f1df0ee4a..0dda22a47 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: 2015-01-16 04:37-0500\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,150 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Liczba nazw pakietów: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Liczba wszystkich typów pakietów: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Zwykłych pakietów: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Czysto wirtualnych pakietów: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Pojedynczych pakietów wirtualnych: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Mieszanych pakietów wirtualnych: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Brakujących: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "W sumie różnych wersji: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "W sumie różnych opisów: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "W sumie zależności: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "W sumie zależności wersja/plik: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "W sumie zależności opis/plik: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "W sumie mapowań zapewnień: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "W sumie dopasowanych napisów: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Sumaryczny rozmiar obszaru zależności od wersji: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Sumaryczny rozmiar niewykorzystanego miejsca: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Całkowity rozmiar: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: 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:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Plików pakietów:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Przypięte pakiety:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(nie znaleziono)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Zainstalowana: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Kandydująca: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(brak)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Sposób przypięcia: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Tabela wersji:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -242,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"
@@ -263,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."
 
@@ -299,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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: 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:454
+#: 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:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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."
@@ -351,26 +347,26 @@ msgstr ""
 "To polecenie jest przestarzałe. Prosimy używać \"apt-mark auto\" i \"apt-"
 "mark manual\"."
 
-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Nie udało się zablokować katalogu pobierania"
 
-#: cmdline/apt-get.cc:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -380,7 +376,7 @@ msgstr ""
 "pod adresem:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -392,80 +388,69 @@ msgstr ""
 "by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego "
 "pakietu.\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pomijanie już pobranego pliku \"%s\"\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Nie udało się ustalić ilości wolnego miejsca w %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "W %s nie ma wystarczającej ilości wolnego miejsca"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Pobieranie źródeł %s\n"
 
-#: cmdline/apt-get.cc:924
+#: 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:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Polecenie budowania \"%s\" zawiodło.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Proces potomny zawiódł"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -474,17 +459,27 @@ msgstr ""
 "Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt."
 "conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -527,30 +522,30 @@ msgstr ""
 "Zależność %s od %s nie może zostać spełniona, ponieważ pakiet %s nie ma "
 "wersji kandydującej"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Nie udało się przetworzyć zależności dla budowania"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Dziennik zmian %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Obsługiwane moduły:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -649,11 +644,11 @@ msgstr ""
 "Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
 "źródła"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -667,55 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -816,12 +811,12 @@ msgstr "Nie odnaleziono dysku."
 msgid "File not found"
 msgstr "Nie odnaleziono pliku"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Nie udało się wykonać operacji stat"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Nie udało się ustawić czasu modyfikacji"
 
@@ -830,34 +825,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Nieprawidłowe URI, lokalne URI nie mogą zaczynać się od //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Logowanie się"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Nie można określić nazwy zdalnego systemu"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Nie udało się określić nazwy lokalnego systemu"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Serwer odrzucił połączenie, otrzymana odpowiedź: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Polecenie USER nie powiodło się, odpowiedź serwera: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Polecenie PASS nie powiodło się, odpowiedź serwera: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -865,125 +860,125 @@ msgstr ""
 "Określono serwer pośredniczący, ale nie określono skryptu rejestrowania, "
 "Acquire::ftp::ProxyLogin jest puste."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "Polecenie skryptu rejestrowania \"%s\" nie powiodło się, odpowiedź serwera: "
 "%s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Polecenie TYPE nie powiodło się, odpowiedź serwera: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Przekroczenie czasu połączenia"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Serwer zamknął połączenie"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Błąd odczytu"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Odpowiedź przepełniła bufor."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Naruszenie zasad protokołu"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Błąd zapisu"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Nie udało się utworzyć gniazda"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nie udało się połączyć gniazda danych, przekroczenie czasu połączenia"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Nie udało się"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Nie udało się połączyć pasywnego gniazda."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo nie było w stanie uzyskać nasłuchującego gniazda"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Nie udało się przyłączyć gniazda"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Nie udało się nasłuchiwać na gnieździe"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Nie udało się określić nazwy gniazda"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Nie można wysłać polecenia PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Nieznana rodzina adresów %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Polecenie EPRT nie powiodło się, odpowiedź serwera: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Przekroczony czas połączenia gniazda danych"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Nie udało się przyjąć połączenia"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nie można pobrać pliku, odpowiedź serwera: %s"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Przekroczony czas oczekiwania na dane"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Nie udało się przesłać danych, odpowiedź serwera: %s"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Info"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Nie można wywołać "
 
@@ -1049,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:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis."
 
-#: methods/gpgv.cc:174
+#: 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Nieznany błąd podczas uruchamiania apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1089,35 +1084,35 @@ msgstr ""
 "Następujące podpisy nie mogły zostać zweryfikowane z powodu braku klucza "
 "publicznego:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "Puste pliki nie mogą być prawidłowymi archiwami"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Błąd przy pisaniu do pliku"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Błąd czytania z serwera"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Błąd przy pisaniu do pliku"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Operacja select nie powiodła się"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Przekroczenie czasu połączenia"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Błąd przy pisaniu do pliku wyjściowego"
 
@@ -1149,185 +1144,435 @@ msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)"
 msgid "Unknown date format"
 msgstr "Nieznany format daty"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Błędne dane nagłówka"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Połączenie nie powiodło się"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
+#: apt-private/private-list.cc:121
+msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Błąd wewnętrzny, użyto InstallPackages z uszkodzonymi pakietami!"
+#: 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-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone."
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Naprawianie zależności..."
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Błąd wewnętrzny, sortowanie niezakończone"
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " nie udało się."
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+#: 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 ""
-"Wystąpił dziwny błąd - rozmiary się nie zgadzają. Proszę to zgłosić pod "
-"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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Konieczne pobranie %sB/%sB archiwów.\n"
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Zainstalowany]"
 
-#. 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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Konieczne pobranie %sB archiwów.\n"
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Zainstalowany]"
 
-#. 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:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n"
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+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
-#: apt-private/private-install.cc:172
+#: 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 "After this operation, %sB disk space will be freed.\n"
-msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n"
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
 
-#: apt-private/private-install.cc:200
+#: apt-private/private-output.cc:455
 #, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca."
+msgid "but %s is installed"
+msgstr "ale %s jest zainstalowany"
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Wystąpiły problemy, a użyto -y bez --force-yes"
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ale %s ma zostać zainstalowany"
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Nakazano wykonywać tylko trywialne operacje, a ta do nich nie należy."
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ale nie da się go zainstalować"
 
-# Bezpieczniej jest nie używać tu polskich znaków.
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Tak, jestem pewien!"
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ale jest pakietem wirtualnym"
 
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Zaraz stanie się coś potencjalnie szkodliwego.\n"
-"Aby kontynuować proszę napisać zdanie \"%s\"\n"
-" ?] "
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ale nie jest zainstalowany"
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Przerwane."
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "ale nie zostanie zainstalowany"
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Kontynuować?"
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " lub"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Nie udało się pobrać niektórych plików"
+#: 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-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Nie udało się pobrać niektórych archiwów, proszę spróbować uruchomić apt-get "
-"update lub użyć opcji --fix-missing."
+#: 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-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing i zamiana nośników nie są obecnie obsługiwane"
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Następujące pakiety zostaną USUNIĘTE:"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Nie udało się poprawić brakujących pakietów."
+#: 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-install.cc:330
-msgid "Aborting install."
-msgstr "Przerywanie instalacji"
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Następujące pakiety zostaną zaktualizowane:"
 
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"Następujący pakiet zniknął z tego systemu, ponieważ wszystkie jego pliki "
-"zostały nadpisane przez inne pakiety:"
-msgstr[1] ""
-"Następujące pakiety zniknęły z tego systemu, ponieważ wszystkie ich pliki "
-"zostały nadpisane przez inne pakiety:"
-msgstr[2] ""
-"Następujące pakiety zniknęły z tego systemu, ponieważ wszystkie ich pliki "
-"zostały nadpisane przez inne pakiety:"
+#: 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-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Uwaga: dpkg wykonał to automatycznie i celowo."
+#: 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-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony"
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (z powodu %s) "
 
-#: apt-private/private-install.cc:499
+#: apt-private/private-output.cc:696
 msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
-"Wygląda na to, że AutoRemover coś uszkodził, a to naprawdę nie\n"
-"powinno się zdarzyć. Prosimy o zgłoszenie błędu w pakiecie apt."
+"UWAGA: Zostaną usunięte następujące istotne pakiety.\n"
+"NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:"
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
 
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Błąd wewnętrzny spowodowany przez AutoRemover"
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu ponownie instalowanych, "
 
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
+#: 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!"
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone."
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Błąd wewnętrzny, sortowanie niezakończone"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Wystąpił dziwny błąd - rozmiary się nie zgadzają. Proszę to zgłosić pod "
+"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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Konieczne pobranie %sB/%sB archiwów.\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:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Konieczne pobranie %sB archiwów.\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:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n"
+
+#. 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 "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Wystąpiły problemy, a użyto -y bez --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 "Nakazano wykonywać tylko trywialne operacje, a ta do nich nie należy."
+
+# Bezpieczniej jest nie używać tu polskich znaków.
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Tak, jestem pewien!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Zaraz stanie się coś potencjalnie szkodliwego.\n"
+"Aby kontynuować proszę napisać zdanie \"%s\"\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Przerwane."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Kontynuować?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Nie udało się pobrać niektórych plików"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Nie udało się pobrać niektórych archiwów, proszę spróbować uruchomić apt-get "
+"update lub użyć opcji --fix-missing."
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing i zamiana nośników nie są obecnie obsługiwane"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Nie udało się poprawić brakujących pakietów."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Przerywanie instalacji"
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"Następujący pakiet zniknął z tego systemu, ponieważ wszystkie jego pliki "
+"zostały nadpisane przez inne pakiety:"
+msgstr[1] ""
+"Następujące pakiety zniknęły z tego systemu, ponieważ wszystkie ich pliki "
+"zostały nadpisane przez inne pakiety:"
+msgstr[2] ""
+"Następujące pakiety zniknęły z tego systemu, ponieważ wszystkie ich pliki "
+"zostały nadpisane przez inne pakiety:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Uwaga: dpkg wykonał to automatycznie i celowo."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony"
+
+#: 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 ""
+"Wygląda na to, że AutoRemover coś uszkodził, a to naprawdę nie\n"
+"powinno się zdarzyć. Prosimy o zgłoszenie błędu w pakiecie apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Błąd wewnętrzny spowodowany przez AutoRemover"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1341,7 +1586,7 @@ msgstr[2] ""
 "Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej "
 "wymagane:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:492
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1356,19 +1601,19 @@ msgstr[2] ""
 "%lu pakietów zostało zainstalowanych automatycznie i nie są już więcej "
 "wymagane.\n"
 
-#: apt-private/private-install.cc:519
+#: apt-private/private-install.cc:494
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Aby go usunąć należy użyć \"apt-get autoremove\"."
 msgstr[1] "Aby je usunąć należy użyć \"apt-get autoremove\"."
 msgstr[2] "Aby je usunąć należy użyć \"apt-get autoremove\"."
 
-#: apt-private/private-install.cc:612
+#: apt-private/private-install.cc:587
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Należy uruchomić \"apt-get -f install\", aby naprawić poniższe problemy:"
 
-#: apt-private/private-install.cc:614
+#: apt-private/private-install.cc:589
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1376,7 +1621,7 @@ msgstr ""
 "Niespełnione zależności. Proszę spróbować wykonać \"apt-get -f install\" bez "
 "pakietów (lub podać rozwiązanie)."
 
-#: apt-private/private-install.cc:638
+#: apt-private/private-install.cc:612
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1388,336 +1633,105 @@ msgstr ""
 "w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n"
 "z katalogu Incoming (\"Przychodzące\")."
 
-#: apt-private/private-install.cc:659
+#: apt-private/private-install.cc:633
 msgid "Broken packages"
 msgstr "Pakiety są uszkodzone"
 
-#: apt-private/private-install.cc:712
+#: apt-private/private-install.cc:710
 msgid "The following extra packages will be installed:"
 msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:"
 
-#: apt-private/private-install.cc:802
+#: apt-private/private-install.cc:800
 msgid "Suggested packages:"
 msgstr "Sugerowane pakiety:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:801
 msgid "Recommended packages:"
 msgstr "Polecane pakiety:"
 
-#: apt-private/private-install.cc:825
+#: apt-private/private-install.cc:823
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Pomijanie %s, jest już zainstalowane, a nie została wybrana aktualizacja.\n"
 
-#: apt-private/private-install.cc:829
+#: apt-private/private-install.cc:827
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Pomijanie %s, nie jest zainstalowane, a wybrano wyłącznie aktualizacje.\n"
 
-#: apt-private/private-install.cc:841
+#: apt-private/private-install.cc:839
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "Ponowna instalacja pakietu %s nie jest możliwa, nie może on zostać pobrany.\n"
 
-#: apt-private/private-install.cc:846
+#: apt-private/private-install.cc:844
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s jest już w najnowszej wersji.\n"
 
-#: apt-private/private-install.cc:894
+#: apt-private/private-install.cc:892
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Wybrano wersję \"%s\" (%s) pakietu \"%s\"\n"
 
-#: apt-private/private-install.cc:899
+#: apt-private/private-install.cc:897
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Wybrano wersję \"%s\" (%s) pakietu \"%s\", z powodu \"%s\"\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
+#: apt-private/private-install.cc:939
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "Pakiet %s nie jest zainstalowany, więc nie zostanie usunięty. Czy chodziło o "
 "\"%s\"?\n"
 
-#: apt-private/private-install.cc:947
+#: apt-private/private-install.cc:945
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Pakiet \"%s\" nie jest zainstalowany, więc nie zostanie usunięty\n"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
 msgstr ""
 
-#: apt-private/private-list.cc:159
-#, 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-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!"
 
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Naprawianie zależności..."
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "Zignorowano ostrzeżenie uwierzytelniania.\n"
 
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " nie udało się."
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Niektóre pakiety nie mogły zostać zweryfikowane"
 
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nie udało się naprawić zależności"
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Zainstalować te pakiety bez weryfikacji?"
 
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nie udało się zminimalizować zbioru aktualizacji"
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Nie udało się pobrać %s  %s\n"
 
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Gotowe"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
+#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
 #, 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Zignorowano ostrzeżenie uwierzytelniania.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Niektóre pakiety nie mogły zostać zweryfikowane"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Zainstalować te pakiety bez weryfikacji?"
+msgid "Couldn't determine free space in %s"
+msgstr "Nie udało się ustalić ilości wolnego miejsca w %s"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:188
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Nie udało się pobrać %s  %s\n"
+msgid "You don't have enough free space in %s."
+msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca."
 
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
@@ -1733,44 +1747,36 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Obliczanie aktualizacji"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Gotowe"
-
 # Ujednolicono z aptitude
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Stary "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Pobieranie:"
 
 # Wyrównane do Hit i Err.
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ign.  "
 
 # Wyrównane do Hit i Ign.
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Błąd  "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Pobrano %sB w %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Pracuje]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1783,18 +1789,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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,205 +1877,456 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Łączenie informacji o dostępnych pakietach"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode wywołane na wciąż podłączonym węźle"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Użycie: apt-extracttemplates plik1 [plik2 ...]\n"
+"\n"
+"apt-extracttemplates to narzędzie służące do pobierania informacji\n"
+"i konfiguracji i szablonach z pakietów Debiana.\n"
+"\n"
+"Opcje:\n"
+"  -h   Ten tekst pomocy.\n"
+"  -t   Ustawia katalog tymczasowy\n"
+"  -c=? Czyta wskazany plik konfiguracyjny.\n"
+"  -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Nie udało się odnaleźć elementu tablicy haszującej!"
+#: 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"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Nie udało się utworzyć ominięcia"
+#: 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"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Błąd wewnętrzny w AddDiversion"
+#: 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?"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Próba nadpisania ominięcia, %s -> %s i %s/%s"
+#: 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"
 
-#: apt-inst/filelist.cc:506
+#: 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 "Double add of diversion %s -> %s"
-msgstr "Podwójne dodanie ominięcia %s -> %s"
+msgid "Error processing directory %s"
+msgstr "Błąd przetwarzania katalogu %s"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Zduplikowany plik konfiguracyjny %s/%s"
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Lista rozszerzeń źródeł jest zbyt długa"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: 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:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "Ścieżka %s jest zbyt długa"
+msgid "Error processing contents %s"
+msgstr "Błąd podczas przetwarzania zawartości %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Użycie: apt-ftparchive [opcje] polecenie\n"
+"Polecenia: packages ścieżka_do_binariów [plik_override [przedrostek]]\n"
+"           sources ścieżka_do_źródeł [plik_override [przedrostek]]\n"
+"           contents ścieżka\n"
+"           release ścieżka\n"
+"           generate konfiguracja [grupy]\n"
+"           clean konfiguracja\n"
+"\n"
+"apt-ftparchive generuje pliki indeksów dla archiwów Debiana. Obsługuje\n"
+"różne rodzaje generowania, od w pełni zautomatyzowanych po funkcjonalne\n"
+"zamienniki programów dpkg-scanpackages i dpkg-scansources.\n"
+"\n"
+"apt-ftparchive generuje pliki Package na postawie drzewa plików .deb.\n"
+"Wygenerowany plik zawiera pola kontrolne wszystkich pakietów oraz ich\n"
+"skróty MD5 i rozmiary. Obsługiwany jest plik override, pozwalający wymusić\n"
+"priorytet i dział pakietu.\n"
+"\n"
+"apt-ftparchive podobnie generuje pliki Sources na podstawie drzewa plików\n"
+".dsc. Przy pomocy opcji --source-override można podać plik override dla\n"
+"źródeł.\n"
+"\n"
+"Polecenia \"packages\" i \"sources\" powinny być wykonywane w katalogu "
+"głównym\n"
+"drzewa. \"ścieżka_do_binariów\" powinna wskazywać na katalog, od którego "
+"zacznie\n"
+"się wyszukiwanie, a plik override powinien zawierać odpowiednie flagi.\n"
+"Przedrostek (o ile został podany) jest dodawany przed ścieżką do każdego\n"
+"pliku. Przykładowe użycie, z archiwum Debiana:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opcje:\n"
+"  -h    Ten tekst pomocy\n"
+"  --md5 Generuje sumy kontrolne MD5\n"
+"  -s=?  Plik override dla źródeł\n"
+"  -q    \"Ciche\" działanie\n"
+"  -d=?  Opcjonalna podręczna baza danych\n"
+"  --no-delink Włącza tryb diagnostyczny odłączania\n"
+"  --contents  Generuje plik zawartości (Contents)\n"
+"  -c=?  Czyta wskazany plik konfiguracyjny\n"
+"  -o=?  Ustawia dowolną opcję konfiguracji"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Nie dopasowano żadnej nazwy"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Wypakowanie %s więcej niż raz"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Brakuje pewnych plików w grupie plików pakietów \"%s\""
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Ominięcie katalogu %s"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Baza była uszkodzona, plik został przeniesiony do %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Pakiet próbuje pisać do celu ominięcia %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Baza jest przestarzała, próbuję zaktualizować %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Zbyt długa ścieżka ominięcia"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Niepoprawny format bazy. Jeśli zaktualizowano ze starszej wersji apt, proszę "
+"usunąć i utworzyć ponownie bazę danych."
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nie udało się otworzyć pliku bazy %s: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Nie udało się wykonać operacji stat na %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Nie udało się odczytać dowiązania %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Archiwum nie posiada rekordu kontrolnego"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Nie udało się pobrać kursora"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Nie udało się zmienić nazwy %s na %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Nie udało się odczytać katalogu %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Katalog %s został zastąpiony obiektem nie będącym katalogiem"
+msgid "W: Unable to stat %s\n"
+msgstr "W: Nie można wykonać operacji stat na %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Nie udało się znaleźć węzła w jego kubełku haszującym"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Ścieżka jest zbyt długa"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "W: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: Błędy odnoszą się do pliku "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Nadpisujący pakiet nie pasuje z wersją %s"
+msgid "Failed to resolve %s"
+msgstr "Nie udało się przetłumaczyć nazwy %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Przejście po drzewie nie powiodło się"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Plik %s/%s nadpisuje plik w pakiecie %s"
+msgid "Failed to open %s"
+msgstr "Nie udało się otworzyć %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Nie można wykonać operacji stat na %s"
+msgid " DeLink %s [%s]\n"
+msgstr " Odłączenie %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Nie udało się zapisać pliku %s"
+msgid "Failed to readlink %s"
+msgstr "Nie udało się odczytać dowiązania %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Nie udało się zamknąć pliku %s"
+msgid "Failed to unlink %s"
+msgstr "Nie udało się usunąć %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "To nie jest poprawne archiwum DEB, brakuje składnika \"%s\""
+msgid "*** Failed to link %s to %s"
+msgstr "*** Nie udało się dowiązać %s do %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Błąd wewnętrzny, nie udało się odnaleźć składnika %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Osiągnięto ograniczenie odłączania %sB.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Plik kontrolny nie może zostać poprawnie zinterpretowany"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Archiwum nie posiadało pola pakietu"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Nieprawidłowy podpis archiwum"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Błąd przy czytaniu nagłówka składnika archiwum"
+#: 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: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: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"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Nie udało się zaalokować pamięci"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Nie można otworzyć %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Nieprawidłowa linia %llu #1 pliku override %s"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Nie udało się czytać pliku override %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Nieprawidłowa linia %2$llu #1 pliku override %1$s"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Nieprawidłowa linia %2$llu #2 pliku override %1$s"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Nieprawidłowa linia %2$llu #3 pliku override %1$s"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Nieznany algorytm kompresji \"%s\""
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Skompresowany plik wynikowy %s wymaga podania kompresji"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Nie udało się utworzyć obiektu FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Nie udało się utworzyć procesu potomnego"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Potomny proces kompresujący"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/multicompress.cc:232
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "Nieprawidłowy nagłówek składnika archiwum: %s"
-
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Nieprawidłowy nagłówek składnika archiwum"
+msgid "Internal error, failed to create %s"
+msgstr "Błąd wewnętrzny, nie udało się utworzyć %s"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Archiwum jest za krótkie"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Zawiodła operacja IO na pliku/podprocesie"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Nie udało się odczytać nagłówków archiwum"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Nie udało się utworzyć potoków"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problem przy usuwaniu %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Nie udało się uruchomić programu gzip "
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Nie udało się zmienić nazwy %s na %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Uszkodzone archiwum"
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Użycie: apt-internal-solver\n"
+"\n"
+"apt-internal-solver jest interfejsem do używania bieżącego, wewnętrznego\n"
+"mechanizmu rozwiązywania zależności - w sposób podobny jak zewnętrznego\n"
+"mechanizmu rodziny APT - do celów debugowania itp.\n"
+"\n"
+"Opcje:\n"
+"  -h   Ten tekst pomocy.\n"
+"  -q   Zapisywalne wyjście - brak wskaźnika postępu\n"
+"  -c=? Czyta wskazany plik konfiguracyjny\n"
+"  -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Nieznane informacje o pakiecie!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Nieznany typ nagłówka TAR %u, składnik %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Użycie: apt-sortpkgs [opcje] plik1 [plik2 ...]\n"
+"\n"
+"apt-sortpkgs to proste narzędzie służące do sortowania plików pakietów.\n"
+"Opcji -s używa się do wskazania typu pliku.\n"
+"\n"
+"Opcje:\n"
+"  -h   Ten tekst pomocy.\n"
+"  -s   Sortowanie pliku źródeł.\n"
+"  -c=? Czyta wskazany plik konfiguracyjny.\n"
+"  -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "Uruchamianie dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "System pakietów \"%s\" nie jest obsługiwany"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Nie udało się określić odpowiedniego typu systemu pakietów"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapisano %i rekordów.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Zapisano %i rekordów z %i brakującymi plikami.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n"
@@ -2084,6 +2341,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."
@@ -2096,157 +2373,335 @@ 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:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Pusty magazyn podręczny pakietów"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Wymaga"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Wymaga wstępnie"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Sugeruje"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Poleca"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "W konflikcie z"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Zastępuje"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Dezaktualizuje"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Narusza zależności"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Rozszerza"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "ważny"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "wymagany"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "standardowy"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "opcjonalny"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "dodatkowy"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Obliczanie aktualizacji"
+
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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/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/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/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nie udało się wykonać operacji stat na pliku %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:1196
+#, 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: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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Zbieranie zapewnień plików"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Budowanie drzewa zależności"
+#: 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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandydujące wersje"
+#: 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/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generowanie 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/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Odczyt informacji o stanie"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Przygotowywanie na otrzymanie rozwiązania"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nie udało się otworzyć pliku stanu %s"
+#: 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/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Błędna suma kontrolna"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Błędny rozmiar"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Nieprawidłowa operacja %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Błąd zapisu"
+
+#: 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:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Podczas weryfikacji podpisu wystąpił błąd. Nie zaktualizowano repozytorium i "
+"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:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Błąd GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Ominięcie katalogu %s"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2255,16 +2710,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:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2273,27 +2728,19 @@ msgstr ""
 "Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego "
 "repozytorium nie będą wykonywane."
 
-#: apt-pkg/acquire-item.cc:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Podczas weryfikacji podpisu wystąpił błąd. Nie zaktualizowano repozytorium i "
-"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:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Błąd GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2302,132 +2749,50 @@ 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:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany"
-
-#: 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/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Wystąpił błąd podczas przetwarzania %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Czytanie list pakietów"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Zbieranie zapewnień plików"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nie udało się pisać do %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: 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:902
+#: 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:904
+#: 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: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"
@@ -2455,7 +2820,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2465,12 +2830,12 @@ msgstr ""
 "5 apt.conf\" i zapoznać się z wpisem APT::Immediate-Configure aby dowiedzieć "
 "się więcej. (%d)"
 
-#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2482,10 +2847,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"
@@ -2556,11 +2924,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"
 
@@ -2572,7 +2940,7 @@ msgstr ""
 "Pakiet %s ma zostać ponownie zainstalowany, ale nie można znaleźć jego "
 "archiwum."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2580,271 +2948,198 @@ msgstr ""
 "Błąd, pkgProblemResolver::Resolve zwrócił błąd, może to być spowodowane "
 "zatrzymanymi pakietami."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Przygotowywanie na otrzymanie rozwiązania"
-
-#: apt-pkg/edsp.cc:327
-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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Nie udało się zanalizować pliku pakietu %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nie udało się przeanalizować pliku Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Brak sekcji w pliku Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Brak wpisu Hash w pliku Release %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Budowanie drzewa 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:139
+msgid "Candidate versions"
+msgstr "Kandydujące wersje"
 
-#: 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/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generowanie zależności"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Otwieranie %s"
+#: 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:371
+#: apt-pkg/depcache.cc:252
 #, 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 open StateFile %s"
+msgstr "Nie udało się otworzyć pliku stanu %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\" jest nieznany w linii %u listy źródeł %s"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie udało się zapisać tymczasowego pliku stanu %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/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "Nie udało się zanalizować pliku pakietu %s (%d)"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona"
 
-#: apt-pkg/cacheset.cc:603
+#: 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:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", "
-"ponieważ nie ma żadnej z nich"
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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 ""
+"Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", "
+"ponieważ nie ma żadnej z nich"
+
+#: 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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Brak wpisu Hash w pliku Release %s"
+
+#: apt-pkg/indexrecords.cc:145
+#, 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:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nieprawidłowy wpis Date w pliku Release %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Nie odnaleziono wyboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie użyta blokada"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nie udało się otworzyć pliku blokady %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie użyta blokada"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nie udało się uzyskać blokady %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 "Lista plików nie może zostać stworzona, ponieważ \"%s\" nie jest katalogiem"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Ignorowanie \"%s\" w katalogu \"%s\", ponieważ nie jest to zwykły plik"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ nie ma on rozszerzenia "
 "pliku"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2852,75 +3147,75 @@ msgstr ""
 "Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ ma on nieprawidłowe "
 "rozszerzenie pliku"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Podproces %s spowodował naruszenie ochrony pamięci."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Podproces %s otrzymał sygnał %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Podproces %s zwrócił kod błędu (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Podproces %s zakończył się niespodziewanie"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problem przy zamykaniu pliku gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nie udało się otworzyć pliku %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nie udało się otworzyć deskryptora pliku %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Nie udało się utworzyć IPC z podprocesem"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Nie udało się uruchomić kompresora "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "należało przeczytać jeszcze %llu, ale nic nie zostało"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "należało zapisać jeszcze %llu, ale nie udało się to"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem przy zamykaniu pliku %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem przy zapisywaniu pliku %s w %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem przy odlinkowywaniu pliku %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Problem przy zapisywaniu pliku na dysk"
 
@@ -3009,111 +3304,105 @@ 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:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Nierozpoznany skrót typu: \"%c\""
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Otwieranie pliku konfiguracyjnego %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Brak zainstalowanej bazy kluczy w %s."
-
-#: 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"
@@ -3123,12 +3412,12 @@ msgstr "Nieprawidłowa operacja %s"
 msgid "Installing %s"
 msgstr "Instalowanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Usuwanie %s"
@@ -3149,79 +3438,79 @@ msgid "Running post-installation trigger %s"
 msgstr "Uruchamianie wyzwalacza post-installation %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Brakuje katalogu \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Przygotowywanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozpakowywanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Przygotowywanie do konfiguracji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "Pakiet %s został zainstalowany"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "Pakiet %s został usunięty"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: 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:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3229,7 +3518,7 @@ msgstr ""
 "Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że "
 "przyczyna niepowodzenia leży w poprzednim błędzie."
 
-#: apt-pkg/deb/dpkgpm.cc:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3237,7 +3526,7 @@ msgstr ""
 "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
 "przepełnienie dysku"
 
-#: apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3245,7 +3534,7 @@ msgstr ""
 "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
 "braku wolnej pamięci"
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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 "
@@ -3254,7 +3543,7 @@ msgstr ""
 "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
 "przepełnienie dysku"
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3273,422 +3562,189 @@ msgstr ""
 # 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"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Użycie: apt-extracttemplates plik1 [plik2 ...]\n"
-"\n"
-"apt-extracttemplates to narzędzie służące do pobierania informacji\n"
-"i konfiguracji i szablonach z pakietów Debiana.\n"
-"\n"
-"Opcje:\n"
-"  -h   Ten tekst pomocy.\n"
-"  -t   Ustawia katalog tymczasowy\n"
-"  -c=? Czyta wskazany plik konfiguracyjny.\n"
-"  -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Nie można wykonać operacji stat na %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Błąd przetwarzania katalogu %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Lista rozszerzeń źródeł jest zbyt długa"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Błąd przy zapisywaniu nagłówka do pliku zawartości"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Błąd podczas przetwarzania zawartości %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Użycie: apt-ftparchive [opcje] polecenie\n"
-"Polecenia: packages ścieżka_do_binariów [plik_override [przedrostek]]\n"
-"           sources ścieżka_do_źródeł [plik_override [przedrostek]]\n"
-"           contents ścieżka\n"
-"           release ścieżka\n"
-"           generate konfiguracja [grupy]\n"
-"           clean konfiguracja\n"
-"\n"
-"apt-ftparchive generuje pliki indeksów dla archiwów Debiana. Obsługuje\n"
-"różne rodzaje generowania, od w pełni zautomatyzowanych po funkcjonalne\n"
-"zamienniki programów dpkg-scanpackages i dpkg-scansources.\n"
-"\n"
-"apt-ftparchive generuje pliki Package na postawie drzewa plików .deb.\n"
-"Wygenerowany plik zawiera pola kontrolne wszystkich pakietów oraz ich\n"
-"skróty MD5 i rozmiary. Obsługiwany jest plik override, pozwalający wymusić\n"
-"priorytet i dział pakietu.\n"
-"\n"
-"apt-ftparchive podobnie generuje pliki Sources na podstawie drzewa plików\n"
-".dsc. Przy pomocy opcji --source-override można podać plik override dla\n"
-"źródeł.\n"
-"\n"
-"Polecenia \"packages\" i \"sources\" powinny być wykonywane w katalogu "
-"głównym\n"
-"drzewa. \"ścieżka_do_binariów\" powinna wskazywać na katalog, od którego "
-"zacznie\n"
-"się wyszukiwanie, a plik override powinien zawierać odpowiednie flagi.\n"
-"Przedrostek (o ile został podany) jest dodawany przed ścieżką do każdego\n"
-"pliku. Przykładowe użycie, z archiwum Debiana:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opcje:\n"
-"  -h    Ten tekst pomocy\n"
-"  --md5 Generuje sumy kontrolne MD5\n"
-"  -s=?  Plik override dla źródeł\n"
-"  -q    \"Ciche\" działanie\n"
-"  -d=?  Opcjonalna podręczna baza danych\n"
-"  --no-delink Włącza tryb diagnostyczny odłączania\n"
-"  --contents  Generuje plik zawartości (Contents)\n"
-"  -c=?  Czyta wskazany plik konfiguracyjny\n"
-"  -o=?  Ustawia dowolną opcję konfiguracji"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Nie dopasowano żadnej nazwy"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, 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\""
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Baza była uszkodzona, plik został przeniesiony do %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Baza jest przestarzała, próbuję zaktualizować %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Niepoprawny format bazy. Jeśli zaktualizowano ze starszej wersji apt, proszę "
-"usunąć i utworzyć ponownie bazę danych."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nie udało się otworzyć pliku bazy %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Nie udało się odczytać dowiązania %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Archiwum nie posiada rekordu kontrolnego"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Nie udało się pobrać kursora"
-
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Nie udało się odczytać katalogu %s\n"
+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?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Nie można wykonać operacji stat na %s\n"
+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."
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Niezablokowany"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "W: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode wywołane na wciąż podłączonym węźle"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: Błędy odnoszą się do pliku "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Nie udało się odnaleźć elementu tablicy haszującej!"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Nie udało się przetłumaczyć nazwy %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Nie udało się utworzyć ominięcia"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Przejście po drzewie nie powiodło się"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Błąd wewnętrzny w AddDiversion"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "Nie udało się otworzyć %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Próba nadpisania ominięcia, %s -> %s i %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Odłączenie %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Podwójne dodanie ominięcia %s -> %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Nie udało się odczytać dowiązania %s"
+msgid "Duplicate conf file %s/%s"
+msgstr "Zduplikowany plik konfiguracyjny %s/%s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Nie udało się usunąć %s"
+msgid "The path %s is too long"
+msgstr "Ścieżka %s jest zbyt długa"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Nie udało się dowiązać %s do %s"
+msgid "Unpacking %s more than once"
+msgstr "Wypakowanie %s więcej niż raz"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Osiągnięto ograniczenie odłączania %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Archiwum nie posiadało pola pakietu"
+msgid "The directory %s is diverted"
+msgstr "Ominięcie katalogu %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nie posiada wpisu w pliku override\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Pakiet próbuje pisać do celu ominięcia %s/%s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  opiekunem %s jest %s, a nie %s\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Zbyt długa ścieżka ominięcia"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nie posiada wpisu w pliku override źródeł\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Katalog %s został zastąpiony obiektem nie będącym katalogiem"
 
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s nie posiada również wpisu w pliku override binariów\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Nie udało się znaleźć węzła w jego kubełku haszującym"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Nie udało się zaalokować pamięci"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Ścieżka jest zbyt długa"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "Nie można otworzyć %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Nieprawidłowa linia %llu #1 pliku override %s"
+msgid "Overwrite package match with no version for %s"
+msgstr "Nadpisujący pakiet nie pasuje z wersją %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Nie udało się czytać pliku override %s"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Plik %s/%s nadpisuje plik w pakiecie %s"
 
-#: ftparchive/override.cc:166
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Nieprawidłowa linia %2$llu #1 pliku override %1$s"
+msgid "Unable to stat %s"
+msgstr "Nie można wykonać operacji stat na %s"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Nieprawidłowa linia %2$llu #2 pliku override %1$s"
+msgid "Failed to write file %s"
+msgstr "Nie udało się zapisać pliku %s"
 
-#: ftparchive/override.cc:191
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Nieprawidłowa linia %2$llu #3 pliku override %1$s"
+msgid "Failed to close file %s"
+msgstr "Nie udało się zamknąć pliku %s"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Nieznany algorytm kompresji \"%s\""
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "To nie jest poprawne archiwum DEB, brakuje składnika \"%s\""
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Skompresowany plik wynikowy %s wymaga podania kompresji"
+msgid "Internal error, could not locate member %s"
+msgstr "Błąd wewnętrzny, nie udało się odnaleźć składnika %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Nie udało się utworzyć obiektu FILE*"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Plik kontrolny nie może zostać poprawnie zinterpretowany"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Nie udało się utworzyć procesu potomnego"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Nieprawidłowy podpis archiwum"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Potomny proces kompresujący"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Błąd przy czytaniu nagłówka składnika archiwum"
 
-#: ftparchive/multicompress.cc:232
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Błąd wewnętrzny, nie udało się utworzyć %s"
+msgid "Invalid archive member header %s"
+msgstr "Nieprawidłowy nagłówek składnika archiwum: %s"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Zawiodła operacja IO na pliku/podprocesie"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Nieprawidłowy nagłówek składnika archiwum"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Archiwum jest za krótkie"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Nie udało się odczytać nagłówków archiwum"
+
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Nie udało się utworzyć potoków"
+
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Nie udało się uruchomić programu gzip "
+
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Uszkodzone archiwum"
+
+#: 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:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem przy usuwaniu %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Nieznany typ nagłówka TAR %u, składnik %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Użycie: apt-internal-solver\n"
-"\n"
-"apt-internal-solver jest interfejsem do używania bieżącego, wewnętrznego\n"
-"mechanizmu rozwiązywania zależności - w sposób podobny jak zewnętrznego\n"
-"mechanizmu rodziny APT - do celów debugowania itp.\n"
-"\n"
-"Opcje:\n"
-"  -h   Ten tekst pomocy.\n"
-"  -q   Zapisywalne wyjście - brak wskaźnika postępu\n"
-"  -c=? Czyta wskazany plik konfiguracyjny\n"
-"  -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Sumaryczny rozmiar obszaru zależności od wersji: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Nieznane informacje o pakiecie!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "W %s nie ma wystarczającej ilości wolnego miejsca"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Użycie: apt-sortpkgs [opcje] plik1 [plik2 ...]\n"
-"\n"
-"apt-sortpkgs to proste narzędzie służące do sortowania plików pakietów.\n"
-"Opcji -s używa się do wskazania typu pliku.\n"
-"\n"
-"Opcje:\n"
-"  -h   Ten tekst pomocy.\n"
-"  -s   Sortowanie pliku źródeł.\n"
-"  -c=? Czyta wskazany plik konfiguracyjny.\n"
-"  -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Gotowe"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Brak zainstalowanej bazy kluczy w %s."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
@@ -3780,9 +3836,6 @@ msgstr ""
 #~ "Nie można zapisać dziennika, openpty() nie powiodło się (/dev/pts nie "
 #~ "jest zamontowane?)\n"
 
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Plik %s nie zaczyna się wiadomością podpisaną w trybie clearsign"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Pomijanie nieistniejącego pliku %s"
 
diff --git a/po/pt.po b/po/pt.po
index e35b146e9..a4b1105f8 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: 2015-01-16 04:37-0500\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,151 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Total de nomes de pacotes: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Total de estruturas de pacotes: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Pacotes normais: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Pacotes virtuais puros: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Pacotes virtuais únicos: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Pacotes virtuais misturados: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Faltam: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Total de versões distintas: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Total de descrições distintas: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Total de dependências: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Total de relações ver/ficheiro: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Total de relações Desc/Ficheiro: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Total de Mapeamentos 'Provides': "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Total de strings globbed: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Espaço total de dependência de versão: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Espaço total desperdiçado: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Espaço total contabilizado: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: 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:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Ficheiros de Pacotes :"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Pacotes Marcados:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(não encontrado)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Marcação do Pacote: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Tabela de Versão:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -238,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"
@@ -260,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."
 
@@ -297,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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: 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:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossível encontrar o pacote %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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,24 +342,24 @@ msgstr ""
 "Este comando foi depreceado. Em vez disso, por favor utilize 'apt-mark auto' "
 "e 'apt-mark manual'."
 
-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: 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:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -373,7 +369,7 @@ msgstr ""
 "'%s' em:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -384,81 +380,70 @@ msgstr ""
 "bzr branch %s\n"
 "para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n"
 
-#: cmdline/apt-get.cc:839
+#: 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"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Não foi possível determinar o espaço livre em %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Você não possui espaço livre suficiente em %s"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter código fonte %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Falhou obter alguns arquivos."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: 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:968
+#: 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:996
+#: 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:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "O processo filho falhou"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -467,18 +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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -521,30 +516,30 @@ 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:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Falhou processar as dependências de compilação"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changlog para %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Módulos Suportados:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -661,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -807,12 +802,12 @@ msgstr "Disco não encontrado."
 msgid "File not found"
 msgstr "Ficheiro não encontrado"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Falhou o stat"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Falhou definir hora de modificação"
 
@@ -821,34 +816,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI inválido, URIs locais não devem começar por //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "A identificar-se no sistema"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Não foi possível determinar o nome do posto"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Não foi possível determinar o nome local"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "O servidor recusou a ligação e respondeu: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER falhou, o servidor respondeu: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS falhou, o servidor respondeu: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -856,123 +851,123 @@ msgstr ""
 "Foi especificado um servidor de proxy mas não um script de login, Acquire::"
 "ftp::ProxyLogin está vazio."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "O comando de script de login '%s' falhou, o servidor respondeu: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE falhou, o servidor respondeu: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Foi atingido o tempo limite de ligação"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "O servidor fechou a ligação"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Erro de leitura"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Uma resposta sobrecarregou o buffer."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Corrupção de protocolo"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Erro de escrita"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Não foi possível criar um socket"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Não foi possível ligar socket de dados, a ligação expirou"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Falhou"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Não foi possível ligar socket passivo."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo não foi capaz de obter um socket de escuta"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Não foi possível fazer o bind a um socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Não foi possível executar listen no socket"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Não foi possível determinar o nome do socket"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Não foi possível enviar o comando PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Família de endereços %u desconhecida (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT falhou, o servidor respondeu: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Ligação de socket de dados expirou"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar ligação"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Não foi possível obter o ficheiro, o servidor respondeu '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Expirou o tempo do socket de dados"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "A transferência de dados falhou, o servidor respondeu '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Pesquisa"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Não foi possível invocar "
 
@@ -1038,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:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Pelo menos uma assinatura inválida foi encontrada."
 
-#: methods/gpgv.cc:174
+#: 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?)"
+"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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Erro desconhecido ao executar apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1079,35 +1074,35 @@ msgstr ""
 "As seguintes assinaturas não puderam ser verificadas porque a chave pública "
 "não está disponível:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "Ficheiros vazios não podem ser arquivos válidos"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Erro ao escrever para o ficheiro"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Erro ao escrever para ficheiro"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "A selecção falhou"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "O tempo da ligação expirou"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Erro ao escrever para o ficheiro de saída"
 
@@ -1139,430 +1134,165 @@ msgstr "Este servidor HTTP possui suporte de range errado"
 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Dados de cabeçalho errados"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "A ligação falhou"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
+#: apt-private/private-list.cc:121
+msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
+#: 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-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "A corrigir dependências..."
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Erro Interno, Ordering não terminou"
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " falhou."
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Estranho... Os tamanhos não coincidiram, escreva para apt@packages.debian.org"
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Não foi possível corrigir dependências"
 
-#. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "É necessário obter %sB/%sB de arquivos.\n"
+#: 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"
 
-#. 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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "É necessário obter %sB de arquivos.\n"
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Feito"
 
-#. 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:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
+#: 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 ""
-"Após esta operação, serão utilizados %sB adicionais de espaço em disco.\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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Após esta operação, será libertado %sB de espaço em disco.\n"
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalado]"
 
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Você não possui espaço livre suficiente em %s."
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalado]"
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Há problemas e foi utilizado -y sem --force-yes"
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Trivial Only especificado mas isto não é uma operação trivial."
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalado]"
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Sim, faça como eu digo!"
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalado]"
 
-#: apt-private/private-install.cc:222
+#: apt-private/private-output.cc:277
 #, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
+msgid "[upgradable from: %s]"
 msgstr ""
-"Você está prestes a fazer algo potencialmente nocivo.\n"
-"Para continuar escreva a frase '%s'\n"
-" ?] "
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Abortado."
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Deseja continuar?"
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "mas %s está instalado"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Falhou o download de alguns ficheiros"
+#: 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-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Não foi possível obter alguns arquivos, tente talvez correr apt-get update "
-"ou tente com --fix-missing?"
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "mas não é instalável"
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing e troca de mídia não são suportados actualmente"
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "mas é um pacote virtual"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Não foi possível corrigir os pacotes em falta."
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "mas não está instalado"
 
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "A abortar a instalação."
+#: 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-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"O seguinte pacote desapareceu do seu sistema pois\n"
-"todos os ficheiros foram sobrescritos por outros pacotes:"
-msgstr[1] ""
-"Os seguintes pacotes desapareceram do seu sistema pois\n"
-"todos os ficheiros foram  por outros pacotes:"
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " ou"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Nota: Isto foi feito automaticamente e intencionalmente pelo dpkg."
+#: 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-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover"
+#: 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-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Hmm, parece que o AutoRemover destruiu algo que realmente não deveria ter\n"
-"acontecido. Por favor arquive um relatório de bug contra o apt."
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Serão REMOVIDOS os seguintes pacotes:"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "A seguinte informação pode ajudar a resolver a situação:"
+#: 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-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Erro Interno, o AutoRemover estragou coisas"
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Serão actualizados os seguintes pacotes:"
 
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"O seguinte pacote foi instalado automaticamente e já não é necessário:"
-msgstr[1] ""
-"Os seguintes pacotes foram instalados automaticamente e já não são "
-"necessários:"
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
 
-#: apt-private/private-install.cc:517
-#, c-format
-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] "O pacote %lu foi instalado automaticamente e já não é necessário.\n"
-msgstr[1] ""
-"Os pacotes %lu foram instalados automaticamente e já não são necessários.\n"
+#: 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-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Utilize 'apt-get autoremove' para o remover."
-msgstr[1] "Utilize 'apt-get autoremove' para os remover."
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Você deve querer executar 'apt-get -f install' para corrigir estes:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dependências não satisfeitas. Tente 'apt-get -f install' sem nenhum pacote "
-"(ou especifique uma solução)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Alguns pacotes não puderam ser instalados. Isso pode significar que\n"
-"você solicitou uma situação impossível ou se você está a usar a\n"
-"distribuição unstable em que alguns pacotes pedidos ainda não foram \n"
-"criados ou foram movidos do Incoming."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Pacotes estragados"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Os seguintes pacotes extra serão instalados:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Pacotes sugeridos:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Pacotes recomendados:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Saltando %s, já está instalado e a actualização não está definida.\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Saltando %s, não está instalado e só são pedidas actualizações.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-"A reinstalação de %s não é possível, o download do mesmo não pode ser "
-"feito.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s já está na versão mais recente.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Versão seleccionada '%s' (%s) para '%s'\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Versão seleccionada '%s' (%s) para '%s' devido a '%s'\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
-"O pacote '%s' não está instalado, por isso não será removido. Queria dizer "
-"'%s'?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "O pacote '%s' não está instalado, por isso não será removido\n"
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "A corrigir dependências..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " falhou."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Não foi possível corrigir dependências"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Não foi possível minimizar o conjunto de actualizações"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Feito"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (devido a %s) "
 
 #: apt-private/private-output.cc:696
 msgid ""
@@ -1623,7 +1353,7 @@ msgstr "S"
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: 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"
@@ -1632,7 +1362,7 @@ msgstr "Erro de compilação de regex - %s"
 msgid "The update command takes no arguments"
 msgstr "O comando update não leva argumentos"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1640,10 +1370,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1668,76 +1402,348 @@ msgstr ""
 "\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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Aviso de autenticação ultrapassado.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Alguns pacotes não puderam ser autenticados"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Erro Interno, Ordering não terminou"
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Instalar estes pacotes sem verificação?"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Estranho... Os tamanhos não coincidiram, escreva para apt@packages.debian.org"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#. 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
+#: apt-private/private-install.cc:154
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Falhou obter %s  %s\n"
-
-#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "Falha ao baixar %s  %s\n"
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "É necessário obter %sB/%sB de arquivos.\n"
 
-#: apt-private/private-sources.cc:70
+#. 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:159
 #, c-format
-msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
+msgid "Need to get %sB of archives.\n"
+msgstr "É necessário obter %sB de arquivos.\n"
 
-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
+#. 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:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
+"Após esta operação, serão utilizados %sB adicionais de espaço em disco.\n"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "A calcular a actualização"
+#. 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 "Após esta operação, será libertado %sB de espaço em disco.\n"
 
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Pronto"
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Há problemas e foi utilizado -y sem --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 especificado mas isto não é uma operação 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Sim, faça como eu digo!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Você está prestes a fazer algo potencialmente nocivo.\n"
+"Para continuar escreva a frase '%s'\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Abortado."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Deseja continuar?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Falhou o download de alguns ficheiros"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Não foi possível obter alguns arquivos, tente talvez correr apt-get update "
+"ou tente com --fix-missing?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing e troca de mídia não são suportados actualmente"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Não foi possível corrigir os pacotes em falta."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "A abortar a instalação."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"O seguinte pacote desapareceu do seu sistema pois\n"
+"todos os ficheiros foram sobrescritos por outros pacotes:"
+msgstr[1] ""
+"Os seguintes pacotes desapareceram do seu sistema pois\n"
+"todos os ficheiros foram  por outros pacotes:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Nota: Isto foi feito automaticamente e intencionalmente pelo dpkg."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover"
+
+#: 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 ""
+"Hmm, parece que o AutoRemover destruiu algo que realmente não deveria ter\n"
+"acontecido. Por favor arquive um relatório de bug contra o apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "A seguinte informação pode ajudar a resolver a situação:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Erro Interno, o AutoRemover estragou coisas"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"O seguinte pacote foi instalado automaticamente e já não é necessário:"
+msgstr[1] ""
+"Os seguintes pacotes foram instalados automaticamente e já não são "
+"necessários:"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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] "O pacote %lu foi instalado automaticamente e já não é necessário.\n"
+msgstr[1] ""
+"Os pacotes %lu foram instalados automaticamente e já não são necessários.\n"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "Utilize 'apt-get autoremove' para o remover."
+msgstr[1] "Utilize 'apt-get autoremove' para os remover."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Você deve querer executar 'apt-get -f install' para corrigir estes:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Dependências não satisfeitas. Tente 'apt-get -f install' sem nenhum pacote "
+"(ou especifique uma solução)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Alguns pacotes não puderam ser instalados. Isso pode significar que\n"
+"você solicitou uma situação impossível ou se você está a usar a\n"
+"distribuição unstable em que alguns pacotes pedidos ainda não foram \n"
+"criados ou foram movidos do Incoming."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Pacotes estragados"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Os seguintes pacotes extra serão instalados:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Pacotes sugeridos:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Pacotes recomendados:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Saltando %s, já está instalado e a actualização não está definida.\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Saltando %s, não está instalado e só são pedidas actualizações.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+"A reinstalação de %s não é possível, o download do mesmo não pode ser "
+"feito.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s já está na versão mais recente.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Versão seleccionada '%s' (%s) para '%s'\n"
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Versão seleccionada '%s' (%s) para '%s' devido a '%s'\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+"O pacote '%s' não está instalado, por isso não será removido. Queria dizer "
+"'%s'?\n"
+
+#: apt-private/private-install.cc:945
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "O pacote '%s' não está instalado, por isso não será removido\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "Aviso de autenticação ultrapassado.\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Alguns pacotes não puderam ser autenticados"
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Instalar estes pacotes sem verificação?"
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Falhou obter %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 "Não foi possível determinar o espaço livre em %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Você não possui espaço livre suficiente em %s."
+
+#: apt-private/private-sources.cc:58
+#, fuzzy, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "Falha ao baixar %s  %s\n"
+
+#: apt-private/private-sources.cc:70
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""
+
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Hit "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Obter:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Obtidos %sB em %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [A trabalhar]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1750,18 +1756,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1839,206 +1845,456 @@ msgstr ""
 msgid "Merging available information"
 msgstr "A juntar a informação disponível"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode chamado em nó ainda linkado"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Utilização: apt-extracttemplates ficheiro1 [ficheiro2 ...]\n"
+"\n"
+"O apt-extracttemplates é uma ferramenta para extrair configuração\n"
+"e informação de template de pacotes debian.\n"
+"\n"
+"Opções:\n"
+"  -h   Este texto de ajuda\n"
+"  -t   Definir o directório temporário\n"
+"  -c=? Ler este ficheiro de configuração\n"
+"  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
+"tmp\n"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Falha ao localizar o elemento de hash!"
+#: 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"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Falha ao alocar desvio (diversion)"
+#: 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"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Erro Interno em AddDiversion"
+#: 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?"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "A tentar sobrescrever um desvio, %s -> %s e %s/%s"
+#: 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"
 
-#: apt-inst/filelist.cc:506
+#: 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 "Double add of diversion %s -> %s"
-msgstr "Adição dupla de desvio %s -> %s"
+msgid "Error processing directory %s"
+msgstr "Erro ao processar o directório %s"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Arquivo de configuração duplicado %s/%s"
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Lista de extensão de códigos-fonte é demasiado longa"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: 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:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "O caminho %s é demasiado longo"
+msgid "Error processing contents %s"
+msgstr "Erro ao processar o conteúdo %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Utilização: apt-ftparchive [opções] comando\n"
+"Comandos: packages caminho_binário [ficheiro_override [prefixo_caminho]]\n"
+"          sources caminho_fonte [ficheiro_override [prefixo_caminho]]\n"
+"          contents caminho\n"
+"          release caminho\n"
+"          generate config [grupos]\n"
+"          clean config\n"
+"\n"
+"O apt-ftparchive gera ficheiros de índice para repositórios Debian. Ele \n"
+"suporta muitos estilos de criação, desde totalmente automatizados até \n"
+"substitutos funcionais para o dpkg-scanpackages e dpkg-scansources\n"
+"\n"
+"O apt-ftparchive gera ficheiros Packages a partir de uma árvore de .debs.\n"
+" O ficheiro Package contém o conteúdo de todos os campos de controle de \n"
+"cada pacote bem como o hash MD5 e tamanho do ficheiro. É suportado um \n"
+"ficheiro override para forçar o valor de Priority e Section.\n"
+"\n"
+"Similarmente, o apt-ftparchive gera ficheiros Sources a partir de uma \n"
+"árvore de .dscs. A opção --source-override pode ser utilizada para \n"
+"especificar um ficheiro override de fontes\n"
+"\n"
+"Os comandos 'packages' e 'sources' devem ser executados na raiz da \n"
+"árvore. CaminhoBinário deve apontar para a base de procura recursiva \n"
+"e o ficheiro override deve conter as flags override. CaminhoPrefixo é \n"
+"incluído aos campos filename caso esteja presente. Exemplo de uso do \n"
+"repositório Debian :\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opções:\n"
+"   -h    Este texto de ajuda\n"
+"   --md5 Controlar a criação do MD5\n"
+"   -s=?  Ficheiro override de código-fonte \n"
+"   -q    Silencioso\n"
+"   -d=?  Seleccionar a base de dados de caching opcional\n"
+"   --no-delink Habilitar o modo de debug delinking\n"
+"   --contents  Controlar a criação do ficheiro de conteúdo\n"
+"   -c=?  Ler este ficheiro de configuração\n"
+"   -o=?  Definir uma opção de configuração arbitrária"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Nenhuma selecção coincidiu"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "A descompactar %s mais de uma vez"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Faltam alguns ficheiros no grupo `%s' do ficheiro do pacote"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "O directório %s é desviado"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "A base de dados estava corrompida, ficheiro renomeado para %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "O pacote está a tentar escrever no alvo de desvio %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "A base de dados é antiga, a tentar actualizar %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "O caminho de desvio é muito longo"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"O formato da BD é inválido. Se actualizou a partir de uma versão antiga do "
+"apt, por favor remova-a e crie novamente a base de dados."
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Não foi possível abrir o ficheiro %s da base de dados: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Falha stat %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Falhou o readlink %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "O arquivo não tem registo de controlo"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Não foi possível obter um cursor"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Falhou renomear %s para %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Não foi possível ler o directório %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "O directório %s está a ser substituído por um não-directório"
+msgid "W: Unable to stat %s\n"
+msgstr "W: Não foi possível fazer stat %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Falhou localizar o nó no seu hash bucket"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "O caminho é demasiado longo"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "W: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: Os erros aplicam-se ao ficheiro "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Substituir o pacote correspondente sem versão para %s"
+msgid "Failed to resolve %s"
+msgstr "Falhou resolver %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Falhou ao percorrer a árvore"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "O ficheiro %s/%s substitui o que está no pacote %s"
+msgid "Failed to open %s"
+msgstr "Falhou abrir %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Não foi possível fazer stat %s"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Falhou escrever o ficheiro %s"
+msgid "Failed to readlink %s"
+msgstr "Falhou o readlink %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Falhou fechar o ficheiro %s"
+msgid "Failed to unlink %s"
+msgstr "Falhou o unlink %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Este não é um arquivo DEB válido, falta o membro '%s'"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Falhou ligar %s a %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Erro Interno, não foi possível localizar o membro %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Limite DeLink de %sB atingido.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Ficheiro de controle não interpretável"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Arquivo não possuía campo package"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Assinatura de arquivo inválida"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Erro na leitura de cabeçalho membro de arquivo"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:712
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "Cabeçalho membro de arquivo inválido %s"
+msgid "  %s has no source override entry\n"
+msgstr "  %s não possui fonte de entrada de 'override'\n"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Cabeçalho membro de arquivo inválido"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Arquivo é demasiado pequeno"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Falhou alocar memória"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Não foi possível abrir %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Override %s malformado linha %llu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Falhou ler o ficheiro override %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Override %s malformado linha %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Override %s malformado linha %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Override %s malformado linha %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algoritmo de compressão desconhecido '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Saída compactada %s precisa de um conjunto de compressão"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Falhou criar FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Falhou o fork"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Falha ao ler os cabeçalhos do arquivo"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Compactar filho"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Falhou a criação de pipes"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Erro Interno, falhou criar %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Falhou executar gzip "
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Falhou o IO para subprocesso/arquivo"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Arquivo corrompido"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Falhou ler durante o cálculo de MD5"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "A soma de controlo do tar falhou, arquivo corrompido"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problema ao executar unlinking %s"
 
-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
+msgid "Failed to rename %s to %s"
+msgstr "Falhou renomear %s para %s"
+
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Utilização: apt-internal-solver\n"
+"\n"
+"O apt-internal-solver é um interface para utilizar o actual interno como um\n"
+" resolvedor externo para a família APT para depuração ou semelhante.\n"
+"\n"
+"Opções:\n"
+"  -h  Este texto de ajuda.\n"
+"  -q  Saída para registo - sem indicador de progresso\n"
+"  -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:91
+msgid "Unknown package record!"
+msgstr "Registo de pacote desconhecido!"
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Utilização: apt-sortpkgs [opções] ficheiro1 [ficheiro2 ...]\n"
+"\n"
+"O apt-sortpkgs é uma ferramenta simples para ordenar ficheiros de pacotes.\n"
+"A opção -s é utilizada para indicar que tipo de ficheiro é.\n"
+"\n"
+"Opções:\n"
+"  -h   Este texto de ajuda\n"
+"  -s   Utilizar a ordenação de ficheiros de código-fonte\n"
+"  -c=? Ler este ficheiro de configuração\n"
+"  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
+"tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "A correr o dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Sistema de empacotamento '%s' não é suportado"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 "Não foi possível determinar um tipo de sistema de empacotamento adequado"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Escreveu %i registos.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Escreveu %i registos com %i ficheiros em falta.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2055,6 +2311,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 ""
@@ -2069,158 +2346,340 @@ 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:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Cache de pacotes vazia"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Pré-Depende"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Sugere"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Em Conflito"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Substitui"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Obsoleta"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Estraga"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Aumenta"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "necessário"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "padrão"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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/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:118
+#: 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:169
+#: 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:455
+#: 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/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:1196
+#, 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: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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versões candidatas"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Enviar cenário a resolver"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Geração de dependências"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Enviar pedido para resolvedor"
 
-#: 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/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Preparar para receber solução"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Falhou abrir o StateFile %s"
+#: 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/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falha escrever ficheiro temporário StateFile %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: 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:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Tamanho incorrecto"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Operação %s inválida"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Erro de escrita"
+
+#: 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:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Ocorreu um erro durante a verificação da assinatura. O repositório não está "
+"actualizado e serão utilizados os ficheiros anteriores de índice. Erro do "
+"GPG: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Erro GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "O directório %s é desviado"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2229,18 +2688,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:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2249,28 +2708,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:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Ocorreu um erro durante a verificação da assinatura. O repositório não está "
-"actualizado e serão utilizados os ficheiros anteriores de índice. Erro do "
-"GPG: %s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Erro GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2280,12 +2730,12 @@ msgstr ""
 "significar que você precisa corrigir manualmente este pacote. (devido a "
 "arquitectura em falta)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2293,125 +2743,38 @@ msgstr ""
 "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
 "para o pacote %s."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Tipo do ficheiro de índice '%s' não é suportado"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Não foi possível fazer stat %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Ocorreu um erro ao processar %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "A ler as listas de pacotes"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "A obter File Provides"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Não conseguiu escrever para %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
@@ -2439,7 +2802,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2448,12 +2811,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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2465,10 +2828,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"
@@ -2539,11 +2905,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"
 
@@ -2555,7 +2921,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:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2563,272 +2929,200 @@ msgstr ""
 "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
 "pacotes mantidos (hold)."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr "Enviar pedido para resolvedor"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Preparar para receber solução"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Executar resolvedor externo"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, 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:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Nenhuma secção, no ficheiro Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Nenhuma entrada hash no ficheiro Release %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Não foi encontrado o Release '%s' para '%s'"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Não foi encontrada a versão '%s' para '%s'"
 
-#: apt-pkg/cacheset.cc:603
+#: 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:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-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/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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 ""
+"Não pode seleccionar a versão instalada nem a versão candidata do pacote "
+"'%s' pois não tem nenhuma destas"
+
+#: 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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Nenhuma entrada hash no ficheiro Release %s"
+
+#: apt-pkg/indexrecords.cc:145
+#, 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:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Entrada, 'Date', inválida no ficheiro Release %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: 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/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Não está a ser utilizado acesso exclusivo para apenas leitura ao ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Não foi possível abrir ficheiro de lock %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Não está a ser utilizado o acesso exclusivo para o ficheiro %s, montado via "
 "nfs"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Não foi possível obter acesso exclusivo a %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 "Lista de ficheiros que não podem ser criados porque '%s' não é um directório"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "A ignorar '%s' no directório '%s' porque não é um ficheiro normal"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "A ignorar o ficheiro '%s' no directório '%s' porque não tem extensão no nome "
 "do ficheiro"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2836,75 +3130,75 @@ msgstr ""
 "A ignorar o ficheiro '%s' no directório '%s' porque tem uma extensão "
 "inválida no nome do ficheiro"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "O sub-processo %s recebeu uma falha de segmentação."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "O sub-processo %s recebeu o sinal %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "O sub-processo %s retornou um código de erro (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "O sub-processo %s terminou inesperadamente"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problema ao fechar o ficheiro gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Não foi possível abrir ficheiro o %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Não foi possível abrir o descritor de ficheiro %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Falhou criar subprocesso IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Falhou executar compactador "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lidos, ainda restam %llu para serem lidos mas não resta nenhum"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "escritos, ainda restam %llu para escrever mas não foi possível"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problema ao fechar o ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problema ao renomear o ficheiro %s para %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problema ao remover o link do ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Problema sincronizando o ficheiro"
 
@@ -2993,112 +3287,106 @@ 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:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Abreviatura de tipo desconhecida: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: 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:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Nenhum keyring instalado em %s."
-
-#: 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"
@@ -3108,12 +3396,12 @@ msgstr "Operação %s inválida"
 msgid "Installing %s"
 msgstr "A instalar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "A remover %s"
@@ -3134,79 +3422,79 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta o directório '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "A preparar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "A desempacotar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "A preparar para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "%s removido"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "Remoção completa de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: 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:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependências - deixando por configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3214,7 +3502,7 @@ 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:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3222,7 +3510,7 @@ msgstr ""
 "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
 "cheio"
 
-#: apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3230,7 +3518,7 @@ msgstr ""
 "Nenhum relatório apport escrito pois a mensagem de erro indica um erro de "
 "memória esgotada"
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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 "
@@ -3239,7 +3527,7 @@ msgstr ""
 "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
 "cheio"
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3257,422 +3545,190 @@ msgstr ""
 
 #: 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"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Utilização: apt-extracttemplates ficheiro1 [ficheiro2 ...]\n"
-"\n"
-"O apt-extracttemplates é uma ferramenta para extrair configuração\n"
-"e informação de template de pacotes debian.\n"
-"\n"
-"Opções:\n"
-"  -h   Este texto de ajuda\n"
-"  -t   Definir o directório temporário\n"
-"  -c=? Ler este ficheiro de configuração\n"
-"  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
-"tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Não foi possível fazer stat %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Erro ao processar o directório %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Lista de extensão de códigos-fonte é demasiado longa"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Erro ao escrever o cabeçalho no ficheiro de conteúdo"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Erro ao processar o conteúdo %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Utilização: apt-ftparchive [opções] comando\n"
-"Comandos: packages caminho_binário [ficheiro_override [prefixo_caminho]]\n"
-"          sources caminho_fonte [ficheiro_override [prefixo_caminho]]\n"
-"          contents caminho\n"
-"          release caminho\n"
-"          generate config [grupos]\n"
-"          clean config\n"
-"\n"
-"O apt-ftparchive gera ficheiros de índice para repositórios Debian. Ele \n"
-"suporta muitos estilos de criação, desde totalmente automatizados até \n"
-"substitutos funcionais para o dpkg-scanpackages e dpkg-scansources\n"
-"\n"
-"O apt-ftparchive gera ficheiros Packages a partir de uma árvore de .debs.\n"
-" O ficheiro Package contém o conteúdo de todos os campos de controle de \n"
-"cada pacote bem como o hash MD5 e tamanho do ficheiro. É suportado um \n"
-"ficheiro override para forçar o valor de Priority e Section.\n"
-"\n"
-"Similarmente, o apt-ftparchive gera ficheiros Sources a partir de uma \n"
-"árvore de .dscs. A opção --source-override pode ser utilizada para \n"
-"especificar um ficheiro override de fontes\n"
-"\n"
-"Os comandos 'packages' e 'sources' devem ser executados na raiz da \n"
-"árvore. CaminhoBinário deve apontar para a base de procura recursiva \n"
-"e o ficheiro override deve conter as flags override. CaminhoPrefixo é \n"
-"incluído aos campos filename caso esteja presente. Exemplo de uso do \n"
-"repositório Debian :\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opções:\n"
-"   -h    Este texto de ajuda\n"
-"   --md5 Controlar a criação do MD5\n"
-"   -s=?  Ficheiro override de código-fonte \n"
-"   -q    Silencioso\n"
-"   -d=?  Seleccionar a base de dados de caching opcional\n"
-"   --no-delink Habilitar o modo de debug delinking\n"
-"   --contents  Controlar a criação do ficheiro de conteúdo\n"
-"   -c=?  Ler este ficheiro de configuração\n"
-"   -o=?  Definir uma opção de configuração arbitrária"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Nenhuma selecção coincidiu"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Faltam alguns ficheiros no grupo `%s' do ficheiro do pacote"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "A base de dados estava corrompida, ficheiro renomeado para %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "A base de dados é antiga, a tentar actualizar %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"O formato da BD é inválido. Se actualizou a partir de uma versão antiga do "
-"apt, por favor remova-a e crie novamente a base de dados."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Não foi possível abrir o ficheiro %s da base de dados: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Falhou o readlink %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "O arquivo não tem registo de controlo"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Não foi possível obter um cursor"
-
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Não foi possível ler o directório %s\n"
+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?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Não foi possível fazer stat %s\n"
+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'"
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Sem acesso exclusivo"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "W: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode chamado em nó ainda linkado"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: Os erros aplicam-se ao ficheiro "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Falha ao localizar o elemento de hash!"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Falhou resolver %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Falha ao alocar desvio (diversion)"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Falhou ao percorrer a árvore"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Erro Interno em AddDiversion"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "Falhou abrir %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "A tentar sobrescrever um desvio, %s -> %s e %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Adição dupla de desvio %s -> %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Falhou o readlink %s"
+msgid "Duplicate conf file %s/%s"
+msgstr "Arquivo de configuração duplicado %s/%s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Falhou o unlink %s"
+msgid "The path %s is too long"
+msgstr "O caminho %s é demasiado longo"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Falhou ligar %s a %s"
+msgid "Unpacking %s more than once"
+msgstr "A descompactar %s mais de uma vez"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Limite DeLink de %sB atingido.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arquivo não possuía campo package"
+msgid "The directory %s is diverted"
+msgstr "O directório %s é desviado"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s não possui entrada override\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "O pacote está a tentar escrever no alvo de desvio %s/%s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr " o maintainer de %s é %s, não %s\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "O caminho de desvio é muito longo"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s não possui fonte de entrada de 'override'\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "O directório %s está a ser substituído por um não-directório"
 
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s também não possui entrada binária de 'override'\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Falhou localizar o nó no seu hash bucket"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Falhou alocar memória"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "O caminho é demasiado longo"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "Não foi possível abrir %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Override %s malformado linha %llu #1"
+msgid "Overwrite package match with no version for %s"
+msgstr "Substituir o pacote correspondente sem versão para %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Falhou ler o ficheiro override %s"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "O ficheiro %s/%s substitui o que está no pacote %s"
 
-#: ftparchive/override.cc:166
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Override %s malformado linha %llu #1"
+msgid "Unable to stat %s"
+msgstr "Não foi possível fazer stat %s"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Override %s malformado linha %llu #2"
+msgid "Failed to write file %s"
+msgstr "Falhou escrever o ficheiro %s"
 
-#: ftparchive/override.cc:191
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Override %s malformado linha %llu #3"
+msgid "Failed to close file %s"
+msgstr "Falhou fechar o ficheiro %s"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritmo de compressão desconhecido '%s'"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Este não é um arquivo DEB válido, falta o membro '%s'"
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Saída compactada %s precisa de um conjunto de compressão"
+msgid "Internal error, could not locate member %s"
+msgstr "Erro Interno, não foi possível localizar o membro %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Falhou criar FILE*"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Ficheiro de controle não interpretável"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Falhou o fork"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Assinatura de arquivo inválida"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Compactar filho"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Erro na leitura de cabeçalho membro de arquivo"
 
-#: ftparchive/multicompress.cc:232
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Erro Interno, falhou criar %s"
+msgid "Invalid archive member header %s"
+msgstr "Cabeçalho membro de arquivo inválido %s"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Falhou o IO para subprocesso/arquivo"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Cabeçalho membro de arquivo inválido"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Falhou ler durante o cálculo de MD5"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arquivo é demasiado pequeno"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Falha ao ler os cabeçalhos do arquivo"
+
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Falhou a criação de pipes"
+
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Falhou executar gzip "
+
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Arquivo corrompido"
+
+#: 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:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Problema ao executar unlinking %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Utilização: apt-internal-solver\n"
-"\n"
-"O apt-internal-solver é um interface para utilizar o actual interno como um\n"
-" resolvedor externo para a família APT para depuração ou semelhante.\n"
-"\n"
-"Opções:\n"
-"  -h  Este texto de ajuda.\n"
-"  -q  Saída para registo - sem indicador de progresso\n"
-"  -c=? Ler este ficheiro de configuração\n"
-"  -o=? Definir uma opção de configuração arbitrária, p.e. dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Espaço total de dependência de versão: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Registo de pacote desconhecido!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Você não possui espaço livre suficiente em %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Utilização: apt-sortpkgs [opções] ficheiro1 [ficheiro2 ...]\n"
-"\n"
-"O apt-sortpkgs é uma ferramenta simples para ordenar ficheiros de pacotes.\n"
-"A opção -s é utilizada para indicar que tipo de ficheiro é.\n"
-"\n"
-"Opções:\n"
-"  -h   Este texto de ajuda\n"
-"  -s   Utilizar a ordenação de ficheiros de código-fonte\n"
-"  -c=? Ler este ficheiro de configuração\n"
-"  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
-"tmp\n"
+#~ msgid "Done"
+#~ msgstr "Pronto"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Nenhum keyring instalado em %s."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
@@ -3764,9 +3820,6 @@ msgstr ""
 #~ "Não é possível escrever o registo (log), openpty() falhou (/dev/pts não "
 #~ "está montado?)\n"
 
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "O ficheiro %s não começa com uma mensagem assinada"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "A saltar ficheiro %s inexistente"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 96bbf0a65..0c4d92d02 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: 2015-01-16 04:37-0500\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,152 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Total de Nomes de Pacotes: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Total de Nomes de Pacotes: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Pacotes normais: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Pacotes puramente virtuais: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Pacotes virtuais únicos: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Pacotes virtuais misturados: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Faltando: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Total de versões distintas: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Total de descrições distintas: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Total de dependências: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Total de relações ver/arquivo: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Total de relações Desc/Arquivo: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Total de mapeamentos \"Provides\": "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Total de strings \"globbed\": "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Total de espaço de dependência de versão: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Total de espaço frouxo: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Total de espaço contabilizado para: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Arquivos de pacote:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Pacotes alfinetados (\"pinned\"):"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(não encontrado)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Pacote alfinetado (\"pin\"): "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Tabela de versão:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -243,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"
@@ -266,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."
 
@@ -304,78 +300,78 @@ msgstr ""
 "  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-get.cc:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossível achar pacote %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: 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:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -383,97 +379,96 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pulando arquivo já baixado '%s'\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Não foi possível determinar o espaço livre em %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Você não possui espaço livre suficiente em %s"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Falhou ao buscar alguns arquivos."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando de desempacotamento '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: 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:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Processo filho falhou"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -516,30 +511,30 @@ 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:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Falhou ao processar as dependências de construção"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Conectando em %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Módulos para os quais há suporte:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -654,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -779,12 +774,12 @@ msgstr "Disco não encontrado."
 msgid "File not found"
 msgstr "Arquivo não encontrado"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Falhou ao executar \"stat\""
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Falhou ao definir hora de modificação"
 
@@ -793,34 +788,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI inválida, URIs locais não devem iniciar com //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Impossível determinar o nome do ponto"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Impossível determinar o nome local"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "O servidor recusou a conexão e disse: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER falhou, servidor disse: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS falhou, servidor disse: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -828,123 +823,123 @@ msgstr ""
 "Um servidor proxy foi especificado mas não um script de login, Acquire::ftp::"
 "ProxyLogin está vazio."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Comando de script de login '%s' falhou, servidor disse: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE falhou, servidor disse: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Conexão expirou"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Servidor fechou a conexão"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Erro de leitura"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Uma resposta sobrecarregou o buffer"
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Corrupção de protocolo"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Erro de escrita"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Não foi possível criar um socket"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Não foi possível conectar um socket de dados, conexão expirou"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Falhou"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Não foi possível conectar um socket passivo."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo não foi capaz de obter um socket de escuta"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Não foi possível fazer \"bind\" de um socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Não foi possível ouvir no socket"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Não foi possível determinar o nome do socket"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Impossível enviar o comando PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Família de endereços %u desconhecida (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT falhou, servidor disse: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Conexão do socket de dados expirou"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar conexão"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Impossível obter arquivo, servidor disse '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Socket de dados expirou"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Transferência de dados falhou, servidor disse '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Pesquisa"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Impossível invocar "
 
@@ -1010,18 +1005,18 @@ 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:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Ao menos uma assinatura inválida foi encontrada."
 
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:164
 #, fuzzy
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
@@ -1029,22 +1024,22 @@ msgstr ""
 "instalado?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Erro desconhecido executando apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1052,35 +1047,35 @@ msgstr ""
 "As assinaturas a seguir não puderam ser verificadas devido à chave pública "
 "não estar disponível:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Erro escrevendo para o arquivo"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Erro lendo do servidor"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Erro escrevendo para arquivo"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Seleção falhou"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Conexão expirou"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Erro escrevendo para arquivo de saída"
 
@@ -1112,294 +1107,30 @@ msgstr "Este servidor HTTP possui suporte a \"range\" quebrado"
 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Dados de cabeçalho ruins"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "Erro interno"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada."
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Erro interno, Ordenação não finalizou"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Que estranho... Os tamanhos não batem, mande e-mail para 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "É preciso baixar %sB/%sB de arquivos.\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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "É preciso baixar %sB de arquivos.\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:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr ""
-"Depois desta operação, %sB adicionais de espaço em disco serão usados.\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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Depois desta operação, %sB de espaço em disco serão liberados.\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Você não possui espaço suficiente em %s."
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Há problemas e -y foi usado sem --force-yes"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "\"Trivial Only\" especificado mas esta não é uma operação 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Sim, faça o que eu digo!"
-
-#: apt-private/private-install.cc:222
+#: methods/server.cc:589
 #, c-format
 msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Você está prestes a fazer algo potencialmente destrutivo.\n"
-"Para continuar digite a frase '%s'\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Abortar."
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Você quer continuar?"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Alguns arquivos falharam ao baixar"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Impossível buscar alguns arquivos, talvez executar apt-get update ou tentar "
-"com --fix-missing?"
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing e troca de mídia não são suportados atualmente"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Impossível corrigir pacotes faltantes."
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Abortando instalação."
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Nós não deveríamos apagar coisas, impossível iniciar AutoRemover"
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Hmm, parece que o AutoRemover destruiu algo o que realmente não deveria\n"
-"acontecer. Por favor, reporte um bug contra o apt."
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "A informação a seguir pode ajudar a resolver a situação:"
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Erro Interno, o AutoRemover quebrou coisas"
-
-#: apt-private/private-install.cc:513
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"Os seguintes pacotes foram automaticamente instalados e não são mais "
-"requeridos:"
-msgstr[1] ""
-"Os seguintes pacotes foram automaticamente instalados e não são mais "
-"requeridos:"
-
-#: apt-private/private-install.cc:517
-#, fuzzy, c-format
-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] ""
-"Os seguintes pacotes foram automaticamente instalados e não são mais "
-"requeridos:"
-msgstr[1] ""
-"Os seguintes pacotes foram automaticamente instalados e não são mais "
-"requeridos:"
-
-#: apt-private/private-install.cc:519
-#, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Use 'apt-get autoremove' para removê-los."
-msgstr[1] "Use 'apt-get autoremove' para removê-los."
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote "
-"(ou especifique uma solução)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"Alguns pacotes não puderam ser instalados. Isto pode significar que\n"
-"você solicitou uma situação impossível ou, se você está usando a\n"
-"distribuição instável, que alguns pacotes requeridos não foram\n"
-"criados ainda ou foram retirados da \"Incoming\"."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Pacotes quebrados"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Os pacotes extra a seguir serão instalados:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Pacotes sugeridos:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Pacotes recomendados:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n"
 
-#: apt-private/private-install.cc:829
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "A reinstalação de %s não é possível, não pode ser baixado.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s já é a versão mais nova.\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Versão selecionada %s (%s) para %s\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Versão selecionada %s (%s) para %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "O pacote %s não está instalado, então não será removido\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "O pacote %s não está instalado, então não será removido\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "Erro interno"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1407,31 +1138,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "Corrigindo dependências..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " falhou."
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "Impossível corrigir dependências"
 
-#: apt-private/private-cachefile.cc:102
+#: 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:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " Pronto"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependências desencontradas. Tente usar -f."
 
@@ -1596,7 +1327,7 @@ msgstr "S"
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: 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"
@@ -1605,7 +1336,7 @@ msgstr "Erro de compilação de regex - %s"
 msgid "The update command takes no arguments"
 msgstr "O comando update não leva argumentos"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1613,10 +1344,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1637,27 +1372,306 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!"
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada."
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Erro interno, Ordenação não finalizou"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Que estranho... Os tamanhos não batem, mande e-mail para 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "É preciso baixar %sB/%sB de arquivos.\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:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "É preciso baixar %sB de arquivos.\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:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr ""
+"Depois desta operação, %sB adicionais de espaço em disco serão usados.\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 "Depois desta operação, %sB de espaço em disco serão liberados.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Há problemas e -y foi usado sem --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\" especificado mas esta não é uma operação 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Sim, faça o que eu digo!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Você está prestes a fazer algo potencialmente destrutivo.\n"
+"Para continuar digite a frase '%s'\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Abortar."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Você quer continuar?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Alguns arquivos falharam ao baixar"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Impossível buscar alguns arquivos, talvez executar apt-get update ou tentar "
+"com --fix-missing?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing e troca de mídia não são suportados atualmente"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Impossível corrigir pacotes faltantes."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Abortando instalação."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Nós não deveríamos apagar coisas, impossível iniciar AutoRemover"
+
+#: 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 ""
+"Hmm, parece que o AutoRemover destruiu algo o que realmente não deveria\n"
+"acontecer. Por favor, reporte um bug contra o apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "A informação a seguir pode ajudar a resolver a situação:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Erro Interno, o AutoRemover quebrou coisas"
+
+#: apt-private/private-install.cc:488
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"Os seguintes pacotes foram automaticamente instalados e não são mais "
+"requeridos:"
+msgstr[1] ""
+"Os seguintes pacotes foram automaticamente instalados e não são mais "
+"requeridos:"
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+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] ""
+"Os seguintes pacotes foram automaticamente instalados e não são mais "
+"requeridos:"
+msgstr[1] ""
+"Os seguintes pacotes foram automaticamente instalados e não são mais "
+"requeridos:"
+
+#: 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] "Use 'apt-get autoremove' para removê-los."
+msgstr[1] "Use 'apt-get autoremove' para removê-los."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote "
+"(ou especifique uma solução)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Alguns pacotes não puderam ser instalados. Isto pode significar que\n"
+"você solicitou uma situação impossível ou, se você está usando a\n"
+"distribuição instável, que alguns pacotes requeridos não foram\n"
+"criados ainda ou foram retirados da \"Incoming\"."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Pacotes quebrados"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Os pacotes extra a seguir serão instalados:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Pacotes sugeridos:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Pacotes recomendados:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n"
+
+#: apt-private/private-install.cc:827
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "A reinstalação de %s não é possível, não pode ser baixado.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s já é a versão mais nova.\n"
+
+#: apt-private/private-install.cc:892
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Versão selecionada %s (%s) para %s\n"
+
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Versão selecionada %s (%s) para %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 "O pacote %s não está instalado, então não será removido\n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "O pacote %s não está instalado, então não será removido\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!"
 
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:98
 msgid "Authentication warning overridden.\n"
 msgstr "Aviso de autenticação sobreposto.\n"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
 msgid "Some packages could not be authenticated"
 msgstr "Alguns pacotes não puderam ser autenticados"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 msgid "Install these packages without verification?"
 msgstr "Instalar estes pacotes sem verificação?"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falhou ao buscar %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 "Não foi possível determinar o espaço livre em %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Você não possui espaço suficiente em %s."
+
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1672,41 +1686,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Calculando atualização"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Pronto"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Atingido "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Obter:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Baixados %sB em %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Trabalhando]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1719,18 +1725,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1810,205 +1816,459 @@ msgstr "são importantes. Por favor, conserte-os e execute [I]nstalar novamente"
 msgid "Merging available information"
 msgstr "Mesclando informação disponível"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "\"DropNode\" chamado em nó ainda ligado (\"linked\")"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Falhou ao localizar o elemento hash!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Falhou ao alocar desvio (\"diversion\")"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Erro interno em \"AddDiversion\""
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n"
+"\n"
+"O apt-extracttemplates é uma ferramenta para extrair informações de modelo\n"
+"(\"template\") e configuração de pacotes debian.\n"
+"\n"
+"Opções:\n"
+"  -h   Este texto de ajuda\n"
+"  -t   Define o diretório temporário\n"
+"  -c=? Lê o arquivo de configuração especificado.\n"
+"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
+"tmp\n"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s"
+#: 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"
 
-#: apt-inst/filelist.cc:506
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Adição dupla de desvio %s -> %s"
+msgid "Unable to write to %s"
+msgstr "Impossível escrever para %s"
 
-#: apt-inst/filelist.cc:549
+#: 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: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: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 "Duplicate conf file %s/%s"
-msgstr "Arquivo de configuração duplicado %s/%s"
+msgid "Error processing directory %s"
+msgstr "Erro processando o diretório %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: 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:400
+msgid "Error writing header to contents file"
+msgstr "Erro ao gravar cabeçalho no arquivo de conteúdo"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "O caminho %s é muito longo"
+msgid "Error processing contents %s"
+msgstr "Erro processando conteúdo %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Uso: apt-ftparchive [opções] comando\n"
+"Comandos: packages caminho_binário [arquivo_override [prefixo_caminho]]\n"
+"          sources caminho_fonte [arquivo_override [prefixo_caminho]]\n"
+"          contents caminho\n"
+"          release caminho\n"
+"          generate config [grupos]\n"
+"          clean config\n"
+"\n"
+"O apt-ftparchive gera arquivos de índice para repositórios Debian. Ele\n"
+"dá suporte a muitos estilos de geração, desde totalmente automatizadas até\n"
+"substitutos funcionais para o dpkg-scanpackages e o dpkg-scansources\n"
+"\n"
+"O apt-ftparchive gera arquivos Package a partir de uma árvore de .debs.\n"
+"O arquivo Package contém o conteúdo de todos os campos controle de\n"
+"cada pacote bem como o hash MD5 e o tamanho do arquivo. Há suporte para\n"
+"um arquivo override para forçar o valor da prioridade (\"Priority\") e a\n"
+"a seção (\"Section\").\n"
+"\n"
+"Similarmente, o apt-ftparchive gera arquivos Sources a partir de uma\n"
+"árvore de .dscs. A opção --source-override pode ser usada para\n"
+"especificar um arquivo override de fontes.\n"
+"\n"
+"Os comandos 'packages' e 'sources' deverão ser executados na raiz da\n"
+"árvore. Caminho_Binário deverá apontar para a base de procura recursiva\n"
+"e o arquivo override deverá conter as \"flags override\". Caminho_Prefixo é\n"
+"anexado aos campos do nome do arquivo se estiverem presentes. Exemplo de\n"
+"uso do repositório Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opções:\n"
+"  -h    Este texto de ajuda\n"
+"  --md5 Controla a geração de MD5\n"
+"  -s=?  Arquivo fonte (\"source\") override\n"
+"  -q    Quieto\n"
+"  -d=?  Seleciona o banco de dados de caching opcional\n"
+"  --no-delink Habilita o modo de depuração \"delinking\"\n"
+"  --contents  Controla a geração do arquivo de conteúdo\n"
+"  -c=? Lê o arquivo de configuração especificado.\n"
+"  -o=? Define uma opção de configuração arbitrária"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Nenhuma seleção combinou"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Desempacotando %s mais de uma vez"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Alguns arquivos estão faltando no grupo de arquivos do pacotes '%s'"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "O diretório %s é desviado (\"diverted\")"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "BD estava corrompido, arquivo renomeado para %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "O pacote está tentando escrever no alvo do desvio %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "BD é antigo, tentando atualizar %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "O caminho de desvio é muito longo"
+#: ftparchive/cachedb.cc:96
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Formato do BD é inválido. Se você atualizou a partir de uma versão antiga do "
+"apt, por favor, remova e recrie o banco de dados."
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Impossível abrir o arquivo BD %s: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Falhou ao executar \"stat\" %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Falhou ao executar \"readlink\" %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Repositório não possui registro de controle"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Impossível obter um cursor"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Falhou ao renomear %s para %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Impossível ler o diretório %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "O diretório %s está sendo substituído por um não-diretório"
+msgid "W: Unable to stat %s\n"
+msgstr "W: Impossível executar \"stat\" em %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Falha ao localizar nó em seu \"hash bucket\""
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "O caminho é muito longo"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "W: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: Erros que se aplicam ao arquivo "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Sobrescrita de pacote não combina com nenhuma versão para %s"
+msgid "Failed to resolve %s"
+msgstr "Falhou ao resolver %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Falhou ao percorrer a árvore"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s"
+msgid "Failed to open %s"
+msgstr "Falhou ao abrir %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Impossível executar \"stat\" em %s"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Falhou ao escrever arquivo %s"
+msgid "Failed to readlink %s"
+msgstr "Falhou ao executar \"readlink\" %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Falhou ao fechar arquivo %s"
+msgid "Failed to unlink %s"
+msgstr "Falhou ao executar \"unlink\" %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Este não é um arquivo DEB válido, membro '%s' faltando"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Falhou ao ligar %s a %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Erro interno, não foi possível localizar membro %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Limite DeLink de %sB atingido.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Arquivo de controle não interpretável"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Repositório não possuía campo pacote"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Assinatura de arquivo inválida"
+#: 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:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  mantenedor de %s é %s, não %s\n"
+
+#: 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:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s também não possui entrada override binária\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Falha ao alocar memória"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Impossível abrir %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Override malformado %s linha %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Falha ao ler o arquivo override %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Override malformado %s linha %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Override malformado %s linha %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Override malformado %s linha %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algoritmo de compactação desconhecido '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Saída compactada %s precisa de um conjunto de compactação"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Erro na leitura de cabeçalho membro de arquivo"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Falhou ao criar FILE*"
 
-#: apt-inst/contrib/arfile.cc:96
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Cabeçalho membro de arquivo inválido"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Falhou ao executar \"fork\""
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Cabeçalho membro de arquivo inválido"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Compactar filho"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Arquivo é muito pequeno"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Erro interno, falhou ao criar %s"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Falhou ao ler os cabeçalhos do arquivo"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "E/S para sub-processo/arquivo falhou"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Falhou ao criar \"pipes\""
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Falhou ao ler durante o cálculo MD5"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Falhou ao executar gzip "
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problema removendo %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Arquivo corrompido"
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Falhou ao renomear %s para %s"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Checksum do arquivo tar falhou, arquivo corrompido"
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n"
+"\n"
+"O apt-extracttemplates é uma ferramenta para extrair informações de modelo\n"
+"(\"template\") e configuração de pacotes debian.\n"
+"\n"
+"Opções:\n"
+"  -h   Este texto de ajuda\n"
+"  -t   Define o diretório temporário\n"
+"  -c=? Lê o arquivo de configuração especificado.\n"
+"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
+"tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Registro de pacote desconhecido!"
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uso: apt-sortpkgs [opções] arquivo1 [arquivo2 ...]\n"
+"\n"
+"O apt-sortpkgs é uma ferramenta simples para ordenar arquivos de pacote.\n"
+"A opção -s é usada para indicar que tipo de arquivo é.\n"
+"\n"
+"Opções:\n"
+"  -h   Este texto de ajuda\n"
+"  -s   Usar ordenação de arquivo fonte\n"
+"  -c=? Lê o arquivo de configuração especificado.\n"
+"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
+"tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Sistema de empacotamento '%s' não é suportado"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Impossível determinar um tipo de sistema de empacotamento aplicável."
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Gravados %i registros.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Gravados %i registros com %i arquivos faltando.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Gravados %i registros com %i arquivos que não combinam\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2025,6 +2285,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 ""
@@ -2039,200 +2320,374 @@ 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:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Cache de pacotes vazio"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Pré-Depende"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Sugere"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Conflita"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Substitui"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Obsoleta"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Quebra"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "requerido"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "padrão"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Calculando atualização"
+
+#: 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/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/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 ""
+"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
+
+#: 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 "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/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Impossível executar \"stat\" %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/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
+#: 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/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Método %s não iniciou corretamente"
+#: 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/acquire-worker.cc:455
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
-"Por favor, insira o disco nomeado: '%s' na unidade '%s' e pressione enter."
+"Pacote %s %s não foi encontrado enquanto processando dependências de arquivo"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Tipo de arquivo de índice '%s' não é suportado"
+msgid "Couldn't stat source package list %s"
+msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Construindo árvore de dependências"
+#: 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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versões candidatas"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Coletando Arquivo \"Provides\""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Geração de dependência"
+#: 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/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/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum incorreto"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Tamanho incorreto"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Operação %s inválida"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Erro de escrita"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "O diretório %s é desviado (\"diverted\")"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: apt-pkg/acquire-item.cc:2059
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
+"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:1926
+#: 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 "
@@ -2242,12 +2697,12 @@ msgstr ""
 "que você precisa consertar manualmente este pacote. (devido a arquitetura "
 "não especificada)."
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2255,126 +2710,38 @@ msgstr ""
 "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
 "\" para o pacote %s."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Tipo de arquivo de índice '%s' não é suportado"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Impossível executar \"stat\" %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Lendo listas de pacotes"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Coletando Arquivo \"Provides\""
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Impossível escrever para %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: apt-pkg/acquire.cc:162
 #, fuzzy, c-format
 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Você deve colocar algumas URIs 'source' em seu sources.list"
@@ -2400,19 +2767,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:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2424,10 +2791,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"
@@ -2496,11 +2867,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"
 
@@ -2512,339 +2883,265 @@ msgstr ""
 "O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
 "arquivo para o mesmo."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
-"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
-"pacotes mantidos (hold)."
-
-#: apt-pkg/algorithms.cc:1088
-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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Impossível analisar arquivo de pacote %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Impossível analisar arquivo de pacote %s (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Nota, selecionando %s ao invés de %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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)"
+"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
+"pacotes mantidos (hold)."
 
-#: 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/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/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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release '%s' para '%s' não foi encontrada"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versão '%s' para '%s' não foi encontrada"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Impossível achar tarefa %s"
 
-#: apt-pkg/cacheset.cc:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:145
+#, 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:164
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Impossível analisar arquivo de pacote %s (1)"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: 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:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Não usando travamento para arquivo de trava somente leitura %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Não foi possível abrir arquivo de trava %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Não usando travamento para arquivo de trava montado via nfs %s"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Não foi possível obter trava %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Sub-processo %s recebeu uma falha de segmentação."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Sub-processo %s recebeu uma falha de segmentação."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Sub-processo %s retornou um código de erro (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Sub-processo %s finalizou inesperadamente"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problema fechando o arquivo"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Não foi possível abrir arquivo %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Não foi possível abrir \"pipe\" para %s"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Falhou ao criar sub-processo IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Falhou ao executar compactador "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "escrita, ainda restam %lu para gravar mas não foi possível"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Problema fechando o arquivo"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problema sincronizando o arquivo"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problema removendo o arquivo"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Problema sincronizando o arquivo"
 
@@ -2929,112 +3226,106 @@ 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:519
+#: 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:633
+#: 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:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abortando instalação."
-
-#: 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"
@@ -3044,12 +3335,12 @@ msgstr "Operação %s inválida"
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Removendo %s"
@@ -3070,103 +3361,103 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Diretório '%s' está faltando"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempacotando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparando para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "%s removido"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s completamente removido"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3195,407 +3486,172 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n"
-"\n"
-"O apt-extracttemplates é uma ferramenta para extrair informações de modelo\n"
-"(\"template\") e configuração de pacotes debian.\n"
-"\n"
-"Opções:\n"
-"  -h   Este texto de ajuda\n"
-"  -t   Define o diretório temporário\n"
-"  -c=? Lê o arquivo de configuração especificado.\n"
-"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
-"tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Impossível executar \"stat\" em %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Erro processando o diretório %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Lista de extensão de fontes é muito extensa"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Erro ao gravar cabeçalho no arquivo de conteúdo"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Erro processando conteúdo %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Uso: apt-ftparchive [opções] comando\n"
-"Comandos: packages caminho_binário [arquivo_override [prefixo_caminho]]\n"
-"          sources caminho_fonte [arquivo_override [prefixo_caminho]]\n"
-"          contents caminho\n"
-"          release caminho\n"
-"          generate config [grupos]\n"
-"          clean config\n"
-"\n"
-"O apt-ftparchive gera arquivos de índice para repositórios Debian. Ele\n"
-"dá suporte a muitos estilos de geração, desde totalmente automatizadas até\n"
-"substitutos funcionais para o dpkg-scanpackages e o dpkg-scansources\n"
-"\n"
-"O apt-ftparchive gera arquivos Package a partir de uma árvore de .debs.\n"
-"O arquivo Package contém o conteúdo de todos os campos controle de\n"
-"cada pacote bem como o hash MD5 e o tamanho do arquivo. Há suporte para\n"
-"um arquivo override para forçar o valor da prioridade (\"Priority\") e a\n"
-"a seção (\"Section\").\n"
-"\n"
-"Similarmente, o apt-ftparchive gera arquivos Sources a partir de uma\n"
-"árvore de .dscs. A opção --source-override pode ser usada para\n"
-"especificar um arquivo override de fontes.\n"
-"\n"
-"Os comandos 'packages' e 'sources' deverão ser executados na raiz da\n"
-"árvore. Caminho_Binário deverá apontar para a base de procura recursiva\n"
-"e o arquivo override deverá conter as \"flags override\". Caminho_Prefixo é\n"
-"anexado aos campos do nome do arquivo se estiverem presentes. Exemplo de\n"
-"uso do repositório Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opções:\n"
-"  -h    Este texto de ajuda\n"
-"  --md5 Controla a geração de MD5\n"
-"  -s=?  Arquivo fonte (\"source\") override\n"
-"  -q    Quieto\n"
-"  -d=?  Seleciona o banco de dados de caching opcional\n"
-"  --no-delink Habilita o modo de depuração \"delinking\"\n"
-"  --contents  Controla a geração do arquivo de conteúdo\n"
-"  -c=? Lê o arquivo de configuração especificado.\n"
-"  -o=? Define uma opção de configuração arbitrária"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Nenhuma seleção combinou"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, 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'"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "BD estava corrompido, arquivo renomeado para %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "BD é antigo, tentando atualizar %s"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Formato do BD é inválido. Se você atualizou a partir de uma versão antiga do "
-"apt, por favor, remova e recrie o banco de dados."
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "\"DropNode\" chamado em nó ainda ligado (\"linked\")"
 
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Impossível abrir o arquivo BD %s: %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Falhou ao localizar o elemento hash!"
 
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Falhou ao executar \"readlink\" %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Falhou ao alocar desvio (\"diversion\")"
 
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Repositório não possui registro de controle"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Erro interno em \"AddDiversion\""
 
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Impossível obter um cursor"
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s"
 
-#: ftparchive/writer.cc:91
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Impossível ler o diretório %s\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Adição dupla de desvio %s -> %s"
 
-#: ftparchive/writer.cc:96
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Impossível executar \"stat\" em %s\n"
+msgid "Duplicate conf file %s/%s"
+msgstr "Arquivo de configuração duplicado %s/%s"
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#, c-format
+msgid "The path %s is too long"
+msgstr "O caminho %s é muito longo"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "W: "
+#: apt-inst/extract.cc:132
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "Desempacotando %s mais de uma vez"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: Erros que se aplicam ao arquivo "
+#: apt-inst/extract.cc:142
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "O diretório %s é desviado (\"diverted\")"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "Falhou ao resolver %s"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "O pacote está tentando escrever no alvo do desvio %s/%s"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Falhou ao percorrer a árvore"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "O caminho de desvio é muito longo"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "Failed to open %s"
-msgstr "Falhou ao abrir %s"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "O diretório %s está sendo substituído por um não-diretório"
 
-#: ftparchive/writer.cc:278
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Falha ao localizar nó em seu \"hash bucket\""
 
-#: ftparchive/writer.cc:286
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Falhou ao executar \"readlink\" %s"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "O caminho é muito longo"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Falhou ao executar \"unlink\" %s"
+msgid "Overwrite package match with no version for %s"
+msgstr "Sobrescrita de pacote não combina com nenhuma versão para %s"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Falhou ao ligar %s a %s"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:498
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Limite DeLink de %sB atingido.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Repositório não possuía campo pacote"
+msgid "Unable to stat %s"
+msgstr "Impossível executar \"stat\" em %s"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s não possui entrada override\n"
+msgid "Failed to write file %s"
+msgstr "Falhou ao escrever arquivo %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  mantenedor de %s é %s, não %s\n"
+msgid "Failed to close file %s"
+msgstr "Falhou ao fechar arquivo %s"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s não possui entrada override fonte\n"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Este não é um arquivo DEB válido, membro '%s' faltando"
 
-#: ftparchive/writer.cc:702
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s também não possui entrada override binária\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Falha ao alocar memória"
+msgid "Internal error, could not locate member %s"
+msgstr "Erro interno, não foi possível localizar membro %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
-#, c-format
-msgid "Unable to open %s"
-msgstr "Impossível abrir %s"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Arquivo de controle não interpretável"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Override malformado %s linha %lu #1"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Assinatura de arquivo inválida"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Falha ao ler o arquivo override %s"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Erro na leitura de cabeçalho membro de arquivo"
 
-#: ftparchive/override.cc:166
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Override malformado %s linha %lu #1"
+msgid "Invalid archive member header %s"
+msgstr "Cabeçalho membro de arquivo inválido"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Override malformado %s linha %lu #2"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Cabeçalho membro de arquivo inválido"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Override malformado %s linha %lu #3"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arquivo é muito pequeno"
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritmo de compactação desconhecido '%s'"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Falhou ao ler os cabeçalhos do arquivo"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Saída compactada %s precisa de um conjunto de compactação"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Falhou ao criar \"pipes\""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Falhou ao criar FILE*"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Falhou ao executar gzip "
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Falhou ao executar \"fork\""
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Arquivo corrompido"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Compactar filho"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Checksum do arquivo tar falhou, arquivo corrompido"
 
-#: ftparchive/multicompress.cc:232
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Erro interno, falhou ao criar %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "E/S para sub-processo/arquivo falhou"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Total de espaço de dependência de versão: "
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Falhou ao ler durante o cálculo MD5"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Você não possui espaço livre suficiente em %s"
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Problema removendo %s"
+#~ msgid "Done"
+#~ msgstr "Pronto"
 
-#: cmdline/apt-internal-solver.cc:49
 #, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n"
-"\n"
-"O apt-extracttemplates é uma ferramenta para extrair informações de modelo\n"
-"(\"template\") e configuração de pacotes debian.\n"
-"\n"
-"Opções:\n"
-"  -h   Este texto de ajuda\n"
-"  -t   Define o diretório temporário\n"
-"  -c=? Lê o arquivo de configuração especificado.\n"
-"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
-"tmp\n"
-
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Registro de pacote desconhecido!"
-
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uso: apt-sortpkgs [opções] arquivo1 [arquivo2 ...]\n"
-"\n"
-"O apt-sortpkgs é uma ferramenta simples para ordenar arquivos de pacote.\n"
-"A opção -s é usada para indicar que tipo de arquivo é.\n"
-"\n"
-"Opções:\n"
-"  -h   Este texto de ajuda\n"
-"  -s   Usar ordenação de arquivo fonte\n"
-"  -c=? Lê o arquivo de configuração especificado.\n"
-"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
-"tmp\n"
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Abortando instalação."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/ro.po b/po/ro.po
index eb66192ad..63df026ab 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: 2015-01-16 04:37-0500\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,151 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Total nume pachete : "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Total nume pachete : "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Pachete normale: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Pachete virtuale pure: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Pachete virtuale singulare: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Pachete virtuale mixte: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Lipsă: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Total versiuni distincte: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Numărul total de descrieri distincte: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Total dependențe: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Total relații versiune/fișier: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Total relații desc/fișier: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Total cartări Furnizează: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Total șiruri înglobate: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Total spațiu versiuni ale dependențelor: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Total spațiu intern: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Total spațiu contorizat pentru: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Fișiere pachet: "
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Pachete alese special:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(negăsit)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Instalat: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Candidează: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(niciunul)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Pachet ales special: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Tabela de versiuni:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -241,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"
@@ -263,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."
 
@@ -300,79 +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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nu pot găsi pachetul %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: 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:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -380,97 +376,96 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Sar peste fișierul deja descărcat '%s'\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "N-am putut determina spațiul disponibil în %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Nu aveți suficient spațiu în %s"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Aducere sursa %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Eșec la aducerea unor arhive."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: 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:968
+#: 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:996
+#: 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:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Procesul copil a eșuat"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -513,30 +508,30 @@ msgstr ""
 "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
 "poate fi găsit"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Eșec la prelucrarea dependențelor de compilare"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Conectare la %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Module suportate:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -652,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -777,12 +772,12 @@ msgstr "Disc negăsit."
 msgid "File not found"
 msgstr "Fișier negăsit"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Eșec la „stat”"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Eșec la ajustarea timpului de modificare"
 
@@ -791,34 +786,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI invalid, URI-uile locale trebuie să nu înceapă cu //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Se autentifică"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Nu se poate detecta numele perechii"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Nu s-a putut detecta numele local"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Serverul a refuzat conexiunea și a spus: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "„USER” a eșuat, serverul a spus: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "„PASS” a eșuat, serverul a spus: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -826,125 +821,125 @@ msgstr ""
 "Un server proxy a fost precizat, dar nu există nici un script de conectare, "
 "Acquire::ftp::ProxyLogin este gol."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Scriptul „%s” cu comenzile de conectare a eșuat, serverul a spus: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "„TYPE” a eșuat, serverul a spus: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Timpul de conectare a expirat"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Serverul a închis conexiunea"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Eroare de citire"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Un răspuns a depășit zona de tampon."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Protocol corupt"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Eroare de scriere"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Nu s-a putut crea un socket"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Nu s-a putut realiza conectarea la socket-ul de date, timpul de conectare a "
 "expirat"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Eșec"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Nu s-a putut realiza conectarea la un socket pasiv"
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "„getaddrinfo” n-a reușit să obțină un socket de ascultare"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Nu s-a putut realiza asocierea la un socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Nu s-a putut asculta pe socket"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Nu s-a putut detecta numele socket-ului"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Nu s-a putut trimite comanda PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Familie de adrese necunoscută %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "„EPRT” a eșuat, serverul a spus: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Timpul de conectare la socket-ul de date expirat"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Nu s-a putut accepta conexiune"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nu s-a putut aduce fișierul, serverul a spus „%s”"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Timp expirat pentru socket-ul de date"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Transferul de date a eșuat, serverul a spus: '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Interogare"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Nu s-a putut invoca"
 
@@ -1011,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:168
+#: 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:172
+#: 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:174
+#: methods/gpgv.cc:164
 #, fuzzy
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
-"Nu s-a putut executa „%s” pentru verificarea semnăturii (gnupg este instalat?)"
+"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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Eroare necunoscută în timp ce se execută apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1052,36 +1048,36 @@ msgstr ""
 "Următoarele semnături n-au putut fi verificate, deoarece cheia publică nu "
 "este disponibilă:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Eroare la scrierea în fișierul"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Eroare la citirea de la server"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Eroare la scrierea în fișier"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Selecția a eșuat"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Timp de conectare expirat"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Eroare la scrierea fișierului de rezultat"
 
@@ -1113,429 +1109,161 @@ msgstr "Acest server HTTP are un suport defect de intervale"
 msgid "Unknown date format"
 msgstr "Format dată necunoscut"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Antet de date necorespunzător"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Conectare eșuată"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Eroare internă"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
+#: apt-private/private-list.cc:121
+msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
+#: 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-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată."
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Corectez dependențele..."
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Eroare internă, Ordering nu s-a terminat"
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " eșec."
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Ce ciudat... Dimensiunile nu se potrivesc, scrieți la apt@packages.debian.org"
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Nu s-au putut corecta dependențele"
 
-#. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Este nevoie să descărcați %sB/%sB de arhive.\n"
+#: 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"
 
-#. 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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Este nevoie să descărcați %sB de arhive.\n"
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Terminat"
 
-#. 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:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "După această operație vor fi folosiți din disc încă %sB.\n"
+#: 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."
 
-#. 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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n"
+#: 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-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Nu aveți suficient spațiu în %s."
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Sunt unele probleme și -y a fost folosit fără --force-yes"
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalat]"
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalat]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
 msgstr ""
-"A fost specificat 'doar neimportant' dar nu este o operațiune neimportantă."
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Da, fă cum îți spun!"
+#: 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-install.cc:222
+#: apt-private/private-output.cc:277
 #, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
+msgid "[upgradable from: %s]"
 msgstr ""
-"Sunteți pe cale de a face ceva cu potențial distructiv.\n"
-"Pentru a continua tastați fraza '%s'\n"
-" ?] "
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Renunțare."
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Vreți să continuați?"
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "dar %s este instalat"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Descărcarea unor fișiere a eșuat"
+#: 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-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Nu s-au putut aduce unele arhive, poate ar fi o idee bună să rulați 'apt-get "
-"update' sau încercați cu --fix-missing?"
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "dar nu este instalabil"
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing și schimbul de mediu nu este deocamdată suportat"
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "dar este un pachet virtual"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Nu pot corecta pachetele lipsă."
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "dar nu este instalat"
 
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Abandonez instalarea."
+#: 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-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " sau"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
+#: 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:"
 
-# XXX: orice sugestie este bine-venită
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover"
+#: 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-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Hmm, se pare că AutoRemover a distrus ceva, lucru care n-ar trebui să se "
-"întâmple. Sunteți rugat să trimiteți un raportați de defect pentru pachetul "
-"apt."
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Următoarele pachete vor fi ȘTERSE:"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:"
+#: 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-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni"
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Următoarele pachete vor fi ÎNNOITE:"
 
-#: apt-private/private-install.cc:513
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
-msgstr[1] ""
-"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
-msgstr[2] ""
-"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Următoarele pachete vor fi DE-GRADATE:"
 
-#: apt-private/private-install.cc:517
-#, fuzzy, c-format
-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] ""
-"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
-msgstr[1] ""
-"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
-msgstr[2] ""
-"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
-
-#: apt-private/private-install.cc:519
-#, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Folosiți 'apt-get autoremove' pentru a le șterge."
-msgstr[1] "Folosiți 'apt-get autoremove' pentru a le șterge."
-msgstr[2] "Folosiți 'apt-get autoremove' pentru a le șterge."
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Ați putea porni 'apt-get -f install' pentru a corecta acestea:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dependențe neîndeplinite. Încercați 'apt-get -f install' fără nici un pachet "
-"(sau oferiți o altă soluție)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Unele pachete n-au putut fi instalate. Aceasta ar putea însemna că ați "
-"cerut\n"
-"o situație imposibilă sau că folosiți distribuția instabilă în care unele "
-"pachete\n"
-"cerute n-au fost create încă sau au fost mutate din Incoming."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Pachete deteriorate"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Următoarele extra pachete vor fi instalate:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Pachete sugerate:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Pachete recomandate:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n"
-
-#: apt-private/private-install.cc:829
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s este deja la cea mai nouă versiune.\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Versiune selectată %s (%s) pentru %s\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Versiune selectată %s (%s) pentru %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Corectez dependențele..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " eșec."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nu s-au putut corecta dependențele"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Terminat"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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: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
@@ -1601,7 +1329,7 @@ msgstr "Y"
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: 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"
@@ -1610,7 +1338,7 @@ msgstr "Eroare de compilare expresie regulată - %s"
 msgid "The update command takes no arguments"
 msgstr "Comanda de actualizare nu are argumente"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1619,10 +1347,14 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1644,76 +1376,351 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
+#: 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!"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Avertisment de autentificare înlocuit.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată."
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Unele pachete n-au putut fi autentificate"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Eroare internă, Ordering nu s-a terminat"
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Instalați aceste pachete fără verificare?"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Ce ciudat... Dimensiunile nu se potrivesc, scrieți la apt@packages.debian.org"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#. 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
+#: apt-private/private-install.cc:154
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Eșec la aducerea lui %s  %s\n"
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Este nevoie să descărcați %sB/%sB de arhive.\n"
 
-#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "Eșec la redenumirea lui %s în %s"
+#. 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:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Este nevoie să descărcați %sB de arhive.\n"
 
-#: apt-private/private-sources.cc:70
+#. 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:166
 #, c-format
-msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "După această operație vor fi folosiți din disc încă %sB.\n"
 
-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
-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
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Calculez înnoirea"
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Sunt unele probleme și -y a fost folosit fără --force-yes"
 
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Terminat"
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr ""
+"A fost specificat 'doar neimportant' dar nu este o operațiune neimportantă."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Da, fă cum îți spun!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Sunteți pe cale de a face ceva cu potențial distructiv.\n"
+"Pentru a continua tastați fraza '%s'\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Renunțare."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Vreți să continuați?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Descărcarea unor fișiere a eșuat"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Nu s-au putut aduce unele arhive, poate ar fi o idee bună să rulați 'apt-get "
+"update' sau încercați cu --fix-missing?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing și schimbul de mediu nu este deocamdată suportat"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Nu pot corecta pachetele lipsă."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Abandonez instalarea."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+# XXX: orice sugestie este bine-venită
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover"
+
+#: 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 ""
+"Hmm, se pare că AutoRemover a distrus ceva, lucru care n-ar trebui să se "
+"întâmple. Sunteți rugat să trimiteți un raportați de defect pentru pachetul "
+"apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni"
+
+#: apt-private/private-install.cc:488
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
+msgstr[1] ""
+"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
+msgstr[2] ""
+"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+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] ""
+"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
+msgstr[1] ""
+"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
+msgstr[2] ""
+"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
+
+#: 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] "Folosiți 'apt-get autoremove' pentru a le șterge."
+msgstr[1] "Folosiți 'apt-get autoremove' pentru a le șterge."
+msgstr[2] "Folosiți 'apt-get autoremove' pentru a le șterge."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Ați putea porni 'apt-get -f install' pentru a corecta acestea:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Dependențe neîndeplinite. Încercați 'apt-get -f install' fără nici un pachet "
+"(sau oferiți o altă soluție)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Unele pachete n-au putut fi instalate. Aceasta ar putea însemna că ați "
+"cerut\n"
+"o situație imposibilă sau că folosiți distribuția instabilă în care unele "
+"pachete\n"
+"cerute n-au fost create încă sau au fost mutate din Incoming."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Pachete deteriorate"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Următoarele extra pachete vor fi instalate:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Pachete sugerate:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Pachete recomandate:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n"
+
+#: apt-private/private-install.cc:827
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s este deja la cea mai nouă versiune.\n"
+
+#: apt-private/private-install.cc:892
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Versiune selectată %s (%s) pentru %s\n"
+
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Versiune selectată %s (%s) pentru %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 "Pachetul %s nu este instalat, așa încât nu este șters\n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "Avertisment de autentificare înlocuit.\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Unele pachete n-au putut fi autentificate"
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Instalați aceste pachete fără verificare?"
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Eșec la aducerea lui %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 "N-am putut determina spațiul disponibil în %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Nu aveți suficient spațiu în %s."
+
+#: apt-private/private-sources.cc:58
+#, fuzzy, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "Eșec la redenumirea lui %s în %s"
+
+#: apt-private/private-sources.cc:70
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""
+
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Atins "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Luat:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ignorat "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Eroare"
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Aduși: %sB în %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [În lucru]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1726,18 +1733,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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,208 +1821,463 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Se combină informațiile disponibile"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "S-a chemat DropNode pe un nod încă „legat”"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n"
+"\n"
+"apt-extracttemplates este o unealtă pentru extragerea informațiilor \n"
+"de configurare și a șabloanelor dintr-un pachet Debian\n"
+"\n"
+"Opțiuni\n"
+"  -h   Acest text de ajutor.\n"
+"  -t   Impune directorul temporar\n"
+"  -c=? Citește acest fișier de configurare\n"
+"  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
 
-# XXX: nu-mi place, fie e hash, fie „element de dispersie”
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Eșec la localizarea elementului de dispersie!"
+#: 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"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Eșec la alocarea redirectării"
+#: 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"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Eroare internă în „AddDiversion”"
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Nu s-a putut citi versiunea debconf. Este instalat debconf?"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Încercare de suprascriere a redirectării, %s -> %s și %s/%s"
+#: 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ă"
 
-#: apt-inst/filelist.cc:506
+#: 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 "Double add of diversion %s -> %s"
-msgstr "Adăugare dublă de redirectare %s -> %s"
+msgid "Error processing directory %s"
+msgstr "Eroare la prelucrarea directorului %s"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Fișier „conf” duplicat %s/%s"
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Lista de extensii pentru sursă este prea lungă"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: 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:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "Calea %s este prea lungă"
+msgid "Error processing contents %s"
+msgstr "Eroare la prelucrarea conținutului %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Utilizare: apt-ftparchive [opțiuni] comanda\n"
+"Comenzi: packages cale_binare [fișier_înlocuire [prefix_cale]]\n"
+"          sources cale_src [fișier_înlocuire [prefix_cale]]\n"
+"          contents cale\n"
+"          release cale\n"
+"          generate config [grupuri]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generează fișiere de indexare pentru arhivele Debian. "
+"Suportă\n"
+"multe stiluri de generare de la complet automat la înlocuiri funcționale\n"
+"pentru dpkg-scanpackage și dpkg-scansources\n"
+"\n"
+"apt-ftparchive generează fișierele Package dintr-un arbore de .deb-uri.\n"
+"Fișierul Pachet înglobează conținutul tuturor câmpurilor de control din "
+"fiecare\n"
+"pachet cât și MD5 hash și dimensiunea fișierului. Un fișier de înlocuire "
+"este\n"
+"furnizat pentru a forța valoarea Priorității și Secțiunii.\n"
+"\n"
+"În mod asemănator apt-ftparchive generează fișierele Sources dintr-un arbore "
+"de .dsc-uri.\n"
+"Opțiunea --source-override poate fi folosită pentru a specifica fișierul de "
+"înlocuire\n"
+"\n"
+"Comenzile 'packages' și 'sources' ar trebui executate în rădăcina "
+"arborelui.\n"
+"Cale_binare ar trebui să indice baza căutării recursive și fișierul de "
+"înlocuire ar\n"
+"trebui să conțină semnalizatorul de înlocuire. Prefix_cale este adăugat "
+"câmpului\n"
+"de nume fișier dacă acesta este prezent. Exemplu de utilizare din arhiva\n"
+"Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opțiuni:\n"
+"  -h   Acest text de ajutor.\n"
+"  --md5 Generarea controlului MD5\n"
+"  -s=?  Fișierul de înlocuire pentru surse\n"
+"  -q    În liniște\n"
+"  -d=?  Selectează baza de date de cache opțională\n"
+"  --no-delink Activează modul de depanare dezlegare\n"
+"  --contents  Generarea fișierului cu sumarul de control\n"
+"  -c=? Citește acest fișier de configurare\n"
+"  -o=? Ajustează o opțiune de configurare arbitrară"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Nu s-a potrivit nici o selecție"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Se despachetează %s de mai multe ori"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Unele fișiere lipsesc din grupul fișierului pachet '%s'"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Directorul %s este redirectat"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB a fost corupt, fișierul a fost redenumit %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Pachetul încearcă să scrie în ținta redirectării %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB este vechi, se încearcă înnoirea %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Calea de redirectare este prea lungă"
+#: ftparchive/cachedb.cc:96
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Formatul DB este nevalid. Dacă l-ați înnoit pe apt de la o versiune mai "
+"veche, ștergeți și recreați baza de date."
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nu s-a putut deschide fișierul DB %s: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Eșec la „stat” pentru %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Eșec la „readlink” pentru %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Arhiva nu are înregistrare de control"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Nu s-a putut obține un cursor"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Eșec la redenumirea lui %s în %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "A: Nu s-a putut citi directorul %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Directorul %s este înlocuit de un non-director"
+msgid "W: Unable to stat %s\n"
+msgstr "A: Nu s-a putut efectua „stat” pentru %s\n"
 
-# XXX: nu-mi place, hash bucket ar trebui tradus mai elegant
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Eșec la localizarea nodului în clasa lui din tabela de dispersie"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Calea este prea lungă"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "A: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: Erori la fișierul "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Pachet suprascris fără nici o versiune pentru %s"
+msgid "Failed to resolve %s"
+msgstr "Eșec la „resolve” pentru %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Parcurgerea arborelui a eșuat"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Fișierul %s/%s îl suprascrie pe cel din pachetul %s"
+msgid "Failed to open %s"
+msgstr "Eșec la „open” pentru %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Nu se poate executa „stat” pe %s"
+msgid " DeLink %s [%s]\n"
+msgstr " Dezlegare %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Eșec la scrierea fișierului %s"
+msgid "Failed to readlink %s"
+msgstr "Eșec la „readlink” pentru %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Eșec la închiderea fișierului %s"
+msgid "Failed to unlink %s"
+msgstr "Eșec la „unlink” pentru %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Aceasta nu este o arhivă DEB validă, lipsește membrul „%s”"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Eșec la „link” între %s și %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Eroare internă, nu pot localiza membrul %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Limita de %sB a dezlegării a fost atinsă.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Fișier de control neanalizabil"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Arhiva nu are câmp de pachet"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Semnătură de arhivă necorespunzătoare"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Eroare la citirea antetului membrului arhivei"
+#: 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: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:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s nu are nici intrare binară de înlocuire\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Eșec la alocarea memoriei"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Nu s-a putut deschide %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Înlocuire greșită %s linia %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Eșec la citirea fișierului de înlocuire a permisiunilor %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Înlocuire greșită %s linia %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Înlocuire greșită %s linia %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Înlocuire greșită %s linia %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algoritm de compresie necunoscut '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Rezultatul comprimat %s are nevoie de o ajustare a compresiei"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Eșec la crearea FIȘIERULUI*"
 
-#: apt-inst/contrib/arfile.cc:96
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Antet de membru de arhivă necorespunzător"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Eșec la „fork”"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Antet de membru de arhivă necorespunzător"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Comprimare copil"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Arhiva este prea scurtă"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Eroare internă, eșec la crearea lui %s"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Eșec la citirea antetelor arhivei"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "IE către subproces/fișier eșuat"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Eșec la crearea conexiunilor"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Eșec la citire în timpul calculului sumei MD5"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Eșec la executarea lui gzip "
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problemă la desfacerea %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Arhivă deteriorată"
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Eșec la redenumirea lui %s în %s"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Suma de control a arhivei tar nu s-a verificat, arhiva este deteriorată"
+"Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n"
+"\n"
+"apt-extracttemplates este o unealtă pentru extragerea informațiilor \n"
+"de configurare și a șabloanelor dintr-un pachet Debian\n"
+"\n"
+"Opțiuni\n"
+"  -h   Acest text de ajutor.\n"
+"  -t   Impune directorul temporar\n"
+"  -c=? Citește acest fișier de configurare\n"
+"  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Tip antet TAR %u necunoscut, membrul %s"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Înregistrare de pachet necunoscut!"
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Utilizare: apt-sortpkgs [opțiuni] fișier1 [fișier2 ...]\n"
+"\n"
+"apt-sortpkgs este o unealtă simplă pentru sortarea fișierelor pachete. \n"
+"Opțiunea -s este folosită pentru a indica ce fel de fișier este.\n"
+"\n"
+"Opțiuni:\n"
+"  -h   Acest text de ajutor\n"
+"  -s   Folosește sortarea de fișiere-sursă\n"
+"  -c=? Citește acest fișier de configurare\n"
+"  -o=? Ajustează o opțiune de configurare arbitrară, ex.: -o dir::cache=/"
+"tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Sistemul de pachete '%s' nu este suportat"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Nu s-a putut determina un tip de sistem de împachetare potrivit"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "S-au scris %i înregistrări.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "S-au scris %i înregistrări cu %i fișiere lipsă.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "S-au scris %i înregistrări cu %i fișiere nepotrivite\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2031,6 +2293,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 ""
@@ -2046,202 +2329,371 @@ msgstr ""
 msgid "The list of sources could not be read."
 msgstr "Lista surselor nu poate fi citită."
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Cache gol de pachet"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Depinde"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Pre-depinde"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Sugerează"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Recomandă"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Este în conflict"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Înlocuiește"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Învechit"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Corupe"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "cerut"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "opțional"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Calculez înnoirea"
+
+#: 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:118
+#: 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/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/acquire-worker.cc:169
+#: 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/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/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/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/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nu pot determina starea %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/acquire-worker.cc:455
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
-"Vă rog introduceți discul numit: '%s' în unitatea '%s' și apăsați Enter."
+"Nu s-a găsit pachetul %s %s în timpul procesării dependențelor de fișiere"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Tipul de fișier index '%s' nu este suportat"
+msgid "Couldn't stat source package list %s"
+msgstr "Nu pot determina starea listei surse de pachete %s"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Se construiește arborele de dependență"
+#: 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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versiuni candidat"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Colectare furnizori fișier"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generare dependențe"
+#: 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/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/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Eșec la deschiderea fișierului de stare %s"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Eșec la scrierea fișierului temporar de stare %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Nepotrivire la suma de căutare"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Nepotrivire dimensiune"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Operațiune invalidă %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Eroare de scriere"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Directorul %s este redirectat"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: apt-pkg/acquire-item.cc:2059
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
+"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:1926
+#: 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 "
@@ -2250,12 +2702,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:1992
+#: 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:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2263,126 +2715,38 @@ msgstr ""
 "Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la "
 "pachetul %s."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Tipul de fișier index '%s' nu este suportat"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nu pot determina starea %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, 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:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nu pot determina starea listei surse de pachete %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Citire liste de pachete"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Colectare furnizori fișier"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nu s-a putut scrie în %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: apt-pkg/acquire.cc:162
 #, fuzzy, c-format
 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:902
+#: 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:904
+#: 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: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"
@@ -2408,19 +2772,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:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2432,10 +2796,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"
@@ -2505,11 +2873,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"
 
@@ -2520,7 +2888,7 @@ msgid ""
 msgstr ""
 "Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2528,326 +2896,257 @@ msgstr ""
 "Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi "
 "cauzată de pachete ținute."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Nu s-a putut analiza fișierul pachet %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, 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:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Notă, se selectează %s în locul lui %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Se construiește arborele de dependență"
 
-#: 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:139
+msgid "Candidate versions"
+msgstr "Versiuni candidat"
 
-#: 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:168
+msgid "Dependency generation"
+msgstr "Generare dependențe"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Deschidere %s"
+#: 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:371
+#: apt-pkg/depcache.cc:252
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Linie greșită %u în lista sursă %s (tip)"
+msgid "Failed to open StateFile %s"
+msgstr "Eșec la deschiderea fișierului de stare %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 "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Eșec la scrierea fișierului temporar de stare %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/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "Nu s-a putut analiza fișierul pachet %s (%d)"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release '%s' pentru '%s' n-a fost găsită"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
 
-#: apt-pkg/cacheset.cc:603
+#: 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:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:145
+#, 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:164
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: 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:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Nu s-a folosit închiderea pentru fișierul disponibil doar-citire %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nu pot deschide fișierul blocat %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Nu este folosit blocajul pentru fișierul montat nfs %s"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nu pot determina blocajul %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Subprocesul %s a primit o eroare de segmentare."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Subprocesul %s a primit o eroare de segmentare."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Subprocesul %s a întors un cod de eroare (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Subprocesul %s s-a terminat brusc"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problemă la închiderea fișierului"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nu s-a putut deschide fișierul %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nu s-a putut deschide conexiunea pentru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Eșec la crearea IPC-ului pentru subproces"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Eșec la executarea compresorului"
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "scriere, încă mai am %lu de scris dar nu pot"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Problemă la închiderea fișierului"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problemă în timpul sincronizării fișierului"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problemă la dezlegarea fișierului"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Problemă în timpul sincronizării fișierului"
 
@@ -2932,112 +3231,106 @@ 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:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Abreviere de tip nerecunoscut: „%c”"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: 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:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abandonez instalarea."
-
-#: 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"
@@ -3047,12 +3340,12 @@ msgstr "Operațiune invalidă %s"
 msgid "Installing %s"
 msgstr "Se instalează %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Se șterge %s"
@@ -3073,103 +3366,103 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directorul „%s” lipsește."
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Se pregătește %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Se despachetează %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: 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:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "Instalat %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "Șters %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "Șters complet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3190,419 +3483,183 @@ msgstr "Nu pot încuia directorul cu lista"
 #. 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 ""
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n"
-"\n"
-"apt-extracttemplates este o unealtă pentru extragerea informațiilor \n"
-"de configurare și a șabloanelor dintr-un pachet Debian\n"
-"\n"
-"Opțiuni\n"
-"  -h   Acest text de ajutor.\n"
-"  -t   Impune directorul temporar\n"
-"  -c=? Citește acest fișier de configurare\n"
-"  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Nu se poate executa „stat” pe %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Eroare la prelucrarea directorului %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Lista de extensii pentru sursă este prea lungă"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Eroare la scrierea antetului în fișierul index"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Eroare la prelucrarea conținutului %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Utilizare: apt-ftparchive [opțiuni] comanda\n"
-"Comenzi: packages cale_binare [fișier_înlocuire [prefix_cale]]\n"
-"          sources cale_src [fișier_înlocuire [prefix_cale]]\n"
-"          contents cale\n"
-"          release cale\n"
-"          generate config [grupuri]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generează fișiere de indexare pentru arhivele Debian. "
-"Suportă\n"
-"multe stiluri de generare de la complet automat la înlocuiri funcționale\n"
-"pentru dpkg-scanpackage și dpkg-scansources\n"
-"\n"
-"apt-ftparchive generează fișierele Package dintr-un arbore de .deb-uri.\n"
-"Fișierul Pachet înglobează conținutul tuturor câmpurilor de control din "
-"fiecare\n"
-"pachet cât și MD5 hash și dimensiunea fișierului. Un fișier de înlocuire "
-"este\n"
-"furnizat pentru a forța valoarea Priorității și Secțiunii.\n"
-"\n"
-"În mod asemănator apt-ftparchive generează fișierele Sources dintr-un arbore "
-"de .dsc-uri.\n"
-"Opțiunea --source-override poate fi folosită pentru a specifica fișierul de "
-"înlocuire\n"
-"\n"
-"Comenzile 'packages' și 'sources' ar trebui executate în rădăcina "
-"arborelui.\n"
-"Cale_binare ar trebui să indice baza căutării recursive și fișierul de "
-"înlocuire ar\n"
-"trebui să conțină semnalizatorul de înlocuire. Prefix_cale este adăugat "
-"câmpului\n"
-"de nume fișier dacă acesta este prezent. Exemplu de utilizare din arhiva\n"
-"Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opțiuni:\n"
-"  -h   Acest text de ajutor.\n"
-"  --md5 Generarea controlului MD5\n"
-"  -s=?  Fișierul de înlocuire pentru surse\n"
-"  -q    În liniște\n"
-"  -d=?  Selectează baza de date de cache opțională\n"
-"  --no-delink Activează modul de depanare dezlegare\n"
-"  --contents  Generarea fișierului cu sumarul de control\n"
-"  -c=? Citește acest fișier de configurare\n"
-"  -o=? Ajustează o opțiune de configurare arbitrară"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Nu s-a potrivit nici o selecție"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Unele fișiere lipsesc din grupul fișierului pachet '%s'"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB a fost corupt, fișierul a fost redenumit %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB este vechi, se încearcă înnoirea %s"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Formatul DB este nevalid. Dacă l-ați înnoit pe apt de la o versiune mai "
-"veche, ștergeți și recreați baza de date."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nu s-a putut deschide fișierul DB %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Eșec la „readlink” pentru %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arhiva nu are înregistrare de control"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Nu s-a putut obține un cursor"
-
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "A: Nu s-a putut citi directorul %s\n"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
 
-#: ftparchive/writer.cc:96
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "A: Nu s-a putut efectua „stat” pentru %s\n"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "S-a chemat DropNode pe un nod încă „legat”"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "A: "
+# XXX: nu-mi place, fie e hash, fie „element de dispersie”
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Eșec la localizarea elementului de dispersie!"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: Erori la fișierul "
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Eșec la alocarea redirectării"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Eșec la „resolve” pentru %s"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Eroare internă în „AddDiversion”"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Parcurgerea arborelui a eșuat"
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Încercare de suprascriere a redirectării, %s -> %s și %s/%s"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to open %s"
-msgstr "Eșec la „open” pentru %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Adăugare dublă de redirectare %s -> %s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Dezlegare %s [%s]\n"
+msgid "Duplicate conf file %s/%s"
+msgstr "Fișier „conf” duplicat %s/%s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Eșec la „readlink” pentru %s"
+msgid "The path %s is too long"
+msgstr "Calea %s este prea lungă"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Eșec la „unlink” pentru %s"
+msgid "Unpacking %s more than once"
+msgstr "Se despachetează %s de mai multe ori"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Eșec la „link” între %s și %s"
+msgid "The directory %s is diverted"
+msgstr "Directorul %s este redirectat"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:152
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Limita de %sB a dezlegării a fost atinsă.\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Pachetul încearcă să scrie în ținta redirectării %s/%s"
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arhiva nu are câmp de pachet"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Calea de redirectare este prea lungă"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nu are intrare de înlocuire\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Directorul %s este înlocuit de un non-director"
+
+# XXX: nu-mi place, hash bucket ar trebui tradus mai elegant
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Eșec la localizarea nodului în clasa lui din tabela de dispersie"
+
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Calea este prea lungă"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s responsabil este %s nu %s\n"
+msgid "Overwrite package match with no version for %s"
+msgstr "Pachet suprascris fără nici o versiune pentru %s"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nu are nici o intrare sursă de înlocuire\n"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Fișierul %s/%s îl suprascrie pe cel din pachetul %s"
 
-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s nu are nici intrare binară de înlocuire\n"
+msgid "Unable to stat %s"
+msgstr "Nu se poate executa „stat” pe %s"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Eșec la alocarea memoriei"
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Eșec la scrierea fișierului %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Unable to open %s"
-msgstr "Nu s-a putut deschide %s"
+msgid "Failed to close file %s"
+msgstr "Eșec la închiderea fișierului %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Înlocuire greșită %s linia %lu #1"
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Aceasta nu este o arhivă DEB validă, lipsește membrul „%s”"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Eșec la citirea fișierului de înlocuire a permisiunilor %s"
+msgid "Internal error, could not locate member %s"
+msgstr "Eroare internă, nu pot localiza membrul %s"
 
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Înlocuire greșită %s linia %lu #1"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Fișier de control neanalizabil"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Înlocuire greșită %s linia %lu #2"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Semnătură de arhivă necorespunzătoare"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Înlocuire greșită %s linia %lu #3"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Eroare la citirea antetului membrului arhivei"
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritm de compresie necunoscut '%s'"
+#: apt-inst/contrib/arfile.cc:96
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "Antet de membru de arhivă necorespunzător"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Rezultatul comprimat %s are nevoie de o ajustare a compresiei"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Antet de membru de arhivă necorespunzător"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Eșec la crearea FIȘIERULUI*"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arhiva este prea scurtă"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Eșec la „fork”"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Eșec la citirea antetelor arhivei"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Comprimare copil"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Eșec la crearea conexiunilor"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Eroare internă, eșec la crearea lui %s"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Eșec la executarea lui gzip "
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "IE către subproces/fișier eșuat"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Arhivă deteriorată"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Eșec la citire în timpul calculului sumei MD5"
+#: 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ă"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Problemă la desfacerea %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Tip antet TAR %u necunoscut, membrul %s"
 
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n"
-"\n"
-"apt-extracttemplates este o unealtă pentru extragerea informațiilor \n"
-"de configurare și a șabloanelor dintr-un pachet Debian\n"
-"\n"
-"Opțiuni\n"
-"  -h   Acest text de ajutor.\n"
-"  -t   Impune directorul temporar\n"
-"  -c=? Citește acest fișier de configurare\n"
-"  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Total spațiu versiuni ale dependențelor: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Înregistrare de pachet necunoscut!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Nu aveți suficient spațiu în %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Utilizare: apt-sortpkgs [opțiuni] fișier1 [fișier2 ...]\n"
-"\n"
-"apt-sortpkgs este o unealtă simplă pentru sortarea fișierelor pachete. \n"
-"Opțiunea -s este folosită pentru a indica ce fel de fișier este.\n"
-"\n"
-"Opțiuni:\n"
-"  -h   Acest text de ajutor\n"
-"  -s   Folosește sortarea de fișiere-sursă\n"
-"  -c=? Citește acest fișier de configurare\n"
-"  -o=? Ajustează o opțiune de configurare arbitrară, ex.: -o dir::cache=/"
-"tmp\n"
+#~ msgid "Done"
+#~ msgstr "Terminat"
+
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Abandonez instalarea."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/ru.po b/po/ru.po
index 6381e7839..260bdd513 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: 2015-01-16 04:37-0500\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,148 +30,144 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Пакет %s версии %s имеет неудовлетворённую зависимость:\n"
 
-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Всего имён пакетов: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Всего структур пакетов: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Обычных пакетов: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Полностью виртуальных пакетов: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Одиночных виртуальных пакетов: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Смешанных виртуальных пакетов: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Отсутствует: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Всего уникальных версий: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Всего уникальных описаний: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Всего зависимостей: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Всего отношений Версия/Файл: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Всего отношений Описание/Файл: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Всего отношений Provides: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Всего развёрнутых строк: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Всего информации о зависимостях: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Пустого места в кэше: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Полное учтённое пространство: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Эта команда устарела. Используйте вместо неё «apt-mark showauto»."
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Не удалось найти пакет %s"
 
-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Списки пакетов:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Зафиксированные пакеты:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(не найдено)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Установлен: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(отсутствует)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Фиксатор пакета: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Таблица версий:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -241,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"
@@ -262,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."
 
@@ -299,48 +295,48 @@ msgstr ""
 "   -o=? Задать значение произвольной настройке, например, -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Не удалось найти пакет по регулярному выражению «%s»"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Не удалось найти пакет по регулярному выражению «%s»"
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Не удалось найти пакет по регулярному выражению «%s»"
 
-#: cmdline/apt-get.cc:367
+#: 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:423
+#: cmdline/apt-get.cc:414
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Игнорируется недоступная версия «%s» пакета «%s»"
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Не удалось найти пакет %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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,25 +344,25 @@ msgstr ""
 "Эта команда устарела. Используйте вместо неё «apt-mark auto» и «apt-mark "
 "manual»."
 
-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Внутренняя ошибка, решатель проблем всё поломал"
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы"
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Укажите как минимум один пакет, исходный код которого необходимо получить"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -375,7 +371,7 @@ msgstr ""
 "ВНИМАНИЕ: упаковка «%s» поддерживается в системе контроля версий «%s»:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -386,80 +382,69 @@ msgstr ""
 "bzr branch %s\n"
 "для получения последних (возможно не выпущенных) обновлений пакета.\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускаем уже скачанный файл «%s»\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Не удалось определить количество свободного места в %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Недостаточно места в %s"
-
 #. 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:895
+#: 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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Необходимо получить %sб архивов исходного кода.\n"
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Получение исходного кода %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Некоторые архивы не удалось получить."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr "Указан режим «только скачивание», и скачивание завершено"
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n"
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Команда распаковки «%s» завершилась неудачно.\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Команда сборки «%s» завершилась неудачно.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Порождённый процесс завершился неудачно"
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Для проверки зависимостей для сборки необходимо указать как минимум один "
 "пакет"
 
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -468,17 +453,27 @@ msgstr ""
 "У %s отсутствует информация об архитектуре. Для её настройки смотрите apt."
 "conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Обработка зависимостей для сборки завершилась неудачно"
+
+#: 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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s не имеет зависимостей для сборки.\n"
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -521,30 +516,30 @@ msgstr ""
 "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
 "имеет версии-кандидата"
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1388
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зависимости для сборки %s не могут быть удовлетворены."
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Обработка зависимостей для сборки завершилась неудачно"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog для %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Поддерживаемые модули:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -646,11 +641,11 @@ msgid "Must specify at least one pair url/filename"
 msgstr ""
 "Укажите как минимум один пакет, исходный код которого необходимо получить"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -664,54 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -812,12 +807,12 @@ msgstr "Диск не найден."
 msgid "File not found"
 msgstr "Файл не найден"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Не удалось получить атрибуты"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Не удалось установить время модификации"
 
@@ -826,34 +821,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Неправильный URI, локальный URI не должен начинаться с //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Вход в систему"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Невозможно определить имя удалённого сервера"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Невозможно определить локальное имя"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Сервер разорвал соединение и сообщил: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Команда USER не выполнена, сервер сообщил: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Команда PASS не выполнена, сервер сообщил: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -861,127 +856,127 @@ msgstr ""
 "Proxy-сервер указан, однако нет сценария входа в систему, Acquire::ftp::"
 "ProxyLogin пуст."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "Команда «%s» сценария входа в систему завершилась неудачно, сервер сообщил: "
 "%s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Команда TYPE не выполнена, сервер сообщил: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Допустимое время ожидания для соединения истекло"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Сервер прервал соединение"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Ошибка чтения"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Ответ переполнил буфер."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Искажение протокола"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Ошибка записи"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Не удалось создать сокет"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Не удалось присоединиться к сокету данных, время на установление соединения "
 "истекло"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Неудачно"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Невозможно присоединить пассивный сокет"
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Вызов getaddrinfo не смог получить сокет"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Невозможно присоединиться к сокету"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Не удалось принимать соединения на сокете"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Не удалось определить имя сокета"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Невозможно послать команду PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Неизвестное семейство адресов %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Команда EPRT не выполнена, сервер сообщил: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Время установления соединения для сокета данных истекло"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Невозможно принять соединение"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Проблема при хешировании файла"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Невозможно получить файл, сервер сообщил: «%s»"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Время ожидания соединения для сокета данных истекло"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Передача данных завершилась неудачно, сервер сообщил: «%s»"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Запрос"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Невозможно вызвать "
 
@@ -1047,38 +1042,39 @@ msgstr "Что-то странное произошло при определе
 msgid "Unable to connect to %s:%s:"
 msgstr "Невозможно соединиться с %s: %s:"
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
 "ключа?!"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Найдена как минимум одна неправильная подпись."
 
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:164
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
-msgstr "Не удалось выполнить «apt-key» для проверки подписи (gnupg установлена?)"
+msgstr ""
+"Не удалось выполнить «apt-key» для проверки подписи (gnupg установлена?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Неизвестная ошибка при выполнении apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr "Следующие подписи неверные:\n"
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1086,35 +1082,35 @@ msgstr ""
 "Следующие подписи не могут быть проверены, так как недоступен открытый "
 "ключ:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "Пустые файлы не могут быть допустимыми архивами"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Ошибка записи в файл"
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Ошибка чтения, удалённый сервер прервал соединение"
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Ошибка чтения с сервера"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Ошибка записи в файл"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Ошибка в select"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Время ожидания для соединения истекло"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Ошибка записи в выходной файл"
 
@@ -1146,439 +1142,164 @@ msgstr "Этот HTTP-сервер не поддерживает скачива
 msgid "Unknown date format"
 msgstr "Неизвестный формат данных"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Неверный заголовок данных"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Соединение разорвано"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
+#: apt-private/private-list.cc:121
+msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-"Внутренняя ошибка, InstallPackages была вызвана с неработоспособными "
-"пакетами!"
+#: 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-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Пакеты необходимо удалить, но удаление запрещено."
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Исправление зависимостей…"
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Внутренняя ошибка, Ordering не завершилась"
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " не удалось."
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr "Странно. Несовпадение размеров, напишите на apt@packages.debian.org"
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Необходимо скачать %sB/%sB архивов.\n"
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Необходимо скачать %sБ архивов.\n"
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+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
-#: apt-private/private-install.cc:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
-"После данной операции, объём занятого дискового пространства возрастёт на "
-"%sB.\n"
+"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
+"f install»."
 
-#. 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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
+#: 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 ""
-"После данной операции, объём занятого дискового пространства уменьшится на "
-"%sB.\n"
 
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Недостаточно свободного места в %s."
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Установлен]"
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Существуют проблемы, а параметр -y указан без --force-yes"
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Установлен]"
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
 msgstr ""
-"Запрошено выполнение только тривиальных операций, но это не тривиальная "
-"операция."
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-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-install.cc:222
+#: apt-private/private-output.cc:277
 #, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
+msgid "[upgradable from: %s]"
 msgstr ""
-"То, что вы хотите сделать, может иметь нежелательные последствия.\n"
-"Чтобы продолжить, введите фразу: «%s»\n"
-" ?] "
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Аварийное завершение."
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Хотите продолжить?"
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "но %s уже установлен"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Некоторые файлы скачать не удалось"
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "но %s будет установлен"
 
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Невозможно получить некоторые архивы, вероятно надо запустить apt-get update "
-"или попытаться повторить запуск с ключом --fix-missing"
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "но он не может быть установлен"
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing и смена носителя в данный момент не поддерживаются"
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "но это виртуальный пакет"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Невозможно исправить ситуацию с пропущенными пакетами."
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "но он не установлен"
 
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Аварийное завершение установки."
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "но он не будет установлен"
 
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"Следующий пакет исчез из системы, так как все их файлы\n"
-"теперь берутся из других пакетов:"
-msgstr[1] ""
-"Следующие пакеты исчез из системы, так как все их файлы\n"
-"теперь берутся из других пакетов:"
-msgstr[2] ""
-"Следующие пакеты исчез из системы, так как все их файлы\n"
-"теперь берутся из других пакетов:"
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " или"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Замечание: это сделано автоматически и специально программой dpkg."
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
 
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover"
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "НОВЫЕ пакеты, которые будут установлены:"
 
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Хм, кажется, что AutoRemover был как-то удалён, чего не должно\n"
-"было случиться. Пожалуйста, отправьте сообщение об ошибке в пакете apt."
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Пакеты, которые будут УДАЛЕНЫ:"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Следующая информация, возможно, поможет вам:"
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Пакеты, которые будут оставлены в неизменном виде:"
 
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Внутренняя ошибка, AutoRemover всё поломал"
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Пакеты, которые будут обновлены:"
 
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "Следующий пакет устанавливался автоматически и больше не требуется:"
-msgstr[1] ""
-"Следующие пакеты устанавливались автоматически и больше не требуются:"
-msgstr[2] ""
-"Следующие пакеты устанавливались автоматически и больше не требуются:"
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:"
 
-#: apt-private/private-install.cc:517
-#, c-format
-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 пакет был установлен автоматически и больше не требуется.\n"
-msgstr[1] "%lu пакета было установлено автоматически и больше не требуется.\n"
-msgstr[2] "%lu пакетов было установлены автоматически и больше не требуются.\n"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Для его удаления используйте «apt-get autoremove»."
-msgstr[1] "Для их удаления используйте «apt-get autoremove»."
-msgstr[2] "Для их удаления используйте «apt-get autoremove»."
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
-"f install»:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Неудовлетворённые зависимости. Попытайтесь выполнить «apt-get -f install», "
-"не указывая имени пакета, (или найдите другое решение)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Некоторые пакеты невозможно установить. Возможно, вы просите невозможного,\n"
-"или же используете нестабильную версию дистрибутива, где запрошенные вами\n"
-"пакеты ещё не созданы или были удалены из Incoming."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Сломанные пакеты"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Будут установлены следующие дополнительные пакеты:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Предлагаемые пакеты:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Рекомендуемые пакеты:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Пропускается %s — пакет уже установлен и нет команды upgrade.\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Пропускается %s — пакет не установлен, а запрошено только обновление.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Переустановка %s невозможна, он не скачивается.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "Уже установлена самая новая версия %s.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Выбрана версия «%s» (%s) для «%s»\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Выбрана версия «%s» (%s) для «%s» из-за «%s»\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
-"Пакет «%s» не установлен, поэтому не может быть удалён. Возможно имелся в "
-"виду «%s»?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Пакет «%s» не установлен, поэтому не может быть удалён\n"
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Исправление зависимостей…"
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " не удалось."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Невозможно скорректировать зависимости"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Невозможно минимизировать набор обновлений"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Готово"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
-"f install»."
-
-#: apt-private/private-cachefile.cc:111
-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:633
+msgid "The following held packages will be changed:"
+msgstr ""
+"Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
 
 #: apt-private/private-output.cc:688
 #, c-format
@@ -1644,7 +1365,7 @@ msgstr "д"
 msgid "N"
 msgstr "н"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Ошибка компиляции регулярного выражения — %s"
@@ -1653,7 +1374,7 @@ msgstr "Ошибка компиляции регулярного выражен
 msgid "The update command takes no arguments"
 msgstr "Команде update не нужны аргументы"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1662,10 +1383,14 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1691,76 +1416,358 @@ msgstr ""
 "      Учтите, что блокировка не используется,\n"
 "      поэтому нет полного соответствия с текущей реальной ситуацией!"
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
+"Внутренняя ошибка, InstallPackages была вызвана с неработоспособными "
+"пакетами!"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Предупреждение об аутентификации не принято в внимание.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Пакеты необходимо удалить, но удаление запрещено."
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Некоторые пакеты невозможно аутентифицировать"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Внутренняя ошибка, Ordering не завершилась"
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Установить эти пакеты без проверки?"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr "Странно. Несовпадение размеров, напишите на apt@packages.debian.org"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#. 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
+#: apt-private/private-install.cc:154
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Не удалось получить %s  %s\n"
-
-#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "Не удалось переименовать %s в %s"
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Необходимо скачать %sB/%sB архивов.\n"
 
-#: apt-private/private-sources.cc:70
+#. 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:159
 #, c-format
-msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
+msgid "Need to get %sB of archives.\n"
+msgstr "Необходимо скачать %sБ архивов.\n"
 
-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
+#. 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:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
+"После данной операции, объём занятого дискового пространства возрастёт на "
+"%sB.\n"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-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
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr ""
+"После данной операции, объём занятого дискового пространства уменьшится на "
+"%sB.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Существуют проблемы, а параметр -y указан без --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 ""
+"Запрошено выполнение только тривиальных операций, но это не тривиальная "
+"операция."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Да, делать, как я скажу!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"То, что вы хотите сделать, может иметь нежелательные последствия.\n"
+"Чтобы продолжить, введите фразу: «%s»\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Аварийное завершение."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Хотите продолжить?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Некоторые файлы скачать не удалось"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Невозможно получить некоторые архивы, вероятно надо запустить apt-get update "
+"или попытаться повторить запуск с ключом --fix-missing"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing и смена носителя в данный момент не поддерживаются"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Невозможно исправить ситуацию с пропущенными пакетами."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Аварийное завершение установки."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"Следующий пакет исчез из системы, так как все их файлы\n"
+"теперь берутся из других пакетов:"
+msgstr[1] ""
+"Следующие пакеты исчез из системы, так как все их файлы\n"
+"теперь берутся из других пакетов:"
+msgstr[2] ""
+"Следующие пакеты исчез из системы, так как все их файлы\n"
+"теперь берутся из других пакетов:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Замечание: это сделано автоматически и специально программой dpkg."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Не предполагалось удалять stuff, невозможно запустить 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 ""
+"Хм, кажется, что AutoRemover был как-то удалён, чего не должно\n"
+"было случиться. Пожалуйста, отправьте сообщение об ошибке в пакете apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Следующая информация, возможно, поможет вам:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Внутренняя ошибка, AutoRemover всё поломал"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "Следующий пакет устанавливался автоматически и больше не требуется:"
+msgstr[1] ""
+"Следующие пакеты устанавливались автоматически и больше не требуются:"
+msgstr[2] ""
+"Следующие пакеты устанавливались автоматически и больше не требуются:"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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 пакет был установлен автоматически и больше не требуется.\n"
+msgstr[1] "%lu пакета было установлено автоматически и больше не требуется.\n"
+msgstr[2] "%lu пакетов было установлены автоматически и больше не требуются.\n"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "Для его удаления используйте «apt-get autoremove»."
+msgstr[1] "Для их удаления используйте «apt-get autoremove»."
+msgstr[2] "Для их удаления используйте «apt-get autoremove»."
 
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Готово"
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr ""
+"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
+"f install»:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Неудовлетворённые зависимости. Попытайтесь выполнить «apt-get -f install», "
+"не указывая имени пакета, (или найдите другое решение)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Некоторые пакеты невозможно установить. Возможно, вы просите невозможного,\n"
+"или же используете нестабильную версию дистрибутива, где запрошенные вами\n"
+"пакеты ещё не созданы или были удалены из Incoming."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Сломанные пакеты"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Будут установлены следующие дополнительные пакеты:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Предлагаемые пакеты:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Рекомендуемые пакеты:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Пропускается %s — пакет уже установлен и нет команды upgrade.\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Пропускается %s — пакет не установлен, а запрошено только обновление.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Переустановка %s невозможна, он не скачивается.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "Уже установлена самая новая версия %s.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Выбрана версия «%s» (%s) для «%s»\n"
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Выбрана версия «%s» (%s) для «%s» из-за «%s»\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+"Пакет «%s» не установлен, поэтому не может быть удалён. Возможно имелся в "
+"виду «%s»?\n"
+
+#: apt-private/private-install.cc:945
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Пакет «%s» не установлен, поэтому не может быть удалён\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "Предупреждение об аутентификации не принято в внимание.\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Некоторые пакеты невозможно аутентифицировать"
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Установить эти пакеты без проверки?"
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Не удалось получить %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 "Не удалось определить количество свободного места в %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Недостаточно свободного места в %s."
+
+#: apt-private/private-sources.cc:58
+#, fuzzy, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "Не удалось переименовать %s в %s"
+
+#: apt-private/private-sources.cc:70
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""
+
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "В кэше "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Получено:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Игн "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Ош  "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Получено %sБ за %s (%sБ/c)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Обработка]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1773,18 +1780,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1860,205 +1867,460 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Слияние доступной информации"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode вызван для узла, который ещё используется"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Не удалось найти элемент хеша!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Не удалось создать diversion"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Внутренняя ошибка в AddDiversion"
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Попытка изменения diversion, %s -> %s и %s/%s"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Использование: apt-extracttemplates файл1 [файл2…]\n"
+"\n"
+"apt-extracttemplates извлекает из пакетов Debian данные config и template\n"
+"\n"
+"Параметры:\n"
+"  -h   Этот текст\n"
+"  -t   Задать каталог для временных файлов\n"
+"  -c=? Читать указанный файл настройки\n"
+"  -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:506
+#: 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:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Двойное добавление diversion %s -> %s"
+msgid "Unable to write to %s"
+msgstr "Невозможно записать в %s"
 
-#: apt-inst/filelist.cc:549
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Невозможно определить версию debconf. Он установлен?"
+
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "Список расширений, допустимых для пакетов, слишком длинен"
+
+#: 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 "Duplicate conf file %s/%s"
-msgstr "Повторно указан файл настройки %s/%s"
+msgid "Error processing directory %s"
+msgstr "Ошибка обработки каталога %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Список расширений источников слишком длинен"
+
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr ""
+"Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "Слишком длинный путь %s"
+msgid "Error processing contents %s"
+msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Использование: apt-ftparchive [параметры] команда\n"
+"Команды:  packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive генерирует индексные файлы архивов Debian. Он поддерживает\n"
+"множество стилей генерации: от полностью автоматического до функциональной "
+"замены\n"
+"программ dpkg-scanpackages и dpkg-scansources\n"
+"\n"
+"apt-ftparchive генерирует файлы Package (списки пакетов) для дерева\n"
+"каталогов, содержащих файлы .deb. Файл Package включает в себя управляющие\n"
+"поля каждого пакета, а также хеш MD5 и размер файла. Значения управляющих\n"
+"полей «приоритет» (Priority) и «секция» (Section) могут быть изменены с\n"
+"помощью файла override.\n"
+"\n"
+"Кроме того, apt-ftparchive может генерировать файлы Sources из дерева\n"
+"каталогов, содержащих файлы .dsc. Для указания файла override в этом \n"
+"режиме можно использовать параметр --source-override.\n"
+"\n"
+"Команды «packages» и «sources» надо выполнять, находясь в корневом каталоге\n"
+"дерева, которое вы хотите обработать. BinaryPath должен указывать на место,\n"
+"с которого начинается рекурсивный обход, а файл переназначений (override)\n"
+"должен содержать записи о переназначениях управляющих полей. Если был "
+"указан\n"
+"Pathprefix, то его значение добавляется к управляющим полям, содержащим\n"
+"имена файлов. Пример использования для архива Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Параметры:\n"
+"  -h    Этот текст\n"
+"  --md5 Управление генерацией MD5-хешей\n"
+"  -s=?  Указать файл переназначений (override) для источников\n"
+"  -q    Не выводить сообщения в процессе работы\n"
+"  -d=?  Указать кэширующую базу данных (не обязательно)\n"
+"  --no-delink Включить режим отладки процесса удаления файлов\n"
+"  --contents  Управление генерацией полного перечня содержимого пакетов\n"
+"              (файла Contents)\n"
+"  -c=?  Использовать указанный файл настройки\n"
+"  -o=?  Задать значение произвольному параметру настройки"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Совпадений не обнаружено"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Повторная распаковка %s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "В группе пакетов «%s» отсутствуют некоторые файлы"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Каталог %s входит в список diverted"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "БД была повреждена, файл переименован в %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Пакет пытается писать в diversion %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB устарела, попытка обновить %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Путь diversion слишком длинен"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите "
+"и создайте базу данных заново."
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Не удалось открыть DB файл %s: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Не удалось получить атрибуты %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Не удалось прочесть ссылку %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "В архиве нет поля control"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Невозможно получить курсор"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Не удалось переименовать %s в %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Не удалось прочитать каталог %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Каталог %s был заменён не-каталогом"
+msgid "W: Unable to stat %s\n"
+msgstr "W: Не удалось прочитать атрибуты %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Не удалось разместить узел в хеше"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Путь слишком длинен"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "W: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: Ошибки относятся к файлу "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Файлы заменяются содержимым пакета %s без версии"
+msgid "Failed to resolve %s"
+msgstr "Не удалось проследовать по ссылке %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Не удалось совершить обход дерева"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Файл %s/%s переписывает файл в пакете %s"
+msgid "Failed to open %s"
+msgstr "Не удалось открыть %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Невозможно получить атрибуты %s"
+msgid " DeLink %s [%s]\n"
+msgstr "DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Не удалось записать в файл %s"
+msgid "Failed to readlink %s"
+msgstr "Не удалось прочесть ссылку %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Не удалось закрыть файл %s"
+msgid "Failed to unlink %s"
+msgstr "Не удалось удалить %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Это неправильный DEB-архив — отсутствует составная часть «%s»"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Не удалось создать ссылку %s на %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Внутренняя ошибка, не удалось найти составную часть %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Превышен лимит в %sB в DeLink.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Не удалось прочесть содержимое control-файла"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "В архиве нет поля package"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Неверная сигнатура архива"
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  Нет записи о переназначении (override) для %s\n"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Ошибка чтения заголовка элемента архива"
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  пакет %s сопровождает %s, а не %s\n"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:712
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "Неправильный заголовок элемента архива %s"
+msgid "  %s has no source override entry\n"
+msgstr "  Нет записи source override для %s\n"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Неправильный заголовок элемента архива"
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  Нет записи binary override для %s\n"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Слишком короткий архив"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc — не удалось выделить память"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Не удалось прочитать заголовки архива"
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Не удалось открыть %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Не удалось прочесть файл переназначений (override) %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Неправильная запись о переназначении (override) %s в строке %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Неправильная запись о переназначении (override) %s в строке %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Неизвестный алгоритм сжатия «%s»"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr ""
+"Для получения сжатого вывода %s необходимо включить использования сжатия"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Не удалось создать FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Не удалось запустить порождённый процесс"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Процесс-потомок, производящий сжатие"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Не удалось создать каналы"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Внутренняя ошибка, не удалось создать %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Не удалось выполнить gzip "
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Ошибка ввода/вывода в подпроцесс/файл"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Повреждённый архив"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Ошибка чтения во время вычисления MD5"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Неправильная контрольная сумма Tar, архив повреждён"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Не удалось удалить %s"
 
-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s"
+msgid "Failed to rename %s to %s"
+msgstr "Не удалось переименовать %s в %s"
+
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Использование: apt-internal-solver\n"
+"\n"
+"apt-internal-solver — интерфейс к внутреннему решателю, предназначен\n"
+"для отладки, подобен интерфейсу внешнего решателя семейства APT\n"
+"\n"
+"Параметры:\n"
+"  -h   Этот текст\n"
+"  -q   Вывод протокола работы — индикатор выполнения отключён\n"
+"  -c=? Читать указанный файл настройки\n"
+"  -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Запись о неизвестном пакете!"
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Использование: apt-sortpkgs [параметры] файл1 [файл2…]\n"
+"\n"
+"apt-sortpkgs — простой инструмент для сортировки списков пакетов. Параметр -"
+"s\n"
+"используется для указания типа списка.\n"
+"\n"
+"Параметры:\n"
+"  -h   этот текст\n"
+"  -s   сортировать список файлов пакетов исходного кода\n"
+"  -c=? читать указанный файл настройки\n"
+"  -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "Запускается dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Система пакетирования «%s» не поддерживается"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Невозможно определить подходящий тип системы пакетирования"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Сохранено %i записей.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Сохранено %i записей с %i отсутствующими файлами.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Сохранено %i записей с %i несовпадающими файлами\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2075,6 +2337,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 "Списки пакетов или файл состояния не могут быть открыты или прочитаны."
@@ -2087,157 +2369,340 @@ msgstr "Вы можете запустить «apt-get update» для испр
 msgid "The list of sources could not be read."
 msgstr "Не читается перечень источников."
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Кэш пакетов пуст"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr "Кэш пакетов повреждён"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr "Не поддерживаемая версия кэша пакетов"
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Кэш пакетов повреждён, он слишком мал"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Эта версия APT не поддерживает систему версий «%s»"
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Зависит"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "ПредЗависит"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Предлагает"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Рекомендует"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Конфликтует"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Заменяет"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Замещает"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Ломает"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Улучшает"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "важный"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "необходимый"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "стандартный"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "необязательный"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "дополнительный"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Расчёт обновлений"
+
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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/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 "Сбор информации о 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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Версии-кандидаты"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Отправка запроса решателю"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Генерирование зависимостей"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Подготовка к приёму решения"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Чтение информации о состоянии"
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Не удалось открыть StateFile %s"
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Запустить внешний решатель"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Не удалось записать временный StateFile %s"
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Хеш сумма не совпадает"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Не совпадает размер"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Неверная операция %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Ошибка записи"
+
+#: apt-pkg/acquire-item.cc:259
+#, fuzzy
+msgid "Does not start with a cleartext signature"
+msgstr "Файл %s не начинается с прозрачно подписанного сообщения"
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Произошла ошибка при проверке подписи. Репозиторий не обновлён и будут "
+"использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Ошибка GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Каталог %s входит в список diverted"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2246,16 +2711,16 @@ msgstr ""
 "Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись "
 "в sources.list или файл)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2264,27 +2729,19 @@ msgstr ""
 "Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого "
 "репозитория производиться не будет."
 
-#: apt-pkg/acquire-item.cc:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Произошла ошибка при проверке подписи. Репозиторий не обновлён и будут "
-"использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Ошибка GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2293,136 +2750,49 @@ msgstr ""
 "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
 "вручную исправить этот пакет (возможно, пропущен arch)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Произошла ошибка во время обработки %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Превышено допустимое количество имён пакетов, которое способен обработать "
-"APT."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Превышено допустимое количество версий, которое способен обработать APT."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Превышено допустимое количество описаний, которое способен обработать APT."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Превышено допустимое количество зависимостей, которое способен обработать "
-"APT."
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Во время обработки файла зависимостей не найден пакет %s %s"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Чтение списков пакетов"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Сбор информации о Provides"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Невозможно записать в %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Архивный каталог %spartial отсутствует."
 
-#: apt-pkg/acquire.cc:99
+#: 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:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Скачивается файл %li из %li (осталось %s)"
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Вы должны заполнить sources.list, поместив туда URI источников пакетов"
@@ -2450,7 +2820,7 @@ msgstr "Неизвестный тип фиксации %s"
 msgid "No priority (or zero) specified for pin"
 msgstr "Для фиксации не указан приоритет (или указан нулевой)"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2459,12 +2829,12 @@ msgstr ""
 "Не удалось выполнить оперативную настройку «%s». Подробней, смотрите в man 5 "
 "apt.conf о APT::Immediate-Configure. (%d)"
 
-#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "Не удалось настроить «%s»."
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2477,10 +2847,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"
@@ -2551,11 +2924,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"
 
@@ -2566,7 +2939,7 @@ msgid ""
 msgstr ""
 "Пакет %s нуждается в переустановке, но найти архив для него не удалось."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2574,269 +2947,196 @@ msgstr ""
 "Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это "
 "может быть вызвано отложенными (held) пакетами."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr "Отправка запроса решателю"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Подготовка к приёму решения"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Запустить внешний решатель"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Невозможно разобрать содержимое пакета %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Невозможно разобрать содержимое файла Release (%s)"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Отсутствуют разделы в файле Release (%s)"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Отсутствуют элементы Hash в файле Release (%s)"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Неправильный элемент «Valid-Until» в файле Release %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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 (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 "Искажённая строка %lu в списке источников %s (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 "Искажённая строка %u в списке источников %s (тип)"
+msgid "Failed to open StateFile %s"
+msgstr "Не удалось открыть 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 "Неизвестный тип «%s» в строке %u в списке источников %s"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Не удалось записать временный StateFile %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/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "Невозможно разобрать содержимое пакета %s (%d)"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Выпуск «%s» для «%s» не найден"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Версия «%s» для «%s» не найдена"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Не удалось найти задачу «%s»"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/cacheset.cc:635
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Не удалось найти пакет по регулярному выражению «%s»"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/cacheset.cc:641
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Не удалось найти пакет по регулярному выражению «%s»"
 
-#: apt-pkg/cacheset.cc:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Не удалось выбрать ни установленную, ни версию кандидата из пакета «%s», так "
-"как в нём нет ни той, ни другой"
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Отсутствуют элементы Hash в файле Release (%s)"
+
+#: apt-pkg/indexrecords.cc:145
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Неправильный элемент «Valid-Until» в файле Release %s"
+
+#: apt-pkg/indexrecords.cc:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Неправильный элемент «Date» в файле Release %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%liмин %liс"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%liс"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Не найдено: %s"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Блокировка не используется, так как файл блокировки %s доступен только для "
 "чтения"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Не удалось открыть файл блокировки %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Блокировка не используется, так как файл блокировки %s находится на файловой "
 "системе nfs"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Не удалось получить доступ к файлу блокировки %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 "Список файлов не может быть создан, так как «%s» не является каталогом"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Файл «%s» в каталоге «%s» игнорируется, так как это необычный файл"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "Файл «%s» в каталоге «%s» игнорируется, так как он не имеет расширения"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2844,77 +3144,77 @@ msgstr ""
 "Файл «%s» в каталоге «%s» игнорируется, так как он не имеет неправильное "
 "расширение"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 "Нарушение защиты памяти (segmentation fault) в порождённом процессе %s."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Порождённый процесс %s получил сигнал %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Порождённый процесс %s вернул код ошибки (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Порождённый процесс %s неожиданно завершился"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Проблема закрытия gzip-файла %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Не удалось открыть файл %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Не удалось открыть файловый дескриптор %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Не удалось создать IPC с порождённым процессом"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Не удалось выполнить компрессор "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 "ошибка при чтении; собирались прочесть ещё %llu байт, но ничего больше нет"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "ошибка при записи; собирались записать ещё %llu байт, но не смогли"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Проблема закрытия файла %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Проблема при переименовании файла %s в %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Проблема при удалении файла %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Проблема при синхронизации файла"
 
@@ -3002,113 +3302,107 @@ msgstr "Невозможно прочитать атрибуты точки мо
 msgid "Failed to stat the cdrom"
 msgstr "Невозможно получить атрибуты cdrom"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Неизвестная аббревиатура типа: «%c»"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Открытие файла настройки %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Синтаксическая ошибка %s:%u: искажённый тег"
 
-#: apt-pkg/contrib/configuration.cc:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Синтаксическая ошибка %s:%u: лишние символы в конце файла"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Связка ключей в %s не установлена."
-
-#: 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"
@@ -3118,12 +3412,12 @@ msgstr "Неверная операция %s"
 msgid "Installing %s"
 msgstr "Устанавливается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Удаляется %s"
@@ -3144,79 +3438,79 @@ msgid "Running post-installation trigger %s"
 msgstr "Выполняется послеустановочный триггер %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Отсутствует каталог «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Подготавливается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Распаковывается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Подготавливается для настройки %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "Установлен %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Подготавливается для удаления %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "Удалён %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Подготовка к полному удалению %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s полностью удалён"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr "Действие прервано до его завершения"
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "проблемы с зависимостями — оставляем ненастроенным"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3224,7 +3518,7 @@ msgstr ""
 "Отчёты apport не записаны, так как сообщение об ошибке указывает на "
 "повторную ошибку от предыдущего отказа."
 
-#: apt-pkg/deb/dpkgpm.cc:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3232,7 +3526,7 @@ msgstr ""
 "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
 "места на диске"
 
-#: apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3240,7 +3534,7 @@ msgstr ""
 "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
 "памяти"
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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 "
@@ -3249,7 +3543,7 @@ msgstr ""
 "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
 "места на диске"
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3267,427 +3561,190 @@ msgstr ""
 
 #: 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 "Не заблокирован"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Использование: apt-extracttemplates файл1 [файл2…]\n"
-"\n"
-"apt-extracttemplates извлекает из пакетов Debian данные config и template\n"
-"\n"
-"Параметры:\n"
-"  -h   Этот текст\n"
-"  -t   Задать каталог для временных файлов\n"
-"  -c=? Читать указанный файл настройки\n"
-"  -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Невозможно получить атрибуты %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Невозможно определить версию debconf. Он установлен?"
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Ошибка обработки каталога %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Список расширений источников слишком длинен"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr ""
-"Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Использование: apt-ftparchive [параметры] команда\n"
-"Команды:  packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive генерирует индексные файлы архивов Debian. Он поддерживает\n"
-"множество стилей генерации: от полностью автоматического до функциональной "
-"замены\n"
-"программ dpkg-scanpackages и dpkg-scansources\n"
-"\n"
-"apt-ftparchive генерирует файлы Package (списки пакетов) для дерева\n"
-"каталогов, содержащих файлы .deb. Файл Package включает в себя управляющие\n"
-"поля каждого пакета, а также хеш MD5 и размер файла. Значения управляющих\n"
-"полей «приоритет» (Priority) и «секция» (Section) могут быть изменены с\n"
-"помощью файла override.\n"
-"\n"
-"Кроме того, apt-ftparchive может генерировать файлы Sources из дерева\n"
-"каталогов, содержащих файлы .dsc. Для указания файла override в этом \n"
-"режиме можно использовать параметр --source-override.\n"
-"\n"
-"Команды «packages» и «sources» надо выполнять, находясь в корневом каталоге\n"
-"дерева, которое вы хотите обработать. BinaryPath должен указывать на место,\n"
-"с которого начинается рекурсивный обход, а файл переназначений (override)\n"
-"должен содержать записи о переназначениях управляющих полей. Если был "
-"указан\n"
-"Pathprefix, то его значение добавляется к управляющим полям, содержащим\n"
-"имена файлов. Пример использования для архива Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Параметры:\n"
-"  -h    Этот текст\n"
-"  --md5 Управление генерацией MD5-хешей\n"
-"  -s=?  Указать файл переназначений (override) для источников\n"
-"  -q    Не выводить сообщения в процессе работы\n"
-"  -d=?  Указать кэширующую базу данных (не обязательно)\n"
-"  --no-delink Включить режим отладки процесса удаления файлов\n"
-"  --contents  Управление генерацией полного перечня содержимого пакетов\n"
-"              (файла Contents)\n"
-"  -c=?  Использовать указанный файл настройки\n"
-"  -o=?  Задать значение произвольному параметру настройки"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Совпадений не обнаружено"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "В группе пакетов «%s» отсутствуют некоторые файлы"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "БД была повреждена, файл переименован в %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB устарела, попытка обновить %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите "
-"и создайте базу данных заново."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Не удалось открыть DB файл %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Не удалось прочесть ссылку %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "В архиве нет поля control"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Невозможно получить курсор"
-
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Не удалось прочитать каталог %s\n"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"Не удалось выполнить блокировку управляющего каталога (%s); у вас есть права "
+"суперпользователя?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Не удалось прочитать атрибуты %s\n"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"Работа dpkg прервана, вы должны вручную запустить «%s» для устранения "
+"проблемы. "
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Не заблокирован"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "W: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode вызван для узла, который ещё используется"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: Ошибки относятся к файлу "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Не удалось найти элемент хеша!"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Не удалось проследовать по ссылке %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Не удалось создать diversion"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Не удалось совершить обход дерева"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Внутренняя ошибка в AddDiversion"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "Не удалось открыть %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Попытка изменения diversion, %s -> %s и %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "DeLink %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Двойное добавление diversion %s -> %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Не удалось прочесть ссылку %s"
+msgid "Duplicate conf file %s/%s"
+msgstr "Повторно указан файл настройки %s/%s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Не удалось удалить %s"
+msgid "The path %s is too long"
+msgstr "Слишком длинный путь %s"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Не удалось создать ссылку %s на %s"
+msgid "Unpacking %s more than once"
+msgstr "Повторная распаковка %s"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Превышен лимит в %sB в DeLink.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "В архиве нет поля package"
+msgid "The directory %s is diverted"
+msgstr "Каталог %s входит в список diverted"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  Нет записи о переназначении (override) для %s\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Пакет пытается писать в diversion %s/%s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  пакет %s сопровождает %s, а не %s\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Путь diversion слишком длинен"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  Нет записи source override для %s\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Каталог %s был заменён не-каталогом"
 
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  Нет записи binary override для %s\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Не удалось разместить узел в хеше"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc — не удалось выделить память"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Путь слишком длинен"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "Не удалось открыть %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1"
+msgid "Overwrite package match with no version for %s"
+msgstr "Файлы заменяются содержимым пакета %s без версии"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Не удалось прочесть файл переназначений (override) %s"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Файл %s/%s переписывает файл в пакете %s"
 
-#: ftparchive/override.cc:166
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Неправильная запись о переназначении (override) %s в строке %llu #1"
+msgid "Unable to stat %s"
+msgstr "Невозможно получить атрибуты %s"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Неправильная запись о переназначении (override) %s в строке %llu #2"
+msgid "Failed to write file %s"
+msgstr "Не удалось записать в файл %s"
 
-#: ftparchive/override.cc:191
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Неправильная запись о переназначении (override) %s в строке %llu #3"
+msgid "Failed to close file %s"
+msgstr "Не удалось закрыть файл %s"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Неизвестный алгоритм сжатия «%s»"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Это неправильный DEB-архив — отсутствует составная часть «%s»"
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr ""
-"Для получения сжатого вывода %s необходимо включить использования сжатия"
+msgid "Internal error, could not locate member %s"
+msgstr "Внутренняя ошибка, не удалось найти составную часть %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Не удалось создать FILE*"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Не удалось прочесть содержимое control-файла"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Не удалось запустить порождённый процесс"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Неверная сигнатура архива"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Процесс-потомок, производящий сжатие"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Ошибка чтения заголовка элемента архива"
 
-#: ftparchive/multicompress.cc:232
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Внутренняя ошибка, не удалось создать %s"
+msgid "Invalid archive member header %s"
+msgstr "Неправильный заголовок элемента архива %s"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Ошибка ввода/вывода в подпроцесс/файл"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Неправильный заголовок элемента архива"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Ошибка чтения во время вычисления MD5"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Слишком короткий архив"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Не удалось прочитать заголовки архива"
+
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Не удалось создать каналы"
+
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Не удалось выполнить gzip "
+
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Повреждённый архив"
+
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Неправильная контрольная сумма Tar, архив повреждён"
+
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Не удалось удалить %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Использование: apt-internal-solver\n"
-"\n"
-"apt-internal-solver — интерфейс к внутреннему решателю, предназначен\n"
-"для отладки, подобен интерфейсу внешнего решателя семейства APT\n"
-"\n"
-"Параметры:\n"
-"  -h   Этот текст\n"
-"  -q   Вывод протокола работы — индикатор выполнения отключён\n"
-"  -c=? Читать указанный файл настройки\n"
-"  -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Всего информации о зависимостях: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Запись о неизвестном пакете!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Недостаточно места в %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Использование: apt-sortpkgs [параметры] файл1 [файл2…]\n"
-"\n"
-"apt-sortpkgs — простой инструмент для сортировки списков пакетов. Параметр -"
-"s\n"
-"используется для указания типа списка.\n"
-"\n"
-"Параметры:\n"
-"  -h   этот текст\n"
-"  -s   сортировать список файлов пакетов исходного кода\n"
-"  -c=? читать указанный файл настройки\n"
-"  -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Готово"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Связка ключей в %s не установлена."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
@@ -3779,9 +3836,6 @@ msgstr ""
 #~ "Не удалось записать в журнал, неудачное выполнение openpty() (/dev/pts не "
 #~ "смонтирован?)\n"
 
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Файл %s не начинается с прозрачно подписанного сообщения"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Пропускается несуществующий файл %s"
 
diff --git a/po/sk.po b/po/sk.po
index 4dfeab746..912d1fcf7 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: 2015-01-16 04:37-0500\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,150 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Celkom názvov balíkov: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Celkom štruktúr balíkov: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Normálnych balíkov: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Čisto virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Jednoduchých virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Zmiešaných virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Chýbajúcich: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Celkom rôznych verzií: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Celkom rôznych popisov: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Celkom závislostí: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Celkom vzťahov ver/súbor: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Celkom vzťahov popis/súbor: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Celkom poskytnutých mapovaní: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Celkom globovaných reťazcov: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Celkom miesta závislých verzií: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Celkom jalového miesta: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Celkom priradeného miesta: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: 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:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Súbory balíka:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Pripevnené balíky:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(nenájdené)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Nainštalovaná verzia: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Kandidát: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(žiadna)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Pripevnený balík:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Tabuľka verzií:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -239,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"
@@ -260,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."
 
@@ -296,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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: 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:454
+#: 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:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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."
@@ -345,24 +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:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: 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:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -372,7 +368,7 @@ msgstr ""
 "adrese:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -384,80 +380,69 @@ msgstr ""
 "ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie "
 "balíka.\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Na %s nemáte dostatok voľného miesta"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stiahnuť zdroj %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Zlyhalo stiahnutie niektorých archívov."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: 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:968
+#: 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:996
+#: 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:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Proces potomka zlyhal"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -466,17 +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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -515,30 +510,30 @@ msgid ""
 msgstr ""
 "%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Spracovanie závislostí na zostavenie zlyhalo"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Záznam zmien %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -653,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -798,12 +793,12 @@ msgstr "Disk sa nenašiel."
 msgid "File not found"
 msgstr "Súbor sa nenašiel"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Vyhodnotenie zlyhalo"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Zlyhalo nastavenie času zmeny"
 
@@ -812,34 +807,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Neplatné URI, lokálne URI nesmie začínať s //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Prihlasovanie"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Nedá sa zistiť názov druhej strany"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Nedá sa zistiť lokálny názov"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Server zamietol naše spojenie s chybou: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Zlyhalo zadanie používateľa, server odpovedal: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Zlyhalo zadanie hesla, server odpovedal: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -847,123 +842,123 @@ msgstr ""
 "Bol zadaný proxy server, ale nie prihlasovací skript. Acquire::ftp::"
 "ProxyLogin je prázdny."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Príkaz „%s“ prihlasovacieho skriptu zlyhal, server odpovedal: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Zlyhalo zadanie typu, server odpovedal: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Uplynul čas spojenia"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Server ukončil spojenie"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Chyba pri čítaní"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Odpoveď preplnila zásobník."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Narušenie protokolu"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Chyba pri zápise"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Nedá sa vytvoriť socket"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nedá sa pripojiť dátový socket, uplynul čas spojenia"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Chyba"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Nedá sa pripojiť pasívny socket."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo nezískal počúvajúci socket"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Nedá sa nadviazať socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Na sockete sa nedá počúvať"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Názov socketu sa nedá zistiť"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Príkaz PORT sa nedá odoslať"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Neznáma rodina adries %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Zlyhalo zadanie EPRT, server odpovedal: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Uplynulo spojenie dátového socketu"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Spojenie sa nedá prijať"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Súbor sa nedá stiahnuť, server odpovedal „%s“"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Uplynula doba dátového socketu"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Prenos dát zlyhal, server odpovedal „%s“"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Dotaz"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Nedá sa vyvolať "
 
@@ -1029,36 +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:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Bola zistená aspoň jedna nesprávna signatúra."
 
-#: methods/gpgv.cc:174
+#: 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?)"
+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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Neznáma chyba pri spustení apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1066,35 +1062,35 @@ msgstr ""
 "Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný "
 "kľúč:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "Prázdne súbory nemôžu byť platné archívy"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do tohto súboru"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Chyba pri čítaní zo servera"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Chyba zápisu do súboru"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Výber zlyhal"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Uplynul čas spojenia"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupného súboru"
 
@@ -1126,184 +1122,434 @@ msgstr "Tento HTTP server má poškodenú podporu rozsahov"
 msgid "Unknown date format"
 msgstr "Neznámy formát dátumu"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Zlé dátové záhlavie"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
+#: apt-private/private-list.cc:121
+msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!"
+#: 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-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Opravujú sa závislosti..."
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Vnútorná chyba, Triedenie sa neukončilo"
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " zlyhalo."
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+#: 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 ""
-"Nezvyčajná udalosť... Veľkosti nesúhlasia, pošlite e-mail na 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Je potrebné stiahnuť %sB/%sB archívov.\n"
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Nainštalovaný]"
 
-#. 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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Je potrebné stiahnuť %sB archívov.\n"
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Nainštalovaný]"
 
-#. 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:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Po tejto operácii sa na disku použije ďalších %sB.\n"
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+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
-#: apt-private/private-install.cc:172
+#: 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 "After this operation, %sB disk space will be freed.\n"
-msgstr "Po tejto operácii sa na disku uvoľní %sB.\n"
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
 
-#: apt-private/private-install.cc:200
+#: apt-private/private-output.cc:455
 #, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Na %s nemáte dostatok voľného miesta."
+msgid "but %s is installed"
+msgstr "ale nainštalovaný je %s"
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Nastali problémy a -y bolo použité bez --force-yes"
+#: 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-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Zadané „iba triviálne“, ale toto nie je triviálna operácia."
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ale sa nedá nainštalovať"
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Áno, urob to, čo vravím!"
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ale je to virtuálny balík"
 
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Možno sa chystáte vykonať niečo škodlivé.\n"
-"Ak chcete pokračovať, opíšte frázu „%s“\n"
-" ?]"
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ale nie je nainštalovaný"
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Prerušené."
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "ale sa nebude inštalovať"
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Chcete pokračovať?"
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " alebo"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Niektoré súbory sa nedajú stiahnuť"
+#: 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-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --"
-"fix-missing"
+#: 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-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing a výmena nosiča nie sú momentálne podporované"
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Nasledovné balíky sa ODSTRÁNIA:"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Chýbajúce balíky sa nedajú opraviť."
+#: 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-install.cc:330
-msgid "Aborting install."
-msgstr "Inštalácia sa prerušuje."
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Nasledovné balíky sa aktualizujú:"
 
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"Nasledovný balík zmizol z vášho systému, pretože\n"
-"všetky súbory boli prepísané inými balíkmi:"
-msgstr[1] ""
-"Nasledovné balíky zmizli z vášho systému, pretože\n"
-"všetky súbory boli prepísané inými balíkmi:"
-msgstr[2] ""
-"Nasledovné balíky zmizli z vášho systému, pretože\n"
-"všetky súbory boli prepísané inými balíkmi:"
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Nasledovné balíky sa DEGRADUJÚ:"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Pozn.: Toto robí dpkg automaticky a zámerne."
+#: 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-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Nemajú sa odstraňovať veci, nespustí sa AutoRemover"
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (kvôli %s) "
 
-#: apt-private/private-install.cc:499
+#: apt-private/private-output.cc:696
 msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
-"Hmm, zdá sa, že AutoRemover niečo zničil, čo sa naozaj nemalo stať.\n"
-"Prosím, pošlite hlásenie o chybe balíka apt."
+"UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
+"Ak presne neviete, čo robíte, tak to NEROBTE!"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
+#: 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-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Vnútorná chyba, AutoRemover niečo pokazil"
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinštalovaných, "
 
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
+#: 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!"
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Vnútorná chyba, Triedenie sa neukončilo"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Nezvyčajná udalosť... Veľkosti nesúhlasia, pošlite e-mail na apt@packages."
+"debian.org"
+
+#. 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Je potrebné stiahnuť %sB/%sB 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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Je potrebné stiahnuť %sB 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
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Po tejto operácii sa na disku použije ďalších %sB.\n"
+
+#. 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 "Po tejto operácii sa na disku uvoľní %sB.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Nastali problémy a -y bolo použité bez --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 "Zadané „iba triviálne“, ale toto nie je triviálna operácia."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Áno, urob to, čo vravím!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Možno sa chystáte vykonať niečo škodlivé.\n"
+"Ak chcete pokračovať, opíšte frázu „%s“\n"
+" ?]"
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Prerušené."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Chcete pokračovať?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Niektoré súbory sa nedajú stiahnuť"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --"
+"fix-missing"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing a výmena nosiča nie sú momentálne podporované"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Chýbajúce balíky sa nedajú opraviť."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Inštalácia sa prerušuje."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"Nasledovný balík zmizol z vášho systému, pretože\n"
+"všetky súbory boli prepísané inými balíkmi:"
+msgstr[1] ""
+"Nasledovné balíky zmizli z vášho systému, pretože\n"
+"všetky súbory boli prepísané inými balíkmi:"
+msgstr[2] ""
+"Nasledovné balíky zmizli z vášho systému, pretože\n"
+"všetky súbory boli prepísané inými balíkmi:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Pozn.: Toto robí dpkg automaticky a zámerne."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Nemajú sa odstraňovať veci, nespustí sa 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 ""
+"Hmm, zdá sa, že AutoRemover niečo zničil, čo sa naozaj nemalo stať.\n"
+"Prosím, pošlite hlásenie o chybe balíka apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Vnútorná chyba, AutoRemover niečo pokazil"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1314,7 +1560,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:492
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1326,18 +1572,18 @@ msgstr[1] ""
 msgstr[2] ""
 "%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n"
 
-#: apt-private/private-install.cc:519
+#: apt-private/private-install.cc:494
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "Na jeho odstránenie použite „apt-get autoremove“."
 msgstr[1] "Na ich odstránenie použite „apt-get autoremove“."
 msgstr[2] "Na ich odstránenie použite „apt-get autoremove“."
 
-#: apt-private/private-install.cc:612
+#: apt-private/private-install.cc:587
 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-install.cc:614
+#: apt-private/private-install.cc:589
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1345,7 +1591,7 @@ msgstr ""
 "Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo "
 "navrhnite riešenie)."
 
-#: apt-private/private-install.cc:638
+#: apt-private/private-install.cc:612
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1357,334 +1603,103 @@ msgstr ""
 "požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n"
 "Novoprichádzajúcich (Incoming) balíkov."
 
-#: apt-private/private-install.cc:659
+#: apt-private/private-install.cc:633
 msgid "Broken packages"
 msgstr "Poškodené balíky"
 
-#: apt-private/private-install.cc:712
+#: apt-private/private-install.cc:710
 msgid "The following extra packages will be installed:"
 msgstr "Nainštalujú sa nasledovné extra balíky:"
 
-#: apt-private/private-install.cc:802
+#: apt-private/private-install.cc:800
 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:801
 msgid "Recommended packages:"
 msgstr "Odporúčané balíky:"
 
-#: apt-private/private-install.cc:825
+#: apt-private/private-install.cc:823
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n"
 
-#: apt-private/private-install.cc:829
+#: apt-private/private-install.cc:827
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Preskakuje sa %s, nie je nainštalovaný a bola vy6iadan8 iba aktualizácia.\n"
 
-#: apt-private/private-install.cc:841
+#: apt-private/private-install.cc:839
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n"
 
-#: apt-private/private-install.cc:846
+#: apt-private/private-install.cc:844
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s je už najnovšej verzie.\n"
 
-#: apt-private/private-install.cc:894
+#: apt-private/private-install.cc:892
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Vybraná verzia „%s“ (%s) pre „%s“\n"
 
-#: apt-private/private-install.cc:899
+#: apt-private/private-install.cc:897
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Vybraná verzia „%s“ (%s) pre „%s“ kvôli „%s“\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
+#: apt-private/private-install.cc:939
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť. Mali ste na mysli "
 "„%s“?\n"
 
-#: apt-private/private-install.cc:947
+#: apt-private/private-install.cc:945
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť\n"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
+#: apt-private/private-download.cc:62
 #, 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] ""
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
 
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Opravujú sa závislosti..."
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!"
 
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " zlyhalo."
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "Upozornenie o vierohodnosti bolo potlačené.\n"
 
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Závislosti sa nedajú opraviť"
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov"
 
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Sada na aktualizáciu sa nedá minimalizovať"
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Nainštalovať tieto nekontrolované balíky?"
 
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Hotovo"
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Zlyhalo stiahnutie %s  %s\n"
 
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
+#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
 #, 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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Upozornenie o vierohodnosti bolo potlačené.\n"
-
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Nainštalovať tieto nekontrolované balíky?"
+msgid "Couldn't determine free space in %s"
+msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:188
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Zlyhalo stiahnutie %s  %s\n"
+msgid "You don't have enough free space in %s."
+msgstr "Na %s nemáte dostatok voľného miesta."
 
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
@@ -1700,41 +1715,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Prepočítava sa aktualizácia"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Hotovo"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Už existuje "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Získava sa:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Chyba "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%sB sa stiahlo za %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Prebieha spracovanie]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1747,18 +1754,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1832,205 +1839,452 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Zlučujú sa dostupné informácie"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Pokus o uvoľnenie uzla (DropNode) na stále prepojenom uzle"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Použitie: apt-extracttemplates súbor1 [súbor2 ...]\n"
+"\n"
+"apt-extracttemplates je nástroj na vyňatie konfiguračných skriptov\n"
+"a šablón z balíkov Debian\n"
+"\n"
+"Voľby:\n"
+"  -h   Tento pomocník.\n"
+"  -t   Nastaví dočasný adresár\n"
+"  -c=? Načíta tento konfiguračný súbor\n"
+"  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Hašovací prvok sa nedá nájsť!"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Nedá sa vyhodnotiť %s"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Nedá sa alokovať diverzia"
+#: 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ť"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Vnútorná chyba pri AddDiversion"
+#: 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ý?"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Pokus o prepísanie diverzie, %s -> %s a %s/%s"
+#: 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ý"
 
-#: apt-inst/filelist.cc:506
+#: 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 "Double add of diversion %s -> %s"
-msgstr "Dvojité pridanie diverzie %s -> %s"
+msgid "Error processing directory %s"
+msgstr "Chyba pri spracovávaní adresára %s"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Duplicitný konfiguračný súbor %s/%s"
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Zoznam zdrojových rozšírení je príliš dlhý"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: 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:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "Cesta %s je príliš dlhá"
+msgid "Error processing contents %s"
+msgstr "Chyba pri spracovávaní obsahu %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Použitie: apt-ftparchive [voľby] príkaz\n"
+"Príkazy: packages binárna_cesta [súbor_override [prefix_cesty]]\n"
+"         sources zdrojová_cesta [súbor_override [prefix_cesty]]\n"
+"         contents cesta\n"
+"         release cesta\n"
+"         generate konfiguračný_súbor [skupiny]\n"
+"         clean konfiguračný_súbor\n"
+"\n"
+"apt-ftparchive generuje indexové súbory archívov Debianu. Podporuje\n"
+"niekoľko režimov vytvárania - od plne automatického až po funkčnú\n"
+"náhradu príkazov dpkg-scanpackages a dpkg-scansources.\n"
+"\n"
+"apt-ftparchive zo stromu .deb súborov vygeneruje súbory Packages. Súbor\n"
+"Packages okrem všetkých riadiacich polí každého balíka obsahuje tiež jeho\n"
+"veľkosť a MD5 súčet. Podporovaný je tiež súbor „override“, pomocou ktorého\n"
+"môžete vynútiť hodnoty polí Priority a Section.\n"
+"\n"
+"Podobne vie apt-ftparchive vygenerovať zo stromu súborov .dsc súbory\n"
+"Sources. Voľbou --source-override môžete určiť zdrojový súbor „override“.\n"
+"\n"
+"Príkazy „packages“ a „sources“ by sa mali spúšťať v koreni stromu.\n"
+"Binárna_cesta by mala ukazovať na začiatok rekurzívneho hľadania\n"
+"a súbor „override“ by mal obsahovať príznaky pre nahradenie. Ak je udaný\n"
+"prefix_cesty, pridá sa do polí „filename“.\n"
+"Skutočný príklad z archívu Debianu:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Voľby:\n"
+"  -h    Tento pomocník\n"
+"  --md5 Vygeneruje kontrolný súčet MD5\n"
+"  -s=?  Zdrojový súbor „override“\n"
+"  -q    Tichý režim\n"
+"  -d=?  Zvolí voliteľnú databázu pre vyrovnávaciu pamäť\n"
+"  --no-delink Povolí ladiaci režim\n"
+"  --contents  Vygeneruje súbor Contents\n"
+"  -c=?  Načíta tento konfiguračný súbor\n"
+"  -o=?  Nastaví ľubovoľnú voľbu"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Nevyhovel žiaden výber"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "%s sa rozbaľuje viackrát"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "V súbore balíka skupiny „%s“ chýbajú niektoré súbory"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Adresár %s je divertovaný"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB je narušená, súbor je premenovaný na %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Balík sa pokúša zapisovať do diverzného cieľa %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Diverzná cesta je príliš dlhá"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Formát DB je neplatný. Ak ste aktualizovali staršiu verziu apt, musíte "
+"odstrániť a znovu vytvoriť databázu."
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nedá sa otvoriť DB súbor %s: %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s sa nedá vyhodnotiť"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Nie je možné vykonať readlink %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Archív nemá riadiaci záznam"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Nedá sa získať kurzor"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Premenovanie %s na %s zlyhalo"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Adresár %s sa nedá čítať\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Adresár %s sa nahradí neadresárom"
+msgid "W: Unable to stat %s\n"
+msgstr "W: %s sa nedá vyhodnotiť\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Nedá sa nájsť uzol na adrese jeho hašu"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Cesta je príliš dlhá"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "W: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: Chyby sa týkajú súboru "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Prepísať zodpovedajúci balík bez udania verzie pre %s"
+msgid "Failed to resolve %s"
+msgstr "Chyba pri preklade %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Prechod stromom zlyhal"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Súbor %s/%s prepisuje ten z balíka %s"
+msgid "Failed to open %s"
+msgstr "%s sa nedá otvoriť"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Nedá sa vyhodnotiť %s"
+msgid " DeLink %s [%s]\n"
+msgstr " Odlinkovanie %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Zápis súboru %s zlyhal"
+msgid "Failed to readlink %s"
+msgstr "Nie je možné vykonať readlink %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Zatvorenie súboru %s zlyhalo"
+msgid "Failed to unlink %s"
+msgstr "Nie je možné vykonať unlink %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Toto nie je platný DEB archív, chýba časť „%s“"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Nepodarilo sa zlinkovať %s s %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Vnútorná chyba, nedá sa nájsť časť %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Nespracovateľný riadiaci súbor"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Archív neobsahuje pole „package“"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Neplatný podpis archívu"
+#: 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:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  správcom %s je %s, nie %s\n"
+
+#: 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:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr " %s nemá žiadnu položku „binary override“\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Zlyhal pokus o pridelenie pamäti"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Nedá sa otvoriť %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Skomolený „override“ %s riadok %llu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Nepodarilo sa prečítať „override“ súbor %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Skomolený „override“ %s riadok %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Skomolený „override“ %s riadok %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Skomolený „override“ %s riadok %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Neznámy kompresný algoritmus „%s“"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Komprimovaný výstup %s potrebuje kompresnú sadu"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Zlyhalo vytvorenie FILE*"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Chyba pri čítaní záhlavia prvku archívu"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Volanie fork() zlyhalo"
 
-#: apt-inst/contrib/arfile.cc:96
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Neplatná hlavička prvku archívu %s"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Komprimovať potomka"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Neplatné záhlavie prvku archívu"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Vnútorná chyba, nepodarilo sa vytvoriť %s"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Archív je príliš krátky"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "V/V operácia s podprocesom/súborom zlyhala"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Chyba pri čítaní hlavičiek archívu"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Chyba čítania pri výpočte MD5"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Vytvorenie rúry zlyhalo"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problém s odlinkovaním %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Spustenie gzip zlyhalo "
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Premenovanie %s na %s zlyhalo"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Porušený archív"
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Použitie: apt-internal-solver\n"
+"\n"
+"apt-internal-solver je rozhranie na použitie aktuálneho vnútorného\n"
+"riešiteľa ako vonkajší pre rodinu APT na ladenie a pod.\n"
+"\n"
+"Voľby:\n"
+"  -h   Tento pomocník.\n"
+"  -q   Výstup vhodný do záznamu - bez indikátora priebehu\n"
+"  -c=? Načíta tento konfiguračný súbor\n"
+"  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Neznámy záznam o balíku!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Neznáma TAR hlavička typu %u, člen %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Použitie: apt-sortpkgs [voľby] súbor1 [súbor2 ...]\n"
+"\n"
+"apt-sortpkgs je jednoduchý nástroj na zotriedenie súborov Packages.\n"
+"Voľbou -s si zvolíte typ súboru.\n"
+"\n"
+"Voľby:\n"
+"  -h   Tento pomocník\n"
+"  -s   Zotriedi zdrojový súbor\n"
+"  -c=? Načíta tento konfiguračný súbor\n"
+"  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "Spúšťa sa dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Systém balíkov „%s“ nie je podporovaný"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Nedá sa určiť vhodný typ systému balíkov"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapísaných %i záznamov.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n"
@@ -2045,6 +2299,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ť."
@@ -2057,157 +2331,333 @@ 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:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Vyrovnávacia pamäť balíkov je prázdna"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Závisí na"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Predzávisí na"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Navrhuje"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Odporúča"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Koliduje s"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Nahrádza"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Zneplatňuje"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Kazí"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Rozširuje"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "dôležitý"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "požadovaný"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "štandardný"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "voliteľný"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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/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:118
+#: 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/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/acquire-worker.cc:169
+#: apt-pkg/sourcelist.cc:173
 #, 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] too short)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s ([option] je príliš krátke)"
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/sourcelist.cc:184
 #, 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 ([%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/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nie je možné vykonať stat %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/pkgrecords.cc:38
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexový súbor typu „%s“ nie je podporovaný"
+msgid "Couldn't stat source package list %s"
+msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Vytvára sa strom závislostí"
+#: 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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidátske verzie"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Collecting File poskytuje"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generovanie závislostí"
+#: 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/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/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Poslať scénár riešiteľovi"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nie je možné otvoriť StateFile %s"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Poslať požiadavku riešiteľovi"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nie je možné zapísať dočasný StateFile %s"
+#: 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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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: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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Nezhoda kontrolných haš súčtov"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Veľkosti sa nezhodujú"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Neplatná operácia %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Chyba pri zápise"
+
+#: 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:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Počas overovania podpisu sa vyskytla chyba. Repozitár nie je aktualizovaný a "
+"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:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Chyba GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Adresár %s je divertovaný"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2216,16 +2666,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:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2234,27 +2684,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:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Počas overovania podpisu sa vyskytla chyba. Repozitár nie je aktualizovaný a "
-"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:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Chyba GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2263,132 +2705,49 @@ 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:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Indexový súbor typu „%s“ nie je podporovaný"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nie je možné vykonať stat %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Načítavajú sa zoznamy balíkov"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Collecting File poskytuje"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Do %s sa nedá zapisovať"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI"
@@ -2416,7 +2775,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2425,12 +2784,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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2441,10 +2800,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"
@@ -2515,11 +2877,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"
 
@@ -2529,7 +2891,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:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2537,335 +2899,265 @@ msgstr ""
 "Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené "
 "pridržanými balíkmi."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr "Poslať požiadavku riešiteľovi"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Pripraviť sa na prijatie riešenia"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Spustiť externého riešiteľa"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Súbor %s sa nedá spracovať (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nedá spracovať súbor Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Žiadne sekcie v Release súbore %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, 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/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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Vytvára sa strom závislostí"
 
-#: 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:139
+msgid "Candidate versions"
+msgstr "Kandidátske verzie"
 
-#: 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:168
+msgid "Dependency generation"
+msgstr "Generovanie závislostí"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Otvára sa %s"
+#: 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:371
+#: apt-pkg/depcache.cc:252
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
+msgid "Failed to open StateFile %s"
+msgstr "Nie je možné otvoriť 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 "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie je možné zapísať dočasný StateFile %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/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "Súbor %s sa nedá spracovať (%d)"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Nebolo nájdené vydanie „%s“ pre „%s“"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Nebola nájdená verzia „%s“ pre „%s“"
 
-#: apt-pkg/cacheset.cc:603
+#: 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:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Nie je možné vybrať nainštalované ani kandidátske verzie z balíka „%s“, "
-"pretože nemá žiadnu z nich"
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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 ""
+"Nie je možné vybrať nainštalované ani kandidátske verzie z balíka „%s“, "
+"pretože nemá žiadnu z nich"
+
+#: 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:132
+#, 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:145
+#, 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:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Chýba položka „Date“ v súbore Release %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%li min %li s"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%li s"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Voľba %s nenájdená"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Zamykanie pre súbor zámku %s, ktorý je iba na čítanie, sa nepoužíva"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Súbor zámku %s sa nedá otvoriť"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Zamykanie pre súbor zámku %s pripojený cez NFS sa nepoužíva"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Zámok %s sa nedá získať"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 "Zoznam súborov nemožno vytvoriť, pretože „%s“ nie je adresár"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Ignoruje sa „%s“ v adresári „%s“, pretože to nie je obyčajný súbor"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "Ignoruje sa „%s“ v adresári „%s“, pretože nemá príponu názvu súboru"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 "Ignoruje sa „%s“ v adresári „%s“, pretože má neplatnú príponu názvu súboru"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Podproces %s obdržal chybu segmentácie."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Podproces %s dostal signál %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Podproces %s vrátil chybový kód (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Podproces %s neočakávane skončil"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problém pri zatváraní gzip súboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nedá sa otvoriť súbor %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nedá sa otvoriť popisovač súboru %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Nedá sa vytvoriť podproces IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Nepodarilo sa spustiť kompresor "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "čítanie, treba prečítať ešte %llu, ale už nič neostáva"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "zápis, treba zapísať ešte %llu, no nedá sa to"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problém pri zatváraní súboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problém pri synchronizovaní súboru %s na %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problém pri odstraňovaní súboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Problém pri synchronizovaní súboru"
 
@@ -2953,111 +3245,105 @@ 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:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Nerozpoznaná skratka typu: „%c“"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: 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:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov."
-
-#: 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"
@@ -3067,12 +3353,12 @@ msgstr "Neplatná operácia %s"
 msgid "Installing %s"
 msgstr "Inštaluje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Odstraňuje sa %s"
@@ -3093,79 +3379,79 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Adresár „%s“ chýba"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Pripravuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozbaľuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Pripravuje sa nastavenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "Nainštalovaný balík %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "Odstránený balík %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: 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:1732
+#: 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:1737
+#: 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:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3173,7 +3459,7 @@ 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:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3181,7 +3467,7 @@ msgstr ""
 "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
 "zaplnený"
 
-#: apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3189,7 +3475,7 @@ msgstr ""
 "Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku "
 "pamäte"
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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 "
@@ -3198,7 +3484,7 @@ msgstr ""
 "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
 "zaplnený"
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3207,421 +3493,192 @@ msgstr ""
 #: 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é"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Použitie: apt-extracttemplates súbor1 [súbor2 ...]\n"
-"\n"
-"apt-extracttemplates je nástroj na vyňatie konfiguračných skriptov\n"
-"a šablón z balíkov Debian\n"
-"\n"
-"Voľby:\n"
-"  -h   Tento pomocník.\n"
-"  -t   Nastaví dočasný adresár\n"
-"  -c=? Načíta tento konfiguračný súbor\n"
-"  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Nedá sa vyhodnotiť %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Chyba pri spracovávaní adresára %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Zoznam zdrojových rozšírení je príliš dlhý"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Chyba pri zapisovaní hlavičky do súboru"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Chyba pri spracovávaní obsahu %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Použitie: apt-ftparchive [voľby] príkaz\n"
-"Príkazy: packages binárna_cesta [súbor_override [prefix_cesty]]\n"
-"         sources zdrojová_cesta [súbor_override [prefix_cesty]]\n"
-"         contents cesta\n"
-"         release cesta\n"
-"         generate konfiguračný_súbor [skupiny]\n"
-"         clean konfiguračný_súbor\n"
-"\n"
-"apt-ftparchive generuje indexové súbory archívov Debianu. Podporuje\n"
-"niekoľko režimov vytvárania - od plne automatického až po funkčnú\n"
-"náhradu príkazov dpkg-scanpackages a dpkg-scansources.\n"
-"\n"
-"apt-ftparchive zo stromu .deb súborov vygeneruje súbory Packages. Súbor\n"
-"Packages okrem všetkých riadiacich polí každého balíka obsahuje tiež jeho\n"
-"veľkosť a MD5 súčet. Podporovaný je tiež súbor „override“, pomocou ktorého\n"
-"môžete vynútiť hodnoty polí Priority a Section.\n"
-"\n"
-"Podobne vie apt-ftparchive vygenerovať zo stromu súborov .dsc súbory\n"
-"Sources. Voľbou --source-override môžete určiť zdrojový súbor „override“.\n"
-"\n"
-"Príkazy „packages“ a „sources“ by sa mali spúšťať v koreni stromu.\n"
-"Binárna_cesta by mala ukazovať na začiatok rekurzívneho hľadania\n"
-"a súbor „override“ by mal obsahovať príznaky pre nahradenie. Ak je udaný\n"
-"prefix_cesty, pridá sa do polí „filename“.\n"
-"Skutočný príklad z archívu Debianu:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Voľby:\n"
-"  -h    Tento pomocník\n"
-"  --md5 Vygeneruje kontrolný súčet MD5\n"
-"  -s=?  Zdrojový súbor „override“\n"
-"  -q    Tichý režim\n"
-"  -d=?  Zvolí voliteľnú databázu pre vyrovnávaciu pamäť\n"
-"  --no-delink Povolí ladiaci režim\n"
-"  --contents  Vygeneruje súbor Contents\n"
-"  -c=?  Načíta tento konfiguračný súbor\n"
-"  -o=?  Nastaví ľubovoľnú voľbu"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Nevyhovel žiaden výber"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, 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"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB je narušená, súbor je premenovaný na %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Formát DB je neplatný. Ak ste aktualizovali staršiu verziu apt, musíte "
-"odstrániť a znovu vytvoriť databázu."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Nedá sa otvoriť DB súbor %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Nie je možné vykonať readlink %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Archív nemá riadiaci záznam"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Nedá sa získať kurzor"
+"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?"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Adresár %s sa nedá čítať\n"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nedá sa zamknúť adresár na správu (%s), ste root?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: %s sa nedá vyhodnotiť\n"
+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“. "
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Nie je zamknuté"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "W: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Pokus o uvoľnenie uzla (DropNode) na stále prepojenom uzle"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: Chyby sa týkajú súboru "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Hašovací prvok sa nedá nájsť!"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Chyba pri preklade %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Nedá sa alokovať diverzia"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Prechod stromom zlyhal"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Vnútorná chyba pri AddDiversion"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "%s sa nedá otvoriť"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Pokus o prepísanie diverzie, %s -> %s a %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Odlinkovanie %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Dvojité pridanie diverzie %s -> %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Nie je možné vykonať readlink %s"
+msgid "Duplicate conf file %s/%s"
+msgstr "Duplicitný konfiguračný súbor %s/%s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Nie je možné vykonať unlink %s"
+msgid "The path %s is too long"
+msgstr "Cesta %s je príliš dlhá"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Nepodarilo sa zlinkovať %s s %s"
+msgid "Unpacking %s more than once"
+msgstr "%s sa rozbaľuje viackrát"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Archív neobsahuje pole „package“"
+msgid "The directory %s is diverted"
+msgstr "Adresár %s je divertovaný"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr " %s nemá žiadnu položku override\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Balík sa pokúša zapisovať do diverzného cieľa %s/%s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  správcom %s je %s, nie %s\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Diverzná cesta je príliš dlhá"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr " %s nemá žiadnu položku „source override“\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Adresár %s sa nahradí neadresárom"
 
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr " %s nemá žiadnu položku „binary override“\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Nedá sa nájsť uzol na adrese jeho hašu"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Zlyhal pokus o pridelenie pamäti"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Cesta je príliš dlhá"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "Nedá sa otvoriť %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Skomolený „override“ %s riadok %llu #1"
+msgid "Overwrite package match with no version for %s"
+msgstr "Prepísať zodpovedajúci balík bez udania verzie pre %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Nepodarilo sa prečítať „override“ súbor %s"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Súbor %s/%s prepisuje ten z balíka %s"
 
-#: ftparchive/override.cc:166
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Skomolený „override“ %s riadok %llu #1"
+msgid "Unable to stat %s"
+msgstr "Nedá sa vyhodnotiť %s"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Skomolený „override“ %s riadok %llu #2"
+msgid "Failed to write file %s"
+msgstr "Zápis súboru %s zlyhal"
 
-#: ftparchive/override.cc:191
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Skomolený „override“ %s riadok %llu #3"
+msgid "Failed to close file %s"
+msgstr "Zatvorenie súboru %s zlyhalo"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Neznámy kompresný algoritmus „%s“"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Toto nie je platný DEB archív, chýba časť „%s“"
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimovaný výstup %s potrebuje kompresnú sadu"
+msgid "Internal error, could not locate member %s"
+msgstr "Vnútorná chyba, nedá sa nájsť časť %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Zlyhalo vytvorenie FILE*"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Nespracovateľný riadiaci súbor"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Volanie fork() zlyhalo"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Neplatný podpis archívu"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Komprimovať potomka"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Chyba pri čítaní záhlavia prvku archívu"
 
-#: ftparchive/multicompress.cc:232
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Vnútorná chyba, nepodarilo sa vytvoriť %s"
+msgid "Invalid archive member header %s"
+msgstr "Neplatná hlavička prvku archívu %s"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "V/V operácia s podprocesom/súborom zlyhala"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Neplatné záhlavie prvku archívu"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Chyba čítania pri výpočte MD5"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Archív je príliš krátky"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Chyba pri čítaní hlavičiek archívu"
+
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Vytvorenie rúry zlyhalo"
+
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Spustenie gzip zlyhalo "
+
+#: 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:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený"
+
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Problém s odlinkovaním %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Neznáma TAR hlavička typu %u, člen %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Použitie: apt-internal-solver\n"
-"\n"
-"apt-internal-solver je rozhranie na použitie aktuálneho vnútorného\n"
-"riešiteľa ako vonkajší pre rodinu APT na ladenie a pod.\n"
-"\n"
-"Voľby:\n"
-"  -h   Tento pomocník.\n"
-"  -q   Výstup vhodný do záznamu - bez indikátora priebehu\n"
-"  -c=? Načíta tento konfiguračný súbor\n"
-"  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Celkom miesta závislých verzií: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Neznámy záznam o balíku!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Na %s nemáte dostatok voľného miesta"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Použitie: apt-sortpkgs [voľby] súbor1 [súbor2 ...]\n"
-"\n"
-"apt-sortpkgs je jednoduchý nástroj na zotriedenie súborov Packages.\n"
-"Voľbou -s si zvolíte typ súboru.\n"
-"\n"
-"Voľby:\n"
-"  -h   Tento pomocník\n"
-"  -s   Zotriedi zdrojový súbor\n"
-"  -c=? Načíta tento konfiguračný súbor\n"
-"  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Hotovo"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
@@ -3710,9 +3767,6 @@ msgstr ""
 #~ "Nedá sa zapísať záznam, volanie openpty() zlyhalo (/dev/pts nie je "
 #~ "pripojený?)\n"
 
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Súbor %s nezačína podpísanou správou v čistom texte (clearsigned)"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Preskakuje sa neexistujúci súbor %s"
 
diff --git a/po/sl.po b/po/sl.po
index 16a39656a..3210fa504 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: 2015-01-16 04:37-0500\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,148 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Vseh imen paketov: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Skupno struktur paketov : "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Običajni paketi: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Čisti navidezni paketi: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Posamezni navidezni paketi: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Mešani navidezni paketi: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Manjka: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Vseh različic: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Skupno različnih opisov: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Vseh odvisnosti: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Vseh povezav Raz/Dat: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Skupno razmerij opisov/datotek: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Vseh dobljenih preslikav: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Vseh razširjenih nizov: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Celotna velikost z odvisnostmi različice: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Celotna ohlapna velikost: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Celotna velikost, izračunana za: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: 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:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Datoteke paketa:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Pripeti paketi:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(ni najdeno)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Nameščen: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(brez)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Bucika paketa: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Preglednica različic:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -237,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"
@@ -258,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."
 
@@ -294,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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: 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:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ni mogoče najti paketa %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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."
@@ -343,25 +339,25 @@ msgstr ""
 "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark auto' in 'apt-mark "
 "manual'."
 
-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Ni mogoče zakleniti mape prejemov"
 
-#: cmdline/apt-get.cc:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -370,7 +366,7 @@ msgstr ""
 "OPOMBA: pakiranje '%s' vzdrževano v sistemu nadzora različice '%s' na:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -381,80 +377,69 @@ msgstr ""
 "bzr branch %s\n"
 "za pridobitev zadnjih (morda še neizdanih) posodobitev paketa.\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Preskok že prejete datoteke '%s'\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Ni mogoče določiti prostega prostora v %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Nimate dovolj prostora na %s"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Dobi vir %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Nekaterih arhivov ni mogoče pridobiti."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Ukaz gradnje '%s' ni uspel.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Podrejeno opravilo ni uspelo"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -463,17 +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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -512,30 +507,30 @@ msgstr ""
 "odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa "
 "%s nima različice kandidata"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Obdelava odvisnosti za gradnjo je spodletela"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Dnevnik sprememb za %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Podprti moduli:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -650,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -794,12 +789,12 @@ msgstr "Diska ni mogoče najti."
 msgid "File not found"
 msgstr "Datoteke ni mogoče najti"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Določitev ni uspela"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Nastavitev časa spremembe je spodletela"
 
@@ -808,34 +803,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Neveljaven URI. Krajevni URI-ji se morajo začeti z //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Prijavljanje"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Ni mogoče ugotoviti imena gostitelja"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Ni mogoče določiti krajevnega imena"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Strežnik je zavrnil povezavo in sporočil: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER je spodletel, strežnik je odgovoril: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS je spodletel, strežnik je odgovoril: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -843,123 +838,123 @@ msgstr ""
 "Naveden je bil posredniški strežnik, ne pa tudi prijavni skript. Acquire::"
 "ftp::ProxyLogin je prazen."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Ukaz prijavne skripte '%s' ni uspel, strežnik je odgovoril: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE je spodletel, strežnik je odgovoril: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Povezava je zakasnela"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Strežnik je zaprl povezavo"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Napaka branja"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Odgovor je prekoračil predpomnilnik."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Okvara protokola"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Napaka pisanja"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Ni mogoče ustvariti vtiča"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Ni mogoče povezati podatkovnega vtiča. Povezava je zakasnela."
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Spodletelo"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Ni mogoče povezat pasivnega vtiča."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo ni mogel dobiti poslušajočega vtiča"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Ni mogoče povezati vtiča"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Ni mogoče poslušati na vtiču"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Ni mogoče določiti imena vtiča"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Ni mogoče poslati ukaza PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Neznan naslov družine %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT ni uspel, strežnik je odgovoril: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Povezava podatkovne vtičnice je zakasnela"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Ni mogoče sprejeti povezave"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Ni mogoče pridobiti datoteke, strežnik je odgovoril '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Podatkovna vtič je potekel"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Prenos podatkov ni uspel, strežnik je odgovoril '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Poizvedba"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Ni mogoče klicati "
 
@@ -1025,72 +1020,73 @@ 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:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Najden je bil vsaj en neveljaven podpis."
 
-#: methods/gpgv.cc:174
+#: 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?)"
+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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Neznana napaka med izvajanjem apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 "Naslednjih podpisov ni mogoče preveriti, ker javni ključ ni na voljo:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "Prazne datoteke ne morejo biti veljavni arhivi"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Napaka med pisanjem v datoteko"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Napaka med branjem s strežnika"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Napaka med pisanjem v datoteko"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Izbira ni uspela"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Povezava je zakasnela"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Napaka med pisanjem v izhodno datoteko"
 
@@ -1122,438 +1118,164 @@ msgstr "Ta strežnik HTTP ima pokvarjen obseg podpore"
 msgid "Unknown date format"
 msgstr "Neznana oblika datuma"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Napačni podatki glave"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Notranja napaka"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
+#: apt-private/private-list.cc:121
+msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!"
+#: 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-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Odstraniti je treba pakete, a je odstranjevanje onemogočeno."
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Popravljanje odvisnosti ..."
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Notranja napaka, Urejanje se ni končalo"
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " spodletelo."
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Kako čudno ... Velikosti se ne ujemata, pošljite sporočilo na apt@packages."
-"debian.org"
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Ni mogoče popraviti odvisnosti"
 
-#. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Potrebno je dobiti %sB/%sB arhivov.\n"
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo"
 
-#. 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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Potrebno je dobiti %sB arhivov.\n"
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Opravljeno"
 
-#. 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:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Po tem opravilu bo porabljenega %sB dodatnega prostora.\n"
+#: 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'."
 
-#. 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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Po tem opravilu bo sproščenega %sB prostora na disku.\n"
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nerešene odvisnosti. Poskusite uporabiti -f."
 
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Na %s je premalo prostora."
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Prišlo je do težav in -y je bil uporabljen brez --force-yes"
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Nameščeno]"
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Navedena je možnost Samo preprosto, a to opravilo ni preprosto."
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Nameščeno]"
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Da, naredi tako kot pravim!"
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
 
-#: apt-private/private-install.cc:222
+#: 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 ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
+msgid "[upgradable from: %s]"
 msgstr ""
-"Naredili boste nekaj, kar je morda lahko škodljivo.\n"
-"Za nadaljevanje vtipkajte frazo '%s'\n"
-" ?] "
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Prekini."
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Ali želite nadaljevati?"
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "vendar je paket %s nameščen"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Prejem nekaterih datotek ni uspel"
+#: 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-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Nekaterih arhivov ni mogoče dobiti. Poskusite uporabiti apt-get update ali --"
-"fix-missing."
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "vendar se ga ne da namestiti"
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing in izmenjava medija trenutno nista podprta"
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "vendar je navidezen paket"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Ni mogoče popraviti manjkajočih paketov."
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "vendar ni nameščen"
 
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Prekinjanje namestitve."
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "vendar ne bo nameščen"
 
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"Naslednji paketi so izginili z vašega sistema, ker so vse\n"
-"datoteke prepisali drugi paketi:"
-msgstr[1] ""
-"Naslednji paketi je izginil z vašega sistema, ker so vse\n"
-"datoteke prepisali drugi paketi:"
-msgstr[2] ""
-"Naslednja paketa sta izginila z vašega sistema, ker so vse\n"
-"datoteke prepisali drugi paketi:"
-msgstr[3] ""
-"Naslednji paketi so izginili z vašega sistema, ker so vse\n"
-"datoteke prepisali drugi paketi:"
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " ali"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Opomba: To je dpkg storil samodejno in namenoma."
+#: 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-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-"Program ne bi smel brisati stvari, ni mogoče zagnati "
-"SamodejnegaOdstranjevalnika"
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Naslednji NOVI paketi bodo nameščeni:"
 
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Videti je, da je SamodejniOdstranjevalnik nekaj uničil, kar se ne bi smelo "
-"zgoditi\n"
-"Pošljite poročilo o hrošču v apt."
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Naslednji podatki vam bodo morda pomagali rešiti težavo:"
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Naslednji paketi so bili zadržani:"
 
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Notranja napaka, SamodejniOdstranjevalnik je pokvaril stvari"
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Naslednji paketi bodo nadgrajeni:"
 
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "Naslednji paketi so bili samodejno nameščeni in niso več zahtevani:"
-msgstr[1] "Naslednji paket je bil samodejno nameščen in ni več zahtevan:"
-msgstr[2] ""
-"Naslednja paketa sta bila samodejno nameščena in nista več zahtevana:"
-msgstr[3] "Naslednji paketi so bili samodejno nameščeni in niso več zahtevani:"
+#: 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-install.cc:517
-#, c-format
-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 paketov je bilo samodejno nameščenih in niso več zahtevani.\n"
-msgstr[1] "%lu paket je bil samodejno nameščen in ni bil več zahtevan.\n"
-msgstr[2] "%lu paketa sta bila samodejno nameščena in nista več zahtevana.\n"
-msgstr[3] "%lu paketi so bili samodejno nameščeni in niso več zahtevani.\n"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Uporabite 'apt-get autoremove' za njihovo odstranitev."
-msgstr[1] "Uporabite 'apt-get autoremove' za njegovo odstranitev."
-msgstr[2] "Uporabite 'apt-get autoremove' za njuno odstranitev."
-msgstr[3] "Uporabite 'apt-get autoremove' za njihovo odstranitev."
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Poskusite zagnati 'apt-get -f install', če želite popraviti naslednje:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Nerešene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
-"navedite rešitev)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Nekaterih paketov ni mogoče namestiti. To lahko pomeni, da ste zahtevali\n"
-"nemogoč položaj, če uporabljate nestabilno izdajo pa\n"
-", da nekateri zahtevani paketi še niso ustvarjeni ali premaknjeni\n"
-" iz Prihajajočega."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Pokvarjeni paketi"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Naslednji dodatni paketi bodo nameščeni:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Predlagani paketi:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Priporočeni paketi:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "%s je preskočen, ker je že nameščen in ne potrebuje nadgradnje.\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Preskok %s, ni nameščen in zahtevane so le nadgradnje\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Ponovna namestitev %s ni možna, ker prejem ni možen.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "Najnovejša različica %s je že nameščena.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Izbrana različica '%s' (%s) za '%s'\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Izbrana različica '%s' (%s) za '%s' namesto '%s'\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
-"Paket '%s' ni nameščen, zato ni bil odstranjen. Ali ste mislili '%s'?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Popravljanje odvisnosti ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " spodletelo."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Ni mogoče popraviti odvisnosti"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Opravljeno"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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
+#: apt-private/private-output.cc:688
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (zaradi %s) "
@@ -1617,7 +1339,7 @@ msgstr ""
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: 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"
@@ -1626,7 +1348,7 @@ msgstr "Napaka med prevajanjem logičnega izraza - %s"
 msgid "The update command takes no arguments"
 msgstr "Ukaz update ne sprejema argumentov"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1636,10 +1358,14 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1666,76 +1392,357 @@ msgstr ""
 "     Zaklepanje je onemogočeno, zato se ne zanašajte\n"
 "     na pomembnost trenutnega pravega stanja!"
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "POZOR: Naslednjih paketov ni bilo mogoče overiti!"
+#: 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!"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Opozorilo overitve je bilo prepisano.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Odstraniti je treba pakete, a je odstranjevanje onemogočeno."
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Nekaterih paketkov bi bilo mogoče overiti"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Notranja napaka, Urejanje se ni končalo"
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Ali želite te pakete namestiti brez preverjanja?"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Kako čudno ... Velikosti se ne ujemata, pošljite sporočilo na apt@packages."
+"debian.org"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#. 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
+#: apt-private/private-install.cc:154
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Ni mogoče dobiti %s  %s\n"
-
-#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "Ni mogoče preimenovati %s v %s"
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Potrebno je dobiti %sB/%sB arhivov.\n"
 
-#: apt-private/private-sources.cc:70
+#. 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:159
 #, c-format
-msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
+msgid "Need to get %sB of archives.\n"
+msgstr "Potrebno je dobiti %sB arhivov.\n"
 
-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
-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
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Po tem opravilu bo porabljenega %sB dodatnega prostora.\n"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Preračunavanje nadgradnje"
+#. 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 "Po tem opravilu bo sproščenega %sB prostora na disku.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Prišlo je do težav in -y je bil uporabljen brez --force-yes"
+
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "Navedena je možnost Samo preprosto, a to opravilo ni preprosto."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Da, naredi tako kot pravim!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Naredili boste nekaj, kar je morda lahko škodljivo.\n"
+"Za nadaljevanje vtipkajte frazo '%s'\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Prekini."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Ali želite nadaljevati?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Prejem nekaterih datotek ni uspel"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Nekaterih arhivov ni mogoče dobiti. Poskusite uporabiti apt-get update ali --"
+"fix-missing."
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing in izmenjava medija trenutno nista podprta"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Ni mogoče popraviti manjkajočih paketov."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Prekinjanje namestitve."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"Naslednji paketi so izginili z vašega sistema, ker so vse\n"
+"datoteke prepisali drugi paketi:"
+msgstr[1] ""
+"Naslednji paketi je izginil z vašega sistema, ker so vse\n"
+"datoteke prepisali drugi paketi:"
+msgstr[2] ""
+"Naslednja paketa sta izginila z vašega sistema, ker so vse\n"
+"datoteke prepisali drugi paketi:"
+msgstr[3] ""
+"Naslednji paketi so izginili z vašega sistema, ker so vse\n"
+"datoteke prepisali drugi paketi:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Opomba: To je dpkg storil samodejno in namenoma."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+"Program ne bi smel brisati stvari, ni mogoče zagnati "
+"SamodejnegaOdstranjevalnika"
+
+#: 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 ""
+"Videti je, da je SamodejniOdstranjevalnik nekaj uničil, kar se ne bi smelo "
+"zgoditi\n"
+"Pošljite poročilo o hrošču v apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Naslednji podatki vam bodo morda pomagali rešiti težavo:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Notranja napaka, SamodejniOdstranjevalnik je pokvaril stvari"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "Naslednji paketi so bili samodejno nameščeni in niso več zahtevani:"
+msgstr[1] "Naslednji paket je bil samodejno nameščen in ni več zahtevan:"
+msgstr[2] ""
+"Naslednja paketa sta bila samodejno nameščena in nista več zahtevana:"
+msgstr[3] "Naslednji paketi so bili samodejno nameščeni in niso več zahtevani:"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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 paketov je bilo samodejno nameščenih in niso več zahtevani.\n"
+msgstr[1] "%lu paket je bil samodejno nameščen in ni bil več zahtevan.\n"
+msgstr[2] "%lu paketa sta bila samodejno nameščena in nista več zahtevana.\n"
+msgstr[3] "%lu paketi so bili samodejno nameščeni in niso več zahtevani.\n"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "Uporabite 'apt-get autoremove' za njihovo odstranitev."
+msgstr[1] "Uporabite 'apt-get autoremove' za njegovo odstranitev."
+msgstr[2] "Uporabite 'apt-get autoremove' za njuno odstranitev."
+msgstr[3] "Uporabite 'apt-get autoremove' za njihovo odstranitev."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Poskusite zagnati 'apt-get -f install', če želite popraviti naslednje:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Nerešene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
+"navedite rešitev)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Nekaterih paketov ni mogoče namestiti. To lahko pomeni, da ste zahtevali\n"
+"nemogoč položaj, če uporabljate nestabilno izdajo pa\n"
+", da nekateri zahtevani paketi še niso ustvarjeni ali premaknjeni\n"
+" iz Prihajajočega."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Pokvarjeni paketi"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Naslednji dodatni paketi bodo nameščeni:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Predlagani paketi:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Priporočeni paketi:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "%s je preskočen, ker je že nameščen in ne potrebuje nadgradnje.\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Preskok %s, ni nameščen in zahtevane so le nadgradnje\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Ponovna namestitev %s ni možna, ker prejem ni možen.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "Najnovejša različica %s je že nameščena.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Izbrana različica '%s' (%s) za '%s'\n"
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Izbrana različica '%s' (%s) za '%s' namesto '%s'\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+"Paket '%s' ni nameščen, zato ni bil odstranjen. Ali ste mislili '%s'?\n"
+
+#: apt-private/private-install.cc:945
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Paket '%s' ni nameščen, zato ni bil odstranjen\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "POZOR: Naslednjih paketov ni bilo mogoče overiti!"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "Opozorilo overitve je bilo prepisano.\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Nekaterih paketkov bi bilo mogoče overiti"
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Ali želite te pakete namestiti brez preverjanja?"
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Ni mogoče dobiti %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 "Ni mogoče določiti prostega prostora v %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Na %s je premalo prostora."
+
+#: apt-private/private-sources.cc:58
+#, fuzzy, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "Ni mogoče preimenovati %s v %s"
+
+#: apt-private/private-sources.cc:70
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""
 
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Opravljeno"
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Zadetek "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Dobi:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Prezr "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Nap "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Pridobljenih %sB v %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Delo]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1748,18 +1755,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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,205 +1841,454 @@ 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"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode je poklical stabilno povezano vozlišče"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Ni mogoče najti razpršenega elementa!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Ni mogoče dodeliti odklona"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uporaba: apt-extracttemplates dat1 [dat2 ...]\n"
+"\n"
+"apt-extracttemplates je orodje za pridobivanje podatkov o\n"
+"nastavitvah in predlogah debianovih paketov\n"
+"\n"
+"Možnosti:\n"
+"  -h  To besedilo pomoči\n"
+"  -t   Nastavi začasno mapo\n"
+"  -c=? Prebere podano datoteko z nastavitvami\n"
+"  -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Notranja napaka v AddDiversion"
+#: 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"
 
-#: apt-inst/filelist.cc:477
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Poskus prepisovanja odklona, %s -> %s in %s/%s"
+msgid "Unable to write to %s"
+msgstr "Ni mogoče pisati na %s"
 
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Dvojni seštevek odklona %s -> %s"
+#: 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?"
 
-#: apt-inst/filelist.cc:549
+#: 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: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 "Duplicate conf file %s/%s"
-msgstr "Dvojnik datoteke z nastavitvami %s/%s"
+msgid "Error processing directory %s"
+msgstr "Napaka med obdelavo mape %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Seznam razširitev virov je predolg"
+
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "Napaka med pisanjem glave v datoteko vsebine"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "Pot %s je predolga"
+msgid "Error processing contents %s"
+msgstr "Napaka med obdelavo vsebine %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Uporaba: apt-ftparchive [možnosti] ukaz\n"
+"Ukazi: packages, binarypath [datoteka prepisa [predpona poti]]\n"
+"          sources srcpath [datoteka prepisa [predpona poti]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [skupine]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive ustvari datoteke kazala za arhive Debian. Podpira\n"
+"več slogov ustvarjanja od popolnoma samodejnih do funkcionalnih zamenjav\n"
+"za dpkg-scanpackages in dpkg-scansources\n"
+"\n"
+"apt-ftparchive ustvari datoteke paketov iz drevesa .debs. Datoteka\n"
+"paketa vsebuje vsebino vseh nadzornih polj iz vsakega paketa kot tudi\n"
+"razpršilo MD5 in velikost datoteke. Datoteka prepisa podpira vsiljenje\n"
+"vrednosti Prednosti in Odseka.\n"
+"\n"
+"Podobno apt-ftparchive ustvari datoteke paketov iz drevesa .dscs.\n"
+"Možnost --source-override je mogoče uporabiti za navedbo datoteke prepisa "
+"src\n"
+"\n"
+"Ukaza 'packages' in 'sources' je treba zagnati v korenu drevesa.\n"
+"BinaryPath bi morala kazati na osnovno mapo rekurzivnega iskanja in\n"
+"datoteka prepisa bi morala vsebovati zastavice prepisa Predpona je pripeta\n"
+"v polja imena datoteke, če je prisotna. Primer uporabe iz arhiva Debian:\n"
+"    apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"                 dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Možnosti:\n"
+"  -h    To besedilo pomoči\n"
+"  --md5 ustvarjanje nadzorne vsote MD5\n"
+"  -s=? datoteka prepisa vira\n"
+"  -q     tiho\n"
+"  -d=?  izbere izbirno podatkovno zbirko pomnilnika\n"
+"  --no-delink omogoči način razhroščevanja razvezovanja\n"
+"  --contents nadzira ustvarjanje datoteke vsebine\n"
+"  -c=? prebere to nastavitveno datoteko\n"
+"  -o=? nastavi poljubno možnost nastavitve"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Nobena izbira se ne ujema"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Odpakiranje %s več kot enkrat"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Nekatere datoteke manjkajo v skupini datotek paketov `%s'"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Mapa %s je odklonjena"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Podatkovna zbirka je pokvarjena, datoteka je preimenovana v %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Paket poskuša pisati v tarčo odklona %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "PZ je star, poskušanje nadgradnje %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Pot odklona je predloga"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Oblika podatkovne zbirke je neveljavna. V kolikor ste nadgradili s starejše "
+"različice apt, podatkovno zbirko odstranite in jo znova ustvarite."
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ni mogoče odprti datoteke PZ %s: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Napaka med določitvijo %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Napaka med branjem povezave %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Arhiv nima nadzornega zapisa"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Ni mogoče najti kazalke"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Ni mogoče preimenovati %s v %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "O: ni mogoče brati mape %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Mapa %s je bil zamenjana z ne-mapo"
+msgid "W: Unable to stat %s\n"
+msgstr "O: Ni mogoče določiti %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Iskanje vozlišča v njegovem razpršenem vedru ni uspelo"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Pot je predolga"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "O: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "N: Napake se sklicujejo na datoteko "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Prepiši zadetek paketa brez vnosa različice za %s"
+msgid "Failed to resolve %s"
+msgstr "Ni mogoče razrešiti %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Hoja drevesa je spodletela"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s"
+msgid "Failed to open %s"
+msgstr "Ni mogoče odprti %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Ni mogoče določiti %s"
+msgid " DeLink %s [%s]\n"
+msgstr " RazVeži %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Zapisovanje datoteke %s je spodletelo"
+msgid "Failed to readlink %s"
+msgstr "Napaka med branjem povezave %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Napaka med zapiranjem datoteke %s"
+msgid "Failed to unlink %s"
+msgstr "Napaka med odvezovanjem %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "To ni veljaven arhiv DEB. Manjka član '%s'."
+msgid "*** Failed to link %s to %s"
+msgstr "*** Napaka med povezovanjem %s in %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Notranja napaka. Ni mogoče najti člana %s."
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Dosežena meja RazVezovanja %sB.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Nadzorne datoteke ni mogoče razčleniti"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Arhiv ni imel polja s paketom"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Neveljaven podpis arhiva"
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s nima prepisanega vnosa\n"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Napaka med branjem glave člana arhiva"
+#: 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:712
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s nima izvornega vnosa prepisa\n"
+
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s nima tudi binarnega vnosa prepisa\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Napaka med dodeljevanjem pomnilnika"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Ni mogoče odpreti %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Napaka med branjem prepisane datoteke %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Neznan algoritem stiskanja '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Stisnjen izhod %s potrebuje niz stiskanja"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Ustvarjanje DATOTEKE* ni uspelo"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Vejitev ni uspela"
 
-#: apt-inst/contrib/arfile.cc:96
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Neveljavna glava arhiva člana %s"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Podrejeni predmet stiskanja"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Neveljavna glava člana arhiva"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Notranja napaka. Ni mogoče ustvariti %s"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Arhiv je prekratek"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "VI podopravila/datoteke je spodletel"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Glav arhiva ni mogoče brati"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Med računanjem MD5 ni mogoče brati"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Ni mogoče ustvariti pip"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Napaka med odvezovanjem %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Ni mogoče izvesti gzip "
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Ni mogoče preimenovati %s v %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Pokvarjen arhiv"
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uporaba: apt-internal-solver\n"
+"\n"
+"apt-internal-solver je vmesnik za uporabo trenutnega notranjega\n"
+"reševalnika kot zunanji reševalnik za družino APT za razhroščevanje ali "
+"podobno.\n"
+"\n"
+"Možnosti:\n"
+"  -h To besedilo pomoči\n"
+"  -q Izhod se beleži - ni kazalnika napredka\n"
+"  -c=? Prebere to nastavitveno datoteko\n"
+"  -o=? Nastavi poljubno nastavitveno možnost, na primer dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Nadzorna vsota tar ni uspela, arhiv je pokvarjen"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Neznan zapis paketa!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Neznana vrsta glave TAR %u, član %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Uporaba: apt-sortpkgs [možnosti] dat1 [dat2 ...]\n"
+"\n"
+"apt-sortpkgs je preprosto orodje za razvrščanje paketnih datotek. Možnost -"
+"s\n"
+"določa vrsto datoteke.\n"
+"\n"
+"Možnosti:\n"
+"  -h   to besedilo pomoči\n"
+"  -s   uporabi razvrščanje izvornih datotek\n"
+"  -c=? Prebere podano datoteko z nastavitvami\n"
+"  -o=? Nastavi poljubno nastavitveno možnost, npr. -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "Poganjanje dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketni sistem '%s' ni podprt"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ni mogoče določiti ustrezne vrste paketnega sistema"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapisanih je bilo %i zapisov.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Zapisanih je bilo %i zapisov z %i neujemajočimi datotekami.\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2049,6 +2305,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."
@@ -2061,157 +2337,336 @@ 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:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Prazen predpomnilnik paketov"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Odvisen od"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Predodvisen od"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Priporoča"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Priporoča"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "V sporu z"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Zamenja"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Zastara"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Pokvari"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Izboljša"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "pomembno"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "obvezno"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "običajni"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "izbirno"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "dodatno"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Preračunavanje nadgradnje"
+
+#: 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:118
+#: 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:169
+#: 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/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/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/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ni mogoče določiti %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/acquire-worker.cc:455
+#: apt-pkg/pkgcachegen.cc:1196
 #, 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 "Couldn't stat source package list %s"
+msgstr "Ni mogoče določiti seznama izvornih paketov %s"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
+#: 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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Gradnja drevesa odvisnosti"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Zbiranje dobaviteljev datotek"
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Različice kandidatov"
+#: 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/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Ustvarjanje odvisnosti"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Pošlji scenarij reševalniku"
 
-#: 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/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Pošlji zahtevo reševalniku"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Odpiranje DatotekeStanja %s je spodletelo"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Priprava za rešitev prejemanja"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Pisanje začasne DatotekeStanja %s je spodletelo"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
+
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Neujemanje vsote razpršil"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Neujemanje velikosti"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Neveljavno opravilo %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Napaka pisanja"
+
+#: 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:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Med preverjanjem podpisa je prišlo do napake. Skladišče ni bilo posodobljeno "
+"zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Napaka GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Mapa %s je odklonjena"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2220,16 +2675,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:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2238,27 +2693,19 @@ msgstr ""
 "Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to "
 "skladišče ne bo uveljavljena."
 
-#: apt-pkg/acquire-item.cc:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Med preverjanjem podpisa je prišlo do napake. Skladišče ni bilo posodobljeno "
-"zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Napaka GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2267,12 +2714,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:1992
+#: 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:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2280,119 +2727,38 @@ msgstr ""
 "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket "
 "%s."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ni mogoče določiti %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, 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:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Ni mogoče določiti seznama izvornih paketov %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Branje seznama paketov"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Zbiranje dobaviteljev datotek"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Ni mogoče pisati na %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "V sources.list morate vstaviti URI-je z viri"
@@ -2420,7 +2786,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2429,12 +2795,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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2445,10 +2811,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"
@@ -2519,11 +2888,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"
 
@@ -2533,7 +2902,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:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2541,337 +2910,262 @@ msgstr ""
 "Napaka. pkgProblemResolver::Resolve pri razrešitvi, ki so jih morda "
 "povzročili zadržani paketi."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr "Pošlji zahtevo reševalniku"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Priprava za rešitev prejemanja"
-
-#: apt-pkg/edsp.cc:327
-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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Izvedi zunanji reševalnik"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Ni mogoče razčleniti datoteke paketa %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ni mogoče razčleniti Release datoteke %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Ni izbir v Release datoteki %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ni vnosa razpršila v Release datoteki %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Izdaje '%s' za '%s' ni mogoče najti"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Različice '%s' za '%s' ni mogoče najti"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Ni mogoče najti naloge '%s'"
 
-#: apt-pkg/cacheset.cc:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Ni mogoče izbrati nameščene različice ali različice kandidata iz paketa "
-"'%s', saj nima nobenega od njiju"
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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 ""
+"Ni mogoče izbrati nameščene različice ali različice kandidata iz paketa "
+"'%s', saj nima nobenega od njiju"
+
+#: 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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Ni vnosa razpršila v Release datoteki %s"
+
+#: apt-pkg/indexrecords.cc:145
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s"
+
+#: apt-pkg/indexrecords.cc:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Neveljavne vnos 'Datum' v Release datoteki %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Izbire %s ni mogoče najti"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko le za branje %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Ni mogoče odprti zaklenjene datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Ni mogoče zakleniti datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 "Seznama datotek ni mogoče ustvariti, ker '%s' ni mapa"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Preziranje '%s' v mapi '%s', ker ni običajna datoteka"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "Preziranje datoteke '%s' v mapi '%s', ker nima pripone imena datotek"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 "Preziranje datoteke '%s' v mapi '%s', ker nima veljavne pripone imena datotek"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Pod-opravilo %s je prejelo segmentacijsko napako."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Pod-opravilo %s je prejelo signal %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Pod-opravilo %s je vrnilo kodo napake (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Pod-opravilo %s se je nepričakovano zaključilo"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Težava med zapiranjem gzip datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Ni mogoče odpreti datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Ni mogoče odpreti opisnika datotek %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Ni mogoče ustvariti podopravila IPD"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Ni mogoče izvesti stiskanja "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "Prebrano, še vedno je treba prebrati %llu bajtov, vendar ni nič ostalo"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "pisanje, preostalo je še %llu za pisanje, vendar ni bilo mogoče pisati"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Težava med zapiranjem datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Težava med preimenovanje datoteke %s v %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Težava med razvezovanjem datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Težava med usklajevanjem datoteke"
 
@@ -2958,111 +3252,105 @@ 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:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Neprepoznana vrsta okrajšave: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Odpiranje nastavitvene datoteke %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s ni nameščenih zbirk ključev."
-
-#: 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"
@@ -3072,12 +3360,12 @@ msgstr "Neveljavno opravilo %s"
 msgid "Installing %s"
 msgstr "Nameščanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Odstranjevanje %s"
@@ -3098,80 +3386,80 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mapa '%s' manjka"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Pripravljanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Razširjanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Pripravljanje na nastavljanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "%s je bil nameščen"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Pripravljanje na odstranitev %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "%s je bil odstranjen"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s je bil popolnoma odstranjen"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: 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:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "težave odvisnosti - puščanje nenastavljenega"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3179,7 +3467,7 @@ 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:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3187,7 +3475,7 @@ msgstr ""
 "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
 "polnega diska"
 
-#: apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3195,7 +3483,7 @@ msgstr ""
 "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
 "zaradi pomanjkanja pomnilnika"
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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"
@@ -3203,7 +3491,7 @@ msgstr ""
 "Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na težavo "
 "na krajevnem sistemu"
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3216,421 +3504,190 @@ 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"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uporaba: apt-extracttemplates dat1 [dat2 ...]\n"
-"\n"
-"apt-extracttemplates je orodje za pridobivanje podatkov o\n"
-"nastavitvah in predlogah debianovih paketov\n"
-"\n"
-"Možnosti:\n"
-"  -h  To besedilo pomoči\n"
-"  -t   Nastavi začasno mapo\n"
-"  -c=? Prebere podano datoteko z nastavitvami\n"
-"  -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Ni mogoče določiti %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Napaka med obdelavo mape %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Seznam razširitev virov je predolg"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Napaka med pisanjem glave v datoteko vsebine"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Napaka med obdelavo vsebine %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Uporaba: apt-ftparchive [možnosti] ukaz\n"
-"Ukazi: packages, binarypath [datoteka prepisa [predpona poti]]\n"
-"          sources srcpath [datoteka prepisa [predpona poti]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [skupine]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive ustvari datoteke kazala za arhive Debian. Podpira\n"
-"več slogov ustvarjanja od popolnoma samodejnih do funkcionalnih zamenjav\n"
-"za dpkg-scanpackages in dpkg-scansources\n"
-"\n"
-"apt-ftparchive ustvari datoteke paketov iz drevesa .debs. Datoteka\n"
-"paketa vsebuje vsebino vseh nadzornih polj iz vsakega paketa kot tudi\n"
-"razpršilo MD5 in velikost datoteke. Datoteka prepisa podpira vsiljenje\n"
-"vrednosti Prednosti in Odseka.\n"
-"\n"
-"Podobno apt-ftparchive ustvari datoteke paketov iz drevesa .dscs.\n"
-"Možnost --source-override je mogoče uporabiti za navedbo datoteke prepisa "
-"src\n"
-"\n"
-"Ukaza 'packages' in 'sources' je treba zagnati v korenu drevesa.\n"
-"BinaryPath bi morala kazati na osnovno mapo rekurzivnega iskanja in\n"
-"datoteka prepisa bi morala vsebovati zastavice prepisa Predpona je pripeta\n"
-"v polja imena datoteke, če je prisotna. Primer uporabe iz arhiva Debian:\n"
-"    apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"                 dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Možnosti:\n"
-"  -h    To besedilo pomoči\n"
-"  --md5 ustvarjanje nadzorne vsote MD5\n"
-"  -s=? datoteka prepisa vira\n"
-"  -q     tiho\n"
-"  -d=?  izbere izbirno podatkovno zbirko pomnilnika\n"
-"  --no-delink omogoči način razhroščevanja razvezovanja\n"
-"  --contents nadzira ustvarjanje datoteke vsebine\n"
-"  -c=? prebere to nastavitveno datoteko\n"
-"  -o=? nastavi poljubno možnost nastavitve"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Nobena izbira se ne ujema"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Nekatere datoteke manjkajo v skupini datotek paketov `%s'"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Podatkovna zbirka je pokvarjena, datoteka je preimenovana v %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "PZ je star, poskušanje nadgradnje %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Oblika podatkovne zbirke je neveljavna. V kolikor ste nadgradili s starejše "
-"različice apt, podatkovno zbirko odstranite in jo znova ustvarite."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ni mogoče odprti datoteke PZ %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Napaka med branjem povezave %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arhiv nima nadzornega zapisa"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Ni mogoče najti kazalke"
+"Skrbniške mape (%s) ni mogoče zakleniti. Jo morda uporablja drugo opravilo?"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "O: ni mogoče brati mape %s\n"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Skrbniške mape (%s) ni mogoče zakleniti. Ali ste skrbnik?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "O: Ni mogoče določiti %s\n"
+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'. "
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Ni zaklenjeno"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "O: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode je poklical stabilno povezano vozlišče"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "N: Napake se sklicujejo na datoteko "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Ni mogoče najti razpršenega elementa!"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Ni mogoče razrešiti %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Ni mogoče dodeliti odklona"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Hoja drevesa je spodletela"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Notranja napaka v AddDiversion"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "Ni mogoče odprti %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Poskus prepisovanja odklona, %s -> %s in %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " RazVeži %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Dvojni seštevek odklona %s -> %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Napaka med branjem povezave %s"
+msgid "Duplicate conf file %s/%s"
+msgstr "Dvojnik datoteke z nastavitvami %s/%s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Napaka med odvezovanjem %s"
+msgid "The path %s is too long"
+msgstr "Pot %s je predolga"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Napaka med povezovanjem %s in %s"
+msgid "Unpacking %s more than once"
+msgstr "Odpakiranje %s več kot enkrat"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Dosežena meja RazVezovanja %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arhiv ni imel polja s paketom"
+msgid "The directory %s is diverted"
+msgstr "Mapa %s je odklonjena"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s nima prepisanega vnosa\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Paket poskuša pisati v tarčo odklona %s/%s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  Vzdrževalec %s je %s in ne %s\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Pot odklona je predloga"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s nima izvornega vnosa prepisa\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Mapa %s je bil zamenjana z ne-mapo"
 
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s nima tudi binarnega vnosa prepisa\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Iskanje vozlišča v njegovem razpršenem vedru ni uspelo"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Napaka med dodeljevanjem pomnilnika"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Pot je predolga"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "Ni mogoče odpreti %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1"
+msgid "Overwrite package match with no version for %s"
+msgstr "Prepiši zadetek paketa brez vnosa različice za %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Napaka med branjem prepisane datoteke %s"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s"
 
-#: ftparchive/override.cc:166
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1"
+msgid "Unable to stat %s"
+msgstr "Ni mogoče določiti %s"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1"
+msgid "Failed to write file %s"
+msgstr "Zapisovanje datoteke %s je spodletelo"
 
-#: ftparchive/override.cc:191
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 3"
+msgid "Failed to close file %s"
+msgstr "Napaka med zapiranjem datoteke %s"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Neznan algoritem stiskanja '%s'"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "To ni veljaven arhiv DEB. Manjka član '%s'."
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Stisnjen izhod %s potrebuje niz stiskanja"
+msgid "Internal error, could not locate member %s"
+msgstr "Notranja napaka. Ni mogoče najti člana %s."
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Ustvarjanje DATOTEKE* ni uspelo"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Nadzorne datoteke ni mogoče razčleniti"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Vejitev ni uspela"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Neveljaven podpis arhiva"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Podrejeni predmet stiskanja"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Napaka med branjem glave člana arhiva"
 
-#: ftparchive/multicompress.cc:232
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Notranja napaka. Ni mogoče ustvariti %s"
+msgid "Invalid archive member header %s"
+msgstr "Neveljavna glava arhiva člana %s"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "VI podopravila/datoteke je spodletel"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Neveljavna glava člana arhiva"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Med računanjem MD5 ni mogoče brati"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arhiv je prekratek"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Glav arhiva ni mogoče brati"
+
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Ni mogoče ustvariti pip"
+
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Ni mogoče izvesti gzip "
+
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Pokvarjen arhiv"
+
+#: 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:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Napaka med odvezovanjem %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Neznana vrsta glave TAR %u, član %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uporaba: apt-internal-solver\n"
-"\n"
-"apt-internal-solver je vmesnik za uporabo trenutnega notranjega\n"
-"reševalnika kot zunanji reševalnik za družino APT za razhroščevanje ali "
-"podobno.\n"
-"\n"
-"Možnosti:\n"
-"  -h To besedilo pomoči\n"
-"  -q Izhod se beleži - ni kazalnika napredka\n"
-"  -c=? Prebere to nastavitveno datoteko\n"
-"  -o=? Nastavi poljubno nastavitveno možnost, na primer dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Celotna velikost z odvisnostmi različice: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Neznan zapis paketa!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Nimate dovolj prostora na %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Uporaba: apt-sortpkgs [možnosti] dat1 [dat2 ...]\n"
-"\n"
-"apt-sortpkgs je preprosto orodje za razvrščanje paketnih datotek. Možnost -"
-"s\n"
-"določa vrsto datoteke.\n"
-"\n"
-"Možnosti:\n"
-"  -h   to besedilo pomoči\n"
-"  -s   uporabi razvrščanje izvornih datotek\n"
-"  -c=? Prebere podano datoteko z nastavitvami\n"
-"  -o=? Nastavi poljubno nastavitveno možnost, npr. -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Opravljeno"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "V %s ni nameščenih zbirk ključev."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
@@ -3720,9 +3777,6 @@ msgstr ""
 #~ "Ni mogoče pisati dnevnika, openpty() je spodletelo (/dev/pts ni "
 #~ "prklopljen?)\n"
 
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Datoteka %s se ne začne s čisto podpisanim sporočilom"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Preskok neobstoječe datoteke %s"
 
diff --git a/po/sv.po b/po/sv.po
index 55afb20d8..70f4b2d2d 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: 2015-01-16 04:37-0500\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,148 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Totalt antal paketnamn: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Totala paketstrukturer: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Vanliga paket: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Helt virtuella paket: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Enstaka virtuella paket: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Blandade virtuella paket: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Saknade: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Totalt antal olika versioner: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Totalt antal olika beskrivningar: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Totalt antal beroenden: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Totalt antal version/filrelationer: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Totalt antal beskrivning/filrelationer: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Totalt antal tillhandahållningsmarkeringar: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Totalt antal sökmönstersträngar: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Totalt utrymme för versionsberoenden: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Totalt bortkastat utrymme: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Totalt utrymme som kan redogöras för: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "\"Package\"-filer:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Fastnålade paket:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(hittades inte)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Installerad: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Paketnålning: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Versionstabell:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -240,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"
@@ -261,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."
 
@@ -297,71 +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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: 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:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunde inte hitta paketet %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Kunde inte låsa hämtningskatalogen"
 
-#: cmdline/apt-get.cc:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -371,7 +367,7 @@ msgstr ""
 "på:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
@@ -382,95 +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:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hoppar över redan hämtade filen \"%s\"\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Kunde inte fastställa ledigt utrymme i %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hämtar källkoden %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Misslyckades med att hämta vissa arkiv."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggkommandot \"%s\" misslyckades.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Barnprocessen misslyckades"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har inga byggberoenden.\n"
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -513,31 +508,31 @@ msgstr ""
 "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
 "hittas"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Misslyckades med att behandla byggberoenden"
 
 # Felmeddelande för misslyckad chdir
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Ansluter till %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Moduler som stöds:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -652,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -777,12 +772,12 @@ msgstr "Skivan hittades inte."
 msgid "File not found"
 msgstr "Filen hittades inte"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Kunde inte ta status"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Misslyckades ställa in ändringstid"
 
@@ -791,34 +786,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ogiltig URI, lokala URI:er får inte börja med //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Loggar in"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Kunde inte fastställa namnet på partnern"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Kunde inte fastställa det lokala namnet"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Servern nekade anslutningen och sade: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER misslyckades, servern sade: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS misslyckades, servern sade: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -826,124 +821,124 @@ msgstr ""
 "En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::"
 "ProxyLogin är tom."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Kommandot \"%s\" i inloggningsskriptet misslyckades, servern sade: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE misslyckades, servern sade: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Tidsgränsen för anslutningen överskreds"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Servern stängde anslutningen"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Läsfel"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Ett svar spillde bufferten."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Protokollet skadat"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Skrivfel"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Kunde inte skapa ett uttag (socket)"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Kunde inte ansluta datauttaget (socket), inget svar inom tidsgräns"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Kunde inte ansluta passivt uttag (socket)."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo kunde inte få tag i ett lyssnande uttag (socket)"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Kunde inte binda ett uttag (socket)"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Kunde inte lyssna på uttaget (socket)"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Kunde inte fastställa uttagets namn (socket)"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Kunde inte sända PORT-kommando"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Okänd adressfamilj %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT misslyckades, servern sade: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Kunde inte ta emot anslutningen"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Kunde inte hämta filen, servern sade \"%s\""
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Datauttag (socket) fick inte svar inom tidsgränsen"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataöverföringen misslyckades, servern sade \"%s\""
 
 # Statusmeddelande, byter från substantiv till verb
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Frågar"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Kunde inte starta "
 
@@ -1013,39 +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:168
+#: 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:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ogiltig signatur träffades på."
 
-#: methods/gpgv.cc:174
+#: 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?)"
+"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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Okänt fel vid körning av apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1053,35 +1049,35 @@ msgstr ""
 "Följande signaturer kunde inte verifieras för att den öppna nyckeln inte är "
 "tillgänglig:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Fel vid skrivning till filen"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Fel vid läsning från server"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Fel vid skrivning till fil"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "\"Select\" misslyckades"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Anslutningen överskred tidsgränsen"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Fel vid skrivning till utdatafil"
 
@@ -1113,433 +1109,165 @@ msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte"
 msgid "Unknown date format"
 msgstr "Okänt datumformat"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Felaktiga data i huvud"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Anslutningen misslyckades"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
+#: apt-private/private-list.cc:121
+msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Internt fel. InstallPackages anropades med trasiga paket!"
+#: 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-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat."
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Korrigerar beroenden..."
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Internt fel. Sorteringen färdigställdes inte"
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " misslyckades."
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Konstigt... storlekarna stämde inte överens, skicka e-post till apt@packages."
-"debian.org"
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Kunde inte korrigera beroenden"
 
-#. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Behöver hämta %sB/%sB arkiv.\n"
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Kunde inte minimera uppgraderingsuppsättningen"
 
-#. 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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Behöver hämta %sB arkiv.\n"
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Färdig"
 
-#. 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:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
+#: 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 ""
-"Efter denna åtgärd kommer ytterligare %sB utrymme användas på disken.\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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n"
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installerat]"
 
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installerat]"
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Problem har uppstått och -y användes utan --force-yes"
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling."
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installerat]"
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Ja, gör som jag säger!"
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installerat]"
 
-#: apt-private/private-install.cc:222
+#: apt-private/private-output.cc:277
 #, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
+msgid "[upgradable from: %s]"
 msgstr ""
-"Du är på väg att göra någonting som kan vara skadligt\n"
-"Skriv in frasen \"%s\" för att fortsätta\n"
-" ?] "
 
-# Visas då man svarar nej
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Avbryter."
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Vill du fortsätta?"
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s är installerat"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Misslyckades med att hämta vissa filer"
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s kommer att installeras"
 
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Vissa arkiv kunte inte hämtas. Prova att köra \"apt-get update\" eller med --"
-"fix-missing."
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "men det kan inte installeras"
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing och mediabyte stöds inte för tillfället"
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "men det är ett virtuellt paket"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Kunde inte korrigera saknade paket."
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "men det är inte installerat"
 
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Avbryter installationen."
+#: 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-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"Följande paket har försvunnit från ditt system eftersom\n"
-"alla filer har skrivits över av andra paket:"
-msgstr[1] ""
-"Följande paket har försvunnit från ditt system eftersom\n"
-"alla filer har skrivits över av andra paket:"
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " eller"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Observera: Detta sker med automatik och vid behov av dpkg."
+#: 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-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-"Det är inte meningen att vi ska ta bort något, kan inte starta AutoRemover"
+#: 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-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Hmm, det verkar som AutoRemover förstörde något som verkligen\n"
-"inte skulle hända. Skicka in en felrapport mot paketet apt."
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Följande paket kommer att TAS BORT:"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Följande information kan vara till hjälp för att lösa situationen:"
+#: 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-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Internt fel, AutoRemover förstörde något"
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Följande paket kommer att uppgraderas:"
 
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"Följande paket har installerats automatiskt och är inte längre nödvändigt:"
-msgstr[1] ""
-"Följande paket har installerats automatiskt och är inte längre nödvändiga:"
+#: 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-install.cc:517
+#: apt-private/private-output.cc:688
 #, c-format
-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 paket blev installerade automatiskt och är inte längre nödvändigt.\n"
-msgstr[1] ""
-"%lu paket blev installerade automatiskt och är inte längre nödvändiga.\n"
-
-#: apt-private/private-install.cc:519
-#, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Använd \"apt-get autoremove\" för att ta bort dem."
-msgstr[1] "Använd \"apt-get autoremove\" för att ta bort dem."
-
-#: apt-private/private-install.cc:612
-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-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket "
-"(eller ange en lösning)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Några paket kunde inte installeras. Det kan betyda att du har begärt\n"
-"en omöjlig situation eller, om du använder den instabila utgåvan\n"
-"att några nödvändiga paket ännu inte har skapats eller flyttats\n"
-"ut från \"Incoming\"."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Trasiga paket"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Följande ytterligare paket kommer att installeras:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Föreslagna paket:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Rekommenderade paket:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Hoppar över %s, det är inte installerat och endast uppgraderingar har "
-"begärts.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s är redan den senaste versionen.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Korrigerar beroenden..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " misslyckades."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Kunde inte korrigera beroenden"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Kunde inte minimera uppgraderingsuppsättningen"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Färdig"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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) "
+msgid "%s (due to %s) "
+msgstr "%s (på grund av %s) "
 
 #: apt-private/private-output.cc:696
 msgid ""
@@ -1600,7 +1328,7 @@ msgstr "J"
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: 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"
@@ -1609,7 +1337,7 @@ msgstr "Fel vid kompilering av reguljärt uttryck - %s"
 msgid "The update command takes no arguments"
 msgstr "Uppdateringskommandot tar inga argument"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1617,10 +1345,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1645,48 +1377,323 @@ msgstr ""
 "           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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "VARNING: Följande paket kunde inte autentiseras!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Internt fel. InstallPackages anropades med trasiga paket!"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Autentiseringsvarning åsidosatt.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat."
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Några av paketen kunde inte autentiseras"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Internt fel. Sorteringen färdigställdes inte"
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Installera dessa paket utan verifiering?"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Konstigt... storlekarna stämde inte överens, skicka e-post till apt@packages."
+"debian.org"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#. 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
+#: apt-private/private-install.cc:154
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Misslyckades med att hämta %s  %s\n"
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Behöver hämta %sB/%sB arkiv.\n"
 
-#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "Misslyckades med att byta namn på %s till %s"
+#. 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:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Behöver hämta %sB arkiv.\n"
 
-#: apt-private/private-sources.cc:70
+#. 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:166
 #, c-format
-msgid "Your '%s' file changed, please run 'apt-get update'."
+msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
+"Efter denna åtgärd kommer ytterligare %sB utrymme användas på disken.\n"
 
-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
-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
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Beräknar uppgradering"
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Problem har uppstått och -y användes utan --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\" angavs, men detta är inte en trivial handling."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Ja, gör som jag säger!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Du är på väg att göra någonting som kan vara skadligt\n"
+"Skriv in frasen \"%s\" för att fortsätta\n"
+" ?] "
+
+# Visas då man svarar nej
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Avbryter."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Vill du fortsätta?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Misslyckades med att hämta vissa filer"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Vissa arkiv kunte inte hämtas. Prova att köra \"apt-get update\" eller med --"
+"fix-missing."
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing och mediabyte stöds inte för tillfället"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Kunde inte korrigera saknade paket."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Avbryter installationen."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"Följande paket har försvunnit från ditt system eftersom\n"
+"alla filer har skrivits över av andra paket:"
+msgstr[1] ""
+"Följande paket har försvunnit från ditt system eftersom\n"
+"alla filer har skrivits över av andra paket:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Observera: Detta sker med automatik och vid behov av dpkg."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+"Det är inte meningen att vi ska ta bort något, kan inte starta AutoRemover"
+
+#: 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 ""
+"Hmm, det verkar som AutoRemover förstörde något som verkligen\n"
+"inte skulle hända. Skicka in en felrapport mot paketet apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Följande information kan vara till hjälp för att lösa situationen:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Internt fel, AutoRemover förstörde något"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"Följande paket har installerats automatiskt och är inte längre nödvändigt:"
+msgstr[1] ""
+"Följande paket har installerats automatiskt och är inte längre nödvändiga:"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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 paket blev installerade automatiskt och är inte längre nödvändigt.\n"
+msgstr[1] ""
+"%lu paket blev installerade automatiskt och är inte längre nödvändiga.\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] "Använd \"apt-get autoremove\" för att ta bort dem."
+msgstr[1] "Använd \"apt-get autoremove\" för att ta bort dem."
+
+#: apt-private/private-install.cc:587
+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-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket "
+"(eller ange en lösning)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Några paket kunde inte installeras. Det kan betyda att du har begärt\n"
+"en omöjlig situation eller, om du använder den instabila utgåvan\n"
+"att några nödvändiga paket ännu inte har skapats eller flyttats\n"
+"ut från \"Incoming\"."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Trasiga paket"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Följande ytterligare paket kommer att installeras:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Föreslagna paket:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Rekommenderade paket:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Hoppar över %s, det är inte installerat och endast uppgraderingar har "
+"begärts.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s är redan den senaste versionen.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
+
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Valde version \"%s\" (%s) för \"%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 "Paketet %s är inte installerat, så det tas inte bort\n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+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-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "VARNING: Följande paket kunde inte autentiseras!"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "Autentiseringsvarning åsidosatt.\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Några av paketen kunde inte autentiseras"
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Installera dessa paket utan verifiering?"
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Misslyckades med att hämta %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 "Kunde inte fastställa ledigt utrymme i %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
+
+#: apt-private/private-sources.cc:58
+#, fuzzy, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "Misslyckades med att byta namn på %s till %s"
+
+#: apt-private/private-sources.cc:70
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""
 
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Färdig"
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 # Måste vara tre bokstäver(?)
 # "Hit" = aktuell version är fortfarande giltig
@@ -1695,31 +1702,31 @@ msgid "Hit "
 msgstr "Bra "
 
 # "Get:" = hämtar ny version
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Läs:"
 
 # "Ign" = hoppar över
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ign "
 
 # "Err" = fel vid hämtning
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Fel "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Hämtade %sB på %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Arbetar]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1732,19 +1739,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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,206 +1827,461 @@ msgstr "meddelandet är viktiga. Försök korrigera dem och kör [I]nstallera ig
 msgid "Merging available information"
 msgstr "Sammanfogar tillgänglig information"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode anropat på fortfarande länkad nod"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Användning: apt-extracttemplates fil1 [fil2 ...]\n"
+"\n"
+"apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n"
+"och mallinformation från paket\n"
+"\n"
+"Flaggor:\n"
+"  -h   Denna hjälptext.\n"
+"  -t   Ställ in temporärkatalogen.\n"
+"  -c=? Läs denna konfigurationsfil.\n"
+"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Misslyckades med att hitta hash-elementet!"
+#: 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"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Misslyckades med att allokera omdirigering"
+#: 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"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Internt fel i AddDiversion"
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Kan inte ta reda på debconf-version. Är debconf installerat?"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Försöker att skriva över en omdirigering, %s -> %s och %s/%s"
+#: 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"
 
-#: apt-inst/filelist.cc:506
+#: 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 "Double add of diversion %s -> %s"
-msgstr "Omdirigeringen %s -> %s inlagd två gånger"
+msgid "Error processing directory %s"
+msgstr "Fel vid behandling av katalogen %s"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Duplicerad konfigurationsfil %s/%s"
+#: 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"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: 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:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "Sökvägen %s är för lång"
+msgid "Error processing contents %s"
+msgstr "Fel vid behandling av innehållet %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Användning: apt-ftparchive [flaggor] kommando\n"
+"Kommandon: packages binärsökväg [åsidosättningsfil [sökvägsprefix]]\n"
+"           sources källsökväg [åsidosättningsfil [sökvägsprefix]]\n"
+"           contents sökväg\n"
+"           release sökväg\n"
+"           generate konfiguration [grupper]\n"
+"           clean konfiguration\n"
+"\n"
+"apt-ftparchive genererar indexfiler för Debianarkiv. Det stöder många\n"
+"former av generering, allt från helautomatiserat till funktionella\n"
+"ersättningar till dpkg-scanpackages och dpkg-scansources\n"
+"\n"
+"apt-ftparchive skapar Package-filer från ett träd med .deb-filer.\n"
+"Packagefilen innehåller alla styrfälten från paketen samt MD5-hashvärdet\n"
+"och filstorlek. En overrride-fil stöds för att tvinga värden på Priority\n"
+"och Section.\n"
+"\n"
+"På samma sätt skapar apt-ftparchive Sources-filer från ett träd med\n"
+".dsc-filer. Flaggan --source-override kan användas för att ange en\n"
+"override-fil för källkoden.\n"
+"\n"
+"Kommandona \"packages\" och \"sources\" bör köras från rotet på trädet.\n"
+"Binärsökvägen bör peka på basen på den rekursiva sökningen och\n"
+"override-filen bör innehålla override-flaggorna de framtvingade flaggorna.\n"
+"Sökvägsprefixet läggs till i filnamnsfälten om det anges. Ett exempel på\n"
+"hur programmet kan användas från Debianarkivet:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Flaggor:\n"
+"  -h    Denna hjälptext\n"
+"  --md5 Kontrollera generering av MD5\n"
+"  -s=?  Källkods-override-fil\n"
+"  -q    Tyst\n"
+"  -d=?  Väljer den valfria cachedatabasen\n"
+"  --no-delink Aktivera \"delinkning\"-felsökningsläget\n"
+"  --contents  Styr skapande av contents-fil\n"
+"  -c=?  Läs denna konfigurationsfil\n"
+"  -o=?  Ställ in en godtycklig konfigurationsflagga"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Inga val träffades"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Packar upp %s flera gånger"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Några filer saknas i paketfilsgruppen \"%s\""
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Katalogen %s är omdirigerad"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB var skadad, filen omdöpt till %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Paketet försöker att skriva till omdirigeringsmålet %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB är gammal, försöker uppgradera %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Omdirigeringssökvägen är för lång"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"DB-formatet är ogiltigt. Ta bort och återskapa databasen om du uppgraderar "
+"från en äldre version av apt."
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Kunde inte öppna DB-filen %s: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Misslyckades med att ta status på %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Misslyckades med att läsa länken %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Arkivet har ingen styrpost"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Kunde inte få tag i någon markör"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Misslyckades med att byta namn på %s till %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "V: Kunde inte läsa katalogen %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Katalogen %s ersätts av en icke-katalog"
+msgid "W: Unable to stat %s\n"
+msgstr "V: Kunde inte ta status på %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Misslyckades med att hitta noden i sin hashkorg"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "F: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Sökvägen är för lång"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "V: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "F: Felen gäller filen "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Skriv över paketträff utan version för %s"
+msgid "Failed to resolve %s"
+msgstr "Misslyckades med att slå upp %s"
 
-#: apt-inst/extract.cc:438
+# ???
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Trädvandring misslyckades"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Filen %s/%s skriver över den i paketet %s"
+msgid "Failed to open %s"
+msgstr "Misslyckades med att öppna %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Kunde inte ta status på %s"
+msgid " DeLink %s [%s]\n"
+msgstr " Avlänka %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Misslyckades med att skriva filen %s"
+msgid "Failed to readlink %s"
+msgstr "Misslyckades med att läsa länken %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Misslyckades med att stänga filen %s"
+msgid "Failed to unlink %s"
+msgstr "Misslyckades med att länka ut %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Misslyckades med att länka %s till %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Internt fel, kunde inta hitta delen %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Avlänkningsgränsen på %sB nåddes.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Kunde inte tolka control-filen"
+# Fält vid namn "Package"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Arkivet har inget package-fält"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Ogiltig arkivsignatur"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Fel vid läsning av rubrik för arkivdel"
+# parametrar: paket, ny, gammal
+#: 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:712
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s har ingen källåsidosättningspost\n"
+
+#: 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"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Misslyckades med att allokera minne"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Kunde inte öppna %s"
+
+# parametrar: filnamn, radnummer
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Felaktig override %s rad %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Misslyckades med att läsa åsidosättningsfilen %s"
+
+# parametrar: filnamn, radnummer
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Felaktig override %s rad %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Felaktig override %s rad %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Felaktig override %s rad %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Okänd komprimeringsalgoritm \"%s\""
 
-#: apt-inst/contrib/arfile.cc:96
+# ???
+#: ftparchive/multicompress.cc:103
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "Ogiltig arkivdelsrubrik %s"
+msgid "Compressed output %s needs a compression set"
+msgstr "Komprimerade utdata %s behöver en komprimeringsuppsättning"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Ogiltigt arkivdelsrubrik"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Misslyckades med att skapa FILE*"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Arkivet är för kort"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Misslyckades med att grena process"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Misslyckades med att läsa arkivrubriker"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Barnprocess för komprimering"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Misslyckades med att skapa rör"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Internt fel, misslyckades med att skapa %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Misslyckades med att köra gzip"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "In/ut för underprocess/fil misslyckades"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Skadat arkiv"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Misslyckades med att läsa vid beräkning av MD5"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar-kontrollsumma misslyckades, arkivet skadat"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problem med att länka ut %s"
 
-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Okänd TAR-rubriktyp %u, del %s"
+msgid "Failed to rename %s to %s"
+msgstr "Misslyckades med att byta namn på %s till %s"
+
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Användning: apt-extracttemplates fil1 [fil2 ...]\n"
+"\n"
+"apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n"
+"och mallinformation från paket\n"
+"\n"
+"Flaggor:\n"
+"  -h   Denna hjälptext.\n"
+"  -t   Ställ in temporärkatalogen.\n"
+"  -c=? Läs denna konfigurationsfil.\n"
+"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Okänd paketpost!"
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Användning: apt-sortpkgs [flaggor] fil1 [fil2 ...]\n"
+"\n"
+"apt-sortpkgs är ett enkelt verktyg för att sortera paketfiler. Flaggan\n"
+"-s anges för att ange filens typ.\n"
+"\n"
+"Flaggor:\n"
+"  -h   Denna hjälptext.\n"
+"  -s   Använd källkodsfilssortering.\n"
+"  -c=? Läs denna konfigurationsfil.\n"
+"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "Kör dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketsystemet \"%s\" stöds inte"
 
 #
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Kunde inte fastställa en lämplig paketsystemstyp"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skrev %i poster med %i saknade filer.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Skrev %i poster med %i filer som inte stämmer\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n"
@@ -2034,6 +2296,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."
@@ -2047,205 +2330,370 @@ msgid "The list of sources could not be read."
 msgstr "Listan över källor kunde inte läsas."
 
 # Felmeddelande
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Paketcachen är tom"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr "Paketcachefilens version är inkompatibel"
 
-#: apt-pkg/pkgcache.cc:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Beroende av"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Förberoende av"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Föreslår"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Rekommenderar"
 
 # "Konfliktar"?
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Står i konflikt med"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Ersätter"
 
 # "Föråldrar"?
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Föråldrar"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Gör sönder"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Utökar"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "viktigt"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "nödvändigt"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "valfri"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Beräknar uppgradering"
+
+#: 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:118
+#: 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/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/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/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Kunde inte ta status på %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/acquire-worker.cc:169
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startade inte korrekt"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Paketet %s %s hittades inte när filberoenden hanterades"
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/pkgcachegen.cc:1196
 #, 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 "Couldn't stat source package list %s"
+msgstr "Kunde inte ta status på källkodspaketlistan %s"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexfiler av typ \"%s\" stöds inte"
+#: 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"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Bygger beroendeträd"
+# Bättre ord?
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Samlar filtillhandahållningar"
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandiderande versioner"
+#: 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/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Beroendegenerering"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: 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/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Misslyckades med att öppna StateFile %s"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Misslyckades med att skriva temporär StateFile %s"
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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: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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Hash-kontrollsumman stämmer inte"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Storleken stämmer inte"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Felaktig åtgärd %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Skrivfel"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Ett fel inträffade vid verifiering av signaturen. Förrådet har inte "
+"uppdaterats och de tidigare indexfilerna kommer att användas. GPG-fel: %s: "
+"%s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG-fel: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Katalogen %s är omdirigerad"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Ett fel inträffade vid verifiering av signaturen. Förrådet har inte "
-"uppdaterats och de tidigare indexfilerna kommer att användas. GPG-fel: %s: "
-"%s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG-fel: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2254,133 +2702,49 @@ 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:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Indexfiler av typ \"%s\" stöds inte"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kunde inte ta status på %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fel uppstod vid hantering av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kunde inte ta status på källkodspaketlistan %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Läser paketlistor"
-
-# Bättre ord?
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samlar filtillhandahållningar"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Kunde inte skriva till %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: 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:902
+#: 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:904
+#: 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: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"
@@ -2407,7 +2771,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2416,12 +2780,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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2433,10 +2797,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"
@@ -2507,11 +2875,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"
 
@@ -2522,7 +2890,7 @@ msgid ""
 msgstr ""
 "Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2530,335 +2898,266 @@ msgstr ""
 "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på "
 "tillbakahållna paket."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Kunde inte tolka paketfilen %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Kunde inte tolka \"Release\"-filen %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Inga sektioner i Release-filen %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ingen Hash-post i Release-filen %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Utgåvan \"%s\" för \"%s\" hittades inte"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Version \"%s\" för \"%s\" hittades inte"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Kunde inte hitta funktionen \"%s\""
 
-#: apt-pkg/cacheset.cc:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Kan inte välja installerad version eller kandidatversion från paketet \"%s\" "
-"eftersom det inte har någon av dem"
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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 inte välja installerad version eller kandidatversion från paketet \"%s\" "
+"eftersom det inte har någon av dem"
+
+#: 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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Ingen Hash-post i Release-filen %s"
+
+#: apt-pkg/indexrecords.cc:145
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s"
+
+#: apt-pkg/indexrecords.cc:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ogiltig \"Date\"-post i Release-filen %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Valet %s hittades inte"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Använder inte låsning för skrivskyddade låsfilen %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Kunde inte öppna låsfilen %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Använder inte låsning för nfs-monterade låsfilen %s"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Kunde inte erhålla låset %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprocessen %s råkade ut för ett segmenteringsfel."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprocessen %s tog emot signal %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprocessen %s svarade med en felkod (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprocessen %s avslutades oväntat"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problem med att stänga gzip-filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Kunde inte öppna filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Kunde inte öppna filhandtag %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Misslyckades med att skapa underprocess-IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Misslyckades med att starta komprimerare "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "skrivning, har fortfarande %lu att skriva men kunde inte"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem med att stänga filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem med att byta namn på filen %s till %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem med att avlänka filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Problem med att synkronisera filen"
 
@@ -2947,110 +3246,104 @@ 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:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Okänd typförkortning: \"%c\""
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Öppnar konfigurationsfilen %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nyckelring installerad i %s."
-
-#: 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"
@@ -3060,12 +3353,12 @@ msgstr "Felaktig åtgärd %s"
 msgid "Installing %s"
 msgstr "Installerar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Tar bort %s"
@@ -3086,79 +3379,79 @@ msgid "Running post-installation trigger %s"
 msgstr "Kör efterinstallationsutlösare %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Katalogen \"%s\" saknas"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Förbereder %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Packar upp %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Förbereder konfigurering av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "Installerade %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "Tog bort %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "Tog bort hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "beroendeproblem - lämnar okonfigurerad"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3166,7 +3459,7 @@ 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:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3174,7 +3467,7 @@ msgstr ""
 "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
 "diskutrymmet är slut"
 
-#: apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3182,7 +3475,7 @@ msgstr ""
 "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet "
 "är slut"
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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 "
@@ -3191,7 +3484,7 @@ msgstr ""
 "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
 "diskutrymmet är slut"
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3215,417 +3508,180 @@ msgstr "Kunde inte låsa administrationskatalogen (%s). Är du root?"
 #. 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"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Användning: apt-extracttemplates fil1 [fil2 ...]\n"
-"\n"
-"apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n"
-"och mallinformation från paket\n"
-"\n"
-"Flaggor:\n"
-"  -h   Denna hjälptext.\n"
-"  -t   Ställ in temporärkatalogen.\n"
-"  -c=? Läs denna konfigurationsfil.\n"
-"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Kunde inte ta status på %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Fel vid behandling av katalogen %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-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
-msgid "Error writing header to contents file"
-msgstr "Fel vid skrivning av rubrik till innehållsfil"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Fel vid behandling av innehållet %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Användning: apt-ftparchive [flaggor] kommando\n"
-"Kommandon: packages binärsökväg [åsidosättningsfil [sökvägsprefix]]\n"
-"           sources källsökväg [åsidosättningsfil [sökvägsprefix]]\n"
-"           contents sökväg\n"
-"           release sökväg\n"
-"           generate konfiguration [grupper]\n"
-"           clean konfiguration\n"
-"\n"
-"apt-ftparchive genererar indexfiler för Debianarkiv. Det stöder många\n"
-"former av generering, allt från helautomatiserat till funktionella\n"
-"ersättningar till dpkg-scanpackages och dpkg-scansources\n"
-"\n"
-"apt-ftparchive skapar Package-filer från ett träd med .deb-filer.\n"
-"Packagefilen innehåller alla styrfälten från paketen samt MD5-hashvärdet\n"
-"och filstorlek. En overrride-fil stöds för att tvinga värden på Priority\n"
-"och Section.\n"
-"\n"
-"På samma sätt skapar apt-ftparchive Sources-filer från ett träd med\n"
-".dsc-filer. Flaggan --source-override kan användas för att ange en\n"
-"override-fil för källkoden.\n"
-"\n"
-"Kommandona \"packages\" och \"sources\" bör köras från rotet på trädet.\n"
-"Binärsökvägen bör peka på basen på den rekursiva sökningen och\n"
-"override-filen bör innehålla override-flaggorna de framtvingade flaggorna.\n"
-"Sökvägsprefixet läggs till i filnamnsfälten om det anges. Ett exempel på\n"
-"hur programmet kan användas från Debianarkivet:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Flaggor:\n"
-"  -h    Denna hjälptext\n"
-"  --md5 Kontrollera generering av MD5\n"
-"  -s=?  Källkods-override-fil\n"
-"  -q    Tyst\n"
-"  -d=?  Väljer den valfria cachedatabasen\n"
-"  --no-delink Aktivera \"delinkning\"-felsökningsläget\n"
-"  --contents  Styr skapande av contents-fil\n"
-"  -c=?  Läs denna konfigurationsfil\n"
-"  -o=?  Ställ in en godtycklig konfigurationsflagga"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Inga val träffades"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Några filer saknas i paketfilsgruppen \"%s\""
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB var skadad, filen omdöpt till %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB är gammal, försöker uppgradera %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"DB-formatet är ogiltigt. Ta bort och återskapa databasen om du uppgraderar "
-"från en äldre version av apt."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Kunde inte öppna DB-filen %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Misslyckades med att läsa länken %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arkivet har ingen styrpost"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Kunde inte få tag i någon markör"
-
-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "V: Kunde inte läsa katalogen %s\n"
+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. "
 
-#: ftparchive/writer.cc:96
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "V: Kunde inte ta status på %s\n"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Inte låst"
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "F: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode anropat på fortfarande länkad nod"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "V: "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Misslyckades med att hitta hash-elementet!"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "F: Felen gäller filen "
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Misslyckades med att allokera omdirigering"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Misslyckades med att slå upp %s"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Internt fel i AddDiversion"
 
-# ???
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Trädvandring misslyckades"
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Försöker att skriva över en omdirigering, %s -> %s och %s/%s"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to open %s"
-msgstr "Misslyckades med att öppna %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Omdirigeringen %s -> %s inlagd två gånger"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Avlänka %s [%s]\n"
+msgid "Duplicate conf file %s/%s"
+msgstr "Duplicerad konfigurationsfil %s/%s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Misslyckades med att läsa länken %s"
+msgid "The path %s is too long"
+msgstr "Sökvägen %s är för lång"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Misslyckades med att länka ut %s"
+msgid "Unpacking %s more than once"
+msgstr "Packar upp %s flera gånger"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Misslyckades med att länka %s till %s"
+msgid "The directory %s is diverted"
+msgstr "Katalogen %s är omdirigerad"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:152
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Avlänkningsgränsen på %sB nåddes.\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Paketet försöker att skriva till omdirigeringsmålet %s/%s"
 
-# Fält vid namn "Package"
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arkivet har inget package-fält"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Omdirigeringssökvägen är för lång"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s har ingen post i override-filen\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Katalogen %s ersätts av en icke-katalog"
 
-# parametrar: paket, ny, gammal
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Misslyckades med att hitta noden i sin hashkorg"
+
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Sökvägen är för lång"
+
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  ansvarig för paketet %s är %s ej %s\n"
+msgid "Overwrite package match with no version for %s"
+msgstr "Skriv över paketträff utan version för %s"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s har ingen källåsidosättningspost\n"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Filen %s/%s skriver över den i paketet %s"
 
-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s har heller ingen binär åsidosättningspost\n"
+msgid "Unable to stat %s"
+msgstr "Kunde inte ta status på %s"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Misslyckades med att allokera minne"
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Misslyckades med att skriva filen %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Unable to open %s"
-msgstr "Kunde inte öppna %s"
+msgid "Failed to close file %s"
+msgstr "Misslyckades med att stänga filen %s"
 
-# parametrar: filnamn, radnummer
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Felaktig override %s rad %lu #1"
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Misslyckades med att läsa åsidosättningsfilen %s"
+msgid "Internal error, could not locate member %s"
+msgstr "Internt fel, kunde inta hitta delen %s"
 
-# parametrar: filnamn, radnummer
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Felaktig override %s rad %lu #1"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Kunde inte tolka control-filen"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Felaktig override %s rad %lu #2"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Ogiltig arkivsignatur"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Felaktig override %s rad %lu #3"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Fel vid läsning av rubrik för arkivdel"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Okänd komprimeringsalgoritm \"%s\""
+msgid "Invalid archive member header %s"
+msgstr "Ogiltig arkivdelsrubrik %s"
 
-# ???
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Komprimerade utdata %s behöver en komprimeringsuppsättning"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Ogiltigt arkivdelsrubrik"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Misslyckades med att skapa FILE*"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arkivet är för kort"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Misslyckades med att grena process"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Misslyckades med att läsa arkivrubriker"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Barnprocess för komprimering"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Misslyckades med att skapa rör"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Internt fel, misslyckades med att skapa %s"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Misslyckades med att köra gzip"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "In/ut för underprocess/fil misslyckades"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Skadat arkiv"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Misslyckades med att läsa vid beräkning av MD5"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar-kontrollsumma misslyckades, arkivet skadat"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Problem med att länka ut %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Okänd TAR-rubriktyp %u, del %s"
 
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Användning: apt-extracttemplates fil1 [fil2 ...]\n"
-"\n"
-"apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n"
-"och mallinformation från paket\n"
-"\n"
-"Flaggor:\n"
-"  -h   Denna hjälptext.\n"
-"  -t   Ställ in temporärkatalogen.\n"
-"  -c=? Läs denna konfigurationsfil.\n"
-"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Totalt utrymme för versionsberoenden: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Okänd paketpost!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Användning: apt-sortpkgs [flaggor] fil1 [fil2 ...]\n"
-"\n"
-"apt-sortpkgs är ett enkelt verktyg för att sortera paketfiler. Flaggan\n"
-"-s anges för att ange filens typ.\n"
-"\n"
-"Flaggor:\n"
-"  -h   Denna hjälptext.\n"
-"  -s   Använd källkodsfilssortering.\n"
-"  -c=? Läs denna konfigurationsfil.\n"
-"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Färdig"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Ingen nyckelring installerad i %s."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/th.po b/po/th.po
index 1dee18de7..147c3b8b8 100644
--- a/po/th.po
+++ b/po/th.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: 2015-01-16 04:37-0500\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"
@@ -23,148 +23,144 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "แพกเกจ %s รุ่น %s ขาดแพกเกจที่ต้องใช้:\n"
 
-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "จำนวนชื่อแพกเกจทั้งหมด: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "จำนวนโครงสร้างแพกเกจทั้งหมด: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  แพกเกจปกติ: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  แพกเกจเสมือนแท้ๆ: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  แพกเกจเสมือนที่มีแพกเกจจริงเดียว: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  แพกเกจเสมือนผสม: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  แพกเกจที่ขาดหาย: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "จำนวนรุ่นที่แตกต่างกันทั้งหมด: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "จำนวนคำบรรยายแพกเกจที่แตกต่างกันทั้งหมด: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "จำนวนการเชื่อมโยงระหว่างแพกเกจทั้งหมด: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "จำนวนความสัมพันธ์ รุ่น/แฟ้ม ทั้งหมด: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "จำนวนความสัมพันธ์ คำบรรยาย/แฟ้ม ทั้งหมด: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "จำนวนผังการตระเตรียมทั้งหมด: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "จำนวนสตริงทั้งหมด: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "ขนาดของพื้นที่ความเชื่อมโยงระหว่างแพกเกจทั้งหมด: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "พื้นที่สำรองทั้งหมด: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "พื้นที่ที่นับรวมทั้งหมด: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark showauto' แทน"
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "ไม่พบแพกเกจ %s"
 
-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "แฟ้มแพกเกจ:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "แพกเกจที่ถูกตรึง:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(ไม่พบ)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  ที่ติดตั้งอยู่: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  รุ่นที่ติดตั้งได้: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(ไม่มี)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  การตรึงแพกเกจ: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  ตารางรุ่น:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -234,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"
@@ -258,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 "ทำเช่นนี้ต่อไปกับแผ่นซีดีที่เหลือในชุด"
 
@@ -294,71 +290,71 @@ msgstr ""
 "  -c=? อ่านแฟ้มค่าตั้งที่กำหนด\n"
 "  -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224
 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "ไม่พบแพกเกจสำหรับสถาปัตยกรรม '%s'"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "ไม่พบแพกเกจ '%s' ที่มีรุ่นเป็น '%s'"
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "ไม่พบแพกเกจ '%s' ที่มีชุดจัดแจกเป็น '%s'"
 
-#: cmdline/apt-get.cc:367
+#: 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:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "ไม่พบรุ่น '%s' ของแพกเกจ '%s'"
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "ไม่พบแพกเกจ %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย"
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด"
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -367,7 +363,7 @@ msgstr ""
 "ข้อสังเกต: การจัดทำแพกเกจ '%s' พัฒนาผ่านระบบควบคุมรุ่น '%s' อยู่ที่:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -378,78 +374,67 @@ msgstr ""
 "bzr branch %s\n"
 "เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออกมา) ของตัวแพกเกจ\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
-
 #. 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:895
+#: 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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n"
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ดาวน์โหลดซอร์ส %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม"
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว"
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n"
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "คำสั่ง build '%s' ล้มเหลว\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "โพรเซสลูกล้มเหลว"
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build"
 
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -457,17 +442,27 @@ msgid ""
 msgstr ""
 "ไม่มีข้อมูลสถาปัตยกรรมสำหรับ %s ดูวิธีตั้งค่าที่หัวข้อ APT::Architectures ของ apt.conf(5)"
 
-#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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:1086 cmdline/apt-get.cc:1089
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s"
 
-#: cmdline/apt-get.cc:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n"
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: cmdline/apt-get.cc:1359
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -496,37 +491,37 @@ msgstr ""
 "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s "
 "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้"
 
-#: cmdline/apt-get.cc:1362
+#: 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:1385
+#: cmdline/apt-get.cc:1388
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้"
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "ปูมการแก้ไขสำหรับ %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "มอดูลที่รองรับ:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -621,11 +616,11 @@ msgstr "ต้องการ URL หนึ่งรายการเป็น
 msgid "Must specify at least one pair url/filename"
 msgstr "ต้องระบุคู่ URL, ชื่อแฟ้ม อย่างน้อยหนึ่งคู่"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr "ดาวน์โหลดไม่สำเร็จ"
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -649,53 +644,53 @@ msgstr ""
 "\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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -813,12 +808,12 @@ msgstr "ไม่พบแผ่น"
 msgid "File not found"
 msgstr "ไม่พบแฟ้ม"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "stat ไม่สำเร็จ"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ"
 
@@ -827,156 +822,156 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI ไม่ถูกต้อง  URI ของแฟ้มในเครื่องต้องขึ้นต้นด้วย //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "เข้าระบบ"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "ไม่สามารถอ่านชื่อของอีกฝ่ายได้"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "ไม่สามารถอ่านชื่อของเครื่องนี้ได้"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "เซิร์ฟเวอร์ปฏิเสธการเชื่อมต่อโดยรายงานว่า: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr "มีการระบุพร็อกซี แต่ไม่มีสคริปต์สำหรับเข้าระบบ ค่า Acquire::ftp:ProxyLogin ว่างเปล่า"
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "คำสั่งสคริปต์เข้าระบบ '%s' ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "หมดเวลารอเชื่อมต่อ"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "การอ่านข้อมูลผิดพลาด"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "คำตอบท่วมบัฟเฟอร์"
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "มีความเสียหายของโพรโทคอล"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "การเขียนข้อมูลผิดพลาด"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "ไม่สามารถสร้างซ็อกเก็ต"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "ไม่สามารถเชื่อมต่อซ็อกเก็ตข้อมูล เนื่องจากหมดเวลาคอย"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "ล้มเหลว"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "ไม่สามารถเชื่อมต่อซ็อกเกตแบบ passive"
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo ไม่สามารถนำซ็อกเก็ตที่รอรับการเชื่อมต่อมาใช้"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "ไม่สามารถ bind ซ็อกเก็ต"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "ไม่สามารถ listen ที่ซ็อกเก็ต"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "ไม่สามารถระบุชื่อซ็อกเก็ต"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "ไม่สามารถส่งคำสั่ง PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "ไม่รู้จักตระกูลที่อยู่ %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "หมดเวลารอเชื่อมต่อซ็อกเก็ตข้อมูล"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "ไม่สามารถรับการเชื่อมต่อ"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "ไม่สามารถดาวน์โหลดแฟ้ม เซิร์ฟเวอร์ตอบว่า: '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "หมดเวลาคอยที่ซ็อกเก็ตข้อมูล"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "ถ่ายโอนข้อมูลไม่สำเร็จ เซิร์ฟเวอร์ตอบว่า '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "สอบถาม"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "ไม่สามารถเรียก "
 
@@ -1042,21 +1037,21 @@ msgstr "เกิดปัญหาร้ายแรงบางอย่าง
 msgid "Unable to connect to %s:%s:"
 msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s:"
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ"
 
-#: methods/gpgv.cc:174
+#: 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1065,49 +1060,49 @@ msgstr ""
 "แฟ้มที่เซ็นกำกับครอบข้อความมีเนื้อหาไม่ถูกต้อง ได้รับผลลัพธ์ "
 "'%s' (เครือข่ายต้องยืนยันตัวบุคคลหรือไม่?)"
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n"
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "ลายเซ็นต่อไปนี้ไม่สามารถตรวจสอบได้ เพราะไม่มีกุญแจสาธารณะ:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "แฟ้มว่างเปล่าไม่สามารถเป็นแฟ้มจัดเก็บที่ใช้การได้"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ"
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "select ไม่สำเร็จ"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "หมดเวลารอเชื่อมต่อ"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์"
 
@@ -1139,309 +1134,61 @@ msgstr "การสนับสนุน Content-Range ที่เซิร์
 msgid "Unknown date format"
 msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "ข้อมูลส่วนหัวผิดพลาด"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "เชื่อมต่อไม่สำเร็จ"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "ข้อผิดพลาดภายใน"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr "กำลังเรียงลำดับ"
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "เกิดข้อผิดพลาดภายใน: มีการเรียก InstallPackages ด้วยแพกเกจที่เสีย!"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "มีแพกเกจที่จำเป็นต้องถอดถอน แต่ถูกห้ามการถอดถอนไว้"
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr "แปลกประหลาด... ขนาดไม่ตรงกัน กรุณาอีเมลแจ้ง 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of 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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "ต้องดาวน์โหลดแพกเกจ %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
-#: apt-private/private-install.cc:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "หลังจากการกระทำนี้ ต้องใช้เนื้อที่บนดิสก์อีก %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
-#: apt-private/private-install.cc:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --force-yes"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Trivial Only ถูกกำหนดไว้ แต่คำสั่งนี้ไม่ใช่คำสั่งเล็กน้อย"
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Yes, do as I say!"
-
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"คุณกำลังจะทำสิ่งที่อาจเป็นอันตราย\n"
-"หากต้องการดำเนินการต่อ ให้พิมพ์ประโยค '%s'\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "เลิกทำ"
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่?"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"ดาวน์โหลดบางแพกเกจไม่สำเร็จ บางที การเรียก apt-get update หรือลองใช้ตัวเลือก --fix-"
-"missing อาจช่วยได้"
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "ยังไม่รองรับ --fix-missing พร้อมกับการเปลี่ยนแผ่น"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "ไม่สามารถแก้ปัญหาแพกเกจที่ขาดหายได้"
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "จะล้มเลิกการติดตั้ง"
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"แพกเกจต่อไปนี้ได้หายไปจากระบบของคุณ เพราะแฟ้มทั้งหมดได้ถูกแทนที่\n"
-"โดยแพกเกจอื่นแล้ว:"
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "หมายเหตุ: นี่เป็นสิ่งที่ dpkg ทำโดยอัตโนมัติโดยเจตนา"
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้"
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"ดูเหมือนการถอดถอนอัตโนมัติได้สร้างความเสียหายบางอย่าง ซึ่งไม่ควรเกิดขึ้น\n"
-"กรุณารายงานบั๊กนี้ของแพกเกจ apt"
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:"
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย"
-
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
-
-#: apt-private/private-install.cc:517
+#: methods/server.cc:589
 #, c-format
-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 แพกเกจถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว\n"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "ใช้ 'apt-get autoremove' เพื่อถอดถอนแพกเกจดังกล่าวได้"
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "คุณอาจเรียก 'apt-get -f install' เพื่อแก้ปัญหานี้ได้:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ "
-"(หรือจะระบุทางแก้ก็ได้)"
-
-#: apt-private/private-install.cc:638
 msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"ไม่สามารถติดตั้งบางแพกเกจได้ คุณอาจระบุเงื่อนไขการติดตั้งที่เป็นไปไม่ได้\n"
-"หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n"
-"ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming"
 
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "แพกเกจมีปัญหา"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "แพกเกจที่แนะนำ:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "แพกเกจที่ควรใช้ร่วมกัน:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "จะข้าม %s เนื่องจากแพกเกจติดตั้งไว้แล้ว และไม่มีการกำหนดให้ปรับรุ่น\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "จะข้าม %s เนื่องจากแพกเกจไม่ได้ติดตั้งไว้ และคำสั่งมีเพียงการปรับรุ่นเท่านั้น\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ เนื่องจากไม่สามารถดาวน์โหลดได้\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว อันเนื่องมาจาก '%s'\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน คุณหมายถึง '%s' หรือเปล่า?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "ข้อผิดพลาดภายใน"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr "กำลังแสดงรายชื่อ"
 
-#: apt-private/private-list.cc:159
+#: 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:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " ล้มเหลว"
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " เสร็จแล้ว"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f"
 
@@ -1602,7 +1349,7 @@ msgstr "Y"
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
@@ -1611,7 +1358,7 @@ msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม
 msgid "The update command takes no arguments"
 msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1619,10 +1366,14 @@ msgid_plural ""
 msgstr[0] ""
 "มี %i แพกเกจสามารถปรับรุ่นได้ เรียก 'apt list --upgradable' หากต้องการดูรายชื่อ\n"
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1646,27 +1397,290 @@ msgstr ""
 "         อย่าลืมด้วยว่าการล็อคก็ไม่ทำงานเช่นกัน\n"
 "         ดังนั้น อย่าถือผลลัพธ์นี้ว่าตรงกับสภาพความเป็นจริงของระบบ!"
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "*คำเตือน*: แพกเกจต่อไปนี้ไม่สามารถยืนยันแหล่งต้นตอได้!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "เกิดข้อผิดพลาดภายใน: มีการเรียก InstallPackages ด้วยแพกเกจที่เสีย!"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "จะข้ามการเตือนเกี่ยวกับการยืนยันแหล่งต้นตอ\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "มีแพกเกจที่จำเป็นต้องถอดถอน แต่ถูกห้ามการถอดถอนไว้"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "มีบางแพกเกจไม่สามารถยืนยันแหล่งต้นตอได้"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr "แปลกประหลาด... ขนาดไม่ตรงกัน กรุณาอีเมลแจ้ง 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of 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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "ต้องดาวน์โหลดแพกเกจ %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
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "หลังจากการกระทำนี้ ต้องใช้เนื้อที่บนดิสก์อีก %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
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --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 ถูกกำหนดไว้ แต่คำสั่งนี้ไม่ใช่คำสั่งเล็กน้อย"
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Yes, do as I say!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"คุณกำลังจะทำสิ่งที่อาจเป็นอันตราย\n"
+"หากต้องการดำเนินการต่อ ให้พิมพ์ประโยค '%s'\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "เลิกทำ"
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"ดาวน์โหลดบางแพกเกจไม่สำเร็จ บางที การเรียก apt-get update หรือลองใช้ตัวเลือก --fix-"
+"missing อาจช่วยได้"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "ยังไม่รองรับ --fix-missing พร้อมกับการเปลี่ยนแผ่น"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "ไม่สามารถแก้ปัญหาแพกเกจที่ขาดหายได้"
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "จะล้มเลิกการติดตั้ง"
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"แพกเกจต่อไปนี้ได้หายไปจากระบบของคุณ เพราะแฟ้มทั้งหมดได้ถูกแทนที่\n"
+"โดยแพกเกจอื่นแล้ว:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "หมายเหตุ: นี่เป็นสิ่งที่ dpkg ทำโดยอัตโนมัติโดยเจตนา"
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้"
+
+#: 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 ""
+"ดูเหมือนการถอดถอนอัตโนมัติได้สร้างความเสียหายบางอย่าง ซึ่งไม่ควรเกิดขึ้น\n"
+"กรุณารายงานบั๊กนี้ของแพกเกจ apt"
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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 แพกเกจถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว\n"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "ใช้ 'apt-get autoremove' เพื่อถอดถอนแพกเกจดังกล่าวได้"
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "คุณอาจเรียก 'apt-get -f install' เพื่อแก้ปัญหานี้ได้:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ "
+"(หรือจะระบุทางแก้ก็ได้)"
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"ไม่สามารถติดตั้งบางแพกเกจได้ คุณอาจระบุเงื่อนไขการติดตั้งที่เป็นไปไม่ได้\n"
+"หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n"
+"ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming"
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "แพกเกจมีปัญหา"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "แพกเกจที่แนะนำ:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "แพกเกจที่ควรใช้ร่วมกัน:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "จะข้าม %s เนื่องจากแพกเกจติดตั้งไว้แล้ว และไม่มีการกำหนดให้ปรับรุ่น\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "จะข้าม %s เนื่องจากแพกเกจไม่ได้ติดตั้งไว้ และคำสั่งมีเพียงการปรับรุ่นเท่านั้น\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ เนื่องจากไม่สามารถดาวน์โหลดได้\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว\n"
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว อันเนื่องมาจาก '%s'\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน คุณหมายถึง '%s' หรือเปล่า?\n"
+
+#: apt-private/private-install.cc:945
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "*คำเตือน*: แพกเกจต่อไปนี้ไม่สามารถยืนยันแหล่งต้นตอได้!"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "จะข้ามการเตือนเกี่ยวกับการยืนยันแหล่งต้นตอ\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "มีบางแพกเกจไม่สามารถยืนยันแหล่งต้นตอได้"
+
+#: apt-private/private-download.cc:108
 msgid "Install these packages without verification?"
 msgstr "จะติดตั้งแพกเกจเหล่านี้โดยไม่ตรวจสอบหรือไม่?"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "ไม่สามารถดาวน์โหลด %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 "ไม่สามารถคำนวณพื้นที่ว่างใน %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
+
 #: apt-private/private-sources.cc:58
 #, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1681,41 +1695,33 @@ msgstr "แฟ้ม '%s' ของคุณมีการเปลี่ยน
 msgid "Full Text Search"
 msgstr "ค้นทั่วทั้งเนื้อความ"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "กำลังคำนวณการปรับรุ่น"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "เสร็จแล้ว"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "เจอ "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "ดึง:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "ข้าม "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "ปัญหา "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [กำลังทำงาน]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1728,18 +1734,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1811,205 +1817,447 @@ msgstr "กรุณาแก้ปัญหาเหล่านั้น แ
 msgid "Merging available information"
 msgstr "กำลังผสานรายชื่อของแพกเกจที่มี"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode ถูกเรียกใช้กับโหนดที่ยังลิงก์อยู่"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "หาสมาชิกในตารางแฮชไม่สำเร็จ!"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"วิธีใช้: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates เป็นเครื่องมือสำหรับแยกเอาข้อมูลการตั้งค่าและเทมเพลต\n"
+"ออกมาจากแพกเกจเดเบียน\n"
+"\n"
+"ตัวเลือก:\n"
+"  -h   แสดงข้อความช่วยเหลือนี้\n"
+"  -t   กำหนดไดเรกทอรีทำงานชั่วคราว\n"
+"  -c=?  อ่านแฟ้มค่าตั้งนี้\n"
+"  -o=?  กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "จองเนื้อที่สำหรับการเบนแฟ้มไม่สำเร็จ"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, c-format
+msgid "Unable to mkstemp %s"
+msgstr "ไม่สามารถ mkstemp %s"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "ข้อผิดพลาดภายในที่ AddDiversion"
-
-#: apt-inst/filelist.cc:477
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "พยายามเขียนทับการเบนแฟ้ม: %s -> %s กับ %s/%s"
+msgid "Unable to write to %s"
+msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
 
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "เพิ่มการเบนแฟ้ม %s -> %s ซ้ำสอง"
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?"
 
-#: apt-inst/filelist.cc:549
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "รายชื่อนามสกุลแพกเกจยาวเกินไป"
+
+#: 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 "Duplicate conf file %s/%s"
-msgstr "แฟ้มค่าตั้ง %s/%s ซ้ำ"
+msgid "Error processing directory %s"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผลไดเรกทอรี %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "รายชื่อนามสกุลซอร์สยาวเกินไป"
+
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "เกิดข้อผิดพลาดขณะเขียนข้อมูลส่วนหัวลงในแฟ้มสารบัญ"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "พาธ %s ยาวเกินไป"
+msgid "Error processing contents %s"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผลสารบัญ %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"วิธีใช้: apt-ftparchive [ตัวเลือก] คำสั่ง\n"
+"คำสั่ง: packages binarypath [overridefile [pathprefix]]\n"
+"        sources srcpath [overridefile [pathprefix]]\n"
+"        contents path\n"
+"        release path\n"
+"        generate config [groups]\n"
+"        clean config\n"
+"\n"
+"apt-ftparchive ใช้สร้างแฟ้มดัชนีสำหรับแหล่งแพกเกจเดเบียน รองรับวิธีสร้างหลายแบบ\n"
+"ตั้งแต่แบบอัตโนมัติทั้งหมด ไปจนถึงการใช้แทน dpkg-scanpackages และ dpkg-scansources\n"
+"\n"
+"apt-ftparchive สร้างแฟ้ม Package จากต้นไม้ไดเรกทอรีที่เก็บ .deb  แฟ้ม Package\n"
+"จะรวมเนื้อหาข้อมูลควบคุมทุกรายการของแต่ละแพกเกจ รวมถึง MD5 hash และขนาดแฟ้ม\n"
+"และรองรับการสร้างแฟ้ม override เพื่อบังคับค่าลำดับความสำคัญและหมวดแพกเกจด้วย\n"
+"\n"
+"ในทำนองเดียวกัน apt-ftparchive จะสร้างแฟ้ม Sources จากต้นไม้ไดเรกทอรีที่เก็บ .dsc\n"
+"คุณสามารถใช้ตัวเลือก --source-override เพื่อระบุแฟ้ม override สำหรับซอร์สได้\n"
+"\n"
+"คำสั่ง 'packages' และ 'sources' ควรเรียกที่ตำแหน่งรากของต้นไม้ไดเรกทอรี\n"
+"ค่า binarypath ควรชี้ไปที่ตำแหน่งฐานที่จะค้นหาแบบทั่วถึง  และแฟ้ม override ก็ควรมีแฟล็ก\n"
+"override ต่างๆ สำหรับแพกเกจ  ค่า pathprefix จะถูกเพิ่มเข้าที่หน้าข้อมูล filename ถ้ามี\n"
+"ตัวอย่างการใช้งานจากแหล่งแพกเกจเดเบียน:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"ตัวเลือก:\n"
+"  -h    แสดงข้อความช่วยเหลือนี้\n"
+"  --md5 ควบคุมการสร้าง MD5\n"
+"  -s=?  แฟ้ม override สำหรับซอร์ส\n"
+"  -q    ทำงานแบบเงียบ\n"
+"  -d=?  เลือกฐานข้อมูลแคชอื่น\n"
+"  --no-delink เปิดโหมดดีบั๊กสำหรับการตัดลิงก์\n"
+"  --contents  ควบคุมการสร้างแฟ้มสารบัญ\n"
+"  -c=?  อ่านแฟ้มค่าตั้งนี้\n"
+"  -o=?  กำหนดตัวเลือกค่าตั้งเป็นรายตัว"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "ไม่มีรายการเลือกที่ตรง"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "พยายามแตกแพกเกจ %s มากกว่าหนึ่งครั้ง"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "บางแฟ้มขาดหายไปในกลุ่มแฟ้มแพกเกจ `%s'"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "ไดเรกทอรี %s ถูก divert"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB เสีย จะเปลี่ยนชื่อแฟ้มเป็น %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "แพกเกจนี้พยายามเขียนลงปลายทางของการเบนแฟ้ม %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB เป็นรุ่นเก่า จะพยายามปรับรุ่น %s ขึ้น"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "พาธของการเบนแฟ้มยาวเกินไป"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ่งปรับรุ่นมาจาก apt รุ่นเก่า กรุณาลบฐานข้อมูลแล้วสร้างใหม่"
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "ไม่สามารถเปิดแฟ้ม DB %s: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "stat %s ไม่สำเร็จ"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+msgid "Failed to read .dsc"
+msgstr "อ่าน .dsc ไม่สำเร็จ"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "แพกเกจไม่มีระเบียนควบคุม"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: อ่านไดเรกทอรี %s ไม่สำเร็จ\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "ไดเรกทอรี %s กำลังจะถูกแทนที่ด้วยสิ่งที่ไม่ใช่ไดเรกทอรี"
+msgid "W: Unable to stat %s\n"
+msgstr "W: stat %s ไม่สำเร็จ\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "หาโหนดใน bucket ของแฮชไม่พบ"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "พาธยาวเกินไป"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "W: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: ข้อผิดพลาดเกิดกับแฟ้ม "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "พบแพกเกจที่เขียนทับโดยไม่มีข้อมูลรุ่นสำหรับ %s"
+msgid "Failed to resolve %s"
+msgstr "หาพาธเต็มของ %s ไม่สำเร็จ"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "เดินท่องต้นไม้ไม่สำเร็จ"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพกเกจ %s"
+msgid "Failed to open %s"
+msgstr "เปิด %s ไม่สำเร็จ"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "ไม่สามารถ stat %s"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "ไม่สามารถเขียนแฟ้ม %s"
+msgid "Failed to readlink %s"
+msgstr "readlink %s ไม่สำเร็จ"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "ไม่สามารถปิดแฟ้ม %s"
+msgid "Failed to unlink %s"
+msgstr "unlink %s ไม่สำเร็จ"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "แฟ้มนี้ไม่ใช่แพกเกจ DEB ที่ใช้การได้ ขาดสมาชิก '%s'"
+msgid "*** Failed to link %s to %s"
+msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิก %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n"
+
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'"
+
+#: 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:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  ผู้ดูแล %s คือ %s ไม่ใช่ %s\n"
+
+#: ftparchive/writer.cc:712
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s ไม่มีข้อมูล override สำหรับซอร์ส\n"
+
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - จองหน่วยความจำไม่สำเร็จ"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "ไม่สามารถเปิด %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu (%s)"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "ไม่สามารถอ่านแฟ้ม override %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "ไม่รู้จักอัลกอริทึมบีบอัด '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "ผลลัพธ์ของการบีบอัด %s ต้องมีชุดของการบีบอัดด้วย"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "ไม่สามารถแจงแฟ้มควบคุมได้"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "สร้าง FILE* ไม่สำเร็จ"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "เอกลักษณ์ของแฟ้มจัดเก็บไม่ถูกต้อง"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "fork ไม่สำเร็จ"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บ"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "โพรเซสลูกสำหรับบีบอัด"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/multicompress.cc:232
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "ข้อมูลส่วนหัว %s ของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง"
-
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "ข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง"
+msgid "Internal error, failed to create %s"
+msgstr "ข้อผิดพลาดภายใน: ไม่สามารถสร้าง %s"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "แฟ้มจัดเก็บสั้นเกินไป"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "IO ไปยังโพรเซสย่อยหรือแฟ้มล้มเหลว"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "อ่านข้อมูลส่วนหัวของแฟ้มจัดเก็บไม่สำเร็จ"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนวณ MD5"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "สร้างไปป์ไม่สำเร็จ"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "มีปัญหาขณะลบแฟ้ม %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "เรียก gzip ไม่สำเร็จ"
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "แฟ้มจัดเก็บเสียหาย"
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"วิธีใช้: apt-internal-solver\n"
+"\n"
+"apt-internal-solver "
+"เป็นเครื่องมือสำหรับเรียกใช้กลไกภายในปัจจุบันเสมือนเป็นกลไกการแก้ปัญหาภายนอกสำหรับโปรแกรมตระกูล "
+"APT เพื่อการดีบั๊กหรืออะไรทำนองนี้\n"
+"\n"
+"ตัวเลือก:\n"
+"  -h  แสดงข้อความช่วยเหลือนี้\n"
+"  -q  แสดงผลลัพธ์แบบบันทึกลงแฟ้มได้ - ไม่ต้องแสดงความคืบหน้า\n"
+"  -c=?  อ่านแฟ้มค่าตั้งนี้\n"
+"  -o=?  กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "checksum ของแฟ้ม tar ผิดพลาด แฟ้มจัดเก็บเสียหาย"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "พบระเบียนแพกเกจที่ไม่รู้จัก!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "พบชนิด %u ของข้อมูลส่วนหัว TAR ที่ไม่รู้จัก ที่สมาชิก %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"วิธีใช้: apt-sortpkgs [ตัวเลือก] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs เป็นเครื่องมืออย่างง่ายสำหรับเรียงลำดับแฟ้มรายชื่อแพกเกจ ตัวเลือก -s\n"
+"ใช้สำหรับระบุชนิดของแฟ้มที่เรียง\n"
+"\n"
+"ตัวเลือก:\n"
+"  -h   แสดงข้อความช่วยเหลือนี้\n"
+"  -s   เรียงตามแฟ้มซอร์สโค้ด\n"
+"  -c=? อ่านแฟ้มค่าตั้งนี้\n"
+"  -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr "ความคืบหน้า: [%3i%%]"
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "กำลังเรียก dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "ไม่รองรับระบบแพกเกจ '%s'"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "ไม่สามารถระบุชนิดของระบบแพกเกจที่เหมาะสมได้"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "เขียนแล้ว %i ระเบียน\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n"
@@ -2024,6 +2272,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 "ไม่สามารถแจงหรือเปิดรายชื่อแพกเกจหรือสถานะแพกเกจได้"
@@ -2036,156 +2304,329 @@ msgstr "คุณอาจเรียก `apt-get update' เพื่อแก
 msgid "The list of sources could not be read."
 msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "แคชของแพกเกจว่างเปล่า"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr "แฟ้มแคชของแพกเกจเสียหาย"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr "แฟ้มแคชของแพกเกจเป็นคนละรุ่นกัน"
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168
 msgid "The package cache file is corrupted, it is too small"
 msgstr "แฟ้มแคชของแพกเกจเสียหาย แฟ้มมีขนาดเล็กกว่าที่ควรจะเป็น"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT รุ่นนี้ไม่รองรับระบบนับรุ่นแบบ '%s'"
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "ต้องใช้"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "ต้องใช้ขณะติดตั้ง"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "แนะนำ"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "ควรใช้ร่วมกับ"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "ขัดแย้งกับ"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "แทนที่"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "ใช้แทน"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "ทำให้พัง"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "เพิ่มความสามารถ"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "สำคัญ"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "จำเป็น"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "มาตรฐาน"
 
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "ตัวเลือก"
+#: apt-pkg/pkgcache.cc:336
+msgid "optional"
+msgstr "ตัวเลือก"
+
+#: apt-pkg/pkgcache.cc:336
+msgid "extra"
+msgstr "ส่วนเสริม"
+
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "กำลังคำนวณการปรับรุ่น"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%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/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
+#, 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/pkgcache.cc:335
-msgid "extra"
-msgstr "ส่วนเสริม"
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Is the package %s installed?"
-msgstr "ได้ติดตั้งแพกเกจ %s ไว้หรือไม่?"
+msgid "Couldn't stat source package list %s"
+msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
 
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-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/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'"
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "ส่งสภาวการณ์ไปยังกลไกการแก้ปัญหา"
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "รุ่นแพกเกจที่มี"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "สร้างลำดับความสัมพันธ์"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "เตรียมรับคำตอบ"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "กำลังอ่านข้อมูลสถานะ"
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s"
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "ผลรวมแฮชไม่ตรงกัน"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "ขนาดไม่ตรงกัน"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 msgid "Invalid file format"
 msgstr "รูปแบบของแฟ้มไม่ถูกต้อง"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "การเขียนข้อมูลผิดพลาด"
+
+#: apt-pkg/acquire-item.cc:259
+#, fuzzy
+msgid "Does not start with a cleartext signature"
+msgstr "แฟ้ม %s ไม่ได้ขึ้นต้นด้วยการระบุการเซ็นกำกับครอบในตัวข้อความ"
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"เกิดข้อผิดพลาดขณะตรวจสอบลายเซ็น จะไม่ปรับข้อมูลคลังแพกเกจนี้ และจะใช้แฟ้มดัชนีเก่า "
+"ข้อผิดพลาดจาก GPG: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "ข้อผิดพลาดจาก GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "ไดเรกทอรี %s ถูก divert"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2194,16 +2635,16 @@ msgstr ""
 "ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง "
 "หรือแฟ้มผิดรูปแบบ)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2212,155 +2653,68 @@ msgstr ""
 "แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ "
 "ของคลังแพกเกจนี้"
 
-#: apt-pkg/acquire-item.cc:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"เกิดข้อผิดพลาดขณะตรวจสอบลายเซ็น จะไม่ปรับข้อมูลคลังแพกเกจนี้ และจะใช้แฟ้มดัชนีเก่า "
-"ข้อผิดพลาดจาก GPG: %s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "ข้อผิดพลาดจาก GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "กำลังอ่านรายชื่อแพกเกจ"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "ไม่มีไดเรกทอรีแพกเกจ %spartial"
 
-#: apt-pkg/acquire.cc:99
+#: 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:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li (เหลืออีก %s)"
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย"
@@ -2386,7 +2740,7 @@ msgstr "ไม่เข้าใจชนิดการตรึง %s"
 msgid "No priority (or zero) specified for pin"
 msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2395,12 +2749,12 @@ msgstr ""
 "ไม่สามารถตั้งค่า '%s' แบบทันทีได้ กรุณาอ่านรายละเอียดเพิ่มเติมจาก man 5 apt.conf ที่หัวข้อ "
 "APT::Immediate-Configure (%d)"
 
-#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "ไม่สามารถตั้งค่า '%s'"
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2412,10 +2766,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"
@@ -2484,11 +2839,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"
 
@@ -2498,7 +2853,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "จำเป็นต้องติดตั้งแพกเกจ %s ซ้ำ แต่หาตัวแพกเกจไม่พบ"
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2506,166 +2861,87 @@ msgstr ""
 "ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เกิดแพกเกจเสีย "
 "อาจเกิดจากแพกเกจที่ถูกกำหนดให้คงรุ่นไว้"
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "เตรียมรับคำตอบ"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "ไม่สามารถแจงแฟ้ม Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "ไม่มีหัวข้อย่อยในแฟ้ม Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "ไม่มีรายการแฮชในแฟ้ม Release %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "รายการ 'Valid-Until' ไม่ถูกต้องในแฟ้ม Release %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+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:139
+msgid "Candidate versions"
+msgstr "รุ่นแพกเกจที่มี"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "กำลังเปิด %s"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "สร้างลำดับความสัมพันธ์"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "กำลังอ่านข้อมูลสถานะ"
+
+#: 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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "ไม่พบรุ่น '%s' ของ '%s'"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "ไม่พบงานติดตั้ง '%s'"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/cacheset.cc:635
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/cacheset.cc:641
 #, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "ไม่พบแพกเกจที่ตรงกับ glob '%s'"
 
-#: apt-pkg/cacheset.cc:626
+#: 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:633 apt-pkg/cacheset.cc:640
+#: 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:727
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "ไม่สามารถเลือกรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีรุ่นสำหรับติดตั้ง"
+
+#: 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:743 apt-pkg/cacheset.cc:751
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -2673,160 +2949,170 @@ msgid ""
 msgstr ""
 "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้หรือรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีทั้งสองอย่าง"
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/indexrecords.cc:83
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "ไม่สามารถเลือกรุ่นใหม่ที่สุดของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง"
+msgid "Unable to parse Release file %s"
+msgstr "ไม่สามารถแจงแฟ้ม Release %s"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/indexrecords.cc:91
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr "ไม่สามารถเลือกรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีรุ่นสำหรับติดตั้ง"
+msgid "No sections in Release file %s"
+msgstr "ไม่มีหัวข้อย่อยในแฟ้ม Release %s"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/indexrecords.cc:132
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้ของแพกเกจ '%s' ได้ เนื่องจากแพกเกจไม่ได้ติดตั้งไว้"
+msgid "No Hash entry in Release file %s"
+msgstr "ไม่มีรายการแฮชในแฟ้ม Release %s"
+
+#: apt-pkg/indexrecords.cc:145
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "รายการ 'Valid-Until' ไม่ถูกต้องในแฟ้ม Release %s"
+
+#: apt-pkg/indexrecords.cc:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "รายการ 'Date' ไม่ถูกต้องในแฟ้ม Release %s"
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%liนาที %liวิ"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%liวิ"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "ไม่พบรายการเลือก %s"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่อ่านได้อย่างเดียว"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ไม่สามารถเปิดแฟ้มล็อค %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่เมานท์ผ่าน nfs"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "ไม่สามารถล็อค %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 "ไม่สามารถสร้างรายชื่อแฟ้มได้ เนื่องจาก '%s' ไม่ใช่ไดเรกทอรี"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่ใช่แฟ้มธรรมดา"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่มีส่วนขยายในชื่อแฟ้ม"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากส่วนขยายในชื่อแฟ้มไม่สามารถใช้การได้"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)"
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "โพรเซสย่อย %s ได้รับสัญญาณ %u"
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "โพรเซสย่อย %s จบการทำงานกะทันหัน"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "เกิดปัญหาขณะปิดแฟ้ม gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "ไม่สามารถเปิดแฟ้ม %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "ไม่สามารถเปิด file destriptor %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "สร้าง IPC ของโพรเซสย่อยไม่สำเร็จ"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "เรียกทำงานตัวบีบอัดไม่สำเร็จ"
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "read: ยังเหลือ %llu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "write: ยังเหลือ %llu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "เกิดปัญหาขณะปิดแฟ้ม %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "เกิดปัญหาขณะเปลี่ยนชื่อแฟ้ม %s ไปเป็น %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "เกิดปัญหาขณะลบแฟ้ม %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "เกิดปัญหาขณะ sync แฟ้ม"
 
@@ -2911,109 +3197,103 @@ msgstr "ไม่สามารถ stat จุดเมานท์ %s"
 msgid "Failed to stat the cdrom"
 msgstr "ไม่สามารถ stat ซีดีรอม"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "พบตัวย่อของชนิดที่ข้อมูลไม่รู้จัก: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "ขณะเปิดแฟ้มค่าตั้ง %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: แท็กผิดรูปแบบ"
 
-#: apt-pkg/contrib/configuration.cc:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังจบแฟ้ม"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "ไม่มีพวงกุญแจติดตั้งไว้ใน %s"
-
-#: 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"
@@ -3023,12 +3303,12 @@ msgstr "ไม่รู้จักคำสั่ง %s"
 msgid "Installing %s"
 msgstr "กำลังติดตั้ง %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "กำลังถอดถอน %s"
@@ -3049,105 +3329,105 @@ msgid "Running post-installation trigger %s"
 msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ไม่มีไดเรกทอรี '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "กำลังเตรียม %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "กำลังแตกแพกเกจ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "กำลังเตรียมตั้งค่า %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "ติดตั้ง %s แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "กำลังเตรียมถอดถอน %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "ถอดถอน %s แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ"
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3155,417 +3435,193 @@ msgstr ""
 
 #: 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 "ไม่ได้ล็อคอยู่"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"วิธีใช้: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates เป็นเครื่องมือสำหรับแยกเอาข้อมูลการตั้งค่าและเทมเพลต\n"
-"ออกมาจากแพกเกจเดเบียน\n"
-"\n"
-"ตัวเลือก:\n"
-"  -h   แสดงข้อความช่วยเหลือนี้\n"
-"  -t   กำหนดไดเรกทอรีทำงานชั่วคราว\n"
-"  -c=?  อ่านแฟ้มค่าตั้งนี้\n"
-"  -o=?  กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, c-format
-msgid "Unable to mkstemp %s"
-msgstr "ไม่สามารถ mkstemp %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?"
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผลไดเรกทอรี %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "รายชื่อนามสกุลซอร์สยาวเกินไป"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "เกิดข้อผิดพลาดขณะเขียนข้อมูลส่วนหัวลงในแฟ้มสารบัญ"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผลสารบัญ %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"วิธีใช้: apt-ftparchive [ตัวเลือก] คำสั่ง\n"
-"คำสั่ง: packages binarypath [overridefile [pathprefix]]\n"
-"        sources srcpath [overridefile [pathprefix]]\n"
-"        contents path\n"
-"        release path\n"
-"        generate config [groups]\n"
-"        clean config\n"
-"\n"
-"apt-ftparchive ใช้สร้างแฟ้มดัชนีสำหรับแหล่งแพกเกจเดเบียน รองรับวิธีสร้างหลายแบบ\n"
-"ตั้งแต่แบบอัตโนมัติทั้งหมด ไปจนถึงการใช้แทน dpkg-scanpackages และ dpkg-scansources\n"
-"\n"
-"apt-ftparchive สร้างแฟ้ม Package จากต้นไม้ไดเรกทอรีที่เก็บ .deb  แฟ้ม Package\n"
-"จะรวมเนื้อหาข้อมูลควบคุมทุกรายการของแต่ละแพกเกจ รวมถึง MD5 hash และขนาดแฟ้ม\n"
-"และรองรับการสร้างแฟ้ม override เพื่อบังคับค่าลำดับความสำคัญและหมวดแพกเกจด้วย\n"
-"\n"
-"ในทำนองเดียวกัน apt-ftparchive จะสร้างแฟ้ม Sources จากต้นไม้ไดเรกทอรีที่เก็บ .dsc\n"
-"คุณสามารถใช้ตัวเลือก --source-override เพื่อระบุแฟ้ม override สำหรับซอร์สได้\n"
-"\n"
-"คำสั่ง 'packages' และ 'sources' ควรเรียกที่ตำแหน่งรากของต้นไม้ไดเรกทอรี\n"
-"ค่า binarypath ควรชี้ไปที่ตำแหน่งฐานที่จะค้นหาแบบทั่วถึง  และแฟ้ม override ก็ควรมีแฟล็ก\n"
-"override ต่างๆ สำหรับแพกเกจ  ค่า pathprefix จะถูกเพิ่มเข้าที่หน้าข้อมูล filename ถ้ามี\n"
-"ตัวอย่างการใช้งานจากแหล่งแพกเกจเดเบียน:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"ตัวเลือก:\n"
-"  -h    แสดงข้อความช่วยเหลือนี้\n"
-"  --md5 ควบคุมการสร้าง MD5\n"
-"  -s=?  แฟ้ม override สำหรับซอร์ส\n"
-"  -q    ทำงานแบบเงียบ\n"
-"  -d=?  เลือกฐานข้อมูลแคชอื่น\n"
-"  --no-delink เปิดโหมดดีบั๊กสำหรับการตัดลิงก์\n"
-"  --contents  ควบคุมการสร้างแฟ้มสารบัญ\n"
-"  -c=?  อ่านแฟ้มค่าตั้งนี้\n"
-"  -o=?  กำหนดตัวเลือกค่าตั้งเป็นรายตัว"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "ไม่มีรายการเลือกที่ตรง"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "บางแฟ้มขาดหายไปในกลุ่มแฟ้มแพกเกจ `%s'"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB เสีย จะเปลี่ยนชื่อแฟ้มเป็น %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB เป็นรุ่นเก่า จะพยายามปรับรุ่น %s ขึ้น"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ่งปรับรุ่นมาจาก apt รุ่นเก่า กรุณาลบฐานข้อมูลแล้วสร้างใหม่"
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "ไม่สามารถเปิดแฟ้ม DB %s: %s"
-
-#: ftparchive/cachedb.cc:332
-msgid "Failed to read .dsc"
-msgstr "อ่าน .dsc ไม่สำเร็จ"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "แพกเกจไม่มีระเบียนควบคุม"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้"
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) มีโพรเซสอื่นใช้งานอยู่หรือเปล่า?"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: อ่านไดเรกทอรี %s ไม่สำเร็จ\n"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) คุณเป็น root หรือเปล่า?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: stat %s ไม่สำเร็จ\n"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรียก '%s' เองเพื่อแก้ปัญหา"
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "ไม่ได้ล็อคอยู่"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "W: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode ถูกเรียกใช้กับโหนดที่ยังลิงก์อยู่"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: ข้อผิดพลาดเกิดกับแฟ้ม "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "หาสมาชิกในตารางแฮชไม่สำเร็จ!"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "หาพาธเต็มของ %s ไม่สำเร็จ"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "จองเนื้อที่สำหรับการเบนแฟ้มไม่สำเร็จ"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "เดินท่องต้นไม้ไม่สำเร็จ"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "ข้อผิดพลาดภายในที่ AddDiversion"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "เปิด %s ไม่สำเร็จ"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "พยายามเขียนทับการเบนแฟ้ม: %s -> %s กับ %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "เพิ่มการเบนแฟ้ม %s -> %s ซ้ำสอง"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "readlink %s ไม่สำเร็จ"
+msgid "Duplicate conf file %s/%s"
+msgstr "แฟ้มค่าตั้ง %s/%s ซ้ำ"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "unlink %s ไม่สำเร็จ"
+msgid "The path %s is too long"
+msgstr "พาธ %s ยาวเกินไป"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ"
+msgid "Unpacking %s more than once"
+msgstr "พยายามแตกแพกเกจ %s มากกว่าหนึ่งครั้ง"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'"
+msgid "The directory %s is diverted"
+msgstr "ไดเรกทอรี %s ถูก divert"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s ไม่มีข้อมูล override\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "แพกเกจนี้พยายามเขียนลงปลายทางของการเบนแฟ้ม %s/%s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  ผู้ดูแล %s คือ %s ไม่ใช่ %s\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "พาธของการเบนแฟ้มยาวเกินไป"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s ไม่มีข้อมูล override สำหรับซอร์ส\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "ไดเรกทอรี %s กำลังจะถูกแทนที่ด้วยสิ่งที่ไม่ใช่ไดเรกทอรี"
 
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "หาโหนดใน bucket ของแฮชไม่พบ"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - จองหน่วยความจำไม่สำเร็จ"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "พาธยาวเกินไป"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "ไม่สามารถเปิด %s"
+msgid "Overwrite package match with no version for %s"
+msgstr "พบแพกเกจที่เขียนทับโดยไม่มีข้อมูลรุ่นสำหรับ %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu (%s)"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพกเกจ %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "ไม่สามารถอ่านแฟ้ม override %s"
+msgid "Unable to stat %s"
+msgstr "ไม่สามารถ stat %s"
 
-#: ftparchive/override.cc:166
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #1"
+msgid "Failed to write file %s"
+msgstr "ไม่สามารถเขียนแฟ้ม %s"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #2"
+msgid "Failed to close file %s"
+msgstr "ไม่สามารถปิดแฟ้ม %s"
 
-#: ftparchive/override.cc:191
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #3"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "แฟ้มนี้ไม่ใช่แพกเกจ DEB ที่ใช้การได้ ขาดสมาชิก '%s'"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "ไม่รู้จักอัลกอริทึมบีบอัด '%s'"
+msgid "Internal error, could not locate member %s"
+msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิก %s"
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "ไม่สามารถแจงแฟ้มควบคุมได้"
+
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "เอกลักษณ์ของแฟ้มจัดเก็บไม่ถูกต้อง"
+
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บ"
+
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "ผลลัพธ์ของการบีบอัด %s ต้องมีชุดของการบีบอัดด้วย"
+msgid "Invalid archive member header %s"
+msgstr "ข้อมูลส่วนหัว %s ของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "สร้าง FILE* ไม่สำเร็จ"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "ข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "fork ไม่สำเร็จ"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "แฟ้มจัดเก็บสั้นเกินไป"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "โพรเซสลูกสำหรับบีบอัด"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "อ่านข้อมูลส่วนหัวของแฟ้มจัดเก็บไม่สำเร็จ"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "ข้อผิดพลาดภายใน: ไม่สามารถสร้าง %s"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "สร้างไปป์ไม่สำเร็จ"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "IO ไปยังโพรเซสย่อยหรือแฟ้มล้มเหลว"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "เรียก gzip ไม่สำเร็จ"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนวณ MD5"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "แฟ้มจัดเก็บเสียหาย"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "checksum ของแฟ้ม tar ผิดพลาด แฟ้มจัดเก็บเสียหาย"
+
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "มีปัญหาขณะลบแฟ้ม %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "พบชนิด %u ของข้อมูลส่วนหัว TAR ที่ไม่รู้จัก ที่สมาชิก %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"วิธีใช้: apt-internal-solver\n"
-"\n"
-"apt-internal-solver "
-"เป็นเครื่องมือสำหรับเรียกใช้กลไกภายในปัจจุบันเสมือนเป็นกลไกการแก้ปัญหาภายนอกสำหรับโปรแกรมตระกูล "
-"APT เพื่อการดีบั๊กหรืออะไรทำนองนี้\n"
-"\n"
-"ตัวเลือก:\n"
-"  -h  แสดงข้อความช่วยเหลือนี้\n"
-"  -q  แสดงผลลัพธ์แบบบันทึกลงแฟ้มได้ - ไม่ต้องแสดงความคืบหน้า\n"
-"  -c=?  อ่านแฟ้มค่าตั้งนี้\n"
-"  -o=?  กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "ขนาดของพื้นที่ความเชื่อมโยงระหว่างแพกเกจทั้งหมด: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "พบระเบียนแพกเกจที่ไม่รู้จัก!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"วิธีใช้: apt-sortpkgs [ตัวเลือก] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs เป็นเครื่องมืออย่างง่ายสำหรับเรียงลำดับแฟ้มรายชื่อแพกเกจ ตัวเลือก -s\n"
-"ใช้สำหรับระบุชนิดของแฟ้มที่เรียง\n"
-"\n"
-"ตัวเลือก:\n"
-"  -h   แสดงข้อความช่วยเหลือนี้\n"
-"  -s   เรียงตามแฟ้มซอร์สโค้ด\n"
-"  -c=? อ่านแฟ้มค่าตั้งนี้\n"
-"  -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "เสร็จแล้ว"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "ไม่มีพวงกุญแจติดตั้งไว้ใน %s"
 
 #~ msgid "Is stdout a terminal?"
 #~ msgstr "stdout เป็นเทอร์มินัลหรือไม่?"
@@ -3655,9 +3711,6 @@ msgstr ""
 #~ "ไม่สามารถเขียนบันทึกปฏิบัติการ เนื่องจาก openpty() ล้มเหลว (ไม่ได้เมานท์ /dev/pts "
 #~ "หรือเปล่า?)\n"
 
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "แฟ้ม %s ไม่ได้ขึ้นต้นด้วยการระบุการเซ็นกำกับครอบในตัวข้อความ"
-
 #~ msgid "Failed to remove %s"
 #~ msgstr "ไม่สามารถลบ %s"
 
diff --git a/po/tl.po b/po/tl.po
index 2bf076a03..e3da79c8a 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: 2015-01-16 04:37-0500\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,152 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Kabuuan ng mga Pakete : "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Kabuuan ng mga Pakete : "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Normal na Pakete: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Purong Birtwual na Pakete: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Nag-iisang Birtwal na Pakete: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Halong Birtwal na Pakete: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Kulang/Nawawala: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Kabuuan ng Natatanging mga Bersyon: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Kabuuan ng Natatanging mga Bersyon: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Kabuuan ng mga Dependensiya: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Kabuuan ng ugnayang Ber/Talaksan: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Kabuuan ng ugnayang Ber/Talaksan: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Kabuuan ng Mapping ng Provides: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Kabuuan ng Globbed String: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Kabuuan ng gamit na puwang ng Dependensiyang Bersyon: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Kabuuan ng Hindi Nagamit na puwang: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Kabuuan ng puwang na napag-tuosan: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Talaksang Pakete:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Mga naka-Pin na Pakete:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(hindi nahanap)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Nakaluklok: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Kandidato: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(wala)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Naka-Pin na Pakete: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Talaang Bersyon:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -246,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"
@@ -268,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."
 
@@ -304,78 +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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Hindi maaldaba ang directory ng download"
 
-#: cmdline/apt-get.cc:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -383,95 +379,94 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Hindi matantsa ang libreng puwang sa %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Kulang kayo ng libreng puwang sa %s"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Kunin ang Source %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Bigo sa pagkuha ng ilang mga arkibo."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: 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:968
+#: 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:996
+#: 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:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Bigo ang prosesong anak"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -514,30 +509,30 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: 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:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Bigo sa pagproseso ng build dependencies"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Kumokonekta sa %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Suportadong mga Module:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -649,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -774,12 +769,12 @@ msgstr "Hindi nahanap ang Disk."
 msgid "File not found"
 msgstr "Hindi Nahanap ang Talaksan"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Bigo ang pag-stat"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Bigo ang pagtakda ng oras ng pagbago"
 
@@ -788,34 +783,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Di tanggap na URI, mga lokal na URI ay di dapat mag-umpisa ng //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Pumapasok"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Hindi malaman ang pangalan ng peer"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Hindi malaman ang pangalang lokal"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Inayawan ng server ang ating koneksyon at ang sabi ay: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Bigo ang USER/GUMAGAMIT, sabi ng server ay: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Bigo ang PASS, sabi ng server ay: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -823,123 +818,123 @@ msgstr ""
 "May tinakdang katuwang na server ngunit walang login script, walang laman "
 "ang Acquire::ftp::ProxyLogin."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Bigo ang utos sa login script '%s', sabi ng server ay: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Bigo ang TYPE, sabi ng server ay: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Lumipas ang koneksyon"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Sinarhan ng server ang koneksyon"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Error sa pagbasa"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "May sagot na bumubo sa buffer."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Sira ang protocol"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Error sa pagsulat"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Hindi maka-likha ng socket"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Hindi maka-konekta sa socket ng datos, nag-time-out ang koneksyon"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Bigo"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Hindi maka-konekta sa socket na passive."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "di makakuha ang getaddrinfo ng socket na nakikinig"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Hindi maka-bind ng socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Hindi makarinig sa socket"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Hindi malaman ang pangalan ng socket"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Hindi makapagpadala ng utos na PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Di kilalang pamilya ng address %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Bigo ang EPRT, sabi ng server ay: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Nag-timeout ang socket ng datos"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Hindi makatanggap ng koneksyon"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Hindi makakuha ng talaksan, sabi ng server ay '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Nag-timeout ang socket ng datos"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Bigo ang paglipat ng datos, sabi ng server ay '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Tanong"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Hindi ma-invoke "
 
@@ -1005,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:168
+#: 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:172
+#: 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:174
+#: methods/gpgv.cc:164
 #, fuzzy
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
 "Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gnupg?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Hindi kilalang error sa pag-execute ng apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1046,35 +1041,35 @@ msgstr ""
 "Ang sumusunod na mga lagda ay hindi maberipika dahil ang public key ay hindi "
 "available:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Error sa pagsusulat sa talaksan"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Error sa pagbasa mula sa server"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Error sa pagsulat sa talaksan"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Bigo ang pagpili"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Nag-timeout ang koneksyon"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Error sa pagsulat ng talaksang output"
 
@@ -1106,289 +1101,30 @@ msgstr "Sira ang range support ng HTTP server na ito"
 msgid "Unknown date format"
 msgstr "Di kilalang anyo ng petsa"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Maling datos sa panimula"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Bigo ang koneksyon"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "Internal na error"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-"Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-"May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove."
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Nakapagtataka... Hindi magkatugma ang laki, mag-email sa apt@packages.debian."
-"org"
-
-#. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Kailangang kumuha ng %sB ng arkibo.\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:167
-#, fuzzy, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr ""
-"Matapos magbuklat ay %sB na karagdagang puwang sa disk ang magagamit.\n"
-
-#. 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:172
-#, fuzzy, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Kulang kayo ng libreng puwang sa %s."
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "May mga problema at -y ay ginamit na walang --force-yes"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Oo, gawin ang sinasabi ko!"
-
-#: apt-private/private-install.cc:222
+#: methods/server.cc:589
 #, c-format
 msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Kayo ay gagawa ng bagay na maaaring makasama sa inyong sistema.\n"
-"Upang magpatuloy, ibigay ang pariralang '%s'\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Abort."
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Nais niyo bang magpatuloy?"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "May mga talaksang hindi nakuha"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o "
-"subukang may --fix-missing?"
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Hindi maayos ang mga kulang na pakete."
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Ina-abort ang pag-instol."
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
-
-#: apt-private/private-install.cc:506
-#, fuzzy
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Error na internal, may nasira ang problem resolver"
-
-#: apt-private/private-install.cc:513
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-
-#: apt-private/private-install.cc:517
-#, fuzzy, c-format
-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] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"Maaaring patakbuhin niyo ang 'apt-get -f install' upang ayusin ang mga ito:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
-"mga pakete (o magtakda ng solusyon)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"May mga paketeng hindi ma-instol. Maaring may hiniling kayong imposible\n"
-"o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n"
-"kailangan na hindi pa nalikha o linipat mula sa Incoming."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Sirang mga pakete"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Mga paketeng mungkahi:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Mga paketeng rekomendado:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
-
-#: apt-private/private-install.cc:829
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ay pinakabagong bersyon na.\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
 
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "Internal na error"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1396,31 +1132,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "Inaayos ang mga dependensiya..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " ay bigo."
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "Hindi maayos ang mga dependensiya"
 
-#: apt-private/private-cachefile.cc:102
+#: 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:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " Tapos"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f."
 
@@ -1584,7 +1320,7 @@ msgstr "O"
 msgid "N"
 msgstr "H"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: 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"
@@ -1593,7 +1329,7 @@ msgstr "Error sa pag-compile ng regex - %s"
 msgid "The update command takes no arguments"
 msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1601,10 +1337,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1625,29 +1365,303 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
+"Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!"
+
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr ""
+"May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove."
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Nakapagtataka... Hindi magkatugma ang laki, mag-email sa apt@packages.debian."
+"org"
+
+#. 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\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:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Kailangang kumuha ng %sB ng arkibo.\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:166
+#, fuzzy, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr ""
+"Matapos magbuklat ay %sB na karagdagang puwang sa disk ang magagamit.\n"
+
+#. 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
+#, fuzzy, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "May mga problema at -y ay ginamit na walang --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 "Tinakdang Trivial Only ngunit hindi ito operasyong 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Oo, gawin ang sinasabi ko!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Kayo ay gagawa ng bagay na maaaring makasama sa inyong sistema.\n"
+"Upang magpatuloy, ibigay ang pariralang '%s'\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Abort."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Nais niyo bang magpatuloy?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "May mga talaksang hindi nakuha"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o "
+"subukang may --fix-missing?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Hindi maayos ang mga kulang na pakete."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Ina-abort ang pag-instol."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: 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 ""
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
+
+#: apt-private/private-install.cc:481
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Error na internal, may nasira ang problem resolver"
+
+#: apt-private/private-install.cc:488
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
+msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+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] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
+msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr ""
+"Maaaring patakbuhin niyo ang 'apt-get -f install' upang ayusin ang mga ito:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
+"mga pakete (o magtakda ng solusyon)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"May mga paketeng hindi ma-instol. Maaring may hiniling kayong imposible\n"
+"o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n"
+"kailangan na hindi pa nalikha o linipat mula sa Incoming."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Sirang mga pakete"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Mga paketeng mungkahi:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Mga paketeng rekomendado:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
+
+#: apt-private/private-install.cc:827
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s ay pinakabagong bersyon na.\n"
+
+#: apt-private/private-install.cc:892
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
+
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Ang napiling bersyon %s (%s) para sa %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 "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+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-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 "BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!"
 
-#: apt-private/private-download.cc:40
+#: apt-private/private-download.cc:98
 msgid "Authentication warning overridden.\n"
 msgstr ""
 "Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
 msgid "Some packages could not be authenticated"
 msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 msgid "Install these packages without verification?"
 msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Bigo sa pagkuha ng %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 "Hindi matantsa ang libreng puwang sa %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Kulang kayo ng libreng puwang sa %s."
+
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1662,41 +1676,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Sinusuri ang pag-upgrade"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Tapos"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Tumama "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Kunin: "
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "DiPansin "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Err "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Nakakuha ng %sB ng %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [May ginagawa]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1709,18 +1715,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1797,205 +1803,460 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Pinagsasama ang magagamit na impormasyon"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Tinawagan ang DropNode sa naka-link pa na node"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Bigo sa paghanap ng elemento ng hash!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Bigo ang pagreserba ng diversion"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Internal error sa AddDiversion"
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Sinusubukang patungan ang diversion, %s -> %s at %s/%s"
-
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Dobleng pagdagdag ng diversion %s -> %s"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n"
+"\n"
+"Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n"
+"sa pagkaayos at template mula sa mga paketeng debian\n"
+"\n"
+"Mga opsyon:\n"
+"  -h   Itong tulong na ito\n"
+"  -t   Itakda ang dir na pansamantala\n"
+"  -c=? Basahin ang talaksang pagkaayos na ito\n"
+"  -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:549
+#: 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:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Nadobleng talaksang conf %s/%s"
+msgid "Unable to write to %s"
+msgstr "Hindi makapagsulat sa %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: 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: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: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 "The path %s is too long"
-msgstr "Sobrang haba ang path na %s"
+msgid "Error processing directory %s"
+msgstr "Error sa pagproseso ng directory %s"
 
-#: apt-inst/extract.cc:132
+#: 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:400
+msgid "Error writing header to contents file"
+msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Binubuklat ang %s ng labis sa isang beses"
+msgid "Error processing contents %s"
+msgstr "Error sa pagproseso ng Contents %s"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Pag-gamit: apt-ftparchive [mga option] utos\n"
+"Mga utos: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [mga grupo]\n"
+"          clean config\n"
+"\n"
+"Ang apt-ftparchive ay gumagawa ng talaksang index para sa arkibong Debian.\n"
+"Suportado nito ang maraming estilo ng pagbuo mula sa awtomatikong buo\n"
+"at kapalit ng dpkg-scanpackages at dpkg-scansources\n"
+"\n"
+"Bumubuo ang apt-ftparchive ng mga talaksang Package mula sa puno ng mga\n"
+".deb. Ang talaksang Package ay naglalaman ng laman ng lahat ng control "
+"field\n"
+"mula sa bawat pakete pati na rin ang MD5 hash at laki ng talaksan. "
+"Suportado\n"
+"ang pag-gamit ng talaksang override upang pilitin ang halaga ng Priority at "
+"Section.\n"
+"\n"
+"Bumubuo din ang apt-ftparchive ng talaksang Sources mula sa puno ng mga\n"
+".dsc. Ang option na --source-override ay maaaring gamitin upang itakda\n"
+"ang talaksang override ng src\n"
+"\n"
+"Ang mga utos na 'packages' at 'sources' ay dapat patakbuhin sa ugat ng\n"
+"puno. Kailangan nakaturo ang BinaryPath sa ugat ng paghahanap na recursive\n"
+"at ang talaksang override ay dapat naglalaman ng mga flag na override. Ang\n"
+"pathprefix ay dinudugtong sa harap ng mga pangalan ng talaksan kung "
+"mayroon.\n"
+"Halimbawa ng pag-gamit mula sa arkibong Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Mga option:\n"
+"  -h    Itong tulong na ito\n"
+"  --md5 Pagbuo ng MD5\n"
+"  -s=?  Talaksang override ng source\n"
+"  -q    Tahimik\n"
+"  -d=?  Piliin ang optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Pagbuo ng talaksang contents\n"
+"  -c=?  Basahin itong talaksang pagkaayos\n"
+"  -o=?  Itakda ang isang option na pagkaayos"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Walang mga pinili na tugma"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Ang directory %s ay divertado"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Ang pakete ay sumusubok na magsulat sa target na diversion %s/%s"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Nasira ang DB, pinalitan ng pangalan ang talaksan sa %s.old"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Sobrang haba ng path na diversion"
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Luma ang DB, sinusubukang maupgrade ang %s"
+
+#: ftparchive/cachedb.cc:96
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Hindi tanggap ang anyo ng DB. Kung kayo ay nagsariwa mula sa nakaraang "
+"bersiyon ng apt, tanggalin at likhain muli ang database."
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Hindi mabuksan ang talaksang DB %s: %s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Bigo ang pag-stat ng %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Bigo ang pagbasa ng link %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Walang kontrol rekord ang arkibo"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Hindi makakuha ng cursor"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Hindi mabasa ang directory %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Ang directory %s ay papalitan ng hindi-directory"
+msgid "W: Unable to stat %s\n"
+msgstr "W: Hindi ma-stat %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Bigo ang paghanap ng node sa kanyang hash bucket"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "E: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Sobrang haba ng path"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "W: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "E: Mga error ay tumutukoy sa talaksang "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Patungan ng paketeng nag-match na walang bersion para sa %s"
+msgid "Failed to resolve %s"
+msgstr "Bigo sa pag-resolba ng %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Bigo ang paglakad sa puno"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s"
+msgid "Failed to open %s"
+msgstr "Bigo ang pagbukas ng %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Hindi ma-stat ang %s"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Bigo sa pagsulat ng talaksang %s"
+msgid "Failed to readlink %s"
+msgstr "Bigo ang pagbasa ng link %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Bigo sa pagsara ng talaksang %s"
+msgid "Failed to unlink %s"
+msgstr "Bigo ang pag-unlink ng %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s'"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Bigo ang pag-link ng %s sa %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Internal error, hindi mahanap ang miyembrong %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink limit na %sB tinamaan.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Di maintindihang talaksang control"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Walang field ng pakete ang arkibo"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Hindi tanggap na signature ng arkibo"
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  %s ay walang override entry\n"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Error sa pagbasa ng header ng miyembro ng arkibo"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:96
+#: 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:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s ay wala ring override entry na binary\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Bigo ang pagreserba ng memory"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Hindi mabuksan %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
 #, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Hindi tanggap na header ng miyembro ng arkibo"
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Maling anyo ng override %s linya %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Bigo ang pagbasa ng talaksang override %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Maling anyo ng override %s linya %lu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Maling anyo ng override %s linya %lu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Maling anyo ng override %s linya %lu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Hindi kilalang algorithmong compression '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Kailangan ng compression set ang compressed output %s"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Hindi tanggap na header ng miyembro ng arkibo"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Bigo ang paglikha ng FILE*"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Bitin ang arkibo. Sobrang iksi."
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Bigo ang pag-fork"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Bigo ang pagbasa ng header ng arkibo"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Anak para sa pag-Compress"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Bigo sa paglikha ng mga pipe"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Error na internal, bigo ang paglikha ng %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Bigo sa pagtakbo ng gzip "
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Bigo ang IO sa subprocess/talaksan"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Sirang arkibo"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Bigo ang pagbasa habang tinutuos ang MD5"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Bigo ang checksum ng tar, sira ang arkibo"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problema sa pag-unlink ng %s"
 
-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s"
+msgid "Failed to rename %s to %s"
+msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
+
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n"
+"\n"
+"Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n"
+"sa pagkaayos at template mula sa mga paketeng debian\n"
+"\n"
+"Mga opsyon:\n"
+"  -h   Itong tulong na ito\n"
+"  -t   Itakda ang dir na pansamantala\n"
+"  -c=? Basahin ang talaksang pagkaayos na ito\n"
+"  -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Di kilalang record ng pakete!"
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Pag-gamit: apt-sortpkgs [mga option] talaksan1 [talaksan2 ...]\n"
+"\n"
+"Ang apt-sortpkgs ay payak na kagamitan upang makapag-sort ng talaksang "
+"pakete.\n"
+"Ang option -s ay ginagamit upang ipaalam kung anong klaseng talaksan ito.\n"
+"\n"
+"Mga option:\n"
+"  -h   Itong tulong na ito\n"
+"  -s   Gamitin ang pag-sort ng talaksang source\n"
+"  -c=? Basahin ang talaksang pagkaayos na ito\n"
+"  -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Hindi suportado ang sistema ng paketeng '%s'"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete "
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Nagsulat ng %i na record.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2012,6 +2273,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 ""
@@ -2027,202 +2309,367 @@ msgstr ""
 msgid "The list of sources could not be read."
 msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Walang laman ang cache ng pakete"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Dependensiya"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "PreDepends"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Mungkahi"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Rekomendado"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Tunggali"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Pumapalit"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Linalaos"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "kailangan"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "optional"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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/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:118
+#: 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/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/acquire-worker.cc:169
+#: 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/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/acquire-worker.cc:455
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+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"
+
+#: 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/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"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+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 ""
-"Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter."
+"Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya."
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
+msgid "Couldn't stat source package list %s"
+msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Ginagawa ang puno ng mga dependensiya"
+#: 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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Bersyong Kandidato"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Kinukuha ang Talaksang Provides"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Pagbuo ng Dependensiya"
+#: 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/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/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Bigo ang pagbukas ng %s"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Bigo sa pagsulat ng talaksang %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Di tugmang MD5Sum"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Di tugmang laki"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Di tanggap na operasyon %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Error sa pagsulat"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Ang directory %s ay divertado"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: apt-pkg/acquire-item.cc:2059
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
+"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:1926
+#: 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 "
@@ -2231,12 +2678,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:1992
+#: 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:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2244,123 +2691,38 @@ msgstr ""
 "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
 "paketeng %s."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, 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:257
-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:260
-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:263
-#, 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:266
-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:576
-#, 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:1211
-#, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Binabasa ang Listahan ng mga Pakete"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Kinukuha ang Talaksang Provides"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Hindi makapagsulat sa %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: apt-pkg/acquire.cc:162
 #, fuzzy, c-format
 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list"
@@ -2386,19 +2748,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:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2410,10 +2772,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"
@@ -2482,11 +2848,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"
 
@@ -2498,7 +2864,7 @@ msgstr ""
 "Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo "
 "para dito."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2506,330 +2872,262 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot "
 "ito ng mga paketeng naka-hold."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Hindi ma-parse ang talaksang pakete %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Paunawa, pinili ang %s imbes na %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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 "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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Ginagawa ang puno ng mga dependensiya"
 
-#: 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:139
+msgid "Candidate versions"
+msgstr "Bersyong Kandidato"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Binubuksan %s"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Pagbuo ng Dependensiya"
 
-#: 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/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: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:252
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Bigo ang pagbukas ng %s"
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/depcache.cc:258
 #, 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 "Failed to write temporary StateFile %s"
+msgstr "Bigo sa pagsulat ng talaksang %s"
+
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "Hindi ma-parse ang talaksang pakete %s (%d)"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release '%s' para sa '%s' ay hindi nahanap"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: apt-pkg/cacheset.cc:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:145
+#, 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:164
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Piniling %s ay hindi nahanap"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Hindi mabuksan ang talaksang aldaba %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa "
 "nfs"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "hindi makuha ang aldaba %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Naghudyat ang sub-process %s ng error code (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Ang sub-process %s ay lumabas ng di inaasahan"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problema sa pagsara ng talaksan"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Hindi mabuksan ang talaksang %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Hindi makapag-bukas ng pipe para sa %s"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Bigo ang paglikha ng subprocess IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Bigo ang pag-exec ng taga-compress"
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Problema sa pagsara ng talaksan"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problema sa pag-sync ng talaksan"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problema sa pag-unlink ng talaksan"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Problema sa pag-sync ng talaksan"
 
@@ -2915,113 +3213,107 @@ 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:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Hindi kilalang katagang uri: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Binubuksan ang talaksang pagsasaayos %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Ina-abort ang pag-instol."
-
-#: 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"
@@ -3031,12 +3323,12 @@ msgstr "Di tanggap na operasyon %s"
 msgid "Installing %s"
 msgstr "Iniluklok ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Tinatanggal ang %s"
@@ -3057,103 +3349,103 @@ msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: 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:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Hinahanda ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Binubuklat ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Hinahanda ang %s upang isaayos"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "Iniluklok ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "Tinanggal ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "Natanggal ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3170,420 +3462,184 @@ msgstr ""
 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 ""
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n"
-"\n"
-"Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n"
-"sa pagkaayos at template mula sa mga paketeng debian\n"
-"\n"
-"Mga opsyon:\n"
-"  -h   Itong tulong na ito\n"
-"  -t   Itakda ang dir na pansamantala\n"
-"  -c=? Basahin ang talaksang pagkaayos na ito\n"
-"  -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Hindi ma-stat ang %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Error sa pagproseso ng directory %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Error sa pagproseso ng Contents %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Pag-gamit: apt-ftparchive [mga option] utos\n"
-"Mga utos: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [mga grupo]\n"
-"          clean config\n"
-"\n"
-"Ang apt-ftparchive ay gumagawa ng talaksang index para sa arkibong Debian.\n"
-"Suportado nito ang maraming estilo ng pagbuo mula sa awtomatikong buo\n"
-"at kapalit ng dpkg-scanpackages at dpkg-scansources\n"
-"\n"
-"Bumubuo ang apt-ftparchive ng mga talaksang Package mula sa puno ng mga\n"
-".deb. Ang talaksang Package ay naglalaman ng laman ng lahat ng control "
-"field\n"
-"mula sa bawat pakete pati na rin ang MD5 hash at laki ng talaksan. "
-"Suportado\n"
-"ang pag-gamit ng talaksang override upang pilitin ang halaga ng Priority at "
-"Section.\n"
-"\n"
-"Bumubuo din ang apt-ftparchive ng talaksang Sources mula sa puno ng mga\n"
-".dsc. Ang option na --source-override ay maaaring gamitin upang itakda\n"
-"ang talaksang override ng src\n"
-"\n"
-"Ang mga utos na 'packages' at 'sources' ay dapat patakbuhin sa ugat ng\n"
-"puno. Kailangan nakaturo ang BinaryPath sa ugat ng paghahanap na recursive\n"
-"at ang talaksang override ay dapat naglalaman ng mga flag na override. Ang\n"
-"pathprefix ay dinudugtong sa harap ng mga pangalan ng talaksan kung "
-"mayroon.\n"
-"Halimbawa ng pag-gamit mula sa arkibong Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Mga option:\n"
-"  -h    Itong tulong na ito\n"
-"  --md5 Pagbuo ng MD5\n"
-"  -s=?  Talaksang override ng source\n"
-"  -q    Tahimik\n"
-"  -d=?  Piliin ang optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Pagbuo ng talaksang contents\n"
-"  -c=?  Basahin itong talaksang pagkaayos\n"
-"  -o=?  Itakda ang isang option na pagkaayos"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Walang mga pinili na tugma"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Nasira ang DB, pinalitan ng pangalan ang talaksan sa %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Luma ang DB, sinusubukang maupgrade ang %s"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Hindi tanggap ang anyo ng DB. Kung kayo ay nagsariwa mula sa nakaraang "
-"bersiyon ng apt, tanggalin at likhain muli ang database."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Hindi mabuksan ang talaksang DB %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Bigo ang pagbasa ng link %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Walang kontrol rekord ang arkibo"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Hindi makakuha ng cursor"
-
-#: ftparchive/writer.cc:91
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: Hindi mabasa ang directory %s\n"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
 
-#: ftparchive/writer.cc:96
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "W: Hindi ma-stat %s\n"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "E: "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Tinawagan ang DropNode sa naka-link pa na node"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "W: "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Bigo sa paghanap ng elemento ng hash!"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "E: Mga error ay tumutukoy sa talaksang "
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Bigo ang pagreserba ng diversion"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Bigo sa pag-resolba ng %s"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Internal error sa AddDiversion"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Bigo ang paglakad sa puno"
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Sinusubukang patungan ang diversion, %s -> %s at %s/%s"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to open %s"
-msgstr "Bigo ang pagbukas ng %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "Dobleng pagdagdag ng diversion %s -> %s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Duplicate conf file %s/%s"
+msgstr "Nadobleng talaksang conf %s/%s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Bigo ang pagbasa ng link %s"
+msgid "The path %s is too long"
+msgstr "Sobrang haba ang path na %s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Bigo ang pag-unlink ng %s"
+msgid "Unpacking %s more than once"
+msgstr "Binubuklat ang %s ng labis sa isang beses"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Bigo ang pag-link ng %s sa %s"
+msgid "The directory %s is diverted"
+msgstr "Ang directory %s ay divertado"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:152
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink limit na %sB tinamaan.\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Ang pakete ay sumusubok na magsulat sa target na diversion %s/%s"
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Walang field ng pakete ang arkibo"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Sobrang haba ng path na diversion"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s ay walang override entry\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Ang directory %s ay papalitan ng hindi-directory"
+
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Bigo ang paghanap ng node sa kanyang hash bucket"
+
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Sobrang haba ng path"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  Tagapangalaga ng %s ay %s hindi %s\n"
+msgid "Overwrite package match with no version for %s"
+msgstr "Patungan ng paketeng nag-match na walang bersion para sa %s"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s ay walang override entry para sa pinagmulan\n"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s"
 
-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s ay wala ring override entry na binary\n"
+msgid "Unable to stat %s"
+msgstr "Hindi ma-stat ang %s"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Bigo ang pagreserba ng memory"
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Bigo sa pagsulat ng talaksang %s"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Unable to open %s"
-msgstr "Hindi mabuksan %s"
+msgid "Failed to close file %s"
+msgstr "Bigo sa pagsara ng talaksang %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Maling anyo ng override %s linya %lu #1"
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s'"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Bigo ang pagbasa ng talaksang override %s"
+msgid "Internal error, could not locate member %s"
+msgstr "Internal error, hindi mahanap ang miyembrong %s"
 
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Maling anyo ng override %s linya %lu #1"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Di maintindihang talaksang control"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Maling anyo ng override %s linya %lu #2"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Hindi tanggap na signature ng arkibo"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Maling anyo ng override %s linya %lu #3"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Error sa pagbasa ng header ng miyembro ng arkibo"
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Hindi kilalang algorithmong compression '%s'"
+#: apt-inst/contrib/arfile.cc:96
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "Hindi tanggap na header ng miyembro ng arkibo"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Kailangan ng compression set ang compressed output %s"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Hindi tanggap na header ng miyembro ng arkibo"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Bigo ang paglikha ng FILE*"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Bitin ang arkibo. Sobrang iksi."
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Bigo ang pag-fork"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Bigo ang pagbasa ng header ng arkibo"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Anak para sa pag-Compress"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Bigo sa paglikha ng mga pipe"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Error na internal, bigo ang paglikha ng %s"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Bigo sa pagtakbo ng gzip "
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Bigo ang IO sa subprocess/talaksan"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Sirang arkibo"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Bigo ang pagbasa habang tinutuos ang MD5"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Bigo ang checksum ng tar, sira ang arkibo"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Problema sa pag-unlink ng %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s"
 
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n"
-"\n"
-"Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n"
-"sa pagkaayos at template mula sa mga paketeng debian\n"
-"\n"
-"Mga opsyon:\n"
-"  -h   Itong tulong na ito\n"
-"  -t   Itakda ang dir na pansamantala\n"
-"  -c=? Basahin ang talaksang pagkaayos na ito\n"
-"  -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Kabuuan ng gamit na puwang ng Dependensiyang Bersyon: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Di kilalang record ng pakete!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Kulang kayo ng libreng puwang sa %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Pag-gamit: apt-sortpkgs [mga option] talaksan1 [talaksan2 ...]\n"
-"\n"
-"Ang apt-sortpkgs ay payak na kagamitan upang makapag-sort ng talaksang "
-"pakete.\n"
-"Ang option -s ay ginagamit upang ipaalam kung anong klaseng talaksan ito.\n"
-"\n"
-"Mga option:\n"
-"  -h   Itong tulong na ito\n"
-"  -s   Gamitin ang pag-sort ng talaksang source\n"
-"  -c=? Basahin ang talaksang pagkaayos na ito\n"
-"  -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Tapos"
+
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Ina-abort ang pag-instol."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
diff --git a/po/tr.po b/po/tr.po
index 621d46108..5d9c3cee3 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: 2015-01-16 04:37-0500\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,150 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Toplam paketlerin adları: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Toplam paket yapıları: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Normal paketler: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Saf sanal paketler: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Tekil sanal paketler: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Karışık sanal paketler: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Eksik: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Toplam farklı sürümler: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Toplam farklı açıklamalar: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Toplam bağımlılıklar: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Toplam sürüm/dosya ilişkileri: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Toplam Tanım/Dosya ilişkileri: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Toplam destekleme eşleştirmeleri: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Toplam birikmiş dizgiler: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Toplam bağımlılık sürümü alanı: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Toplam serbest alan: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Hesaplanan toplam alan: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: 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:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Paket dosyaları:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Sabitlenmiş paketler:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(bulunamadı)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Kurulu: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Aday: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(hiçbiri)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Paket sabitleme: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Sürüm çizelgesi:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -240,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"
@@ -266,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."
 
@@ -303,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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: 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:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s paketi bulunamadı"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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."
@@ -352,24 +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:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "İndirme dizini kilitlenemiyor"
 
-#: cmdline/apt-get.cc:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -379,7 +375,7 @@ msgstr ""
 "yapılmaktadır:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -391,78 +387,67 @@ msgstr ""
 "bzr branch %s\n"
 "komutunu kullanın.\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Zaten indirilmiş olan '%s' dosyası atlanıyor\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "%s içindeki boş alan miktarı belirlenemedi"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "%s üzerinde yeterli boş alan yok"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s kaynağını al\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Bazı arşivler alınamadı."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: 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:968
+#: 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:996
+#: 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:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Alt süreç başarısız"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -471,17 +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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -520,30 +515,30 @@ 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:1385
+#: 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:1400
+#: 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:1405
+#: 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"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) paketinin değişim günlüğü"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Desteklenen birimler:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr "İndirme Başarısız"
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -669,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -836,12 +831,12 @@ msgstr "Disk bulunamadı."
 msgid "File not found"
 msgstr "Dosya bulunamadı"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Durum bilgisi okunamadı"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Değişiklik zamanı ayarlanamadı"
 
@@ -850,34 +845,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Geçersiz URI, yerel URI'ler // ile başlamamalıdır"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Giriş yapılıyor"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Eş adı belirlenemiyor"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Yerel ad belirlenemiyor"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Sunucu bağlantıyı reddetti, sunucunun iletisi: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER başarısız, sunucunun iletisi: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS başarısız, sunucunun iletisi: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -885,123 +880,123 @@ msgstr ""
 "Bir Vekil sunucu belirtildi ancak oturum açma betiği belirtilmedi, Acquire::"
 "ftp::ProxyLogin boş."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Oturum açma betiği komutu '%s' başarısız oldu, sunucunun iletisi: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE başarısız, sunucunun iletisi: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Bağlantı zaman aşımına uğradı"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Sunucu bağlantıyı kesti"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Okuma hatası"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Bir yanıt arabelleği taşırdı."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "İletişim kuralları bozulması"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Yazma hatası"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Bir soket oluşturulamadı"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Veri soketine bağlanılamadı, bağlantı zaman aşımına uğradı"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Başarısız"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Edilgen sokete bağlanılamadı."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo bir dinleme soketi alamıyor"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Bir sokete bağlanılamadı"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Soket dinlenemedi"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Soketin adı belirlenemedi"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "PORT komutu gönderilemedi"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Bilinmeyen adres ailesi %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT başarısız, sunucunun iletisi: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Veri soketi bağlantısı zaman aşımına uğradı"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Bağlantı kabul edilemiyor"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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ı"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Dosya alınamıyor, sunucunun iletisi: '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Veri soketi zaman aşımına uğradı"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Veri aktarımı başarısız, sunucunun iletisi: '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Sorgu"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Çağrılamıyor "
 
@@ -1067,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:168
+#: 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:172
+#: 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:174
+#: 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1090,49 +1085,49 @@ msgstr ""
 "Temiz-imzalı dosya geçerli değil, '%s' hatası alındı (ağ kimlik doğrulama "
 "gerektiriyor mu?)"
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "apt-key çalıştırılırken bilinmeyen hata"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "Aşağıdaki imzalar doğrulanamadı, çünkü genel anahtar mevcut değil:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "Boş dosyalar geçerli birer arşiv dosyası olamazlar"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Dosyaya yazılamadı"
 
-#: methods/http.cc:527
+#: 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:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Sunucundan okunurken hata"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Dosyaya yazılamadı"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Seçme başarısız"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Bağlantı zaman aşımına uğradı"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Çıktı dosyasına yazılırken hata"
 
@@ -1164,444 +1159,176 @@ msgstr "HTTP sunucusunun aralık desteği bozuk"
 msgid "Unknown date format"
 msgstr "Bilinmeyen tarih biçimi"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Kötü başlık verisi"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Bağlantı başarısız"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "İç hata"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr "Sıralama"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Listeleme"
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "İç hata, InstallPackages bozuk paketler ile çağrıldı!"
+#: 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-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-"Paketlerin kaldırılması gerekiyor ancak kaldırma işlemi devre dışı "
-"bırakılmış."
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Bağımlılıklar düzeltiliyor..."
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "İç hata, Sıralama tamamlanamadı"
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " başarısız oldu."
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+#: 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 ""
-"Ne kadar ilginç... Boyutlar eşleşmedi, apt@packages.debian.org adresine "
-"eposta atın"
+"Bu sorunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız "
+"gerekebilir."
 
-#. 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "%sB/%sB arşiv dosyası indirilecek.\n"
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Karşılanmayan bağımlılıklar. -f kullanmayı deneyin."
 
-#. 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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "%sB arşiv dosyası indirilecek.\n"
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "bilinmeyen"
 
-#. 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:167
+#: apt-private/private-output.cc:265
 #, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Bu işlem tamamlandıktan sonra %sB ek disk alanı kullanılacak.\n"
+msgid "[installed,upgradable to: %s]"
+msgstr "[kurulu,yükseltilebilir: %s]"
 
-#. 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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Bu işlem tamamlandıktan sonra %sB disk alanı boşalacak.\n"
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr "[kurulu,yerel]"
 
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "%s içinde yeterli boş alanınız yok."
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[kurulu,otomatik-kaldırılabilir]"
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Bazı sorunlar çıktı ve -y seçeneği, --force-yes olmadan kullanıldı"
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr "[kurulu,otomatik]"
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Sadece Önemsiz seçeneği ayarlandı, ama bu önemsiz bir işlem değil."
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr "[kurulu]"
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Evet, söylediğim şekilde yap!"
+#: 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-install.cc:222
+#: apt-private/private-output.cc:455
 #, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Tehlikeli bir iş yapmak üzeresiniz.\n"
-"Devam etmek için '%s' ifadesini yazınız\n"
-" ?] "
+msgid "but %s is installed"
+msgstr "ama %s kurulu"
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Vazgeç."
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ama %s kurulacak"
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Devam etmek istiyor musunuz?"
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ama kurulabilir değil"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Bazı dosyalar indirilemedi"
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ama o bir sanal paket"
 
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Bazı arşivler alınamıyor, apt-get update'i çalıştırmayı ya da --fix-missing "
-"seçeneğini ekleyerek düzeltmeyi deneyin."
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ama kurulu değil"
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing seçeneği ve ortam takası şu an için desteklenmiyor"
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "ama kurulmayacak"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Eksik paketler düzeltilemedi."
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " ya da"
 
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Kurulum iptal ediliyor."
+#: 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-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"Tüm dosyalarının üzerine yazıldığı için aşağıdaki paket\n"
-"sisteminizden kayboldu:"
-msgstr[1] ""
-"Tüm dosyalarının üzerine yazıldığı için aşağıdaki paketler\n"
-"sisteminizden kayboldu:"
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Aşağıdaki YENİ paketler kurulacak:"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Not: Bu eylem dpkg tarafından otomatik ve kasıtlı olarak yapılmıştır."
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Aşağıdaki paketler KALDIRILACAK:"
 
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Nesneleri silmemiz beklenemez, AutoRemover çalıştırılamıyor"
+#: 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-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"AutoRemover yapmaması gereken bir yıkıma\n"
-"sebep oldu. Lütfen apt hakkında bir hata raporu doldurun."
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Aşağıdaki paketler yükseltilecek:"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Aşağıdaki bilgiler durumu çözmenize yardımcı olabilir:"
+#: 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-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "İç hata, AutoRemover bazı şeyleri bozdu"
+#: 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-install.cc:513
+#: apt-private/private-output.cc:696
 msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"Aşağıdaki paket otomatik olarak kurulmuş ve artık bu pakete gerek duyulmuyor:"
-msgstr[1] ""
-"Aşağıdaki paketler otomatik olarak kurulmuş ve artık bu paketlere gerek "
-"duyulmuyor:"
+"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-install.cc:517
-#, c-format
-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 paket otomatik olarak kurulmuş ve artık gerekli değil.\n"
-msgstr[1] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Bu paketi kaldırmak için 'apt-get autoremove' komutunu kullanın."
-msgstr[1] "Bu paketleri kaldırmak için 'apt-get autoremove' komutunu kullanın."
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"Bunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız "
-"gerekebilir:"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Karşılanmamış bağımlılıklar. 'apt-get -f install' komutunu paket seçeneği "
-"vermeden deneyin (ya da bir çözüm belirtin)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Bazı paketler kurulamadı. Bu durum, olanaksız bir durum istemiş\n"
-"olduğunuzu ya da kararsız (unstable) dağıtımı kullandığınızı ve\n"
-"bazı paketlerin henüz oluşturulamamış  ya da oluşturulmakta\n"
-"olduğunu gösterir."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Bozuk paketler"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Aşağıdaki ek paketler de kurulacak:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Önerilen paketler:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Tavsiye edilen paketler:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "%s atlanıyor, bu paket zaten kurulu ve yükseltme seçilmemiş.\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"%s atlanıyor, bu paket kurulu değil ve sadece yükseltmeler isteniyor.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-"%s paketinin yeniden kurulumu mümkün değil, çünkü paket indirilemedi.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s zaten en yeni sürümde.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "'%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "'%4$s' nedeniyle '%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
-"'%s' kurulu değildi, dolayısıyla kaldırılmadı. Bunu mu demek istediniz: "
-"'%s'?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-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:129
-msgid "Listing"
-msgstr "Listeleme"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Bağımlılıklar düzeltiliyor..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " başarısız oldu."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Bağımlılıklar düzeltilemedi"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Yükseltme kümesi küçültülemiyor"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Tamamlandı"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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
+#: apt-private/private-output.cc:727
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, "
@@ -1652,7 +1379,7 @@ msgstr "E"
 msgid "N"
 msgstr "H"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex derleme hatası - %s"
@@ -1661,7 +1388,7 @@ msgstr "Regex derleme hatası - %s"
 msgid "The update command takes no arguments"
 msgstr "'update' komutu argüman almaz"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1673,10 +1400,14 @@ 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:101
+#: 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"
@@ -1703,27 +1434,310 @@ msgstr ""
 "      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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "UYARI: Aşağıdaki paketler doğrulanamıyor!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "İç hata, InstallPackages bozuk paketler ile çağrıldı!"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Kimlik denetimi uyarısı görmezden geliniyor.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr ""
+"Paketlerin kaldırılması gerekiyor ancak kaldırma işlemi devre dışı "
+"bırakılmış."
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Bazı paketlerin kimlik denetimi yapılamadı"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "İç hata, Sıralama tamamlanamadı"
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Paketler doğrulanmadan kurulsun mu?"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Ne kadar ilginç... Boyutlar eşleşmedi, apt@packages.debian.org adresine "
+"eposta atın"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#. 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
+#: apt-private/private-install.cc:154
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "%s ağdan alınamadı. %s\n"
-
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "%sB/%sB arşiv dosyası 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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "%sB arşiv dosyası 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
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Bu işlem tamamlandıktan sonra %sB ek disk alanı kullanılacak.\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 "Bu işlem tamamlandıktan sonra %sB disk alanı boşalacak.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Bazı sorunlar çıktı ve -y seçeneği, --force-yes olmadan kullanıldı"
+
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "Sadece Önemsiz seçeneği ayarlandı, ama bu önemsiz bir işlem değil."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Evet, söylediğim şekilde yap!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Tehlikeli bir iş yapmak üzeresiniz.\n"
+"Devam etmek için '%s' ifadesini yazınız\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Vazgeç."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Devam etmek istiyor musunuz?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Bazı dosyalar indirilemedi"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Bazı arşivler alınamıyor, apt-get update'i çalıştırmayı ya da --fix-missing "
+"seçeneğini ekleyerek düzeltmeyi deneyin."
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing seçeneği ve ortam takası şu an için desteklenmiyor"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Eksik paketler düzeltilemedi."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Kurulum iptal ediliyor."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"Tüm dosyalarının üzerine yazıldığı için aşağıdaki paket\n"
+"sisteminizden kayboldu:"
+msgstr[1] ""
+"Tüm dosyalarının üzerine yazıldığı için aşağıdaki paketler\n"
+"sisteminizden kayboldu:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Not: Bu eylem dpkg tarafından otomatik ve kasıtlı olarak yapılmıştır."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Nesneleri silmemiz beklenemez, AutoRemover çalıştırılamıyor"
+
+#: 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 ""
+"AutoRemover yapmaması gereken bir yıkıma\n"
+"sebep oldu. Lütfen apt hakkında bir hata raporu doldurun."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Aşağıdaki bilgiler durumu çözmenize yardımcı olabilir:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "İç hata, AutoRemover bazı şeyleri bozdu"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"Aşağıdaki paket otomatik olarak kurulmuş ve artık bu pakete gerek duyulmuyor:"
+msgstr[1] ""
+"Aşağıdaki paketler otomatik olarak kurulmuş ve artık bu paketlere gerek "
+"duyulmuyor:"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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 paket otomatik olarak kurulmuş ve artık gerekli değil.\n"
+msgstr[1] "%lu paket otomatik olarak kurulmuş ve artık gerekli değil.\n"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "Bu paketi kaldırmak için 'apt-get autoremove' komutunu kullanın."
+msgstr[1] "Bu paketleri kaldırmak için 'apt-get autoremove' komutunu kullanın."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr ""
+"Bunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız "
+"gerekebilir:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Karşılanmamış bağımlılıklar. 'apt-get -f install' komutunu paket seçeneği "
+"vermeden deneyin (ya da bir çözüm belirtin)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Bazı paketler kurulamadı. Bu durum, olanaksız bir durum istemiş\n"
+"olduğunuzu ya da kararsız (unstable) dağıtımı kullandığınızı ve\n"
+"bazı paketlerin henüz oluşturulamamış  ya da oluşturulmakta\n"
+"olduğunu gösterir."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Bozuk paketler"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Aşağıdaki ek paketler de kurulacak:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Önerilen paketler:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Tavsiye edilen paketler:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "%s atlanıyor, bu paket zaten kurulu ve yükseltme seçilmemiş.\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"%s atlanıyor, bu paket kurulu değil ve sadece yükseltmeler isteniyor.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+"%s paketinin yeniden kurulumu mümkün değil, çünkü paket indirilemedi.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s zaten en yeni sürümde.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "'%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n"
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "'%4$s' nedeniyle '%3$s' paketinin '%1$s' (%2$s) sürümü seçildi\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+"'%s' kurulu değildi, dolayısıyla kaldırılmadı. Bunu mu demek istediniz: "
+"'%s'?\n"
+
+#: apt-private/private-install.cc:945
+#, c-format
+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-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "UYARI: Aşağıdaki paketler doğrulanamıyor!"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "Kimlik denetimi uyarısı görmezden geliniyor.\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Bazı paketlerin kimlik denetimi yapılamadı"
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Paketler doğrulanmadan kurulsun mu?"
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "%s ağdan alınamadı. %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 "%s içindeki boş alan miktarı belirlenemedi"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "%s içinde yeterli boş alanınız yok."
+
 #: apt-private/private-sources.cc:58
 #, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1738,41 +1752,33 @@ msgstr "'%s' dosyası değişti, lütfen 'apt-get update' komutunu çalıştır
 msgid "Full Text Search"
 msgstr "Tam Metin Arama"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Yükseltme hesaplanıyor"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Bitti"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Bağlandı  "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Alınıyor: "
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Yoksay    "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Hata      "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%2$s'de %1$sB alındı (%3$sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Çalışıyor]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1785,18 +1791,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1873,205 +1879,456 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Kullanılabilir bilgiler birleştiriliyor"
 
-#: 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ı"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Sağlama elementi bulunamadı!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Yönlendirme tahsisi başarısız oldu"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "AddDiversion'da iç hata"
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Bir yönlendirmenin üzerine yazılmaya çalışılıyor, %s -> %s ve %s/%s"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Kullanım: apt-extracttemplates dosya1 [dosya2 ...]\n"
+"\n"
+"apt-extracttemplates, Debian paketlerinden ayar ve şablon bilgisini\n"
+"almak için kullanılan bir araçtır\n"
+"\n"
+"Seçenekler:\n"
+"  -h   Bu yardım dosyası\n"
+"  -t   Geçici dizini ayarlar\n"
+"  -c=? Belirtilen ayar dosyasını kullanır\n"
+"  -o=? Ayar seçeneği belirtmeyi sağlar, ör -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:506
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Aynı dosya iki kez yönlendirilemez: %s -> %s"
+msgid "Unable to mkstemp %s"
+msgstr "mkstemp %s başarısız oldu"
 
-#: apt-inst/filelist.cc:549
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "%s/%s yapılandırma dosyası zaten mevcut"
+msgid "Unable to write to %s"
+msgstr "%s dosyasına yazılamıyor"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: 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:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "Paket uzantı listesi çok uzun"
+
+#: 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 "The path %s is too long"
-msgstr "%s yolu çok uzun"
+msgid "Error processing directory %s"
+msgstr "%s dizinini işlemede hata"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "Kaynak uzantı listesi çok uzun"
+
+#: 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:430
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "%s paketi bir çok kez açıldı"
+msgid "Error processing contents %s"
+msgstr "%s içeriğini işlemede hata"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Kullanım: apt-ftparchive [seçenekler] komut\n"
+"Komutlar:   packages ikilikonumu [geçersizkılmadosyası [konumöneki]]\n"
+"            sources kaynakkonumu [geçersizkılmadosyası [konumöneki]]\n"
+"            contents konum\n"
+"            release konum\n"
+"            generate yapılandırma [gruplar]\n"
+"            clean yapılandırma\n"
+"\n"
+"apt-ftparchive Debian arşivleri için indeks dosyaları üretir. \n"
+"dpkg-scanpackages ve dpkg-scansources için tamamen otomatikten\n"
+"işlevsel yedeklere kadar birçok üretim çeşidini destekler.\n"
+"\n"
+"apt-ftparchive, .deb dizinlerinden 'Package' dosyaları üretir. 'Package'\n"
+"dosyası, her paketin MD5 doğrulama ve dosya büyüklüğü gibi denetim\n"
+"alanlarının bilgilerini içerir. Öncelik (Priority) ve bölüm (Section)\n"
+"değerlerini istenen başka değerlerle değiştirebilmek için bir geçersiz\n"
+"kılma dosyası kullanılabilir.\n"
+"\n"
+"Benzer şekilde, apt-ftparchive, .dscs dosyalarından 'Sources' dosyaları\n"
+"üretir. '--source-override' seçeneği bir src geçersiz kılma dosyası\n"
+"belirtmek için kullanıabilir.\n"
+"\n"
+"'packages' ve 'sources' komutları dizin ağacının kökünde çalıştırıl-\n"
+"malıdır. BinaryPath özyineli aramanın temeline işaret etmeli ve\n"
+"geçersiz kılma dosyası geçersiz kılma bayraklarını içermelidir.\n"
+"Pathprefix mevcutsa dosya adı alanlarının sonuna eklenir. Debian\n"
+"arşivinden örnek kullanım şu şekildedir:\n"
+"\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Seçenekler:\n"
+"  -h    Bu yardım metni\n"
+"  --md5 MD5 üretimini denetle\n"
+"  -s=?  Kaynak geçersiz kılma dosyası\n"
+"  -q    Sessiz\n"
+"  -d=?  Seçimlik önbellek veritabanını seç\n"
+"  --no-delink Bağ kurulmamış hata ayıklama kipini etkinleştir\n"
+"  --contents  İçerik dosyası üretimini denetle\n"
+"  -c=?  Belirtilen yapılandırma dosyası kullan\n"
+"  -o=?  Yapılandırma seçeneği ayarla"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Hiçbir seçim eşleşmedi"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "%s dizini yönlendirilmiş"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "'%s' paket dosyası grubunda bazı dosyalar eksik"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Bu paket yönlendirme hedefine (%s/%s) yazmayı deniyor"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Veritabanı bozuk, dosya adı %s.old olarak değiştirildi"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Yönlendirme yolu çok uzun"
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Veritabanı eski, %s yükseltilmeye çalışılıyor"
+
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Veritabanı biçimi geçersiz. Eğer apt'ın eski bir sürümünden yükseltme "
+"yaptıysanız, lütfen veritabanını silin ve yeniden oluşturun."
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Veritabanı dosyası %s açılamadı: %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s durum bilgisi alınamadı"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+msgid "Failed to read .dsc"
+msgstr ".dsc dosyası okunamadı"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Arşivin denetim kaydı yok"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "İmleç alınamıyor"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "%s, %s olarak yeniden adlandırılamadı"
+msgid "W: Unable to read directory %s\n"
+msgstr "U: %s dizini okunamıyor\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "%s dizini dizin olmayan bir öğeyle değiştirildi"
+msgid "W: Unable to stat %s\n"
+msgstr "U: %s durum bilgisi alınamıyor\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Düğüm sağlama kovasında bulunamadı"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "H: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Yol çok uzun"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "U: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "H: Hatalar şu dosya için geçerli: "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "%s paketinin sürümü yok"
+msgid "Failed to resolve %s"
+msgstr "%s çözümlenemedi"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Ağaçta gezinme başarısız"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "%s/%s dosyası %s paketindeki aynı adlı dosyanın üzerine yazmak istiyor"
+msgid "Failed to open %s"
+msgstr "%s açılamadı"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "%s durum bilgisi alınamadı"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "%s dosyasına yazılamadı"
+msgid "Failed to readlink %s"
+msgstr "%s readlink çağrısı başarısız oldu"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "%s dosyası kapatılamadı"
+msgid "Failed to unlink %s"
+msgstr "%s bağı koparılamadı"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Bu dosya geçerli bir DEB arşivi değil, '%s' üyesi eksik"
+msgid "*** Failed to link %s to %s"
+msgstr "*** %s, %s konumuna bağlanamadı"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "İç hata, %s üyesi bulunamadı"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " %sB'lik bağ koparma (DeLink) sınırına ulaşıldı.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Ayrıştırılamayan 'control' dosyası"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Arşivde paket alanı yok"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Geçersiz arşiv imzası"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Arşiv üyesi başlığı okuma hatası"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:712
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "Geçersiz arşiv üyesi başlığı %s"
+msgid "  %s has no source override entry\n"
+msgstr "  '%s' paketinin yerine geçecek bir kaynak paket yok\n"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Geçersiz arşiv üyesi başlığı"
+#: 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"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Bellek ayırma yapılamadı"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s açılamıyor"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Hatalı geçersiz kılma %s satır %llu (%s)"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Geçersiz kılma dosyası %s okunamadı"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Hatalı geçersiz kılma %s satır %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Hatalı geçersiz kılma %s satır %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Hatalı geçersiz kılma %s satır %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Bilinmeyen sıkıştırma algoritması '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Sıkıştırılmış %s çıktısı bir sıkıştırma kümesine ihtiyaç duymaktadır"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "DOSYA* oluşturulamadı"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "fork yapılamadı"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Çocuğu sıkıştır"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "İç hata, %s oluşturulamadı"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Arşiv çok kısa"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Altsürece/dosyaya GÇ işlemi başarısız oldu"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Arşiv başlıkları okunamadı"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "MD5 hesaplanırken okunamadı"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Boru oluşturulamadı"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "%s bağı koparılırken sorun çıktı"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Gzip çalıştırılamadı "
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "%s, %s olarak yeniden adlandırılamadı"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Bozuk arşiv"
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Kullanım: apt-internal-solver\n"
+"\n"
+"apt-internal-solver mevcut dâhilî çözücüyü (hata ayıklama\n"
+"gibi sebeplerle) harici çözücü gibi kullanmaya yarayan bir\n"
+"arayüzdür.\n"
+"\n"
+"Seçenekler:\n"
+"  -h  Bu yardım metni.\n"
+"  -q  Günlük tutmaya uygun çıktı - İlerleme göstergesi yok\n"
+"  -c=? Belirtilen yapılandırma dosyası kullan\n"
+"  -o=? Yapılandırma seçeneği ayarla, örneğin -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar sağlama toplamı başarısız, arşiv bozulmuş"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Bilinmeyen paket kaydı!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Bilinmeyen TAR başlığı türü %u, üye %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Kullanım: apt-sortpkgs [seçenekler] dosya1 [dosya2 ...]\n"
+"\n"
+"apt-sortpkgs, paket dosyalarını sıralayan basit bir araçtır.\n"
+"-s seçeneği ne tür bir dosya olduğunu göstermekte kullanılır.\n"
+"\n"
+"Seçenekler:\n"
+"  -h Bu yardım metni\n"
+"  -s Kaynak dosyası sıralamayı kullan\n"
+"  -c=? Belirtilen yapılandırma dosyasını oku\n"
+"  -o=? Herhangi bir yapılandırma seçeneği ayarla, örneğin -o dir::cache=/"
+"tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr "Durum: [%3i%%]"
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "dpkg çalıştırılıyor"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketleme sistemi '%s' desteklenmiyor"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Uygun bir paketleme sistemi türü bulunamıyor"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i kayıt yazıldı.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%2$i eksik dosyayla %1$i kayıt yazıldı.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%2$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 "%2$i eksik dosya ve %3$i eşleşmeyen dosyayla %1$i kayıt yazıldı\n"
@@ -2086,6 +2343,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ı."
@@ -2098,158 +2377,341 @@ 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:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Paket önbelleği boş"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Bağımlılıklar"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "ÖnBağımlılıklar"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Önerdikleri"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Tavsiye ettikleri"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Çakışmalar"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Değiştirilenler"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Eskiyenler"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Bozdukları"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Geliştirdikleri"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "önemli"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "gerekli"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "standart"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "seçimlik"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "ilave"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Yükseltme hesaplanıyor"
+
+#: 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:118
+#: 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/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/acquire-worker.cc:169
+#: apt-pkg/sourcelist.cc:173
 #, 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] too short)"
+msgstr ""
+"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] çok kısa)"
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 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ı ([%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/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/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/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "İndeks dosyası türü '%s' desteklenmiyor"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Dosya Sağlananları Toplanıyor"
 
-#: 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/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Kaynak önbelleği kaydedilirken GÇ Hatası"
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Aday sürümler"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Çözücüye senaryo gönder"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Bağımlılık oluşturma"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Çözücüye istek gönder"
 
-#: 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/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Çözüm almak için hazırlan"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Durum dosyası (StateFile) %s açılamadı"
+#: 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/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Geçici durum dosyasına (%s) yazma 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Sağlama toplamları eşleşmiyor"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Boyutlar eşleşmiyor"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 msgid "Invalid file format"
 msgstr "Geçersiz dosya biçimi"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Yazma hatası"
+
+#: 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:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"İmza doğrulama sırasında bir hata meydana geldi. Depo güncel değil ve önceki "
+"indeks dosyaları kullanılacak. GPG hatası: %s:%s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG hatası: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "%s dizini yönlendirilmiş"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2258,17 +2720,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:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2277,27 +2739,19 @@ msgstr ""
 "%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun "
 "güncelleştirmeleri uygulanmayacak."
 
-#: apt-pkg/acquire-item.cc:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"İmza doğrulama sırasında bir hata meydana geldi. Depo güncel değil ve önceki "
-"indeks dosyaları kullanılacak. GPG hatası: %s:%s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG hatası: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2306,130 +2760,49 @@ 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:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, 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:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kaynak listesinin (%s) dosya bilgisi alınamadı"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Paket listeleri okunuyor"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Dosya Sağlananları Toplanıyor"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "%s dosyasına yazılamıyor"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: apt-pkg/acquire.cc:162
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "%s dizini kilitlenemiyor"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:902
+#: 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:904
+#: 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: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"
@@ -2457,7 +2830,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2466,12 +2839,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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2483,10 +2856,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"
@@ -2557,11 +2933,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"
 
@@ -2573,7 +2949,7 @@ msgstr ""
 "%s paketinin tekrar kurulması gerekli, ancak gereken arşiv dosyası "
 "bulunamıyor."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2581,178 +2957,87 @@ msgstr ""
 "Hata, pkgProblemResolver::Resolve bozuk paketlere yol açtı, bu sorunun "
 "nedeni tutulan paketler olabilir."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr "Çözücüye istek gönder"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Çözüm almak için hazırlan"
-
-#: apt-pkg/edsp.cc:327
-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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Harici çözücüyü çalıştır"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Paket dosyası %s ayrıştırılamadı (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "'Release' dosyası (%s) ayrıştırılamadı"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "'Release' dosyası %s içinde hiç bölüm yok"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "'Release' dosyasında (%s) sağlama girdisi yok"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Bağımlılık ağacı oluşturuluyor"
 
-#: 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:139
+msgid "Candidate versions"
+msgstr "Aday sürümler"
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "%s Açılıyor"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Bağımlılık oluşturma"
 
-#: apt-pkg/sourcelist.cc:371
+#: 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/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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "'%s' görevi bulunamadı"
 
-#: apt-pkg/cacheset.cc:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
+#: 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: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: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:743 apt-pkg/cacheset.cc:751
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -2761,88 +3046,98 @@ msgstr ""
 "'%s' paketi kurulu olmadığı ve aday sürüme sahip olmadığı için her ikisi de "
 "seçilemiyor"
 
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/indexrecords.cc:83
 #, 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"
+msgid "Unable to parse Release file %s"
+msgstr "'Release' dosyası (%s) ayrıştırılamadı"
 
-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/indexrecords.cc:91
 #, 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"
+msgid "No sections in Release file %s"
+msgstr "'Release' dosyası %s içinde hiç bölüm yok"
 
-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/indexrecords.cc:132
 #, 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"
+msgid "No Hash entry in Release file %s"
+msgstr "'Release' dosyasında (%s) sağlama girdisi yok"
+
+#: apt-pkg/indexrecords.cc:145
+#, 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:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "'Release' dosyasında (%s) geçersiz 'Date' girdisi"
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%li dk. %li sn."
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%li sn."
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s seçimi bulunamadı"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Kilitleme dosyası %s salt okunur olduğu için kilitleme kullanılmıyor"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Kilit dosyası %s açılamadı"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "nfs ile bağlanmış kilit dosyası %s için kilitleme kullanılmıyor"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "%s kilidi alınamadı"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 "'%s' dizin olmadığı için dosya listeli oluşturulamıyor"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 "'%2$s' dizinindeki '%1$s' normal bir dosya olmadığı için görmezden geliniyor"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "'%2$s' dizinindeki '%1$s' dosyası uzantısı olmadığı için görmezden geliniyor"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2850,75 +3145,75 @@ msgstr ""
 "'%2$s' dizinindeki '%1$s' dosyası geçersiz bir dosya uzantısı olduğu için "
 "yok sayılıyor"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "%s altsüreci bir bölümleme hatası aldı (segmentation fault)."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "%s altsüreci %u sinyali aldı."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "%s altsüreci bir hata kodu gönderdi (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "%s altsüreci beklenmeyen bir şekilde sona erdi"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Gzip dosyası %s kapatılamadı"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s dosyası açılamadı"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Dosya tanımlayıcı %d açılamadı"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Altsüreç IPC'si oluşturulamadı"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Sıkıştırma programı çalıştırılamadı "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "read, %llu bayt okunması gerekli ama hiç kalmamış"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "write, yazılması gereken %llu bayt yazılamıyor"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "%s dosyası kapatılamadı"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "%s dosyası %s olarak yeniden adlandırılamadı"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "%s dosyasından bağ kaldırma sorunu"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Dosya eşitlenirken sorun çıktı"
 
@@ -3006,114 +3301,108 @@ 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:519
+#: 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:633
+#: 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:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s dizininde kurulu bir anahtar yok."
-
-#: 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"
@@ -3123,12 +3412,12 @@ msgstr "Geçersiz işlem: %s"
 msgid "Installing %s"
 msgstr "%s kuruluyor"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "%s kaldırılıyor"
@@ -3149,80 +3438,80 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "'%s' dizini bulunamadı"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "%s hazırlanıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s paketi açılıyor"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: 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:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "%s kuruldu"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "%s kaldırıldı"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s tamamen kaldırıldı"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr "İşlem yarıda kesildi"
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: 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:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3230,14 +3519,14 @@ msgstr ""
 "Apport raporu yazılmadı çünkü hata iletisi bu durumun bir önceki hatadan "
 "kaynaklanan bir hata olduğunu belirtiyor."
 
-#: apt-pkg/deb/dpkgpm.cc:1745
+#: 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:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3245,7 +3534,7 @@ msgstr ""
 "Hata iletisi bir bellek yetersizliği hatasına işaret ettiği için apport "
 "raporu yazılamadı"
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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"
@@ -3253,7 +3542,7 @@ msgstr ""
 "Hata iletisi yerel bir sistem hatasına işaret ettiği için apport raporu "
 "yazılamadı"
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3266,425 +3555,192 @@ 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ş"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Kullanım: apt-extracttemplates dosya1 [dosya2 ...]\n"
-"\n"
-"apt-extracttemplates, Debian paketlerinden ayar ve şablon bilgisini\n"
-"almak için kullanılan bir araçtır\n"
-"\n"
-"Seçenekler:\n"
-"  -h   Bu yardım dosyası\n"
-"  -t   Geçici dizini ayarlar\n"
-"  -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:254
-#, c-format
-msgid "Unable to mkstemp %s"
-msgstr "mkstemp %s başarısız oldu"
-
-#: cmdline/apt-extracttemplates.cc:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "%s dizinini işlemede hata"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Kaynak uzantı listesi çok uzun"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "İçindekiler dosyasına başlık yazmada hata"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "%s içeriğini işlemede hata"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Kullanım: apt-ftparchive [seçenekler] komut\n"
-"Komutlar:   packages ikilikonumu [geçersizkılmadosyası [konumöneki]]\n"
-"            sources kaynakkonumu [geçersizkılmadosyası [konumöneki]]\n"
-"            contents konum\n"
-"            release konum\n"
-"            generate yapılandırma [gruplar]\n"
-"            clean yapılandırma\n"
-"\n"
-"apt-ftparchive Debian arşivleri için indeks dosyaları üretir. \n"
-"dpkg-scanpackages ve dpkg-scansources için tamamen otomatikten\n"
-"işlevsel yedeklere kadar birçok üretim çeşidini destekler.\n"
-"\n"
-"apt-ftparchive, .deb dizinlerinden 'Package' dosyaları üretir. 'Package'\n"
-"dosyası, her paketin MD5 doğrulama ve dosya büyüklüğü gibi denetim\n"
-"alanlarının bilgilerini içerir. Öncelik (Priority) ve bölüm (Section)\n"
-"değerlerini istenen başka değerlerle değiştirebilmek için bir geçersiz\n"
-"kılma dosyası kullanılabilir.\n"
-"\n"
-"Benzer şekilde, apt-ftparchive, .dscs dosyalarından 'Sources' dosyaları\n"
-"üretir. '--source-override' seçeneği bir src geçersiz kılma dosyası\n"
-"belirtmek için kullanıabilir.\n"
-"\n"
-"'packages' ve 'sources' komutları dizin ağacının kökünde çalıştırıl-\n"
-"malıdır. BinaryPath özyineli aramanın temeline işaret etmeli ve\n"
-"geçersiz kılma dosyası geçersiz kılma bayraklarını içermelidir.\n"
-"Pathprefix mevcutsa dosya adı alanlarının sonuna eklenir. Debian\n"
-"arşivinden örnek kullanım şu şekildedir:\n"
-"\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Seçenekler:\n"
-"  -h    Bu yardım metni\n"
-"  --md5 MD5 üretimini denetle\n"
-"  -s=?  Kaynak geçersiz kılma dosyası\n"
-"  -q    Sessiz\n"
-"  -d=?  Seçimlik önbellek veritabanını seç\n"
-"  --no-delink Bağ kurulmamış hata ayıklama kipini etkinleştir\n"
-"  --contents  İçerik dosyası üretimini denetle\n"
-"  -c=?  Belirtilen yapılandırma dosyası kullan\n"
-"  -o=?  Yapılandırma seçeneği ayarla"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Hiçbir seçim eşleşmedi"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "'%s' paket dosyası grubunda bazı dosyalar eksik"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Veritabanı bozuk, dosya adı %s.old olarak değiştirildi"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Veritabanı eski, %s yükseltilmeye çalışılıyor"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Veritabanı biçimi geçersiz. Eğer apt'ın eski bir sürümünden yükseltme "
-"yaptıysanız, lütfen veritabanını silin ve yeniden oluşturun."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Veritabanı dosyası %s açılamadı: %s"
-
-#: ftparchive/cachedb.cc:332
-msgid "Failed to read .dsc"
-msgstr ".dsc dosyası okunamadı"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Arşivin denetim kaydı yok"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "İmleç alınamıyor"
+"Yönetim dizini (%s) kilitlenemiyor, başka bir işlem tarafından kullanılıyor "
+"olmasın?"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "U: %s dizini okunamıyor\n"
+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?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "U: %s durum bilgisi alınamıyor\n"
+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. "
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "H: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Kilitlenmemiş"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "U: "
+#: 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ı"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "H: Hatalar şu dosya için geçerli: "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Sağlama elementi bulunamadı!"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "%s çözümlenemedi"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Yönlendirme tahsisi başarısız oldu"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Ağaçta gezinme başarısız"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "AddDiversion'da iç hata"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "%s açılamadı"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Bir yönlendirmenin üzerine yazılmaya çalışılıyor, %s -> %s ve %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Aynı dosya iki kez yönlendirilemez: %s -> %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "%s readlink çağrısı başarısız oldu"
+msgid "Duplicate conf file %s/%s"
+msgstr "%s/%s yapılandırma dosyası zaten mevcut"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "%s bağı koparılamadı"
+msgid "The path %s is too long"
+msgstr "%s yolu çok uzun"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** %s, %s konumuna bağlanamadı"
+msgid "Unpacking %s more than once"
+msgstr "%s paketi bir çok kez açıldı"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " %sB'lik bağ koparma (DeLink) sınırına ulaşıldı.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Arşivde paket alanı yok"
+msgid "The directory %s is diverted"
+msgstr "%s dizini yönlendirilmiş"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s için geçersiz kılma girdisi yok\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Bu paket yönlendirme hedefine (%s/%s) yazmayı deniyor"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s geliştiricisi %s, %s değil\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Yönlendirme yolu çok uzun"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  '%s' paketinin yerine geçecek bir kaynak paket yok\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "%s dizini dizin olmayan bir öğeyle değiştirildi"
 
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  '%s' paketinin yerine geçecek bir ikili paket de yok\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Düğüm sağlama kovasında bulunamadı"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Bellek ayırma yapılamadı"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Yol çok uzun"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "%s açılamıyor"
+msgid "Overwrite package match with no version for %s"
+msgstr "%s paketinin sürümü yok"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Hatalı geçersiz kılma %s satır %llu (%s)"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "%s/%s dosyası %s paketindeki aynı adlı dosyanın üzerine yazmak istiyor"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Geçersiz kılma dosyası %s okunamadı"
+msgid "Unable to stat %s"
+msgstr "%s durum bilgisi alınamadı"
 
-#: ftparchive/override.cc:166
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Hatalı geçersiz kılma %s satır %llu #1"
+msgid "Failed to write file %s"
+msgstr "%s dosyasına yazılamadı"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Hatalı geçersiz kılma %s satır %llu #2"
+msgid "Failed to close file %s"
+msgstr "%s dosyası kapatılamadı"
 
-#: ftparchive/override.cc:191
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Hatalı geçersiz kılma %s satır %llu #3"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Bu dosya geçerli bir DEB arşivi değil, '%s' üyesi eksik"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Bilinmeyen sıkıştırma algoritması '%s'"
+msgid "Internal error, could not locate member %s"
+msgstr "İç hata, %s üyesi bulunamadı"
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Ayrıştırılamayan 'control' dosyası"
+
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Geçersiz arşiv imzası"
+
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Arşiv üyesi başlığı okuma hatası"
+
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Sıkıştırılmış %s çıktısı bir sıkıştırma kümesine ihtiyaç duymaktadır"
+msgid "Invalid archive member header %s"
+msgstr "Geçersiz arşiv üyesi başlığı %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "DOSYA* oluşturulamadı"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Geçersiz arşiv üyesi başlığı"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "fork yapılamadı"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arşiv çok kısa"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Çocuğu sıkıştır"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Arşiv başlıkları okunamadı"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "İç hata, %s oluşturulamadı"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Boru oluşturulamadı"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Altsürece/dosyaya GÇ işlemi başarısız oldu"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Gzip çalıştırılamadı "
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "MD5 hesaplanırken okunamadı"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Bozuk arşiv"
 
-#: ftparchive/multicompress.cc:359
+#: 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:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "%s bağı koparılırken sorun çıktı"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Bilinmeyen TAR başlığı türü %u, üye %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Kullanım: apt-internal-solver\n"
-"\n"
-"apt-internal-solver mevcut dâhilî çözücüyü (hata ayıklama\n"
-"gibi sebeplerle) harici çözücü gibi kullanmaya yarayan bir\n"
-"arayüzdür.\n"
-"\n"
-"Seçenekler:\n"
-"  -h  Bu yardım metni.\n"
-"  -q  Günlük tutmaya uygun çıktı - İlerleme göstergesi yok\n"
-"  -c=? Belirtilen yapılandırma dosyası kullan\n"
-"  -o=? Yapılandırma seçeneği ayarla, örneğin -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Toplam bağımlılık sürümü alanı: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Bilinmeyen paket kaydı!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "%s üzerinde yeterli boş alan yok"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Kullanım: apt-sortpkgs [seçenekler] dosya1 [dosya2 ...]\n"
-"\n"
-"apt-sortpkgs, paket dosyalarını sıralayan basit bir araçtır.\n"
-"-s seçeneği ne tür bir dosya olduğunu göstermekte kullanılır.\n"
-"\n"
-"Seçenekler:\n"
-"  -h Bu yardım metni\n"
-"  -s Kaynak dosyası sıralamayı kullan\n"
-"  -c=? Belirtilen yapılandırma dosyasını oku\n"
-"  -o=? Herhangi bir yapılandırma seçeneği ayarla, örneğin -o dir::cache=/"
-"tmp\n"
+#~ msgid "Done"
+#~ msgstr "Bitti"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "%s dizininde kurulu bir anahtar yok."
 
 #~ msgid "Is stdout a terminal?"
 #~ msgstr "stdout bir uçbirim mi?"
@@ -3779,6 +3835,3 @@ msgstr ""
 #~ msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 #~ msgstr ""
 #~ "Günlük yazılamadı, openpty() başarısız oldu (/dev/pts bağlanmadı mı?)\n"
-
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "%s dosyası açıkimzalı bir iletiyle başlamıyor"
diff --git a/po/uk.po b/po/uk.po
index 92f07bb15..faeedf941 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: 2015-01-16 04:37-0500\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,151 +29,146 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Пакунок %s версії %s має незадоволену залежність:\n"
 
-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Всього імен пакунків: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Всього структур пакунків: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Нормальних пакунків: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Цілком віртуальних пакунків: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Окремих віртуальних пакунків: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Змішаних віртуальних пакунків: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Відсутні: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Всього унікальних версій: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Всього унікальних описів: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Всього залежностей: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Всього відносин Версія/Файл: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Всього відносин Опис/Файл: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 #, fuzzy
 msgid "Total Provides mappings: "
 msgstr "Всього карт 'Provides': "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Всього відфільтрованих (globbed) рядків: "
 
-#: cmdline/apt-cache.cc:362
-#, fuzzy
-msgid "Total dependency version space: "
-msgstr "Всього інформації про залежності: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 #, fuzzy
 msgid "Total slack space: "
 msgstr "Порожнього місця в кеші: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Загальний простір полічений для: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Ця команда є застарілою. Будь-ласка використовуйте 'apt-mark showauto'"
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Не можу знайти пакунок %s"
 
-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Переліки пакунків:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Зафіксовані пакунки:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(не знайдено)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Встановлено: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(відсутній)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Фіксатор(pin) пакунка: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Таблиця версій:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -243,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"
@@ -264,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 з вашого набору."
 
@@ -300,48 +295,48 @@ msgstr ""
 "   -с=? Читати зазначений конфігураційний файл.\n"
 "   -o=? Встановити умовну опцію, наприклад, -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
 
-#: cmdline/apt-get.cc:367
+#: 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:423
+#: cmdline/apt-get.cc:414
 #, fuzzy, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr "Ігнорувати недоступну версію '%s' пакунку '%s'"
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Не можу знайти пакунок %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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,26 +344,26 @@ msgstr ""
 "Ця команда застаріла. Будь-ласка, використовуйте замість неї 'apt-mark auto' "
 "і 'apt-mark manual'."
 
-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Внутрішня помилка, вирішувач проблем щось поламав"
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Неможливо заблокувати директорію для завантаження"
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
 "тексти"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -388,81 +383,70 @@ msgstr ""
 "bzr branch %s\n"
 "щоб отримати найновіші (потенційно не випущені) оновлення до пакунку.\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускаємо вже завантажений файл '%s'\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Не вдалося визначити кількість вільного місця в %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Недостатньо місця в %s"
-
 #. 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:895
+#: 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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n"
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Завантаження вихідних текстів %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Деякі архіви не вдалося завантажити."
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr "Завантаження завершено в режимі \"тільки завантаження\""
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Пропускається розпакування вихідних текстів, тому що вже розпаковано в %s\n"
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Команда розпакування '%s' завершилася невдало.\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Команда побудови '%s' закінчилася невдало.\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Породжений процес завершився невдало"
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Для перевірки залежностей для побудови необхідно вказати як мінімум один "
 "пакунок"
 
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -471,17 +455,27 @@ msgstr ""
 "Відсутня інформація про архітектуру для %s. Дивись apt.conf(5) APT::"
 "Архітектури для налащтування"
 
-#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Обробка залежностей для побудови закінчилася невдало"
+
+#: 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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s не має залежностей для побудови.\n"
 
-#: cmdline/apt-get.cc:1276
+#: 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 +484,7 @@ msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо %s не є дозволеним на "
 "'%s' пакунках"
 
-#: cmdline/apt-get.cc:1294
+#: cmdline/apt-get.cc:1297
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -498,14 +492,14 @@ msgid ""
 msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
 
-#: cmdline/apt-get.cc:1317
+#: 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:1356
+#: cmdline/apt-get.cc:1359
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -514,7 +508,7 @@ msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо версія пакунку-"
 "кандидата %s не задовольняє умови по версіям"
 
-#: cmdline/apt-get.cc:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -523,30 +517,30 @@ msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо немає пакунку-"
 "кандидата %s потрібної версії"
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1388
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s"
 
-#: cmdline/apt-get.cc:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Залежності для побудови %s не можуть бути задоволені."
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Обробка залежностей для побудови закінчилася невдало"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Журнал змін для %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Підтримувані модулі:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -649,11 +643,11 @@ msgstr ""
 "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
 "тексти"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -667,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -813,13 +807,13 @@ msgstr "Диск не знайдено."
 msgid "File not found"
 msgstr "Файл не знайдено"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 #, fuzzy
 msgid "Failed to stat"
 msgstr "Не вдалося одержати атрибути (stat)"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Не вдалося встановити час модифікації"
 
@@ -828,34 +822,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Невірне посилання (URI), локальні посилання не повинні починатися з //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Логінюсь в"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Неможливо визначити назву вузла"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Неможливо визначити локальну назву"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Сервер розірвав з'єднання, відповівши: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER невдало, сервер мовив: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS невдало, сервер мовив: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -863,123 +857,123 @@ msgstr ""
 "Вказано проксі-сервер, але відсутній скрипт логіну, Acquire::ftp::ProxyLogin "
 "пустий."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Команда '%s' у скрипті логіна не вдалася, сервер мовив: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE невдало, сервер мовив: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Час з'єднання вичерпався"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Сервер закрив з'єднання"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Помилка зчитування"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Відповідь переповнила буфер."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Спотворений протокол"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Помилка запису"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Неможливо створити сокет (socket)"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Неможливо під'єднати сокет (socket) з даними, час з'єднання вичерпався"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Невдача"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Неможливо під'єднати пасивний сокет (passive socket)."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Виклик getaddrinfo не зміг отримати слухаючий сокет"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Неможливо приєднатися до сокета"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Неможливо прослухати на сокеті"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Не вдалося визначити назву сокета"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Неможливо відіслати команду PORT"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Невідоме адресове сімейство %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT невдало, сервер мовив: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Час з'єднання з сокетом даних вичерпався"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Неможливо прийняти з'єднання"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Проблема хешування файла"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Неможливо завантажити файл, сервер мовив: '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Час з'єднання з сокетом (socket) з даними вичерпався"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Передача даних обірвалася, сервер мовив '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Черга"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Неможливо викликати "
 
@@ -1045,38 +1039,39 @@ msgstr "Сталося щось дивне при спробі отримати
 msgid "Unable to connect to %s:%s:"
 msgstr "Неможливо під'єднатися до %s:%s:"
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його "
 "відбиток?!"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "Знайдено як мінімум один невірний підпис."
 
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:164
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
-msgstr "Неможливо виконати 'apt-key' для перевірки підпису (чи встановлено gnupg?)"
+msgstr ""
+"Неможливо виконати 'apt-key' для перевірки підпису (чи встановлено gnupg?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "Невідома помилка виконання apt-key"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr "Наступні підписи були невірними:\n"
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1084,35 +1079,35 @@ msgstr ""
 "Наступні підписи не можуть бути перевірені, тому що публічний ключ "
 "відсутній:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "Пусті файли не можуть бути правильними архівами"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Помилка запису у файл"
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Помилка зчитування з сервера. Віддалена сторона закрила з'єднання"
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Помилка зчитування з сервера"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Помилка запису у файл"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Вибір провалився"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Час очікування з'єднання вийшов"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Помилка запису у вихідний файл"
 
@@ -1144,441 +1139,167 @@ msgstr "Цей HTTP сервер має поламану підтримку 'ran
 msgid "Unknown date format"
 msgstr "Невідомий формат дати"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Погана заголовкова інформація"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "З'єднання не вдалося"
 
-#: methods/server.cc:659
+#: 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:712
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
+#: apt-private/private-list.cc:121
+msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-"Внутрішня помилка, InstallPackages була викликана з непрацездатними "
-"пакунками!"
+#: 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-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Необхідно видалити пакунки, але видалення заборонене."
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Виправлення залежностей..."
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Внутрішня помилка, Ordering не завершилася"
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " невдача."
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr "Дивно... Розбіжність розмірів, напишіть на apt@packages.debian.org"
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Необхідно завантажити %sB/%sB архівів.\n"
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Необхідно завантажити %sB архівів.\n"
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+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
-#: apt-private/private-install.cc:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
-"Після цієї операції об'єм зайнятого дискового простору зросте на %sB.\n"
+"Для виправлення цих помилок ви можете скористатися 'apt-get -f install'."
 
-#. 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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
+#: 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 ""
-"Після цієї операції об'єм зайнятого дискового простору зменшиться на %sB.\n"
 
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Недостатньо вільного місця в %s."
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Встановлено]"
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Виявлено проблеми, а опція -y була використана без --force-yes"
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Встановлено]"
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
 msgstr ""
-"Вказано виконання тільки тривіальних операцій, але це не тривіальна операція."
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-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-install.cc:222
+#: apt-private/private-output.cc:277
 #, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
+msgid "[upgradable from: %s]"
 msgstr ""
-"Те, що ви хочете зробити, може мати небажані наслідки.\n"
-"Щоб продовжити, введіть фразу: '%s'\n"
-" ?] "
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Перервано."
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Бажаєте продовжити?"
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "але %s вже встановлений"
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Деякі файли не вдалося завантажити"
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "але %s буде встановлений"
 
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Неможливо завантажити деякі архіви, імовірно треба виконати apt-get update "
-"або спробувати повторити запуск з ключем --fix-missing?"
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "але він не може бути встановлений"
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing і зміна носія в даний момент не підтримується"
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "але це віртуальний пакунок"
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Неможливо виправити втрачені пакунки."
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "але він не встановлений"
 
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Переривається встановлення."
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "але він не буде встановлений"
 
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"Вказаний пакунок зник з вашої системи, так як\n"
-"усі файли були перезаписані іншими пакунками:"
-msgstr[1] ""
-"Вказані пакунки зникли з вашої системи, так як\n"
-"усі файли були перезаписані іншими пакунками:"
-msgstr[2] ""
-"Вказані пакунки зникли з вашої системи, так як\n"
-"усі файли були перезаписані іншими пакунками:"
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " чи"
 
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Увага: це зроблено автоматично і умисно dpkg'ем."
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Пакунки, що мають незадоволені залежності:"
 
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Нам не дозволено видаляти, неможливо запустити AutoRemover"
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "НОВІ пакунки, які будуть встановлені:"
 
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Хм, виглядає так, що AutoRemover помилково знищив щось потрібне.\n"
-"Будь-ласка відправте багрепорт щодо apt."
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Пакунки, які будуть ВИДАЛЕНІ:"
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Наступна інформація можливо допоможе Вам виправити ситуацію:"
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Пакунки, які залишені в незмінному стані:"
 
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Внутрішня Помилка, AutoRemover щось поламав"
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Пакунки, які будуть ОНОВЛЕНІ:"
 
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"Наступний пакунок був встановлений автоматично і більше не потрібен:"
-msgstr[1] "Наступні пакунки були встановлені автоматично і більше не потрібні:"
-msgstr[2] "Наступні пакунки були встановлені автоматично і більше не потрібні:"
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:"
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:"
+
+#: apt-private/private-output.cc:688
 #, c-format
-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 пакунок був встановлений автоматично і більше не потрібен.\n"
-msgstr[1] ""
-"%lu пакунка було встановлено автоматично і вони більше не потрібні.\n"
-msgstr[2] ""
-"%lu пакунків було встановлено автоматично і вони більше не потрібні.\n"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Використовуйте 'apt-get autoremove' щоб видалити його."
-msgstr[1] "Використовуйте 'apt-get autoremove' щоб видалити їх."
-msgstr[2] "Використовуйте 'apt-get autoremove' щоб видалити їх."
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-"Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f "
-"install':"
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не "
-"вказуючи назв пакунків (або вкажіть рішення)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Деякі пакунки неможливо встановити. Можливо, Ви просите неможливого,\n"
-"або ж використовуєте нестабільний дистрибутив, і запитані Вами пакунки\n"
-"ще не створені або були вилучені з Incoming."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Зламані пакунки"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Будуть встановлені наступні додаткові пакунки:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Пропоновані пакунки:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Рекомендовані пакунки:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Пропускається %s, пакунок вже встановлений і опція ОНОВИТИ не встановлена.\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Пропускається %s, пакунок не встановлений, а запитуються тільки оновлення.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Перевстановлення %s неможливе, бо він не може бути завантаженим.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "Вже встановлена найновіша версія %s.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Обрана версія '%s' (%s) для '%s'\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Обрана версія '%s' (%s) для '%s' через '%s'\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
-"Пакунок '%s' не встановлений, тому не видалений. Можливо ви мали на увазі "
-"'%s'?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Пакунок '%s' не встановлений, тому не видалений\n"
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Виправлення залежностей..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " невдача."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Неможливо скоригувати залежності"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Неможливо мінімізувати набір оновлень"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Виконано"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Для виправлення цих помилок ви можете скористатися 'apt-get -f install'."
-
-#: apt-private/private-cachefile.cc:111
-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) "
+msgid "%s (due to %s) "
+msgstr "%s (внаслідок %s) "
 
 #: apt-private/private-output.cc:696
 msgid ""
@@ -1639,7 +1360,7 @@ msgstr ""
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Помилка компіляції регулярного виразу - %s"
@@ -1648,7 +1369,7 @@ msgstr "Помилка компіляції регулярного виразу
 msgid "The update command takes no arguments"
 msgstr "Команді update не потрібні аргументи"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1657,10 +1378,14 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1686,76 +1411,357 @@ msgstr ""
 "       Також не забувайте, що блокування вимикається,\n"
 "       тому не очікуйте на відповідність поточній реальній ситуації!"
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
+"Внутрішня помилка, InstallPackages була викликана з непрацездатними "
+"пакунками!"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Автентифікаційне попередження не прийнято до уваги.\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Необхідно видалити пакунки, але видалення заборонене."
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "Деякі пакунки неможливо автентифікувати"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Внутрішня помилка, Ordering не завершилася"
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "Встановити ці пакунки без перевірки?"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr "Дивно... Розбіжність розмірів, напишіть на apt@packages.debian.org"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#. 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
+#: apt-private/private-install.cc:154
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Не вдалося завантажити %s  %s\n"
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Необхідно завантажити %sB/%sB архівів.\n"
 
-#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "Не вдалося перейменувати %s на %s"
+#. 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:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Необхідно завантажити %sB архівів.\n"
 
-#: apt-private/private-sources.cc:70
+#. 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:166
 #, c-format
-msgid "Your '%s' file changed, please run 'apt-get update'."
+msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
+"Після цієї операції об'єм зайнятого дискового простору зросте на %sB.\n"
 
-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
+#. 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 ""
+"Після цієї операції об'єм зайнятого дискового простору зменшиться на %sB.\n"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Обчислення оновлень"
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Виявлено проблеми, а опція -y була використана без --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 ""
+"Вказано виконання тільки тривіальних операцій, але це не тривіальна операція."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Так, робити, як я скажу!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Те, що ви хочете зробити, може мати небажані наслідки.\n"
+"Щоб продовжити, введіть фразу: '%s'\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Перервано."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Бажаєте продовжити?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Деякі файли не вдалося завантажити"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Неможливо завантажити деякі архіви, імовірно треба виконати apt-get update "
+"або спробувати повторити запуск з ключем --fix-missing?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing і зміна носія в даний момент не підтримується"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Неможливо виправити втрачені пакунки."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Переривається встановлення."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"Вказаний пакунок зник з вашої системи, так як\n"
+"усі файли були перезаписані іншими пакунками:"
+msgstr[1] ""
+"Вказані пакунки зникли з вашої системи, так як\n"
+"усі файли були перезаписані іншими пакунками:"
+msgstr[2] ""
+"Вказані пакунки зникли з вашої системи, так як\n"
+"усі файли були перезаписані іншими пакунками:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Увага: це зроблено автоматично і умисно dpkg'ем."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Нам не дозволено видаляти, неможливо запустити 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 ""
+"Хм, виглядає так, що AutoRemover помилково знищив щось потрібне.\n"
+"Будь-ласка відправте багрепорт щодо apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Наступна інформація можливо допоможе Вам виправити ситуацію:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Внутрішня Помилка, AutoRemover щось поламав"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"Наступний пакунок був встановлений автоматично і більше не потрібен:"
+msgstr[1] "Наступні пакунки були встановлені автоматично і більше не потрібні:"
+msgstr[2] "Наступні пакунки були встановлені автоматично і більше не потрібні:"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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 пакунок був встановлений автоматично і більше не потрібен.\n"
+msgstr[1] ""
+"%lu пакунка було встановлено автоматично і вони більше не потрібні.\n"
+msgstr[2] ""
+"%lu пакунків було встановлено автоматично і вони більше не потрібні.\n"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "Використовуйте 'apt-get autoremove' щоб видалити його."
+msgstr[1] "Використовуйте 'apt-get autoremove' щоб видалити їх."
+msgstr[2] "Використовуйте 'apt-get autoremove' щоб видалити їх."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr ""
+"Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f "
+"install':"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не "
+"вказуючи назв пакунків (або вкажіть рішення)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Деякі пакунки неможливо встановити. Можливо, Ви просите неможливого,\n"
+"або ж використовуєте нестабільний дистрибутив, і запитані Вами пакунки\n"
+"ще не створені або були вилучені з Incoming."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Зламані пакунки"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Будуть встановлені наступні додаткові пакунки:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Пропоновані пакунки:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Рекомендовані пакунки:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+"Пропускається %s, пакунок вже встановлений і опція ОНОВИТИ не встановлена.\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Пропускається %s, пакунок не встановлений, а запитуються тільки оновлення.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Перевстановлення %s неможливе, бо він не може бути завантаженим.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "Вже встановлена найновіша версія %s.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Обрана версія '%s' (%s) для '%s'\n"
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Обрана версія '%s' (%s) для '%s' через '%s'\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+"Пакунок '%s' не встановлений, тому не видалений. Можливо ви мали на увазі "
+"'%s'?\n"
+
+#: apt-private/private-install.cc:945
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Пакунок '%s' не встановлений, тому не видалений\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "Автентифікаційне попередження не прийнято до уваги.\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Деякі пакунки неможливо автентифікувати"
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Встановити ці пакунки без перевірки?"
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Не вдалося завантажити %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 "Не вдалося визначити кількість вільного місця в %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Недостатньо вільного місця в %s."
+
+#: apt-private/private-sources.cc:58
+#, fuzzy, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "Не вдалося перейменувати %s на %s"
+
+#: apt-private/private-sources.cc:70
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""
 
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Виконано"
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "В кеші "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Отр:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Ігн "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Пом "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Отримано %sB за %sB (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Йде робота]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1768,18 +1774,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1856,209 +1862,465 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Об'єднання доступної інформації"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode було викликано для вузла, що ще використовувався"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Не вдалося знайти елемент хеша!"
-
-#: apt-inst/filelist.cc:459
-#, fuzzy
-msgid "Failed to allocate diversion"
-msgstr "Не вдалося створити diversion"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Внутрішня помилка в AddDiversion"
-
-#: apt-inst/filelist.cc:477
-#, fuzzy, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Спроба перезапису diversion, %s -> %s і %s/%s"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Використання: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates витягує з пакунків Debian конфігураційні скрипти\n"
+"і файли-шаблони\n"
+"\n"
+"Опції:\n"
+"  -h   Цей текст\n"
+"  -t   Встановити директорію для тимчасових файлів\n"
+"  -c=? Читати зазначений конфігураційний файл\n"
+"  -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:506
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
 #, fuzzy, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Подвійне додавання diversion %s -> %s"
+msgid "Unable to mkstemp %s"
+msgstr "Неможливо прочитати атрибути %s"
 
-#: apt-inst/filelist.cc:549
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Копія конфігураційного файлу %s/%s"
+msgid "Unable to write to %s"
+msgstr "Неможливо записати в %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Неможливо визначити версію debconf. Він встановлений?"
+
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "Список розширень, припустимих для пакунків, занадто довгий"
+
+#: 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 "The path %s is too long"
-msgstr "Шлях %s занадто довгий"
+msgid "Error processing directory %s"
+msgstr "Помилка обробки директорії %s"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr ""
+"Список розширень, припустимих для пакунків з вихідними текстами, занадто "
+"довгий"
+
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "Помилка запису заголовка в повний перелік вмісту пакунків (Contents)"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Розпакування %s більш ніж один раз"
+msgid "Error processing contents %s"
+msgstr "Помилка обробки повного переліку вмісту пакунків (Contents) %s"
 
-#: apt-inst/extract.cc:142
-#, fuzzy, c-format
-msgid "The directory %s is diverted"
-msgstr "Директорія %s є відхиленою (diverted)"
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Використання: apt-ftparchive [параметри] команда\n"
+"Команди:  packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive генерує індексні файли архівів Debian. Він підтримує\n"
+"безліч стилів генерації: від повністю автоматичного до функціональної "
+"заміни\n"
+"програм dpkg-scanpackages і dpkg-scansources\n"
+"\n"
+"apt-ftparchive генерує файли Package (переліки пакунків) для дерева\n"
+"тек, що містять файли .deb. Файл Package містить у собі керуючі\n"
+"поля кожного пакунка, а також хеш MD5 і розмір файлу. Значення керуючих\n"
+"полів \"пріоритет\" (Priority) і \"секція\" (Section) можуть бути змінені з\n"
+"допомогою файлу override.\n"
+"\n"
+"Крім того, apt-ftparchive може генерувати файли Sources з дерева\n"
+"тек, що містять файли .dsc. Для вказівки файлу override у цьому \n"
+"режимі можна використати параметр --source-override.\n"
+"\n"
+"Команди 'packages' і 'sources' треба виконувати, перебуваючи в кореневій "
+"теці\n"
+"дерева, що ви хочете обробити. BinaryPath повинен вказувати на місце,\n"
+"з якого починається рекурсивний обхід, а файл перепризначень (override)\n"
+"повинен містити запис про перепризначення керуючих полів. Якщо був "
+"зазначений\n"
+"Pathprefix, то його значення додається до керуючих полів, що містять\n"
+"імена файлів. Приклад використання для архіву Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Параметри:\n"
+"  -h    Цей текст\n"
+"  --md5 Керування генерацією MD5-хешів\n"
+"  -s=?  Вказати файл перепризначень (override) для пакунків з вихідними "
+"текстами\n"
+"  -q    Не виводити повідомлення в процесі роботи\n"
+"  -d=?  Вказати кешуючу базу даних (не обов'язково)\n"
+"  --no-delink Включити режим налагодження процесу видалення файлів\n"
+"  --contents  Керування генерацією повного переліку вмісту пакунків\n"
+"              (файлу Contents)\n"
+"  -c=?  Використати зазначений конфігураційний файл\n"
+"  -o=?  Вказати довільний параметр конфігурації"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "Збігів не виявлено"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Пакунок пробує записати у ціль з diversion %s/%s"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "У групі пакунків '%s' відсутні деякі файли"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-#, fuzzy
-msgid "The diversion path is too long"
-msgstr "Шлях 'diversion' є занадто довгим"
+#: ftparchive/cachedb.cc:67
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "БД була пошкоджена, файл перейменований на %s.old"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "БД застаріла, намагаюсь оновити %s"
+
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Невірний формат БД. Якщо ви оновилися зі старої версії apt, будь-ласка "
+"видаліть і наново створіть базу-даних."
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Не вдалося відкрити файл БД %s: %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Не вдалося одержати атрибути %s"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Не вдалося прочитати посилання (readlink) %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "В архіві немає запису 'control'"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Неможливо одержати курсор"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Не вдалося перейменувати %s на %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "У: Не вдалося прочитати директорію %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Директорія %s замінюється не директорією"
+msgid "W: Unable to stat %s\n"
+msgstr "У: Неможливо прочитати атрибути %s\n"
 
-#: apt-inst/extract.cc:289
-#, fuzzy
-msgid "Failed to locate node in its hash bucket"
-msgstr "Не вдалося знайти вузол у його наборі хешів"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "П: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Шлях занадто довгий"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "У: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "П: Помилки відносяться до файлу "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Перезаписати відповідність пакунка без версії для %s"
+msgid "Failed to resolve %s"
+msgstr "Не вдалося визначити %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Не вдалося зробити обхід дерева"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Файл %s/%s перезаписує інший файл в пакунку %s"
+msgid "Failed to open %s"
+msgstr "Не вдалося відкрити %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Неможливо прочитати атрибути %s"
+msgid " DeLink %s [%s]\n"
+msgstr "DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Не вдалося записати файл %s"
+msgid "Failed to readlink %s"
+msgstr "Не вдалося прочитати посилання (readlink) %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Не вдалося закрити файл %s"
+msgid "Failed to unlink %s"
+msgstr "Не вдалося видалити посилання (unlink) %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Невірний DEB архів, відсутній член '%s'"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Не вдалося створити посилання %s на %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Внутрішня помилка, не можу знайти складову частину %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Перевищено ліміт в %sB в DeLink.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Контрольний файл не можливо обробити"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Архів не мав поля 'package'"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Невірний підпис архіву"
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
+#, fuzzy, c-format
+msgid "  %s has no override entry\n"
+msgstr "  Відсутній запис про перепризначення (override) для %s\n"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Неможливо прочитати заголовок 'member' в архіві"
+#: 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:712
+#, fuzzy, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  Відсутній запис про перепризначення вихідних текстів для %s\n"
+
+#: ftparchive/writer.cc:716
+#, fuzzy, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  Крім того, відсутній запис про бінарне перепризначення для %s\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Не вдалося виділити пам'ять"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Не вдалося відкрити %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Не вдалося прочитати файл перепризначень (override) %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Невідомий алгоритм стиснення '%s'"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Для отримання стиснутого виводу %s необхідно ввімкнути стиснення"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Не вдалося створити FILE*"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Не вдалося породити процес (fork)"
 
-#: apt-inst/contrib/arfile.cc:96
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Невірний заголовок 'member' %s в архіві"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Процес-нащадок, що виконує пакування"
 
-#: apt-inst/contrib/arfile.cc:108
-#, fuzzy
-msgid "Invalid archive member header"
-msgstr "Невірний заголовок 'member' в архіві"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Внутрішня помилка, не вдалося створити %s"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Архів занадто малий"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Помилка уведення/виводу в підпроцес/файл"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Не вдалося прочитати заголовки в архіві"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Помилка зчитування під час обчислення MD5"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Не вдалося створити канали (pipes)"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Не вдалося видалити %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Не вдалося виконати gzip "
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Не вдалося перейменувати %s на %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Пошкоджений архів"
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Використання: apt-internal-solver\n"
+"\n"
+"apt-internal-solver це інтерфейс для використання поточного\n"
+"внутрішнього розв'язувача (як зовнішнього) для АРТ програм\n"
+"для дебагу чи інших цілей\n"
+"\n"
+"Опції:\n"
+"  -h     Цей текст допомоги.\n"
+"  -q     Виводити повідомлення, придатні для запису у файл журналу.\n"
+"          Не виводити індикатор прогресу\n"
+"  -c=? Читати зазначений конфігураційний файл\n"
+"  -o=? Вказати умовну опцію, наприклад, -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Контрольна сума tar архіва невірна, архів пошкоджений"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Невідомий запис про пакунок!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Невідомий тип заголовку TAR - %u, член %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Використання: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs - простий інструмент для сортування переліків пакунків. Опція -"
+"s\n"
+"використається, щоб вказати тип списку.\n"
+"\n"
+"Опції:\n"
+"  -h   цей текст\n"
+"  -s   сортувати список файлів з вихідними текстами\n"
+"  -c=? читати зазначений файл конфігурації\n"
+"  -o=? встановити довільну опцію, наприклад, -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "Виконується dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Система пакування '%s' не підтримується"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Неможливо визначити тип необхідної системи пакування"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Записано %i записів.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Записано %i записів з %i відсутніми файлами.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Записано %i записів з %i невідповідними файлам\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 записів з %i відсутніми і %i невідповідними файлами\n"
@@ -2073,6 +2335,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 "Не можу обробити чи відкрити перелік пакунків чи статусний файл."
@@ -2085,158 +2368,339 @@ msgstr "Для виправлення цих помилок Ви можете в
 msgid "The list of sources could not be read."
 msgstr "Неможливо прочитати перелік вихідних кодів."
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Кеш пакунків пустий"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr "Файл кешу пакунків пошкоджений"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr "Файл кешу пакунків має несумісну версію"
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168
 msgid "The package cache file is corrupted, it is too small"
 msgstr "Файл кешу пакунків пошкоджений, занадто малий"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Цей APT не підтримує систему призначення версій '%s'"
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Залежності (Depends)"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Пре-Залежності (PreDepends)"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Пропонує (Suggests)"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Рекомендує (Recommends)"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Конфлікти (Conflicts)"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Заміняє (Replaces)"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Застарілі (Obsoletes)"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Ламає (Breaks)"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Покращує (Enhances)"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "важливі (important)"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "необхідні (required)"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "стандартні (standard)"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "необов'язкові (optional)"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "додаткові (extra)"
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Обчислення оновлень"
+
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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/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/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/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/pkgrecords.cc:38
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Тип '%s' індексного файлу не підтримується"
+msgid "Couldn't stat source package list %s"
+msgstr "Не вдалося прочитати атрибути переліку вихідних текстів %s"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Версії кандидатів"
+#: apt-pkg/pkgcachegen.cc:1301
+#, fuzzy
+msgid "Collecting File Provides"
+msgstr "Збирання інформації про 'File Provides'"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Ґенерація залежностей"
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Помилка IO під час збереження кешу вихідних текстів"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Зчитування інформації про стан"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+#, fuzzy
+msgid "Send scenario to solver"
+msgstr "Відправити сценарій розв'язувачу"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Не вдалося відкрити StateFile %s"
+#: apt-pkg/edsp.cc:244
+#, fuzzy
+msgid "Send request to solver"
+msgstr "Відправити запит розв'язувачу"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Не вдалося записати до тимчасового StateFile файла %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Невідповідність хешу MD5Sum"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Невідповідність розміру"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Невірна дія %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Помилка запису"
+
+#: apt-pkg/acquire-item.cc:259
+#, fuzzy
+msgid "Does not start with a cleartext signature"
+msgstr "Файл %s починається з не 'clearsigned' повідомленням"
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Виникла помилка під час перевірки підпису. Репозиторій не оновлено, "
+"попередні індексні файли будуть використані. Помилка GPG: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Помилка GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Директорія %s є відхиленою (diverted)"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2245,16 +2709,16 @@ msgstr ""
 "Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у "
 "sources.list, або пошкоджений файл)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2263,27 +2727,19 @@ msgstr ""
 "Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього "
 "репозиторія не будуть застосовані."
 
-#: apt-pkg/acquire-item.cc:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Виникла помилка під час перевірки підпису. Репозиторій не оновлено, "
-"попередні індексні файли будуть використані. Помилка GPG: %s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Помилка GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2292,132 +2748,50 @@ msgstr ""
 "Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно "
 "власноруч виправити цей пакунок. (через відсутність 'arch')"
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Виникла помилка під час обробки %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Ого! Ви перевищили кількість імен пакунків, які APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Ого! Ви перевищили кількість версій, які APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Ого! Ви перевищили кількість описів, які APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Ого! Ви перевищили кількість залежностей, які APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Пакунок %s %s не був знайдений під час обробки залежностей"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Не вдалося прочитати атрибути переліку вихідних текстів %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Зчитування переліків пакунків"
-
-#: apt-pkg/pkgcachegen.cc:1316
-#, fuzzy
-msgid "Collecting File Provides"
-msgstr "Збирання інформації про 'File Provides'"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Неможливо записати в %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Відсутня директорія для архівів: %spartial"
 
-#: apt-pkg/acquire.cc:99
+#: 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:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Завантажується файл %li з %li (залишилось %s)"
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Додайте деякі посилання (URI) на вихідні тексти у ваш sources.list"
@@ -2445,7 +2819,7 @@ msgstr "Не зрозумів тип %s для фіксатора пакункі
 msgid "No priority (or zero) specified for pin"
 msgstr "Не встановлено пріоритету (або стоїть 0) для фіксатора пакунків (pin)"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2454,12 +2828,12 @@ msgstr ""
 "Неможливо прямо налаштувати конфігурацію на '%s'. Будь-ласка, дивіться man 5 "
 "apt.conf, нижче APT::Immediate-Configure для деталей. (%d)"
 
-#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "Неможливо налаштувати '%s'."
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2471,10 +2845,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"
@@ -2545,11 +2922,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"
 
@@ -2560,7 +2937,7 @@ msgid ""
 msgstr ""
 "Пакунок %s повинен бути перевстановленим, але я не можу знайти його архів."
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2568,345 +2945,268 @@ msgstr ""
 "Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути "
 "пов'язано з зафіксованими пакунками."
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-#, fuzzy
-msgid "Send request to solver"
-msgstr "Відправити запит розв'язувачу"
-
-#: apt-pkg/edsp.cc:320
-#, fuzzy
-msgid "Prepare for receiving solution"
-msgstr "Пригодуватися до отримання розв'язку"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про "
-"помилку"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-#, fuzzy
-msgid "Execute external solver"
-msgstr "Виконати зовнішній розв'язувач"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Неможливо проаналізувати файл пакунку %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Неможливо проаналізувати 'Release' файл %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Немає секцій у 'Release' файлі %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Немає запису 'Hash' у 'Release' файлі %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Невірний запис 'Valid-Until' у 'Release' файлі %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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 (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 "Спотворений рядок %lu у переліку джерел %s (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 "Спотворений рядок %u у переліку джерел %s (тип)"
+msgid "Failed to open StateFile %s"
+msgstr "Не вдалося відкрити 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 "Невідомий тип '%s' на рядку %u в переліку джерел %s"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Не вдалося записати до тимчасового StateFile файла %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/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "Неможливо проаналізувати файл пакунку %s (%d)"
 
-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Випуск '%s' для '%s' не знайдено"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Версія '%s' для '%s' не знайдена"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Неможливо знайти завдання '%s'"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/cacheset.cc:635
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/cacheset.cc:641
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
 
-#: apt-pkg/cacheset.cc:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Неможливо вибрати встановлений пакунок, або версію-кандидат пакунку '%s', "
-"так як вони відсутні"
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Немає запису 'Hash' у 'Release' файлі %s"
+
+#: apt-pkg/indexrecords.cc:145
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Невірний запис 'Valid-Until' у 'Release' файлі %s"
+
+#: apt-pkg/indexrecords.cc:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Невірний запис 'Date' у 'Release' файлі %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%liхв %liс"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%liс"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "Вибір %s не знайдено"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Блокування не використовується, так як файл блокування %s доступний тільки "
 "для зчитування"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Неможливо відкрити 'lock' файл %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Блокування не використовується, так як файл блокування %s знаходиться на "
 "файловій системі nfs"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Неможливо отримати замок %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 "Неможливо створити перелік файлів, так як '%s' не є директорією"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Ігнорується '%s' у директорії '%s', так як не є звичайним файлом"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "Ігнорується файл '%s' у директорії '%s', так як він не має розширення"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 "Ігнорується файл '%s' у директорії '%s', так як він має невірне розширення"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Підпроцес %s отримав 'segmentation fault' (фатальна помилка)."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Підпроцес %s отримав сигнал %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Підпроцес %s повернув код помилки (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Підпроцес %s раптово завершився"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Проблема з закриттям gzip файла %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Неможливо відкрити файл %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Неможливо відкрити файловий дескриптор %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Не вдалося створити IPC з породженим процесом"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Не вдалося виконати компресор "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "зчитування, повинен зчитати ще %llu байт, але нічого більше нема"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "записування, повинен був записати ще %llu байт, але не вдалося"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Проблема з закриттям файла %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Проблема з перейменуванням файла %s на %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Проблема з роз'єднанням файла %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Проблема з синхронізацією файла"
 
@@ -2994,114 +3294,108 @@ msgstr "Неможливо прочитати атрибути точки мон
 msgid "Failed to stat the cdrom"
 msgstr "Не вдалося прочитати атрибути cdrom"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Нерозпізнаваний тип абревіатури: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Відкривається конфігураційний файл %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Синтаксична помилка %s:%u: спотворений тег"
 
-#: apt-pkg/contrib/configuration.cc:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Синтаксична помилка %s:%u: Зайве сміття в кінці файла"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Не встановлено 'keyring' у %s."
-
-#: 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"
@@ -3111,12 +3405,12 @@ msgstr "Невірна дія %s"
 msgid "Installing %s"
 msgstr "Встановлюється %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Видаляється %s"
@@ -3137,81 +3431,81 @@ msgid "Running post-installation trigger %s"
 msgstr "Виконується післяустановочний ініціатор %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Директорія '%s' відсутня"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Підготовка %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Розпакування %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Підготовка до конфігурації %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "Встановлено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Підготовка до видалення %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "Видалено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Підготовка до повного видалення %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "Повністю видалено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr "Операцію було перервано до того, як вона мала завершитися"
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "проблеми з залежностями - залишено неналаштованим"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3219,7 +3513,7 @@ msgstr ""
 "Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, "
 "що ця помилка є наслідком попередньої невдачі."
 
-#: apt-pkg/deb/dpkgpm.cc:1745
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3227,7 +3521,7 @@ msgstr ""
 "Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
 "відсутність вільного місця на диску"
 
-#: apt-pkg/deb/dpkgpm.cc:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3235,7 +3529,7 @@ msgstr ""
 "Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
 "відсутність вільного місця у пам'яті"
 
-#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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 "
@@ -3244,7 +3538,7 @@ msgstr ""
 "Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
 "відсутність вільного місця на диску"
 
-#: apt-pkg/deb/dpkgpm.cc:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3279,413 +3573,176 @@ msgstr ""
 msgid "Not locked"
 msgstr "Не заблоковано"
 
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Використання: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates витягує з пакунків Debian конфігураційні скрипти\n"
-"і файли-шаблони\n"
-"\n"
-"Опції:\n"
-"  -h   Цей текст\n"
-"  -t   Встановити директорію для тимчасових файлів\n"
-"  -c=? Читати зазначений конфігураційний файл\n"
-"  -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Неможливо прочитати атрибути %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Неможливо визначити версію debconf. Він встановлений?"
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Помилка обробки директорії %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr ""
-"Список розширень, припустимих для пакунків з вихідними текстами, занадто "
-"довгий"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Помилка запису заголовка в повний перелік вмісту пакунків (Contents)"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Помилка обробки повного переліку вмісту пакунків (Contents) %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Використання: apt-ftparchive [параметри] команда\n"
-"Команди:  packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive генерує індексні файли архівів Debian. Він підтримує\n"
-"безліч стилів генерації: від повністю автоматичного до функціональної "
-"заміни\n"
-"програм dpkg-scanpackages і dpkg-scansources\n"
-"\n"
-"apt-ftparchive генерує файли Package (переліки пакунків) для дерева\n"
-"тек, що містять файли .deb. Файл Package містить у собі керуючі\n"
-"поля кожного пакунка, а також хеш MD5 і розмір файлу. Значення керуючих\n"
-"полів \"пріоритет\" (Priority) і \"секція\" (Section) можуть бути змінені з\n"
-"допомогою файлу override.\n"
-"\n"
-"Крім того, apt-ftparchive може генерувати файли Sources з дерева\n"
-"тек, що містять файли .dsc. Для вказівки файлу override у цьому \n"
-"режимі можна використати параметр --source-override.\n"
-"\n"
-"Команди 'packages' і 'sources' треба виконувати, перебуваючи в кореневій "
-"теці\n"
-"дерева, що ви хочете обробити. BinaryPath повинен вказувати на місце,\n"
-"з якого починається рекурсивний обхід, а файл перепризначень (override)\n"
-"повинен містити запис про перепризначення керуючих полів. Якщо був "
-"зазначений\n"
-"Pathprefix, то його значення додається до керуючих полів, що містять\n"
-"імена файлів. Приклад використання для архіву Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Параметри:\n"
-"  -h    Цей текст\n"
-"  --md5 Керування генерацією MD5-хешів\n"
-"  -s=?  Вказати файл перепризначень (override) для пакунків з вихідними "
-"текстами\n"
-"  -q    Не виводити повідомлення в процесі роботи\n"
-"  -d=?  Вказати кешуючу базу даних (не обов'язково)\n"
-"  --no-delink Включити режим налагодження процесу видалення файлів\n"
-"  --contents  Керування генерацією повного переліку вмісту пакунків\n"
-"              (файлу Contents)\n"
-"  -c=?  Використати зазначений конфігураційний файл\n"
-"  -o=?  Вказати довільний параметр конфігурації"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "Збігів не виявлено"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "У групі пакунків '%s' відсутні деякі файли"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "БД була пошкоджена, файл перейменований на %s.old"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode було викликано для вузла, що ще використовувався"
 
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "БД застаріла, намагаюсь оновити %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Не вдалося знайти елемент хеша!"
 
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Невірний формат БД. Якщо ви оновилися зі старої версії apt, будь-ласка "
-"видаліть і наново створіть базу-даних."
+#: apt-inst/filelist.cc:459
+#, fuzzy
+msgid "Failed to allocate diversion"
+msgstr "Не вдалося створити diversion"
 
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Не вдалося відкрити файл БД %s: %s"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Внутрішня помилка в AddDiversion"
 
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Не вдалося прочитати посилання (readlink) %s"
+#: apt-inst/filelist.cc:477
+#, fuzzy, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Спроба перезапису diversion, %s -> %s і %s/%s"
 
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "В архіві немає запису 'control'"
+#: apt-inst/filelist.cc:506
+#, fuzzy, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Подвійне додавання diversion %s -> %s"
 
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Неможливо одержати курсор"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Копія конфігураційного файлу %s/%s"
 
-#: ftparchive/writer.cc:91
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "У: Не вдалося прочитати директорію %s\n"
+msgid "The path %s is too long"
+msgstr "Шлях %s занадто довгий"
 
-#: ftparchive/writer.cc:96
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "У: Неможливо прочитати атрибути %s\n"
+msgid "Unpacking %s more than once"
+msgstr "Розпакування %s більш ніж один раз"
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "П: "
+#: apt-inst/extract.cc:142
+#, fuzzy, c-format
+msgid "The directory %s is diverted"
+msgstr "Директорія %s є відхиленою (diverted)"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "У: "
+#: apt-inst/extract.cc:152
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Пакунок пробує записати у ціль з diversion %s/%s"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "П: Помилки відносяться до файлу "
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+#, fuzzy
+msgid "The diversion path is too long"
+msgstr "Шлях 'diversion' є занадто довгим"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "Failed to resolve %s"
-msgstr "Не вдалося визначити %s"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Директорія %s замінюється не директорією"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Не вдалося зробити обхід дерева"
+#: apt-inst/extract.cc:289
+#, fuzzy
+msgid "Failed to locate node in its hash bucket"
+msgstr "Не вдалося знайти вузол у його наборі хешів"
 
-#: ftparchive/writer.cc:219
-#, c-format
-msgid "Failed to open %s"
-msgstr "Не вдалося відкрити %s"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Шлях занадто довгий"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/extract.cc:421
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr "DeLink %s [%s]\n"
+msgid "Overwrite package match with no version for %s"
+msgstr "Перезаписати відповідність пакунка без версії для %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Не вдалося прочитати посилання (readlink) %s"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Файл %s/%s перезаписує інший файл в пакунку %s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Не вдалося видалити посилання (unlink) %s"
+msgid "Unable to stat %s"
+msgstr "Неможливо прочитати атрибути %s"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Не вдалося створити посилання %s на %s"
+msgid "Failed to write file %s"
+msgstr "Не вдалося записати файл %s"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Перевищено ліміт в %sB в DeLink.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Архів не мав поля 'package'"
-
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
-#, fuzzy, c-format
-msgid "  %s has no override entry\n"
-msgstr "  Відсутній запис про перепризначення (override) для %s\n"
+msgid "Failed to close file %s"
+msgstr "Не вдалося закрити файл %s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  пакунок %s супроводжується %s, а не %s\n"
-
-#: ftparchive/writer.cc:698
-#, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  Відсутній запис про перепризначення вихідних текстів для %s\n"
-
-#: ftparchive/writer.cc:702
-#, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  Крім того, відсутній запис про бінарне перепризначення для %s\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Не вдалося виділити пам'ять"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Невірний DEB архів, відсутній член '%s'"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Unable to open %s"
-msgstr "Не вдалося відкрити %s"
-
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1"
+msgid "Internal error, could not locate member %s"
+msgstr "Внутрішня помилка, не можу знайти складову частину %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Не вдалося прочитати файл перепризначень (override) %s"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Контрольний файл не можливо обробити"
 
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Невірний підпис архіву"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #2"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Неможливо прочитати заголовок 'member' в архіві"
 
-#: ftparchive/override.cc:191
+#: apt-inst/contrib/arfile.cc:96
 #, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #3"
-
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Невідомий алгоритм стиснення '%s'"
+msgid "Invalid archive member header %s"
+msgstr "Невірний заголовок 'member' %s в архіві"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Для отримання стиснутого виводу %s необхідно ввімкнути стиснення"
+#: apt-inst/contrib/arfile.cc:108
+#, fuzzy
+msgid "Invalid archive member header"
+msgstr "Невірний заголовок 'member' в архіві"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Не вдалося створити FILE*"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Архів занадто малий"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Не вдалося породити процес (fork)"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Не вдалося прочитати заголовки в архіві"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Процес-нащадок, що виконує пакування"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Не вдалося створити канали (pipes)"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Внутрішня помилка, не вдалося створити %s"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Не вдалося виконати gzip "
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Помилка уведення/виводу в підпроцес/файл"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Пошкоджений архів"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Помилка зчитування під час обчислення MD5"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Контрольна сума tar архіва невірна, архів пошкоджений"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Не вдалося видалити %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Невідомий тип заголовку TAR - %u, член %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Використання: apt-internal-solver\n"
-"\n"
-"apt-internal-solver це інтерфейс для використання поточного\n"
-"внутрішнього розв'язувача (як зовнішнього) для АРТ програм\n"
-"для дебагу чи інших цілей\n"
-"\n"
-"Опції:\n"
-"  -h     Цей текст допомоги.\n"
-"  -q     Виводити повідомлення, придатні для запису у файл журналу.\n"
-"          Не виводити індикатор прогресу\n"
-"  -c=? Читати зазначений конфігураційний файл\n"
-"  -o=? Вказати умовну опцію, наприклад, -o dir::cache=/tmp\n"
+#, fuzzy
+#~ msgid "Total dependency version space: "
+#~ msgstr "Всього інформації про залежності: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Невідомий запис про пакунок!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Недостатньо місця в %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Використання: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs - простий інструмент для сортування переліків пакунків. Опція -"
-"s\n"
-"використається, щоб вказати тип списку.\n"
-"\n"
-"Опції:\n"
-"  -h   цей текст\n"
-"  -s   сортувати список файлів з вихідними текстами\n"
-"  -c=? читати зазначений файл конфігурації\n"
-"  -o=? встановити довільну опцію, наприклад, -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "Виконано"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Не встановлено 'keyring' у %s."
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
@@ -3775,9 +3832,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Неможливо записати в лог, проблема з openpty() (не змонтовано /dev/pts?)\n"
 
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Файл %s починається з не 'clearsigned' повідомленням"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Пропускається неіснуючий файл %s"
 
diff --git a/po/vi.po b/po/vi.po
index fb80076f9..089d8461a 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: 2015-01-16 04:37-0500\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,150 +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:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Tổng các tên gói: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "Tổng các cấu trúc gói: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Gói thường: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Gói thuần ảo: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Gói ảo đơn: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Gói ảo hỗn hợp: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Thiếu: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Tổng phiên bản riêng: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "Tổng mô tả riêng: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Tổng gói phụ thuộc: "
 
-#: cmdline/apt-cache.cc:332
+#: 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:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "Tổng quan hệ mô-tả/tập-tin: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Tổng ánh xạ Cung cấp: "
 
-#: cmdline/apt-cache.cc:348
+#: 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:362
-msgid "Total dependency version space: "
-msgstr "Tổng chỗ phiên bản phụ thuộc: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Tổng chỗ trống: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Tổng chỗ đã tính dành cho: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: 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:1516 apt-pkg/cacheset.cc:596
+#: 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:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Tập tin gói:"
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Các gói đã ghim:"
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(không tìm thấy)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Đã cài đặt: "
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Ứng cử: "
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(không)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Ghim gói: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Bảng phiên bản:"
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -244,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"
@@ -270,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."
 
@@ -308,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:245
+#: 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:327
+#: 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:330
+#: 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:367
+#: 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:423
+#: 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:454
+#: 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:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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."
@@ -357,24 +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:538 cmdline/apt-get.cc:546
+#: 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:574 cmdline/apt-get.cc:611
+#: 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:726
+#: 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:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -384,7 +380,7 @@ msgstr ""
 "“%s” tại:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -395,79 +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:839
+#: 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"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Không thể tìm được chỗ trống trong %s"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Không đủ chỗ trống trên %s"
-
 #. 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:895
+#: 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:900
+#: 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:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Lấy mã nguồn %s\n"
 
-#: cmdline/apt-get.cc:924
+#: 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:929 apt-private/private-install.cc:314
+#: 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:954
+#: 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:967
+#: 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:968
+#: 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:996
+#: 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:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Tiến trình con bị lỗi"
 
-#: cmdline/apt-get.cc:1034
+#: 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:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -476,17 +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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: 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: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:1106
+#: 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:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: 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:1362
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -528,30 +523,30 @@ 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:1385
+#: 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:1400
+#: 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:1405
+#: 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"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog cho %s (%s)"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Hỗ trợ các mô-đun:"
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -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:73 cmdline/apt-helper.cc:77
+#: 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:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -681,55 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -851,12 +846,12 @@ msgstr "Không tìm thấy đĩa."
 msgid "File not found"
 msgstr "Không tìm thấy tập tin"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Gặp lỗi khi lấy thống kê"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Gặp lỗi khi đặt giờ sửa đổi"
 
@@ -865,34 +860,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Địa chỉ URI không hợp lệ, URI nội bộ không thể bắt đầu bằng “//”"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Đang đăng nhập vào"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Không thể quyết định tên ngang hàng"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Không thể phân giải tên cục bộ"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Máy phục vụ đã từ chối kết nối, và đã nói: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Lệnh USER (người dùng) đã thất bại: máy chủ nói: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Lệnh PASS (mật khẩu) đã thất bại: máy chủ nói: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -900,123 +895,123 @@ msgstr ""
 "Đã ghi rõ máy phục vụ ủy nhiệm, nhưng mà chưa ghi rõ tập lệnh đăng nhập. "
 "“Acquire::ftp::ProxyLogin” là rỗng."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Văn lệnh đăng nhập “%s” đã thất bại: máy chủ nói: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Lệnh TYPE (kiểu) đã thất bại: máy chủ nói: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Thời hạn kết nối"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Máy phục vụ đã đóng kết nối"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Lỗi đọc"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Một trả lời đã tràn bộ đệm."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Giao thức bị hỏng"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "Lỗi ghi"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Không thể tạo ổ cắm"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Không thể kết nối ổ cắm dữ liệu, kết nối đã quá giờ"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Gặp lỗi"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Không thể kết nối ổ cắm bị động."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo (lấy thông tin địa chỉ) không thể lấy ổ cắm lắng nghe"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Không thể ràng buộc ổ cắm"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Không thể lắng nghe trên ổ cắm đó"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Không thể quyết định tên ổ cắm đó"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Không thể gửi lệnh PORT (cổng)"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Không biết họ địa chỉ %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Lệnh EPRT (thông báo lỗi) đã thất bại: máy chủ nói: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Quá giờ kết nối ổ cắm dữ liệu"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Không thể chấp nhận kết nối"
 
-#: methods/ftp.cc:877 methods/server.cc:357 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"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Không thể lấy tập tin: máy phục vụ nói “%s”"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Ổ cắm dữ liệu đã quá giờ"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Việc truyền dữ liệu bị lỗi: máy phục vụ nói “%s”"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Truy vấn"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Không thể gọi "
 
@@ -1082,22 +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:168
+#: 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:172
+#: 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:174
+#: 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?)"
+"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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1106,50 +1102,50 @@ 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:184
+#: 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:217 methods/gpgv.cc:224
+#: 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:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 "Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn có:\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 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:513
+#: 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:527
+#: 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:529
+#: 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:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Gặp lỗi khi ghi vào tập tin"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Việc chọn bị lỗi"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Kết nối đã quá giờ"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Gặp lỗi khi ghi vào tập tin đầu ra"
 
@@ -1185,318 +1181,61 @@ msgstr "Máy phục vụ HTTP không hỗ trợ tải một phần tập tin"
 msgid "Unknown date format"
 msgstr "Không rõ định dạng ngày"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Dữ liệu phần đầu sai"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Kết nối bị lỗi"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "Gặp lỗi nội bộ"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr "Đang sắp xếp"
-
-#: apt-private/private-install.cc:82
-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!"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-"Cần phải gỡ bỏ một số gói, nhưng mà tính năng Gỡ bỏ (Remove) đã bị tắt."
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "Gặp lỗi nội bộ: Tiến trình Sắp xếp chưa xong"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Lạ nhỉ... Kích cỡ không khớp nhau. Hãy gửi thư cho <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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Cần phải lấy %sB/%sB từ kho chứa.\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:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Cần phải lấy %sB từ kho chứa.\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:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ bị chiếm dụng.\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:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ được giải phóng.\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Bạn không có đủ dung lượng đĩa còn trống trong %s."
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Có lỗi và đã dùng tùy chọn “-y” mà không có  “--force-yes”"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-"Đã đưa ra “Chỉ không đáng kể” (Trivial Only) nhưng mà thao tác này là đáng "
-"kể."
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Có, làm đi!"
-
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Bạn sắp làm việc mà nó có thể gây hư hại cho hệ thống.\n"
-"Nếu vẫn muốn tiếp tục thì hãy gõ cụm từ “%s”\n"
-"?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Hủy bỏ."
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Bạn có muốn tiếp tục không?"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Một số tập tin không tải về được"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Không thể lấy một số kho, có lẽ hãy chạy lệnh “apt-get update” (apt lấy cập "
-"nhật)\n"
-"hay dùng tùy chọn “--fix-missing” (sửa thiếu sót) không?"
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
-"Chưa hỗ trợ tùy chọn “--fix-missing” (sửa khi thiếu) và trao đổi phương tiện."
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Không thể sửa những gói còn thiếu."
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "Đang hủy bỏ tiến trình cài đặt."
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"Những gói theo đây không còn nằm trên hệ thống này vì mọi tập tin đều bị gói "
-"khác ghi đè:"
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Ghi chú: Thay đổi này được tự động thực hiện bởi dpkg."
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động"
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Ừm, có vẻ là Bộ Gỡ bỏ Tự động đã hủy cái gì, một trường hợp thực sự không "
-"nên xảy ra. Hãy thông báo lỗi về apt."
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ bạn giải quyết tình trạng này:"
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Lỗi nội bộ: Bộ Gỡ bỏ Tự động đã làm hỏng một thứ gì đó"
-
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"(Các) gói sau đây đã được tự động cài đặt nên không còn cần yêu cầu lại:"
-
-#: apt-private/private-install.cc:517
+#: methods/server.cc:589
 #, c-format
-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 gói đã được tự động cài đặt nên không còn cần yêu cầu lại.\n"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Hãy dùng lệnh “apt-get autoremove” để gỡ bỏ chúng."
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Có lẽ bạn cần chạy lệnh “apt-get -f install” để sửa những cái đó:"
-
-#: apt-private/private-install.cc:614
 msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Thưa thỏa mãn quan hệ phụ thuộc. Hãy thử chạy lệnh “apt-get -f install” mà "
-"không có gói nào (hoặc chỉ định cách thức giải quyết)."
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Không thể cài đặt một số gói. Điều đó có nghĩa là bạn đã yêu cầu\n"
-"một trường hợp không thể, hoặc nếu bạn đang sử dụng bản phân phối\n"
-"chưa ổn định cái mà yêu cầu các gói mà nó còn chưa được tạo ra\n"
-"hay chưa được chuyển ra khỏi phần Incoming (Đến)."
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Gói bị hỏng"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Những gói thêm theo đây sẽ được cài đặt:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Các gói đề nghị:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Gói khuyến khích:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa đặt tùy chọn Nâng cấp.\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"Đang bỏ qua %s vì nó chưa được cài đặt và chỉ Nâng cấp là được yêu cầu.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Không thể cài đặt lại %s vì không thể tải nó về.\n"
 
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s là phiên bản mới nhất.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Đã chọn phiên bản “%s” (%s) cho “%s”\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Đã chọn phiên bản “%s” (%s) cho “%s” vì “%s”\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó. Có phải ý bạn là “%s'?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-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"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "Gặp lỗi nội bộ"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr "Đang liệt kê"
 
-#: apt-private/private-list.cc:159
+#: 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:93
+#: 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:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " gặp lỗi."
 
-#: apt-private/private-cachefile.cc:99
+#: 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:102
+#: 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:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " Xong"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: 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”."
 
@@ -1657,7 +1396,7 @@ msgstr "C"
 msgid "N"
 msgstr "K"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: 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"
@@ -1666,7 +1405,7 @@ msgstr "Lỗi biên dịch biểu thức chính quy - %s"
 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:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1674,10 +1413,14 @@ msgid_plural ""
 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:101
+#: 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"
@@ -1701,27 +1444,299 @@ msgstr ""
 "       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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "CẢNH BÁO: Không thể xác thực những gói sau đây!"
+#: 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!"
 
-#: apt-private/private-download.cc:40
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr ""
+"Cần phải gỡ bỏ một số gói, nhưng mà tính năng Gỡ bỏ (Remove) đã bị tắt."
+
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "Gặp lỗi nội bộ: Tiến trình Sắp xếp chưa xong"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Lạ nhỉ... Kích cỡ không khớp nhau. Hãy gửi thư cho <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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Cần phải lấy %sB/%sB từ kho chứa.\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:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Cần phải lấy %sB từ kho chứa.\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:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ bị chiếm dụng.\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 "Sau thao tác này, %sB dung lượng đĩa sẽ được giải phóng.\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Có lỗi và đã dùng tùy chọn “-y” mà không có  “--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 ""
+"Đã đưa ra “Chỉ không đáng kể” (Trivial Only) nhưng mà thao tác này là đáng "
+"kể."
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Có, làm đi!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Bạn sắp làm việc mà nó có thể gây hư hại cho hệ thống.\n"
+"Nếu vẫn muốn tiếp tục thì hãy gõ cụm từ “%s”\n"
+"?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "Hủy bỏ."
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Bạn có muốn tiếp tục không?"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "Một số tập tin không tải về được"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Không thể lấy một số kho, có lẽ hãy chạy lệnh “apt-get update” (apt lấy cập "
+"nhật)\n"
+"hay dùng tùy chọn “--fix-missing” (sửa thiếu sót) không?"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr ""
+"Chưa hỗ trợ tùy chọn “--fix-missing” (sửa khi thiếu) và trao đổi phương tiện."
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "Không thể sửa những gói còn thiếu."
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "Đang hủy bỏ tiến trình cài đặt."
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"Những gói theo đây không còn nằm trên hệ thống này vì mọi tập tin đều bị gói "
+"khác ghi đè:"
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Ghi chú: Thay đổi này được tự động thực hiện bởi dpkg."
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động"
+
+#: 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 ""
+"Ừm, có vẻ là Bộ Gỡ bỏ Tự động đã hủy cái gì, một trường hợp thực sự không "
+"nên xảy ra. Hãy thông báo lỗi về apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ bạn giải quyết tình trạng này:"
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Lỗi nội bộ: Bộ Gỡ bỏ Tự động đã làm hỏng một thứ gì đó"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"(Các) gói sau đây đã được tự động cài đặt nên không còn cần yêu cầu lại:"
+
+#: apt-private/private-install.cc:492
+#, c-format
+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 gói đã được tự động cài đặt nên không còn cần yêu cầu lại.\n"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "Hãy dùng lệnh “apt-get autoremove” để gỡ bỏ chúng."
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Có lẽ bạn cần chạy lệnh “apt-get -f install” để sửa những cái đó:"
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Thưa thỏa mãn quan hệ phụ thuộc. Hãy thử chạy lệnh “apt-get -f install” mà "
+"không có gói nào (hoặc chỉ định cách thức giải quyết)."
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Không thể cài đặt một số gói. Điều đó có nghĩa là bạn đã yêu cầu\n"
+"một trường hợp không thể, hoặc nếu bạn đang sử dụng bản phân phối\n"
+"chưa ổn định cái mà yêu cầu các gói mà nó còn chưa được tạo ra\n"
+"hay chưa được chuyển ra khỏi phần Incoming (Đến)."
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "Gói bị hỏng"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "Những gói thêm theo đây sẽ được cài đặt:"
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "Các gói đề nghị:"
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "Gói khuyến khích:"
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa đặt tùy chọn Nâng cấp.\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+"Đang bỏ qua %s vì nó chưa được cài đặt và chỉ Nâng cấp là được yêu cầu.\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Không thể cài đặt lại %s vì không thể tải nó về.\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s là phiên bản mới nhất.\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Đã chọn phiên bản “%s” (%s) cho “%s”\n"
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Đã chọn phiên bản “%s” (%s) cho “%s” vì “%s”\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó. Có phải ý bạn là “%s'?\n"
+
+#: apt-private/private-install.cc:945
+#, c-format
+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-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "CẢNH BÁO: Không thể xác thực những gói sau đây!"
+
+#: apt-private/private-download.cc:98
 msgid "Authentication warning overridden.\n"
 msgstr "Cảnh báo xác thực bị đè.\n"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
 msgid "Some packages could not be authenticated"
 msgstr "Một số gói không thể được xác thực"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 msgid "Install these packages without verification?"
 msgstr "Cài đặt những gói này mà không cần thẩm tra?"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Gặp lỗi khi lấy về %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 "Không thể tìm được chỗ trống trong %s"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Bạn không có đủ dung lượng đĩa còn trống trong %s."
+
 #: apt-private/private-sources.cc:58
 #, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1736,41 +1751,33 @@ msgstr "Tập tin “%s” của bạn đã thay đổi, hãy chạy lệnh “a
 msgid "Full Text Search"
 msgstr "Tìm kiếm toàn văn"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "Đang tính toán nâng cấp"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Xong"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "Tìm thấy "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "Lấy:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "Bỏq "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "Lỗi "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Đã lấy về %sB mất %s (%sB/g).\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [Đang hoạt động]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1783,18 +1790,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1868,205 +1875,474 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Đang hòa trộn các thông tin sẵn có..."
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Gặp lỗi khi định vị phần tử băm!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Gặp lỗi khi định vị trệch đi"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)"
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s"
-
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Sự trệch đi được thêm hai lần %s → %s"
-
-#: apt-inst/filelist.cc:549
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Cách dùng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n"
+"\n"
+"[extract:  rút trích;\n"
+"templates: mẫu]\n"
+"\n"
+"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n"
+"\tvà biểu mẫu đều từ gói Debian\n"
+"\n"
+"Tùy chọn:\n"
+"  -h   Trợ giúp này\n"
+"  -t   Đặt thư mục tạm thời\n"
+"       [t: viết tắt cho từ “temporary”: tạm thời]\n"
+"  -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:259 apt-pkg/contrib/fileutl.cc:2092
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s"
+msgid "Unable to mkstemp %s"
+msgstr "Không thể tạo tập tin tạm (hàm mkstemp) %s"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
-msgid "The path %s is too long"
-msgstr "Đường dẫn %s quá dài"
+msgid "Unable to write to %s"
+msgstr "Không thể ghi vào %s"
 
-#: apt-inst/extract.cc:132
+#: 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: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: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 "Unpacking %s more than once"
-msgstr "Đang giải nén %s nhiều lần"
+msgid "Error processing directory %s"
+msgstr "Gặp lỗi khi xử lý thư mục %s"
 
-#: apt-inst/extract.cc:142
+#: 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: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:430
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Thư mục %s bị trệch hướng"
+msgid "Error processing contents %s"
+msgstr "Gặp lỗi khi xử lý nội dung %s"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Cách dùng: apt-ftparchive [tùy_chọn...] lệnh\n"
+"\n"
+"[ftparchive: FTP archive: kho FTP]\n"
+"\n"
+"Lệnh: packages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n"
+"      sources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n"
+"      contents path\n"
+"      release path\n"
+"      generate config [các_nhóm]\n"
+"      clean config\n"
+"\n"
+"(packages:    những gói;\n"
+"binarypath:   đường dẫn nhị phân;\n"
+"sources:      những nguồn;\n"
+"srcpath:      đường dẫn nguồn;\n"
+"contents path: đường dẫn nội dung;\n"
+"release path: đường dẫn bản đã phát hành;\n"
+"generate config [groups]: tạo ra cấu hình [các nhóm];\n"
+"clean config: cấu hình toàn mới)\n"
+"\n"
+"apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n"
+"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động hoàn toàn\n"
+"đến cách thay thế hàm cho dpkg-scanpackages (dpkg-quét_gói)\n"
+"và dpkg-scansources (dpkg-quét_nguồn).\n"
+"\n"
+"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n"
+"Tập tin gói chứa nội dung các trường điều khiển từ mỗi gói,\n"
+"cùng với băm MD5 và kích cỡ tập tin.\n"
+"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n"
+"\n"
+"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n"
+"Có thể sử dụng tùy chọn “--source-override” (đè nguồn)\n"
+"để ghi rõ tập tin đè nguồn\n"
+"\n"
+"Lệnh “packages” (gói) và “sources” (nguồn) nên chạy tại gốc cây.\n"
+"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ "
+"quy,\n"
+"và tập tin đè nên chứa những cờ đè.\n"
+"Pathprefix (tiền tố đường dẫn) được phụ thêm vào\n"
+"những trường tên tập tin nếu có.\n"
+"Cách sử dụng thí dụ từ kho Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Tùy chọn:\n"
+"  -h    _Trợ giúp_ này\n"
+"  --md5 Điều khiển cách tạo ra MD5\n"
+"  -s=?  Tập tin đè nguồn\n"
+"  -q    _Im lặng_ (không xuất chi tiết)\n"
+"  -d=?  Chọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n"
+"  --no-delink Mở chế độ gỡ lỗi _bỏ liên kết_\n"
+"  --contents  Điều khiển cách tạo ra tập tin _nội dung_\n"
+"  -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:821
+msgid "No selections matched"
+msgstr "Không có cái được chọn khớp được"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s"
+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”."
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Đường dẫn trệch đi quá dài"
+#: ftparchive/cachedb.cc:67
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tập tin thành %s.old (old: cũ)."
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Cơ sở dữ liệu đã cũ, nên đang cố nâng cấp lên thành %s"
+
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản "
+"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu."
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s."
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Việc lấy thông tin thống kê cho %s bị lỗi"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+msgid "Failed to read .dsc"
+msgstr "Gặp lỗi khi đọc .dsc"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Kho không có mục ghi điều khiển"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Không thể lấy con trỏ"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Việc đổi tên %s thành %s bị lỗi"
+msgid "W: Unable to read directory %s\n"
+msgstr "CB: Không thể đọc thư mục %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Thư mục %s đang được thay thế do một cái không phải là thư mục"
+msgid "W: Unable to stat %s\n"
+msgstr "CB: Không thể lấy thông tin thống kê %s\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Gặp lỗi định vị điểm nút trong hộp băm nó bị lỗi"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "L: "
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Đường dẫn quá dài"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "CB: "
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "LỖI: có lỗi áp dụng vào tập tin "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s"
+msgid "Failed to resolve %s"
+msgstr "Gặp lỗi khi phân giải %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Việc di chuyển qua cây bị lỗi"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s"
+msgid "Failed to open %s"
+msgstr "Gặp lỗi khi mở %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Không thể lấy thông tin thống kê %s"
+msgid " DeLink %s [%s]\n"
+msgstr " Bỏ liên kết %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "Việc ghi tập tin %s gặp lỗi"
+msgid "Failed to readlink %s"
+msgstr "Gặp lỗi khi đọc liên kết %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Việc đóng tập tin %s gặp lỗi"
+msgid "Failed to unlink %s"
+msgstr "Việc bỏ liên kết %s bị lỗi"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành viên “%s”"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Gặp lỗi khi liên kết %s đến %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Gặp lỗi nội bộ, không thể định vị thành viên %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Hết hạn bỏ liên kết của %sB.\n"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Tập tin điều khiển không có khả năng phân tách"
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "Kho không có trường gói"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Chữ ký kho không hợp lệ"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Gặp lỗi khi đọc phần đầu thành viên kho"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:712
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "Phần đầu thành viên kho lưu không hợp lệ %s"
+msgid "  %s has no source override entry\n"
+msgstr "  %s không có mục ghi đè (override) nguồn\n"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Phần đầu thành viên kho không hợp lê"
+#: 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"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Kho quá ngắn"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Việc đọc phần đầu kho bị lỗi"
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Không thể mở %s"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Gặp lỗi khi tạo các đường ống dẫn lệnh"
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Sai “override” %s dòng %llu (%s)"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Việc đọc tập tin đè %s bị lỗi"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Sai override %s dòng %llu #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Sai override %s dòng %llu #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Sai override %s dòng %llu #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Không biết thuật toán nén “%s”"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Dữ liệu xuất đã nén %s cần một bộ nén"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Việc tạo TẬP_TIN* bị lỗi"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Gặp lỗi khi rẽ nhánh tiến trình"
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "Nén con"
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s"
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin"
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Gặp lỗi khi đọc trong khi tính MD5"
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Gặp lỗi khi bỏ liên kết %s"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Việc thực hiện gzip bị lỗi "
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Việc đổi tên %s thành %s bị lỗi"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Kho bị hỏng."
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Cách dùng: apt-internal-solver\n"
+"\n"
+"apt-internal-solver là một giao diện để dùng cho bộ phân giải nội bộ\n"
+"hiện tại giống như bộ phân giải bên ngoài dành cho họ chương trình APT\n"
+"để phục vụ cho việc gỡ lỗi hay tương tự thế\n"
+"\n"
+"Tùy chọn:\n"
+"  -h  Trợ giúp này.\n"
+"  -q  Làm việc ở chế độ im lặng - không hiển thị tiến triển công việc\n"
+"  -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"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Gặp lỗi khi tổng kiểm “tar”, kho bị hỏng"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Không hiểu bản ghi gói!"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, 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"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Cách dùng: apt-sortpkgs [tùy_chọn...] tập_tin1 [tập_tin2 ...]\n"
+"\n"
+"[sortpkgs: sort packages: sắp xếp các gói]\n"
+"\n"
+"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n"
+"Tùy chọn “-s” dùng để ngầm chỉ kiểu tập tin là gì.\n"
+"\n"
+"Tùy chọn:\n"
+"  -h   Trợ giúp_ này\n"
+"  -s   Sắp xếp những tập tin _nguồn_\n"
+"  -c=? Đọc tập tin cấu hình này\n"
+"  -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr "Diễn biến: [%3i%%]"
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "Đang chạy dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Không hỗ trợ hệ thống đóng gói “%s”"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Đã ghi %i bản ghi.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Đã ghi %i bản ghi với %i tập tin còn thiếu.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Đã ghi %i bản ghi với %i tập tin không khớp với nhau\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 ""
@@ -2083,6 +2359,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."
@@ -2097,156 +2393,339 @@ msgstr ""
 msgid "The list of sources could not be read."
 msgstr "Không thể đọc danh sách nguồn."
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "Bộ nhớ tạm gói trống"
 
-#: apt-pkg/pkgcache.cc:161
+#: 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:166
+#: 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:169
+#: 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:174
+#: 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:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "Phụ thuộc"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "Phụ thuộc sẵn"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "Đề nghị"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "Khuyến khích"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "Xung đột"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "Thay thế"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "Cũ"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "Làm hỏng"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "Tăng cường"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "quan trọng"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "yêu cầu"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "chuẩn"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "tùy chọn"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr "bổ sung"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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/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:118
+#: 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:169
+#: 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:455
+#: 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/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/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/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/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/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Chuẩn bị để lấy cách giải quyết"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Lỗi mở tập tin tình trạng StateFile %s"
+#: 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/depcache.cc:256
-#, 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"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
+
+#: 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:163
+#: 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:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Kích cỡ không khớp nhau"
 
-#: apt-pkg/acquire-item.cc:173
+#: 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:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Lỗi ghi"
+
+#: 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:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Gặp lỗi trong khi thẩm tra chữ ký.\n"
+"Kho lưu chưa được cập nhật nên dùng những tập tin chỉ mục trước.\n"
+"Lỗi GPG: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: 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"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Thư mục %s bị trệch hướng"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2255,16 +2734,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:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2273,28 +2752,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:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"Gặp lỗi trong khi thẩm tra chữ ký.\n"
-"Kho lưu chưa được cập nhật nên dùng những tập tin chỉ mục trước.\n"
-"Lỗi GPG: %s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Lỗi GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2303,12 +2773,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:1992
+#: 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:2050
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2316,119 +2786,38 @@ 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, 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:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, 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:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Đang đọc các danh sách gói"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Đang tập hợp các Nhà cung cấp Tập tin"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Không thể ghi vào %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: apt-pkg/acquire.cc:162
 #, c-format
 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:902
+#: 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:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2458,7 +2847,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:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2467,12 +2856,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:550 apt-pkg/packagemanager.cc:580
+#: 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:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2484,10 +2873,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"
@@ -2557,11 +2949,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"
 
@@ -2571,7 +2963,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:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2579,178 +2971,89 @@ 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:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr "Gửi yêu cầu đến bộ phân giải"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Chuẩn bị để lấy cách giải quyết"
-
-#: apt-pkg/edsp.cc:327
-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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Thi hành bộ phân giải từ bên ngoài"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-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/indexrecords.cc:78
-#, 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:86
-#, 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:117
-#, 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:130
-#, 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:149
-#, 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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Không tìm thấy bản phát hành “%s” cho “%s”"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 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:603
+#: 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:609
+#: 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:615
+#: 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:626
+#: 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:633 apt-pkg/cacheset.cc:640
+#: 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: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: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:743 apt-pkg/cacheset.cc:751
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -2759,90 +3062,101 @@ 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/cacheset.cc:647
+#: apt-pkg/indexrecords.cc:83
 #, 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"
+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/cacheset.cc:655
+#: apt-pkg/indexrecords.cc:91
 #, 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ử"
+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/cacheset.cc:663
+#: apt-pkg/indexrecords.cc:132
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+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:145
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
 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"
+"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:164
+#, 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"
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: 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:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%li giây"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: 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/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Không thể mở tập tin khóa %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Không thể lấy khóa %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 "Liệt kê các tập tin không thể được tạo ra vì “%s” không phải là một thư mục"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Bỏ qua “%s” trong thư mục “%s'vì nó không phải là tập tin bình thường"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 "Bỏ qua tập tin “%s” trong thư mục “%s” vì nó không có phần đuôi mở rộng"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2850,75 +3164,75 @@ msgstr ""
 "Bỏ qua tập tin “%s” trong thư mục “%s” vì nó có phần đuôi mở rộng không hợp "
 "lệ"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Tiến trình con %s đã nhận một lỗi phân đoạn."
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Tiến trình con %s đã nhận tín hiệu %u."
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Tiến trình con %s đã trả về một mã lỗi (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Tiến trình con %s đã thoát bất thường"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Gặp vấn đề khi đóng tập tin gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Không thể mở tập tin %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Không thể mở bộ mô tả tập tin %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Việc tạo tiến trình con IPC bị lỗi"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Gặp lỗi khi thực hiện nén "
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "ghi, còn cần ghi %llu nhưng mà không thể"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Gặp vấn đề khi đóng tập tin %s"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Gặp vấn đề khi đổi tên tập tin %s thành %s"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Gặp vấn đề khi đồng bộ hóa tập tin"
 
@@ -3006,111 +3320,105 @@ 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:519
+#: 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:633
+#: 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:801
+#: 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:820
+#: 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:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: 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"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Không có vòng khoá nào được cài đặt vào %s."
-
-#: 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ệ"
@@ -3120,12 +3428,12 @@ msgstr "Thao tác “%s” không hợp lệ"
 msgid "Installing %s"
 msgstr "Đang cài đặt %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "Đang gỡ bỏ %s"
@@ -3146,80 +3454,80 @@ 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:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Thiếu thư mục “%s”"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "Đang chuẩn bị %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "Đang mở gói %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: 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:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "Đã cài đặt %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: 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:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "Đã gỡ bỏ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: 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:1030
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1670
+#: 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:1732
+#: 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:1737
+#: 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:1739
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3227,14 +3535,14 @@ 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:1745
+#: 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:1752
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3242,7 +3550,7 @@ 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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"
@@ -3250,7 +3558,7 @@ 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3265,441 +3573,190 @@ 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á"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Cách dùng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n"
-"\n"
-"[extract:  rút trích;\n"
-"templates: mẫu]\n"
-"\n"
-"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n"
-"\tvà biểu mẫu đều từ gói Debian\n"
-"\n"
-"Tùy chọn:\n"
-"  -h   Trợ giúp này\n"
-"  -t   Đặt thư mục tạm thời\n"
-"       [t: viết tắt cho từ “temporary”: tạm thời]\n"
-"  -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:254
-#, 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:300
-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
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "Gặp lỗi khi xử lý thư mục %s"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Danh sách mở rộng nguồn quá dài"
-
-#: ftparchive/apt-ftparchive.cc:401
-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
-#, c-format
-msgid "Error processing contents %s"
-msgstr "Gặp lỗi khi xử lý nội dung %s"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"Cách dùng: apt-ftparchive [tùy_chọn...] lệnh\n"
-"\n"
-"[ftparchive: FTP archive: kho FTP]\n"
-"\n"
-"Lệnh: packages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n"
-"      sources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n"
-"      contents path\n"
-"      release path\n"
-"      generate config [các_nhóm]\n"
-"      clean config\n"
-"\n"
-"(packages:    những gói;\n"
-"binarypath:   đường dẫn nhị phân;\n"
-"sources:      những nguồn;\n"
-"srcpath:      đường dẫn nguồn;\n"
-"contents path: đường dẫn nội dung;\n"
-"release path: đường dẫn bản đã phát hành;\n"
-"generate config [groups]: tạo ra cấu hình [các nhóm];\n"
-"clean config: cấu hình toàn mới)\n"
-"\n"
-"apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n"
-"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động hoàn toàn\n"
-"đến cách thay thế hàm cho dpkg-scanpackages (dpkg-quét_gói)\n"
-"và dpkg-scansources (dpkg-quét_nguồn).\n"
-"\n"
-"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n"
-"Tập tin gói chứa nội dung các trường điều khiển từ mỗi gói,\n"
-"cùng với băm MD5 và kích cỡ tập tin.\n"
-"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n"
-"\n"
-"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n"
-"Có thể sử dụng tùy chọn “--source-override” (đè nguồn)\n"
-"để ghi rõ tập tin đè nguồn\n"
-"\n"
-"Lệnh “packages” (gói) và “sources” (nguồn) nên chạy tại gốc cây.\n"
-"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ "
-"quy,\n"
-"và tập tin đè nên chứa những cờ đè.\n"
-"Pathprefix (tiền tố đường dẫn) được phụ thêm vào\n"
-"những trường tên tập tin nếu có.\n"
-"Cách sử dụng thí dụ từ kho Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Tùy chọn:\n"
-"  -h    _Trợ giúp_ này\n"
-"  --md5 Điều khiển cách tạo ra MD5\n"
-"  -s=?  Tập tin đè nguồn\n"
-"  -q    _Im lặng_ (không xuất chi tiết)\n"
-"  -d=?  Chọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n"
-"  --no-delink Mở chế độ gỡ lỗi _bỏ liên kết_\n"
-"  --contents  Điều khiển cách tạo ra tập tin _nội dung_\n"
-"  -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
-msgid "No selections matched"
-msgstr "Không có cái được chọn khớp được"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Thiếu một số tập tin trong nhóm tập tin gói “%s”."
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tập tin thành %s.old (old: cũ)."
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Cơ sở dữ liệu đã cũ, nên đang cố nâng cấp lên thành %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản "
-"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu."
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s."
-
-#: ftparchive/cachedb.cc:332
-msgid "Failed to read .dsc"
-msgstr "Gặp lỗi khi đọc .dsc"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Kho không có mục ghi điều khiển"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Không thể lấy con trỏ"
-
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "CB: Không thể đọc thư mục %s\n"
+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?"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "CB: Không thể lấy thông tin thống kê %s\n"
+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. "
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "L: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Chưa được khoá"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "CB: "
+#: 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"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "LỖI: có lỗi áp dụng vào tập tin "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Gặp lỗi khi định vị phần tử băm!"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Gặp lỗi khi phân giải %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Gặp lỗi khi định vị trệch đi"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Việc di chuyển qua cây bị lỗi"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "Gặp lỗi khi mở %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " Bỏ liên kết %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "Sự trệch đi được thêm hai lần %s → %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "Gặp lỗi khi đọc liên kết %s"
+msgid "Duplicate conf file %s/%s"
+msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "Việc bỏ liên kết %s bị lỗi"
+msgid "The path %s is too long"
+msgstr "Đường dẫn %s quá dài"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Gặp lỗi khi liên kết %s đến %s"
+msgid "Unpacking %s more than once"
+msgstr "Đang giải nén %s nhiều lần"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Hết hạn bỏ liên kết của %sB.\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Kho không có trường gói"
+msgid "The directory %s is diverted"
+msgstr "Thư mục %s bị trệch hướng"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s không có mục ghi đè (override)\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, 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"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Đường dẫn trệch đi quá dài"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s không có mục ghi đè (override) nguồn\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Thư mục %s đang được thay thế do một cái không phải là thư mục"
 
-#: ftparchive/writer.cc:702
-#, 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"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Gặp lỗi định vị điểm nút trong hộp băm nó bị lỗi"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Đường dẫn quá dài"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "Không thể mở %s"
+msgid "Overwrite package match with no version for %s"
+msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Sai “override” %s dòng %llu (%s)"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Tập tin %s/%s ghi đè lên một tập tin trong gói %s"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "Việc đọc tập tin đè %s bị lỗi"
+msgid "Unable to stat %s"
+msgstr "Không thể lấy thông tin thống kê %s"
 
-#: ftparchive/override.cc:166
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Sai override %s dòng %llu #1"
+msgid "Failed to write file %s"
+msgstr "Việc ghi tập tin %s gặp lỗi"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Sai override %s dòng %llu #2"
+msgid "Failed to close file %s"
+msgstr "Việc đóng tập tin %s gặp lỗi"
 
-#: ftparchive/override.cc:191
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Sai override %s dòng %llu #3"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành viên “%s”"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Không biết thuật toán nén “%s”"
+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"
 
-#: ftparchive/multicompress.cc:103
+#: 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"
+
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Chữ ký kho không hợp lệ"
+
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Gặp lỗi khi đọc phần đầu thành viên kho"
+
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Dữ liệu xuất đã nén %s cần một bộ nén"
+msgid "Invalid archive member header %s"
+msgstr "Phần đầu thành viên kho lưu không hợp lệ %s"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Việc tạo TẬP_TIN* bị lỗi"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Phần đầu thành viên kho không hợp lê"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Gặp lỗi khi rẽ nhánh tiến trình"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Kho quá ngắn"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "Nén con"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Việc đọc phần đầu kho bị lỗi"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s"
+#: 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"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Việc thực hiện gzip bị lỗi "
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Gặp lỗi khi đọc trong khi tính MD5"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Kho bị hỏng."
 
-#: ftparchive/multicompress.cc:359
+#: 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:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "Gặp lỗi khi bỏ liên kết %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Cách dùng: apt-internal-solver\n"
-"\n"
-"apt-internal-solver là một giao diện để dùng cho bộ phân giải nội bộ\n"
-"hiện tại giống như bộ phân giải bên ngoài dành cho họ chương trình APT\n"
-"để phục vụ cho việc gỡ lỗi hay tương tự thế\n"
-"\n"
-"Tùy chọn:\n"
-"  -h  Trợ giúp này.\n"
-"  -q  Làm việc ở chế độ im lặng - không hiển thị tiến triển công việc\n"
-"  -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"
+#~ msgid "Total dependency version space: "
+#~ msgstr "Tổng chỗ phiên bản phụ thuộc: "
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Không hiểu bản ghi gói!"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Không đủ chỗ trống trên %s"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Cách dùng: apt-sortpkgs [tùy_chọn...] tập_tin1 [tập_tin2 ...]\n"
-"\n"
-"[sortpkgs: sort packages: sắp xếp các gói]\n"
-"\n"
-"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n"
-"Tùy chọn “-s” dùng để ngầm chỉ kiểu tập tin là gì.\n"
-"\n"
-"Tùy chọn:\n"
-"  -h   Trợ giúp_ này\n"
-"  -s   Sắp xếp những tập tin _nguồn_\n"
-"  -c=? Đọc tập tin cấu hình này\n"
-"  -o=? Đặt tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n"
+#~ msgid "Done"
+#~ msgstr "Xong"
+
+#~ 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?"
@@ -3802,9 +3859,6 @@ msgstr ""
 #~ "Kho lưu chưa được cập nhật nên dùng những tập tin chỉ mục trước.\n"
 #~ "Lỗi GPG: %s: %s\n"
 
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Tập tin %s không bắt đầu bằng một đoạn chữ ký (gpg)"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Đang bỏ qua tập tin không tồn tại %s"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 661d8f92c..2ff5bcf01 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ 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: 2015-01-16 04:37-0500\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"
@@ -25,148 +25,144 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
 
-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "软件包名称总数："
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr "全部软件包结构："
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  普通软件包："
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  完全虚拟软件包："
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  单虚拟软件包："
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  混合虚拟软件包："
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  缺失："
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "按版本共计："
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "按不同的说明共计："
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "按依赖关系共计："
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "按版本/文件关系共计："
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "按说明/文件关系共计："
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "提供映射共计："
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Glob 字串共计："
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "依赖关系版本名所占空间共计："
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Slack 空间共计："
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "总占用空间："
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "该命令已废弃。请使用‘apt-mark showauto’代替。"
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "未发现软件包 %s"
 
-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "软件包文件："
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "被锁定的软件包："
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(没有找到)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  已安装："
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  候选软件包："
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(无)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  软件包锁："
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  版本列表："
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -236,20 +232,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"
@@ -260,7 +256,7 @@ msgstr ""
 "您可以尝试用 --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 "请对您的盘片套件中的其它盘片重复相同的操作。"
 
@@ -296,71 +292,71 @@ msgstr ""
 "  -c=? 读取指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如：-o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224
 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "找不到‘%s’体系结构下的软件包"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "找不到软件包‘%s’的‘%s’版本"
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "找不到软件包‘%s’的‘%s’发行"
 
-#: cmdline/apt-get.cc:367
+#: 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:423
+#: 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:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "无法找到软件包 %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部错误，问题解决工具坏事了"
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "无法锁定下载目录"
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr "要下载源代码，必须指定至少一个对应的软件包"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -369,7 +365,7 @@ msgstr ""
 "提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -380,78 +376,67 @@ msgstr ""
 "bzr branch %s\n"
 "获得该软件包的最近更新(可能尚未正式发布)。\n"
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "忽略已下载的文件“%s”\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "无法获知您在 %s 上的可用空间"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "您在 %s 上没有足够的可用空间"
-
 #. 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:895
+#: 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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下载 %sB 的源代码包。\n"
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下载源代码 %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "有一些包文件无法下载。"
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr "下载完毕，目前是“仅下载”模式"
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "忽略已经被解包到 %s 目录的源代码包\n"
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "运行解包的命令“%s”出错。\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "执行构造软件包命令“%s”失败。\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "子进程出错"
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包"
 
-#: cmdline/apt-get.cc:1059
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -460,17 +445,27 @@ msgstr ""
 "找不到关于 %s 的有效体系结构信息。请参见 apt.conf(5) APT::Architectures for "
 "setup"
 
-#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "无法处理构建依赖关系"
+
+#: 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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建依赖关系信息。\n"
 
-#: cmdline/apt-get.cc:1276
+#: cmdline/apt-get.cc:1279
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -478,19 +473,19 @@ msgid ""
 msgstr ""
 "由于 %3$s 不被软件包 %4$s 所允许，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
-#: cmdline/apt-get.cc:1294
+#: 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:1317
+#: 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:1356
+#: cmdline/apt-get.cc:1359
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -498,37 +493,37 @@ msgid ""
 msgstr ""
 "软件包 %3$s 的候选版本不能满足版本要求，因此 %2$s 软件包的 %1$s 依赖无法满足"
 
-#: cmdline/apt-get.cc:1362
+#: 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 依赖无法满足"
 
-#: cmdline/apt-get.cc:1385
+#: 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:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) 的 Changelog"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "支持的模块："
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -623,11 +618,11 @@ msgstr "需要一个 URL 作为参数"
 msgid "Must specify at least one pair url/filename"
 msgstr "必须指定至少一对URL或者文件名"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr "下载失败"
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -651,53 +646,53 @@ msgstr ""
 "\n"
 "                       This APT helper has 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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -816,12 +811,12 @@ msgstr "找不到盘片。"
 msgid "File not found"
 msgstr "无法找到该文件"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "无法读取状态"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "无法设置文件的修改日期"
 
@@ -830,157 +825,157 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "无效的 URI，本地的 URI 不能以 // 开头"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "正在登录"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "无法获知对方主机名"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "无法获知本地主机名"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "服务器拒绝了我们的连接，响应信息为：%s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER 指令出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS 指令出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 "您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。"
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE 指令出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "连接超时"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "服务器关闭了连接"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "读错误"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "回应超出了缓存区大小。"
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "协议有误"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "写出错"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "无法创建套接字"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "无法连接上数据套接字，连接超时"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "失败"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "无法连接被动模式的套接字。"
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo 无法得到监听套接字"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "无法绑定套接字"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "无法在套接字上监听"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "无法确定套接字的名字"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "无法发出 PORT 指令"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "无法识别的地址族 %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT 指令出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "数据套接字连接超时"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "把文件加入哈希表时出错"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "无法获取文件，服务器响应信息为“%s”"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "数据套接字超时"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "数据传送出错，服务器响应信息为“%s”"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "查询"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "无法调用 "
 
@@ -1046,70 +1041,70 @@ msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "不能连接到 %s：%s："
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "至少发现一个无效的签名。"
 
-#: methods/gpgv.cc:174
+#: 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:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr "明文签署文件不可用，结果为‘%s’（您的网络需要认证吗？）"
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "运行 apt-key 时发生未知错误"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr "下列签名无效：\n"
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "由于没有公钥，无法验证下列签名：\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr "空文件不能当作有效归档"
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "写入文件出错"
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "写入文件出错"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "select 调用出错"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "连接超时"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 
@@ -1141,305 +1136,61 @@ msgstr "该 HTTP 服务器的 range 支持不正常"
 msgid "Unknown date format"
 msgstr "无法识别的日期格式"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "错误的报头数据"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "内部错误"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr "正在排序"
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "内部错误，Ordering 未能完成"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr "怪了……文件大小不符，请发信给 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of 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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "需要下载 %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
-#: apt-private/private-install.cc:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "解压缩后会消耗掉 %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
-#: apt-private/private-install.cc:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "解压缩后将会空出 %sB 的空间。\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "您在 %s 上没有足够的可用空间。"
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。"
-
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "是，按我说的做！"
-
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"您的操作会导致潜在的危害。\n"
-"若还想继续的话，就输入下面的短句“%s”\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "中止执行。"
-
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "您希望继续执行吗？"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "有一些文件无法下载"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
-"再试试？"
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "目前还不支持 --fix-missing 和介质交换"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "无法更正缺少的软件包。"
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "中止安装。"
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失："
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "注意：这是自动被 dpkg 有意完成的。"
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "我们不应该进行删除，无法启动自动删除器"
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。"
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "下列信息可能会对解决问题有所帮助："
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "内部错误，自动卸载工具坏事了"
-
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "下列软件包是自动安装的并且现在不需要了："
-
-#: apt-private/private-install.cc:517
+#: methods/server.cc:589
 #, c-format
-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 个自动安装的的软件包现在已不再需要了。\n"
-
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "使用'apt-get autoremove'来卸载它(它们)。"
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
-"以指定一个解决办法)。"
-
-#: apt-private/private-install.cc:638
 msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"有一些软件包无法被安装。如果您用的是 unstable 发行版，这也许是\n"
-"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
-"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "破损的软件包"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "将会安装下列额外的软件包："
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "建议安装的软件包："
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "推荐安装的软件包："
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "不能重新安装 %s，因为无法下载它。\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s 已经是最新的版本。\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%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:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "软件包 %s 还未安装，因而不会被卸载。您的意思是 ‘%s’ 吗？\n"
 
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "软件包 %s 还未安装，因而不会被卸载\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "内部错误"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr "正在列表"
 
-#: apt-private/private-list.cc:159
+#: 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:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "正在更正依赖关系..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " 失败。"
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "无法更正依赖关系"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr "无法最小化要升级的软件包集合"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " 完成"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
 
@@ -1600,7 +1351,7 @@ msgstr "Y"
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "编译正则表达式时出错 - %s"
@@ -1609,7 +1360,7 @@ msgstr "编译正则表达式时出错 - %s"
 msgid "The update command takes no arguments"
 msgstr " update 命令不需要参数"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1617,10 +1368,14 @@ msgid_plural ""
 msgstr[0] ""
 "有 %i 个软件包可以升级。请执行 ‘apt list --upgradable’ 来查看它们。\n"
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1643,27 +1398,286 @@ msgstr ""
 "　　　apt-get 需要 root 特权进行实际的执行。\n"
 "　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！"
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "【警告】：下列软件包不能通过验证！"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "忽略了认证警告。\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-msgid "Some packages could not be authenticated"
-msgstr "有些软件包不能通过验证"
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "内部错误，Ordering 未能完成"
 
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
-msgstr "不经验证就安装这些软件包吗？"
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
+#. 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of 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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "需要下载 %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
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "解压缩后会消耗掉 %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
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "解压缩后将会空出 %sB 的空间。\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --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 "虽然您指定了仅执行常规操作，但这不是个常规操作。"
+
+#. 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "是，按我说的做！"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"您的操作会导致潜在的危害。\n"
+"若还想继续的话，就输入下面的短句“%s”\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "中止执行。"
+
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "您希望继续执行吗？"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "有一些文件无法下载"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
+"再试试？"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "目前还不支持 --fix-missing 和介质交换"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "无法更正缺少的软件包。"
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "中止安装。"
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失："
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "注意：这是自动被 dpkg 有意完成的。"
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "我们不应该进行删除，无法启动自动删除器"
+
+#: 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 "似乎自动卸载工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。"
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "下列信息可能会对解决问题有所帮助："
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "内部错误，自动卸载工具坏事了"
+
+#: apt-private/private-install.cc:488
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "下列软件包是自动安装的并且现在不需要了："
+
+#: apt-private/private-install.cc:492
+#, c-format
+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 个自动安装的的软件包现在已不再需要了。\n"
+
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "使用'apt-get autoremove'来卸载它(它们)。"
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
+"以指定一个解决办法)。"
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"有一些软件包无法被安装。如果您用的是 unstable 发行版，这也许是\n"
+"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
+"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "破损的软件包"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "将会安装下列额外的软件包："
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "建议安装的软件包："
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "推荐安装的软件包："
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "不能重新安装 %s，因为无法下载它。\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s 已经是最新的版本。\n"
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%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
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "软件包 %s 还未安装，因而不会被卸载。您的意思是 ‘%s’ 吗？\n"
+
+#: apt-private/private-install.cc:945
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "软件包 %s 还未安装，因而不会被卸载\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "【警告】：下列软件包不能通过验证！"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "忽略了认证警告。\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "有些软件包不能通过验证"
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "不经验证就安装这些软件包吗？"
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %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 "无法获知您在 %s 上的可用空间"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "您在 %s 上没有足够的可用空间。"
+
 #: apt-private/private-sources.cc:58
 #, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1678,41 +1692,33 @@ msgstr "您的 %s 文件有过改动，请执行 ‘apt-get update’。"
 msgid "Full Text Search"
 msgstr "全文搜索"
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "正在对升级进行计算"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "完成"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "命中 "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "获取："
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "忽略 "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "错误 "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "下载 %sB，耗时 %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [执行中]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1725,18 +1731,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1808,205 +1814,450 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们，
 msgid "Merging available information"
 msgstr "正在合并可用信息"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "把 DropNode 用在了仍在链表中的节点上"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
+"\n"
+"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
+"信息的工具\n"
+"\n"
+"选项：\n"
+"  -h   本帮助文本\n"
+"  -t   设置 temp 目录\n"
+"  -c=? 读指定的配置文件\n"
+"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "无法定位哈希表元素！"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, c-format
+msgid "Unable to mkstemp %s"
+msgstr "无法建立临时文件(mkstemp) %s "
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "无法分配转移项"
+#: 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"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "内部错误，出现在 AddDiversion"
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s"
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "软件包的扩展列表太长"
 
-#: apt-inst/filelist.cc:506
+#: 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 "Double add of diversion %s -> %s"
-msgstr "添加了两个转移项 %s-> %s"
+msgid "Error processing directory %s"
+msgstr "处理目录 %s 时出错"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "重复的配置文件 %s/%s"
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "源扩展列表太长"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "将头写入到目录文件时出错"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "路径名 %s 太长"
+msgid "Error processing contents %s"
+msgstr "处理目录 %s 时出错"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"用法： apt-ftparchive [选项] 命令\n"
+"命令： packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n"
+"       sources 源代码包搜索路径 [overridefile [路径前缀]]\n"
+"       contents 搜索路径\n"
+"       release 搜索路径\n"
+"       generate 配置文件 [groups]\n"
+"       clean 配置文件\n"
+"\n"
+"apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n"
+"多种生成索引的方式，从全自动的索引生成到在功能上取代 dpkg-scanpackages \n"
+"和 dpkg-scansources，都能游刃有余\n"
+"\n"
+"apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n"
+"Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n"
+"还有软件包的所有控制字段的内容。该软件同时支持 override 文件，\n"
+"通过它可以强制指定软件包的优先级及其所属的软件类别。\n"
+"\n"
+"与上面类似，apt-ftparchive 也能由 .dsc 的文件树生成 Source 文件。\n"
+"可以通过使用 --source-override 选项来指定一个 override 文件\n"
+"\n"
+"使用“packages”和“source”命令时，必须在文件树的根部执行本程序。\n"
+"二进制包的搜索路径一定要是递归搜索的底层，而且 override 文件里\n"
+"应该注明 override 的标志。若指定了路径前缀，那么它会被加到文件名前面。\n"
+"下面有个来自 Debian 文档的例子：\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386 > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"选项:\n"
+"  -h    本帮助文档\n"
+"  --md5 使之生成 MD5 校验和\n"
+"  -s=?  源代码包 override 文件\n"
+"  -q    输出精简信息\n"
+"  -d=?  指定可选的缓存数据库\n"
+"  -d=?  使用另一个可选的缓存数据库\n"
+"  --no-delink 开启delink的调试模式\n"
+"  --contents  使之生成控制内容文件\n"
+"  -c=?  读取指定配置文件\n"
+"  -o=?  设置任意指定的配置选项"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "没有任何选定项是匹配的"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "%s 被解包了不只一次"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "软件包文件组“%s”中缺少一些文件"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "目录 %s 已被转移"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "该软件包正尝试写入转移对象 %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "数据库已过期，现尝试进行升级 %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "该转移路径太长"
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。"
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "无法打开数据库文件 %s：%s"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "无法获得 %s 的状态"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+msgid "Failed to read .dsc"
+msgstr "读取 .dsc 文件失败"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "归档文件没有包含控制字段"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "无法获得游标"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "无法将 %s 重命名为 %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "警告：无法读取目录 %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "目录 %s 要被一个非目录的文件替换"
+msgid "W: Unable to stat %s\n"
+msgstr "警告：无法获得 %s 的状态\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "无法在其散列桶中分配节点"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "错误："
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "路径名太长"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "警告："
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "错误：处理文件时出错 "
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "用来覆盖的软件包不属于 %s 的任何版本"
+msgid "Failed to resolve %s"
+msgstr "无法解析 %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "无法遍历目录树"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
+msgid "Failed to open %s"
+msgstr "无法打开 %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "无法读取 %s 的状态"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "无法写入文件 %s"
+msgid "Failed to readlink %s"
+msgstr "无法读取符号链接 %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "无法关闭文件 %s"
+msgid "Failed to unlink %s"
+msgstr "无法使用 unlink 删除 %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
+msgid "*** Failed to link %s to %s"
+msgstr "*** 无法将 %s 链接到 %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:321
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "内部错误，无法定位包内文件 %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr " 达到了 DeLink 的上限 %sB。\n"
+
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "归档文件没有包含 package 字段"
+
+#: 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:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s 的维护者 %s 并非 %s\n"
+
+#: ftparchive/writer.cc:712
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s 没有源代码的 override 项\n"
+
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s 中没有二进制文件的 override 项\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - 分配内存失败"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "无法打开 %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "override 文件 %s 第 %llu (%s) 行的格式有误"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "无法读取 override 文件 %s"
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "override 文件 %s 第 %llu 行的格式有误 #1"
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "override 文件 %s 第 %llu 行的格式有误 #2"
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "override 文件 %s 第 %llu 行的格式有误 #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "未知的压缩算法“%s”"
+
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "不能解析的主控文件"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "无法创建 FILE*"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "无效的归档签名"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "无法 fork"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "读取归档成员文件头出错"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "压缩子进程"
 
-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/multicompress.cc:232
 #, c-format
-msgid "Invalid archive member header %s"
-msgstr "归档文件中成员文件头 %s 无效"
-
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "归档文件中成员文件头无效"
+msgid "Internal error, failed to create %s"
+msgstr "内部错误，无法创建 %s"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "归档文件太短"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "无法对子进程或文件进行读写"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "无法读取归档文件的数据头"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "在计算 MD5 校验和时无法读取数据"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "无法创建管道"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "在使用 unlink 删除 %s 时出错"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "无法执行 gzip"
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "无法将 %s 重命名为 %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "包文件已被损坏"
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"用法： apt-internal-solver\n"
+"\n"
+"apt-internal-solver 是个用于调试及类似用途的接口，它可以\n"
+"像 APT 家族外部解决器(resolver)那样使用当前的内部解决器。\n"
+"\n"
+"选项：\n"
+"  -h  显示本帮助。\n"
+"  -q  日志型输出 - 无进度指示\n"
+"  -c=? 读取指定配置文件\n"
+"  -o=? 设置任意配置项，比如 -o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar 的校验和不符，文件已损坏"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "未知的软件包记录！"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "未知的 TAR 数据头类型 %u，成员 %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
+"\n"
+"apt-sortpkgs 是对软件包索引文件内容进行排序的简单工具。-s 选项\n"
+"是用来指出后面参数所示文件是哪种文件。\n"
+"\n"
+"选项：\n"
+"  -h   本帮助文档\n"
+"  -s   根据源文件排序\n"
+"  -c=? 读取指定配置文件\n"
+"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr "进度：[%3i%%]"
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr "正在运行 dpkg"
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "不支持“%s”打包系统"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "无法确定适合的打包系统类型"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "已写入 %i 条记录。\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
@@ -2021,6 +2272,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 "无法解析或打开软件包的列表或是状态文件。"
@@ -2033,156 +2304,327 @@ msgstr "您可能需要运行 apt-get update 来解决这些问题"
 msgid "The list of sources could not be read."
 msgstr "无法读取源列表。"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "软件包缓存区是空的"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr "软件包缓存文件损坏了"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr "软件包缓存区文件的版本不兼容"
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168
 msgid "The package cache file is corrupted, it is too small"
 msgstr "软件包缓存文件损坏，它太小了"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "本程序目前不支持“%s”版本系统"
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "依赖"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "预依赖"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "建议"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "推荐"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "冲突"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "替换"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "废弃"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "破坏"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr "增强"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "必需"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "标准"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "可选"
 
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "额外"
+#: apt-pkg/pkgcache.cc:336
+msgid "extra"
+msgstr "额外"
+
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "正在对升级进行计算"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "不支持索引文件类型“%s”"
+
+#: 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/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/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 行有错误(独立发行版)"
+
+#: 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/acquire-worker.cc:116
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Is the package %s installed?"
-msgstr "请检查是否安装了 %s 软件包"
+msgid "Couldn't stat source package list %s"
+msgstr "无法获取源软件包列表 %s 的状态"
 
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-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/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "正在收集文件所提供的软件包"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "不支持索引文件类型“%s”"
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "无法读取或写入软件源缓存"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "正在分析软件包的依赖关系树"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "向solver发送情景"
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "候选版本"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "向solver发送请求"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "生成依赖关系"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "准备接收解决方案"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "正在读取状态信息"
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "外部solver出错，错误信息不恰当"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "无法打开状态文件 %s"
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "执行外部solver"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "无法写入临时状态文件 %s"
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Hash 校验和不符"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "大小不符"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 msgid "Invalid file format"
 msgstr "无效的文件格式 %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "写出错"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG 错误：%s: %s"
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "目录 %s 已被转移"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2190,16 +2632,16 @@ msgid ""
 msgstr ""
 "在 Release 文件中找不到期望的条目 %s（sources.list条目有误，或者文件有误）"
 
-#: apt-pkg/acquire-item.cc:1656
+#: 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:1698
+#: 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:1736
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2207,26 +2649,19 @@ msgid ""
 msgstr ""
 "%s 的 Release 文件已经过期(invalid since %s)。该仓库的更新将不会被应用。"
 
-#: apt-pkg/acquire-item.cc:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
-"校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG 错误：%s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: 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 "
@@ -2235,128 +2670,49 @@ msgstr ""
 "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
 "包。(缘于架构缺失)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "处理 %s (%s%d) 时出错"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "哇，软件包数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "无法获取源软件包列表 %s 的状态"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "正在读取软件包列表"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "正在收集文件所提供的软件包"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "无法写入 %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "仓库目录 %spartial 确实。"
 
-#: apt-pkg/acquire.cc:99
+#: 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:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
@@ -2383,7 +2739,7 @@ msgstr "无法识别锁定的类型 %s"
 msgid "No priority (or zero) specified for pin"
 msgstr "没有为版本锁定指定优先级(或为零)"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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 "
@@ -2392,12 +2748,12 @@ msgstr ""
 "无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
 "(%d)"
 
-#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "无法配置 %s。"
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2408,10 +2764,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"
@@ -2482,11 +2839,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"
 
@@ -2496,7 +2853,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2504,328 +2861,259 @@ msgstr ""
 "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
 "缘故。"
 
-#: apt-pkg/algorithms.cc:1088
+#: 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 "向solver发送情景"
-
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "向solver发送请求"
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "准备接收解决方案"
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "外部solver出错，错误信息不恰当"
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "执行外部solver"
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "无法解析软件包文件 %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "无法解析软件包仓库 Release 文件 %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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 解析)"
-
-#: 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/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: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 行有错误(独立发行版)"
+#: 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 行有错误(发行版解析)"
+#: 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 行的格式有误(类型)"
+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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”发布版本"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”版本"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "无法找到任务 %s"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/cacheset.cc:635
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "无法按照正则表达式 %s 找到任何软件包"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/cacheset.cc:641
 #, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "无法按照 glob ‘%s’ 找到任何软件包"
 
-#: apt-pkg/cacheset.cc:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择"
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
+
+#: apt-pkg/indexrecords.cc:145
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
+
+#: apt-pkg/indexrecords.cc:164
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: 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:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr "%li分 %li秒"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr "%li秒"
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "找不到您选则的 %s"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "由于文件系统为只读，因而无法使用文件锁 %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "无法打开锁文件 %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "无法在 nfs 文件系统上使用文件锁 %s"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "无法获得锁 %s"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 "无法创建文件列表，因为‘%s’不是一个目录"
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "忽略‘%s’(于目录‘%s’)，鉴于它不是一个常规文件"
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "忽略‘%s’(于目录‘%s’)，鉴于它没有文件扩展名"
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr "忽略‘%s’(于目录‘%s’)，鉴于它的文件扩展名无效"
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "子进程 %s 发生了段错误"
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "子进程 %s 收到信号 %u。"
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子进程 %s 返回了一个错误号 (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子进程 %s 异常退出"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "关闭 gzip %s 文件出错"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "无法打开文件 %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "无法打开文件描述符 %d"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "无法创建子进程的 IPC 管道"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "无法执行压缩程序"
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "还剩 %llu 字节没有读出，但已没有可读信息"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "还剩 %llu 字节没有写入，但无法写入操作"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "关闭文件 %s 出错"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "重命名文件 %s 为 %s 出错"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "用 unlink 删除文件 %s 出错"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "同步文件出错"
 
@@ -2910,109 +3198,103 @@ msgstr "无法读取文件系统挂载点 %s 的状态"
 msgid "Failed to stat the cdrom"
 msgstr "无法读取盘片的状态"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "无法识别的类型缩写：“%c”"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "正在打开配置文件 %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "语法错误 %s:%u：标签格式有误"
 
-#: apt-pkg/contrib/configuration.cc:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s 中没有安装密钥环。"
-
-#: 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"
@@ -3022,12 +3304,12 @@ msgstr "无效的操作 %s"
 msgid "Installing %s"
 msgstr "正在安装 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "正在删除 %s"
@@ -3048,523 +3330,296 @@ msgid "Running post-installation trigger %s"
 msgstr "执行安装后执行的触发器 %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "目录 %s 缺失"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "正在准备 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解压缩 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "已安装 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在准备 %s 的删除操作"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "已删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在准备完全删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr "操作在完成之前被打断"
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr "依赖问题 - 保持未配置"
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: 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 "未锁定"
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
-"\n"
-"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
-"信息的工具\n"
-"\n"
-"选项：\n"
-"  -h   本帮助文本\n"
-"  -t   设置 temp 目录\n"
-"  -c=? 读指定的配置文件\n"
-"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, c-format
-msgid "Unable to mkstemp %s"
-msgstr "无法建立临时文件(mkstemp) %s "
-
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "处理目录 %s 时出错"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "源扩展列表太长"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "将头写入到目录文件时出错"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "处理目录 %s 时出错"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"用法： apt-ftparchive [选项] 命令\n"
-"命令： packages 二进制软件包搜索路径 [overridefile [路径前缀]]\n"
-"       sources 源代码包搜索路径 [overridefile [路径前缀]]\n"
-"       contents 搜索路径\n"
-"       release 搜索路径\n"
-"       generate 配置文件 [groups]\n"
-"       clean 配置文件\n"
-"\n"
-"apt-ftparchive 被用来为 Debian 软件包生成索引文件。它能支持\n"
-"多种生成索引的方式，从全自动的索引生成到在功能上取代 dpkg-scanpackages \n"
-"和 dpkg-scansources，都能游刃有余\n"
-"\n"
-"apt-ftparchive 能依据一个由 .deb 文件构成的文件树生成 Package 文件。\n"
-"Package 文件里不仅注有每个软件包的 MD5 校验码和文件大小，\n"
-"还有软件包的所有控制字段的内容。该软件同时支持 override 文件，\n"
-"通过它可以强制指定软件包的优先级及其所属的软件类别。\n"
-"\n"
-"与上面类似，apt-ftparchive 也能由 .dsc 的文件树生成 Source 文件。\n"
-"可以通过使用 --source-override 选项来指定一个 override 文件\n"
-"\n"
-"使用“packages”和“source”命令时，必须在文件树的根部执行本程序。\n"
-"二进制包的搜索路径一定要是递归搜索的底层，而且 override 文件里\n"
-"应该注明 override 的标志。若指定了路径前缀，那么它会被加到文件名前面。\n"
-"下面有个来自 Debian 文档的例子：\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386 > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"选项:\n"
-"  -h    本帮助文档\n"
-"  --md5 使之生成 MD5 校验和\n"
-"  -s=?  源代码包 override 文件\n"
-"  -q    输出精简信息\n"
-"  -d=?  指定可选的缓存数据库\n"
-"  -d=?  使用另一个可选的缓存数据库\n"
-"  --no-delink 开启delink的调试模式\n"
-"  --contents  使之生成控制内容文件\n"
-"  -c=?  读取指定配置文件\n"
-"  -o=?  设置任意指定的配置选项"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "没有任何选定项是匹配的"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "软件包文件组“%s”中缺少一些文件"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "数据库已过期，现尝试进行升级 %s"
-
-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。"
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "无法打开数据库文件 %s：%s"
-
-#: ftparchive/cachedb.cc:332
-msgid "Failed to read .dsc"
-msgstr "读取 .dsc 文件失败"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "归档文件没有包含控制字段"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "无法获得游标"
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"
 
-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "警告：无法读取目录 %s\n"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？"
 
-#: ftparchive/writer.cc:96
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "警告：无法获得 %s 的状态\n"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg 被中断，您必须手工运行 ‘%s’ 解决此问题。"
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "错误："
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "未锁定"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "警告："
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "把 DropNode 用在了仍在链表中的节点上"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "错误：处理文件时出错 "
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "无法定位哈希表元素！"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "无法解析 %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "无法分配转移项"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "无法遍历目录树"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "内部错误，出现在 AddDiversion"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:477
 #, c-format
-msgid "Failed to open %s"
-msgstr "无法打开 %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Double add of diversion %s -> %s"
+msgstr "添加了两个转移项 %s-> %s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "无法读取符号链接 %s"
+msgid "Duplicate conf file %s/%s"
+msgstr "重复的配置文件 %s/%s"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "无法使用 unlink 删除 %s"
+msgid "The path %s is too long"
+msgstr "路径名 %s 太长"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** 无法将 %s 链接到 %s"
+msgid "Unpacking %s more than once"
+msgstr "%s 被解包了不只一次"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:142
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " 达到了 DeLink 的上限 %sB。\n"
-
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "归档文件没有包含 package 字段"
+msgid "The directory %s is diverted"
+msgstr "目录 %s 已被转移"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s 中没有 override 项\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "该软件包正尝试写入转移对象 %s/%s"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s 的维护者 %s 并非 %s\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "该转移路径太长"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s 没有源代码的 override 项\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "目录 %s 要被一个非目录的文件替换"
 
-#: ftparchive/writer.cc:702
-#, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s 中没有二进制文件的 override 项\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "无法在其散列桶中分配节点"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 分配内存失败"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "路径名太长"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "Unable to open %s"
-msgstr "无法打开 %s"
+msgid "Overwrite package match with no version for %s"
+msgstr "用来覆盖的软件包不属于 %s 的任何版本"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "override 文件 %s 第 %llu (%s) 行的格式有误"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "无法读取 override 文件 %s"
+msgid "Unable to stat %s"
+msgstr "无法读取 %s 的状态"
 
-#: ftparchive/override.cc:166
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "override 文件 %s 第 %llu 行的格式有误 #1"
+msgid "Failed to write file %s"
+msgstr "无法写入文件 %s"
 
-#: ftparchive/override.cc:178
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "override 文件 %s 第 %llu 行的格式有误 #2"
+msgid "Failed to close file %s"
+msgstr "无法关闭文件 %s"
 
-#: ftparchive/override.cc:191
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "override 文件 %s 第 %llu 行的格式有误 #3"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
 
-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "未知的压缩算法“%s”"
+msgid "Internal error, could not locate member %s"
+msgstr "内部错误，无法定位包内文件 %s"
 
-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "不能解析的主控文件"
+
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "无效的归档签名"
+
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "读取归档成员文件头出错"
+
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"
+msgid "Invalid archive member header %s"
+msgstr "归档文件中成员文件头 %s 无效"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "无法创建 FILE*"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "归档文件中成员文件头无效"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "无法 fork"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "归档文件太短"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "压缩子进程"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "无法读取归档文件的数据头"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "内部错误，无法创建 %s"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "无法创建管道"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "无法对子进程或文件进行读写"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "无法执行 gzip"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "在计算 MD5 校验和时无法读取数据"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "包文件已被损坏"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar 的校验和不符，文件已损坏"
+
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "在使用 unlink 删除 %s 时出错"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "未知的 TAR 数据头类型 %u，成员 %s"
 
-#: cmdline/apt-internal-solver.cc:49
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"用法： apt-internal-solver\n"
-"\n"
-"apt-internal-solver 是个用于调试及类似用途的接口，它可以\n"
-"像 APT 家族外部解决器(resolver)那样使用当前的内部解决器。\n"
-"\n"
-"选项：\n"
-"  -h  显示本帮助。\n"
-"  -q  日志型输出 - 无进度指示\n"
-"  -c=? 读取指定配置文件\n"
-"  -o=? 设置任意配置项，比如 -o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "依赖关系版本名所占空间共计："
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "未知的软件包记录！"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "您在 %s 上没有足够的可用空间"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"用法： apt-sortpkgs [选项] 文件甲 [文件乙 ...]\n"
-"\n"
-"apt-sortpkgs 是对软件包索引文件内容进行排序的简单工具。-s 选项\n"
-"是用来指出后面参数所示文件是哪种文件。\n"
-"\n"
-"选项：\n"
-"  -h   本帮助文档\n"
-"  -s   根据源文件排序\n"
-"  -c=? 读取指定配置文件\n"
-"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "完成"
+
+#~ msgid "No keyring installed in %s."
+#~ msgstr "%s 中没有安装密钥环。"
 
 #~ msgid "Is stdout a terminal?"
 #~ msgstr "stdout 是终端吗？"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c9a134b62..e35910df2 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: 2015-01-16 04:37-0500\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,150 +23,146 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "套件 %s 版本 %s 未能滿足相依性：\n"
 
-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "套件名稱合計："
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "套件名稱合計："
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  一般套件："
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  完全虛擬套件："
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  單一虛擬套件："
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  混合虛擬套件："
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  找不到："
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "個別版本合計："
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr "個別版本類別合計："
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "相依關係合計："
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "版本/檔案關聯合計："
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr "類別/檔案關聯合計："
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "提供者對應合計："
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "所有字串合計："
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "相依版本空間合計："
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "間暇空間合計："
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "統計後的空間合計："
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1442
-#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 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:1254 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:1421
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "找不到套件 %s"
 
-#: cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "套件檔："
 
-#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644
+#: 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:1567
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "鎖定的套件："
 
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(未找到)"
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  已安裝："
 
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  候選："
 
-#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(無)"
 
-#: cmdline/apt-cache.cc:1621
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  套件鎖定："
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  版本列表："
 
-#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: 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:1750
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -239,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"
@@ -261,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 "請對您的光碟組中的其它光碟重複相同的操作。"
 
@@ -297,78 +293,78 @@ msgstr ""
 "  -c=? 讀取指定的設定檔\n"
 "  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "無法找到套件 %s"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "無法找到套件 %s"
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "無法找到套件 %s"
 
-#: cmdline/apt-get.cc:367
+#: cmdline/apt-get.cc:358
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "無法取得來源套件列表 %s 的狀態"
 
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "無法找到套件 %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
+#: 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:461 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:469 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:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr "內部錯誤，問題排除器造成了損壞"
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "無法鎖定下載目錄"
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr "在取得原始碼時必須至少指定一個套件"
 
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071
+#: 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:786
+#: 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:791
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -376,114 +372,113 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "略過已下載的檔案 '%s'\n"
 
-#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "無法確認 %s 的未使用空間"
-
-#: cmdline/apt-get.cc:886
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "在 %s 裡沒有足夠的的未使用空間"
-
 #. 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:895
+#: 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:900
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下載 %sB 的原始套件檔。\n"
 
-#: cmdline/apt-get.cc:906
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "取得原始碼 %s\n"
 
-#: cmdline/apt-get.cc:924
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "無法取得某些套件檔。"
 
-#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr "下載完成，且這是『僅下載』模式"
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "不解開，因原始碼已解開至 %s\n"
 
-#: cmdline/apt-get.cc:967
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "解開指令 '%s' 失敗。\n"
 
-#: cmdline/apt-get.cc:968
+#: 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:996
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "編譯指令 '%s' 失敗。\n"
 
-#: cmdline/apt-get.cc:1015
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "子程序失敗"
 
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr "在檢查編譯相依關係時必須至少指定一個套件"
 
-#: cmdline/apt-get.cc:1059
+#: 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:1083 cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "無法處理編譯相依關係"
+
+#: 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:1106
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 沒有編譯相依關係。\n"
 
-#: cmdline/apt-get.cc:1276
+#: 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:1294
+#: 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:1317
+#: 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:1356
+#: cmdline/apt-get.cc:1359
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -491,37 +486,37 @@ msgid ""
 msgstr ""
 "無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求"
 
-#: cmdline/apt-get.cc:1362
+#: 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:1385
+#: 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:1400
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "無法滿足套件 %s 的編譯相依關係。"
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "無法處理編譯相依關係"
 
-#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "正和 %s (%s) 連線"
 
-#: cmdline/apt-get.cc:1596
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "已支援模組："
 
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -616,11 +611,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr "在取得原始碼時必須至少指定一個套件"
 
-#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:91
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -634,53 +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/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1317
+#: 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"
@@ -758,12 +753,12 @@ msgstr "找不到磁碟。"
 msgid "File not found"
 msgstr "找不到檔案"
 
-#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "無法取得狀態"
 
-#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "無法設定修改時間"
 
@@ -772,157 +767,157 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "不正確的 URI，本機 URI 不應以 // 開頭"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "登入中"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "無法解析對方主機名稱"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "無法解析本機名稱"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "伺服器不接受連線，並回應：%s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER 指令失敗，伺服器回應：%s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS 指令失敗，伺服器回應：%s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 "指定了代理伺服器，但沒有指定登入 script，Acquire::ftp::ProxyLogin 是空的。"
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "登入 script 指令 '%s' 失敗，伺服器回應：%s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE 指令失敗，伺服器回應：%s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "連線逾時"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "伺服器已關閉連線"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
+#: 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
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "回應超過緩衝區長度。"
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "協定失敗"
 
-#: methods/ftp.cc:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
+#: methods/ftp.cc:463 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 "寫入錯誤"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "無法建立 Socket"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "無法和 data socket 連線，連線逾時"
 
-#: methods/ftp.cc:716 methods/connect.cc:116
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "失敗"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "無法和 passive socket 連線。"
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo 無法取得監聽 socket"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "無法 bind 至 socket"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "無法監聽 socket"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "無法解析 socket 名稱"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "無法送出 PORT 指令"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "未知的地址家族 %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT 指令失敗，伺服器回應：%s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Data socket 連線逾時"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "無法接受連線"
 
-#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "有問題的雜湊檔"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "無法取得檔案，伺服器回應 '%s'"
 
-#: methods/ftp.cc:905 methods/rsh.cc:338
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Data socket 連線逾時"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "資料傳輸失敗，伺服器回應 '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "查詢"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "無法 invoke "
 
@@ -988,71 +983,71 @@ msgstr "在解析 '%s:%s' (%i) 時出了怪事"
 msgid "Unable to connect to %s:%s:"
 msgstr "無法連線至 %s %s："
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "內部錯誤：簽章無誤，但卻無法辨識密鑰的指紋碼？！"
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr "至少發現一個無效的簽章。"
 
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:164
 #, fuzzy
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr "無法執行 '%s' 來驗證簽章（gnupg 是否安裝了？）"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr "在執行 apt-key 時發生未知的錯誤"
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr "以下簽名無效：\n"
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "由於無法取得它們的公鑰，以下簽章無法進行驗證：\n"
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:513
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "在寫入該檔時發生錯誤"
 
-#: methods/http.cc:527
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線"
 
-#: methods/http.cc:529
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "在讀取伺服器時發生錯誤"
 
-#: methods/http.cc:565
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "在寫入檔案時發生錯誤"
 
-#: methods/http.cc:625
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "選擇失敗"
 
-#: methods/http.cc:630
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "連線逾時"
 
-#: methods/http.cc:653
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "在寫入輸出檔時發生錯誤"
 
@@ -1084,282 +1079,30 @@ msgstr "這個 HTTP 伺服器的範圍支援有問題"
 msgid "Unknown date format"
 msgstr "未知的資料格式"
 
-#: methods/server.cc:494
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "錯誤的標頭資料"
 
-#: methods/server.cc:511 methods/server.cc:567
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: methods/server.cc:659
-msgid "Internal error"
-msgstr "內部錯誤"
-
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "內部錯誤，在損毀的套件上執行 InstallPackages！"
-
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
-msgstr "有套件需要被移除，但卻被禁止移除。"
-
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
-msgstr "內部錯誤，排序未能完成"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr "怪哉... 檔案大小不符，請發信給 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of 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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "需要下載 %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
-#: apt-private/private-install.cc:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "此操作完成之後，會多佔用 %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
-#: apt-private/private-install.cc:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "此操作完成之後，會空出 %sB 的磁碟空間。\n"
-
-#: apt-private/private-install.cc:200
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "在 %s 裡沒有足夠的的未使用空間。"
-
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "發生了問題，且 -y 並沒有和 --force-yes 搭配使用"
-
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "雖然指定了 Trivial Only（自動答 NO）選項，但這並不是 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
-msgstr "Yes, do as I say!"
-
-#: apt-private/private-install.cc:222
+#: methods/server.cc:589
 #, c-format
 msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"您所進行的操作可能會帶來危險。\n"
-"請輸入 '%s' 這個句子以繼續進行\n"
-" ?] "
-
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "放棄執行。"
-
-#: apt-private/private-install.cc:243
-#, fuzzy
-msgid "Do you want to continue?"
-msgstr "是否繼續進行 [Y/n]？"
-
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "有部份檔案無法下載"
-
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"有部份套件檔無法取得，試著執行 apt-get update 或者試著加上 --fix-missing 選"
-"項？"
-
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "目前尚未支援 --fix-missing 和媒體抽換"
-
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "無法修正欠缺的套件。"
-
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
-msgstr "放棄安裝。"
-
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
-
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "我們沒有計劃要刪除任何東西，無法啟動 AutoRemover"
-
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"嗯，看起來 AutoRemover 弄壞了什麼東西，而這是不該發生的。\n"
-"請針對 apt 發佈錯誤回報。"
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "以下的資訊或許有助於解決當前的情況："
-
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "內部錯誤，AutoRemover 處理失敗"
-
-#: apt-private/private-install.cc:513
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "以下套件是被自動安裝進來的，且已不再會被用到了："
-msgstr[1] "以下套件是被自動安裝進來的，且已不再會被用到了："
-
-#: apt-private/private-install.cc:517
-#, fuzzy, c-format
-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] "以下套件是被自動安裝進來的，且已不再會被用到了："
-msgstr[1] "以下套件是被自動安裝進來的，且已不再會被用到了："
-
-#: apt-private/private-install.cc:519
-#, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "使用 'apt-get autoremove' 來將其移除。"
-msgstr[1] "使用 'apt-get autoremove' 來將其移除。"
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "您也許得執行 'apt-get -f install' 以修正這些問題："
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'（或採取其它的解"
-"決方案）。"
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
 msgstr ""
-"有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n"
-"unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。"
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "損毀的套件"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "下列的額外套件將被安裝："
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "建議套件："
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "推薦套件："
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
-
-#: apt-private/private-install.cc:829
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "無法重新安裝 %s，因為它無法下載。\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s 已經是最新版本了。\n"
 
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "內部錯誤"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:151
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -1367,31 +1110,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "正在修正相依關係..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " 失敗。"
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "無法修正相依關係"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr "無法將升級計劃最小化"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " 完成"
 
-#: apt-private/private-cachefile.cc:108
+#: 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:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "未能滿足相依關係。試試 -f 選項。"
 
@@ -1555,7 +1298,7 @@ msgstr ""
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "編譯正規表示式時發生錯誤 - %s"
@@ -1564,7 +1307,7 @@ msgstr "編譯正規表示式時發生錯誤 - %s"
 msgid "The update command takes no arguments"
 msgstr "update 指令不需任何參數"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-update.cc:95
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
@@ -1572,10 +1315,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-update.cc:101
+#: 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"
@@ -1596,27 +1343,294 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "【警告】：無法驗證下列套件！"
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "內部錯誤，在損毀的套件上執行 InstallPackages！"
 
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "忽略了驗證警告。\n"
+#: apt-private/private-install.cc:90
+msgid "Packages need to be removed but remove is disabled."
+msgstr "有套件需要被移除，但卻被禁止移除。"
 
-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
+#: apt-private/private-install.cc:109
+msgid "Internal error, Ordering didn't finish"
+msgstr "內部錯誤，排序未能完成"
+
+#: apt-private/private-install.cc:147
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+msgstr "怪哉... 檔案大小不符，請發信給 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
+#: apt-private/private-install.cc:154
+#, c-format
+msgid "Need to get %sB/%sB of 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
+#: apt-private/private-install.cc:159
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "需要下載 %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
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "此操作完成之後，會多佔用 %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
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "此操作完成之後，會空出 %sB 的磁碟空間。\n"
+
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "發生了問題，且 -y 並沒有和 --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（自動答 NO）選項，但這並不是 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)
+#: apt-private/private-install.cc:195
+msgid "Yes, do as I say!"
+msgstr "Yes, do as I say!"
+
+#: apt-private/private-install.cc:197
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"您所進行的操作可能會帶來危險。\n"
+"請輸入 '%s' 這個句子以繼續進行\n"
+" ?] "
+
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+msgid "Abort."
+msgstr "放棄執行。"
+
+#: apt-private/private-install.cc:218
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "是否繼續進行 [Y/n]？"
+
+#: apt-private/private-install.cc:288
+msgid "Some files failed to download"
+msgstr "有部份檔案無法下載"
+
+#: apt-private/private-install.cc:295
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"有部份套件檔無法取得，試著執行 apt-get update 或者試著加上 --fix-missing 選"
+"項？"
+
+#: apt-private/private-install.cc:299
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "目前尚未支援 --fix-missing 和媒體抽換"
+
+#: apt-private/private-install.cc:304
+msgid "Unable to correct missing packages."
+msgstr "無法修正欠缺的套件。"
+
+#: apt-private/private-install.cc:305
+msgid "Aborting install."
+msgstr "放棄安裝。"
+
+#: apt-private/private-install.cc:341
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:366
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "我們沒有計劃要刪除任何東西，無法啟動 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 ""
+"嗯，看起來 AutoRemover 弄壞了什麼東西，而這是不該發生的。\n"
+"請針對 apt 發佈錯誤回報。"
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+msgid "The following information may help to resolve the situation:"
+msgstr "以下的資訊或許有助於解決當前的情況："
+
+#: apt-private/private-install.cc:481
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "內部錯誤，AutoRemover 處理失敗"
+
+#: apt-private/private-install.cc:488
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "以下套件是被自動安裝進來的，且已不再會被用到了："
+msgstr[1] "以下套件是被自動安裝進來的，且已不再會被用到了："
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+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] "以下套件是被自動安裝進來的，且已不再會被用到了："
+msgstr[1] "以下套件是被自動安裝進來的，且已不再會被用到了："
+
+#: 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[1] "使用 'apt-get autoremove' 來將其移除。"
+
+#: apt-private/private-install.cc:587
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "您也許得執行 'apt-get -f install' 以修正這些問題："
+
+#: apt-private/private-install.cc:589
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'（或採取其它的解"
+"決方案）。"
+
+#: apt-private/private-install.cc:612
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n"
+"unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。"
+
+#: apt-private/private-install.cc:633
+msgid "Broken packages"
+msgstr "損毀的套件"
+
+#: apt-private/private-install.cc:710
+msgid "The following extra packages will be installed:"
+msgstr "下列的額外套件將被安裝："
+
+#: apt-private/private-install.cc:800
+msgid "Suggested packages:"
+msgstr "建議套件："
+
+#: apt-private/private-install.cc:801
+msgid "Recommended packages:"
+msgstr "推薦套件："
+
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
+
+#: apt-private/private-install.cc:827
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "無法重新安裝 %s，因為它無法下載。\n"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s 已經是最新版本了。\n"
+
+#: apt-private/private-install.cc:892
+#, fuzzy, c-format
+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
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "選定的版本為 %3$s 的 %1$s (%2$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 "套件 %s 並沒有被安裝，所以也不會被移除\n"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
+
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "【警告】：無法驗證下列套件！"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr "忽略了驗證警告。\n"
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
 msgid "Some packages could not be authenticated"
 msgstr "有部份套件無法驗證"
 
-#: apt-private/private-download.cc:50
+#: apt-private/private-download.cc:108
 msgid "Install these packages without verification?"
 msgstr "是否不經驗證就安裝這些套件？"
 
-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "無法取得 %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 "無法確認 %s 的未使用空間"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "在 %s 裡沒有足夠的的未使用空間。"
+
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
@@ -1631,41 +1645,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade"
-msgstr "籌備升級中"
-
-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "完成"
-
 #: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr "已有 "
 
-#: apt-private/acqprogress.cc:90
+#: apt-private/acqprogress.cc:88
 msgid "Get:"
 msgstr "下載:"
 
-#: apt-private/acqprogress.cc:121
+#: apt-private/acqprogress.cc:119
 msgid "Ign "
 msgstr "略過 "
 
-#: apt-private/acqprogress.cc:125
+#: apt-private/acqprogress.cc:126
 msgid "Err "
 msgstr "錯誤 "
 
-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "取得 %sB 用了 %s (%sB/s)\n"
 
-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr " [工作中]"
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1678,18 +1684,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-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: 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/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1763,205 +1769,450 @@ msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]"
 msgid "Merging available information"
 msgstr "整合現有的資料"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode 在還有連結結點時被呼叫"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"用法：apt-extracttemplates 檔案1 [檔案2 ...]\n"
+"\n"
+"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n"
+"的工具\n"
+"\n"
+"選項\n"
+"  -h   本幫助訊息。\n"
+"  -t   指定暫存目錄\n"
+"  -c=? 讀取指定的設定檔\n"
+"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "找不到雜湊元件！"
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "無法取得 %s 的狀態"
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "在配置抽換資訊時失敗"
+#: 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"
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "在 AddDiversion 發生了內部錯誤"
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "無法取得 debconf 版本。是否有安裝 debconf？"
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "試圖改寫抽換資訊，%s -> %s 和 %s/%s"
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"
+msgstr "套件延伸列表過長"
 
-#: apt-inst/filelist.cc:506
+#: 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 "Double add of diversion %s -> %s"
-msgstr "重複加入抽換資訊 %s -> %s"
+msgid "Error processing directory %s"
+msgstr "處理目錄 %s 時發生錯誤"
 
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "重複的設定檔 %s/%s"
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"
+msgstr "原始碼的延伸列表太長"
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"
+msgstr "寫入標頭資訊到內容檔時發生錯誤"
+
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
-msgid "The path %s is too long"
-msgstr "路徑 %s 過長"
+msgid "Error processing contents %s"
+msgstr "處理內容 %s 時發生錯誤"
 
-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"用法：apt-ftparchive [選項] 指令\n"
+"指令：packages 二進制檔搜索路徑 [重新定義檔 [路徑前綴]]\n"
+"      sources 原始碼搜索路徑 [重新定義檔 [路徑前綴]]\n"
+"      contents 搜索路徑\n"
+"      release 搜索路徑\n"
+"      generate 設定檔 [群組]\n"
+"      clean 設定檔\n"
+"\n"
+"apt-ftparchive 可用來替 Debian 套件庫建立索引檔。它支援了從全\n"
+"自動化到足以替代 dpkg-scanpackages 及 dpkg-scansources 所提供\n"
+"的所有功能等等各式各樣建立索引的方式。apt-ftparchive 會根據 .deb 檔案樹建立 "
+"Package 檔。Package 檔\n"
+"裡不僅包含了每個套件的 control 資料的內容，還包含了 MD5 檢驗\n"
+"碼和檔案大小。它還支援了重新定義檔，可用來強制指定優先等級及\n"
+"其所屬的類別。\n"
+"\n"
+"而同樣的，apt-ftparchive 也能根據 .dsc 檔案樹生成 Source 檔。\n"
+"可用 --source-override 選項來指定一個 src 重新定義檔。\n"
+"\n"
+"應當在檔案樹的根目錄下執行 'packages' 和 'source' 指令。\n"
+"二進制檔的搜索路徑必須指向遞迴搜索的底層，且在重新定義檔裡必\n"
+"須包含 override 旗標。若指定了路徑前綴時，則會被附加到檔案名\n"
+"稱這個欄位裡。以 Debian 套件庫為例:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"選項：\n"
+"  -h    本幫助說明\n"
+"  --md5 控制如何產生 MD5 檢驗碼\n"
+"  -s=?  原始碼的重新定義檔\n"
+"  -q    安靜模式\n"
+"  -d=?  指定搭配的快取資料庫\n"
+"  --no-delink 啟用 DeLinking 模式\n"
+"  --contents  產生控制內容檔\n"
+"  -c=?  讀取指定的設定檔\n"
+"  -o=?  指定任意的設定選項"
+
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"
+msgstr "找不到符合的選項"
+
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "解開 %s 超過一次"
+msgid "Some files are missing in the package file group `%s'"
+msgstr "套件檔案組 `%s' 少了部份檔案"
 
-#: apt-inst/extract.cc:142
+#: ftparchive/cachedb.cc:67
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "路徑 %s 已被抽換"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB 已損毀，檔案被更名為 %s.old"
 
-#: apt-inst/extract.cc:152
+#: ftparchive/cachedb.cc:85
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "此套件試圖寫至抽換後的目標 %s/%s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB 過舊，嘗試升級 %s"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "要進行抽換的路徑過長"
+#: ftparchive/cachedb.cc:96
+#, fuzzy
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"資料庫格式不正確。如果您是由舊版的 apt 升級上來的，請移除並重新建立資料庫。"
 
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "無法開啟 DB 檔 %s: %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "無法取得 %s 的狀態"
 
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "無法讀取連結 %s"
+
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "套件檔沒有 control 記錄"
+
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "無法取得遊標"
+
+#: ftparchive/writer.cc:104
 #, c-format
-msgid "Failed to rename %s to %s"
-msgstr "無法將 %s 更名為 %s"
+msgid "W: Unable to read directory %s\n"
+msgstr "警告：無法讀取目錄 %s\n"
 
-#: apt-inst/extract.cc:249
+#: ftparchive/writer.cc:109
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "目錄 %s 已經被非目錄的檔案所取代"
+msgid "W: Unable to stat %s\n"
+msgstr "警告：無法取得 %s 狀態\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "在雜湊表中找不到節點"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "錯誤："
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "路徑過長"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "警告："
 
-#: apt-inst/extract.cc:421
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "錯誤：套用到檔案時發生錯誤"
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "以無版本的 %s 覆寫原始套件"
+msgid "Failed to resolve %s"
+msgstr "無法解析 %s"
 
-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "無法走訪目錄樹"
+
+#: ftparchive/writer.cc:232
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "檔案 %s/%s 覆寫了套件 %s 中的相同檔案"
+msgid "Failed to open %s"
+msgstr "無法開啟 %s"
 
-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:291
 #, c-format
-msgid "Unable to stat %s"
-msgstr "無法取得 %s 的狀態"
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: ftparchive/writer.cc:299
 #, c-format
-msgid "Failed to write file %s"
-msgstr "寫入檔案 %s 失敗"
+msgid "Failed to readlink %s"
+msgstr "無法讀取連結 %s"
 
-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:303
 #, c-format
-msgid "Failed to close file %s"
-msgstr "關閉檔案 %s 失敗"
+msgid "Failed to unlink %s"
+msgstr "無法移除連結 %s"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:311
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "這是個不正確的 DEB 套件檔，沒有 '%s' 成員"
+msgid "*** Failed to link %s to %s"
+msgstr "*** 無法將 %s 連結到 %s"
+
+#: ftparchive/writer.cc:321
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " 達到了 DeLink 的上限 %sB。\n"
+
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr "套件檔裡沒有套件資訊"
+
+#: 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:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  %s 的維護者是 %s，而非 %s\n"
+
+#: ftparchive/writer.cc:712
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  %s 沒有原始碼重新定義項目\n"
+
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  %s 也沒有二元碼重新定義項目\n"
+
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - 無法配置記憶體"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "無法開啟 %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "無法讀取重新定義檔 %s"
+
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1"
+
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #2"
+
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #3"
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "未知的壓縮演算法 '%s'"
 
-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/multicompress.cc:103
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "內部錯誤，找不找到成員 %s"
-
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "無法分析的 control 檔"
+msgid "Compressed output %s needs a compression set"
+msgstr "要壓縮輸出 %s 需搭配壓縮動作"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "無效的套件庫簽章"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "無法建立 FILE*"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "讀取套件檔的成員標頭訊息時發生錯誤"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "fork 時失敗"
 
-#: apt-inst/contrib/arfile.cc:96
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "無效的套件檔成員標頭"
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr "壓縮子程序"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "無效的套件檔成員標頭"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "內部錯誤，無法建立 %s"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "套件檔過短"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "和子程序/檔案 IO 失敗"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "讀取套件檔標頭失敗"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "在計算 MD5 時無法讀取到資料"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "無法建立管線"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "在取消 %s 的連結時發生問題"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "無法執行 gzip"
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "無法將 %s 更名為 %s"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "損毀的套件檔"
+#: cmdline/apt-internal-solver.cc:51
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"用法：apt-extracttemplates 檔案1 [檔案2 ...]\n"
+"\n"
+"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n"
+"的工具\n"
+"\n"
+"選項\n"
+"  -h   本幫助訊息。\n"
+"  -t   指定暫存目錄\n"
+"  -c=? 讀取指定的設定檔\n"
+"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar checksum 失敗，套件檔已損毀"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "未知的套件記錄！"
 
-#: apt-inst/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "未知的 TAR 標頭類型 %u，成員 %s"
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"用法：apt-sortpkgs [選項] 檔案1 [檔案2 ...]\n"
+"\n"
+"apt-sortpkgs 是用來排序套件檔的簡單工具。-s 選項是用來指定它的檔案類型。\n"
+"\n"
+"選項：\n"
+"  -h   本幫助訊息。\n"
+"  -s   根據原始檔排序\n"
+"  -c=? 讀取指定的設定檔\n"
+"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "不支援的套件包裝系統 '%s'"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172
 msgid "Unable to determine a suitable packaging system type"
 msgstr "無法確認合適的套件包裝系統類型"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "寫入 %i 筆紀錄。\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了。\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案不符\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: 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 筆紀綠，其中有 %i 個檔案遺失了，有 %i 個檔案不符\n"
@@ -1976,6 +2227,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 "無法分析或開啟套件清單或狀況檔。"
@@ -1988,199 +2259,363 @@ msgstr "您也許得執行 apt-get update 以修正這些問題"
 msgid "The list of sources could not be read."
 msgstr "無法讀取來源列表。"
 
-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr "清空套件快取"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr "套件快取檔損壞"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr "套件快取檔版本不符"
 
-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168
 #, fuzzy
 msgid "The package cache file is corrupted, it is too small"
 msgstr "套件快取檔損壞"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "本 APT 不支援 '%s' 版本系統"
 
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
+#: 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:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr "相依關係"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr "預先相依關係"
 
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr "建議"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr "推薦"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr "衝突"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr "取代"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr "廢棄"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr "毀損"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr "必要"
 
-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr "標準"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr "次要"
 
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "額外"
+#: apt-pkg/pkgcache.cc:336
+msgid "extra"
+msgstr "額外"
+
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "籌備升級中"
+
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "不被支援的索引檔類型 '%s'"
+
+#: 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/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 行的格式錯誤（絕對發行版）"
+
+#: 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/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/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "找不到安裝方式的驅動程式 %s。"
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "哇呀，您已經超過這個 APT 所能處理的說明數量了。"
 
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "哇呀，您已經超過這個 APT 所能處理的相依關係數量了。"
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
-msgid "Method %s did not start correctly"
-msgstr "安裝方式 %s 沒有正確啟動"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "在計算檔案相依性時找不到套件 %s %s"
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。"
+msgid "Couldn't stat source package list %s"
+msgstr "無法取得來源套件列表 %s 的狀態"
 
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "正在重建相依關係"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "正在收集檔案提供者"
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "候選版本"
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "在儲存來源快取時 IO 錯誤"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "建立相依關係"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "正在讀取狀態資料"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "無法開啟 StateFile %s"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "無法寫入暫存的 StateFile %s"
+#: 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:148 apt-pkg/contrib/fileutl.cc:2047
+#: 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:163
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum 不符"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "大小不符"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "無效的操作 %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "寫入錯誤"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "路徑 %s 已被抽換"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: 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: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:1656
+#: 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:1698
+#: 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:1736
+#: 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:1758
+#: 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:1788
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"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"
-msgstr ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
-#, c-format
-msgid "GPG error: %s: %s"
+"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:1926
+#: 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 "
@@ -2189,129 +2624,49 @@ msgstr ""
 "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平"
 "台）"
 
-#: apt-pkg/acquire-item.cc:1992
+#: 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:2050
+#: 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "在處理 %s 時發生錯誤 (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "哇呀，您已經超過這個 APT 所能處理的套件名稱數量了。"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "哇呀，您已經超過這個 APT 所能處理的版本數量了。"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "哇呀，您已經超過這個 APT 所能處理的說明數量了。"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "哇呀，您已經超過這個 APT 所能處理的相依關係數量了。"
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "在計算檔案相依性時找不到套件 %s %s"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "無法取得來源套件列表 %s 的狀態"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "正在讀取套件清單"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "正在收集檔案提供者"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "無法寫入 %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-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:87 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:91
+#: 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:99
+#: apt-pkg/acquire.cc:162
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "無法鎖定列表目錄"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:902
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "正在取得檔案 %li/%li（還有 %s）"
 
-#: apt-pkg/acquire.cc:904
+#: 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "在 sources.list 中必須包含一些 'source' URI"
@@ -2337,19 +2692,19 @@ msgstr "無法分析鎖定類型 %s"
 msgid "No priority (or zero) specified for pin"
 msgstr "銷定並沒有優先順序之分（或零）"
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
+#: 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:550 apt-pkg/packagemanager.cc:580
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "無法開啟檔案 %s"
 
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2359,10 +2714,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"
@@ -2429,11 +2786,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"
 
@@ -2443,7 +2800,7 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "套件 %s 需要重新安裝，但找不到它的套件檔。"
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2451,326 +2808,257 @@ msgstr ""
 "錯誤，pkgProblemResolver::Resolve 的建立中斷了，這可能肇因於保留 (hold) 套"
 "件。"
 
-#: apt-pkg/algorithms.cc:1088
+#: 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "無法辨識套件檔 %s (%d)"
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "無法辨別 Release 檔 %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有區段"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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:489
+#: apt-pkg/cacheset.cc:501
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "找不到 '%2$s' 的 '%1$s' 發行版"
 
-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "找不到 '%s' 版的 '%s'"
 
-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "無法找到主題 %s"
 
-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/cacheset.cc:635
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "無法找到套件 %s"
 
-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/cacheset.cc:641
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "無法找到套件 %s"
 
-#: apt-pkg/cacheset.cc:626
+#: 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:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
+#: 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:655
+#: 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:663
+#: 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: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/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:132
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
+
+#: apt-pkg/indexrecords.cc:145
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
+
+#: apt-pkg/indexrecords.cc:164
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
+
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:418
+#: 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:425
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:437
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1258
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
 msgid "Selection %s not found"
 msgstr "選項 %s 找不到"
 
-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "不在唯讀檔案 %s 上使用檔案鎖定"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "無法開啟鎖定檔 %s"
 
-#: apt-pkg/contrib/fileutl.cc:218
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "不在以 nfs 掛載的檔案 %s 上使用檔案鎖定"
 
-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "無法將 %s 鎖定"
 
-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: 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 ""
 
-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "子程序 %s 收到一個記憶體錯誤。"
 
-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc:848
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "子程序 %s 收到一個記憶體錯誤。"
 
-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子程序 %s 傳回錯誤碼 (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子程序 %s 不預期得結束"
 
-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc:952
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "在關閉檔案時發生問題"
 
-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "無法開啟檔案 %s"
 
-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "無法開啟管線給 %s 使用"
 
-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "無法建立子程序 IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "無法執行壓縮程式"
 
-#: apt-pkg/contrib/fileutl.cc:1514
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "讀取，仍有 %lu 未讀但已無空間"
 
-#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "寫入，仍有 %lu 待寫入但已沒辨法"
 
-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "在關閉檔案時發生問題"
 
-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc:1965
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "在同步檔案時發生問題"
 
-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc:1976
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "在刪除檔案時發生問題"
 
-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "在同步檔案時發生問題"
 
@@ -2857,109 +3145,103 @@ msgstr "無法取得掛載點 %s 的狀態"
 msgid "Failed to stat the cdrom"
 msgstr "無法取得 CD-ROM 的狀態"
 
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "無法辨識的縮寫類型：'%c'"
 
-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "開啟設定檔 %s"
 
-#: apt-pkg/contrib/configuration.cc:801
+#: 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:820
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "語法錯誤 %s:%u：標籤格式錯誤"
 
-#: apt-pkg/contrib/configuration.cc:837
+#: 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:877
+#: 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:884
+#: 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:888 apt-pkg/contrib/configuration.cc:893
+#: 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:897
+#: 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:900
+#: 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:950
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "語法錯誤 %s:%u：在檔案結尾有多餘的垃圾"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-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 "命令列選項 %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"
@@ -2969,12 +3251,12 @@ msgstr "無效的操作 %s"
 msgid "Installing %s"
 msgstr "正在安裝 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016
+#: 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:1023
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, c-format
 msgid "Removing %s"
 msgstr "正在移除 %s"
@@ -2995,103 +3277,103 @@ msgid "Running post-installation trigger %s"
 msgstr "正在執行安裝後套件後續處理程式 %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "找不到 '%s' 目錄"
 
-#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884
+#: 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:1009
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Preparing %s"
 msgstr "正在準備 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解開 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在準備設定 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
 msgid "Installed %s"
 msgstr "已安裝 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在準備移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, c-format
 msgid "Removed %s"
 msgstr "已移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1029
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在準備完整移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, c-format
 msgid "Completely removed %s"
 msgstr "已完整移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: 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:1091 apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1670
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1732
+#: 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:1737
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1739
+#: 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:1745
+#: 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:1752
+#: 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:1759 apt-pkg/deb/dpkgpm.cc:1765
+#: 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:1787
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3105,413 +3387,187 @@ 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 ""
-
-#: cmdline/apt-extracttemplates.cc:224
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"用法：apt-extracttemplates 檔案1 [檔案2 ...]\n"
-"\n"
-"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n"
-"的工具\n"
-"\n"
-"選項\n"
-"  -h   本幫助訊息。\n"
-"  -t   指定暫存目錄\n"
-"  -c=? 讀取指定的設定檔\n"
-"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "無法取得 %s 的狀態"
-
-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "無法取得 debconf 版本。是否有安裝 debconf？"
-
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-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
-#, c-format
-msgid "Error processing directory %s"
-msgstr "處理目錄 %s 時發生錯誤"
-
-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "原始碼的延伸列表太長"
-
-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "寫入標頭資訊到內容檔時發生錯誤"
-
-#: ftparchive/apt-ftparchive.cc:431
-#, c-format
-msgid "Error processing contents %s"
-msgstr "處理內容 %s 時發生錯誤"
-
-#: ftparchive/apt-ftparchive.cc:626
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
-msgstr ""
-"用法：apt-ftparchive [選項] 指令\n"
-"指令：packages 二進制檔搜索路徑 [重新定義檔 [路徑前綴]]\n"
-"      sources 原始碼搜索路徑 [重新定義檔 [路徑前綴]]\n"
-"      contents 搜索路徑\n"
-"      release 搜索路徑\n"
-"      generate 設定檔 [群組]\n"
-"      clean 設定檔\n"
-"\n"
-"apt-ftparchive 可用來替 Debian 套件庫建立索引檔。它支援了從全\n"
-"自動化到足以替代 dpkg-scanpackages 及 dpkg-scansources 所提供\n"
-"的所有功能等等各式各樣建立索引的方式。apt-ftparchive 會根據 .deb 檔案樹建立 "
-"Package 檔。Package 檔\n"
-"裡不僅包含了每個套件的 control 資料的內容，還包含了 MD5 檢驗\n"
-"碼和檔案大小。它還支援了重新定義檔，可用來強制指定優先等級及\n"
-"其所屬的類別。\n"
-"\n"
-"而同樣的，apt-ftparchive 也能根據 .dsc 檔案樹生成 Source 檔。\n"
-"可用 --source-override 選項來指定一個 src 重新定義檔。\n"
-"\n"
-"應當在檔案樹的根目錄下執行 'packages' 和 'source' 指令。\n"
-"二進制檔的搜索路徑必須指向遞迴搜索的底層，且在重新定義檔裡必\n"
-"須包含 override 旗標。若指定了路徑前綴時，則會被附加到檔案名\n"
-"稱這個欄位裡。以 Debian 套件庫為例:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"選項：\n"
-"  -h    本幫助說明\n"
-"  --md5 控制如何產生 MD5 檢驗碼\n"
-"  -s=?  原始碼的重新定義檔\n"
-"  -q    安靜模式\n"
-"  -d=?  指定搭配的快取資料庫\n"
-"  --no-delink 啟用 DeLinking 模式\n"
-"  --contents  產生控制內容檔\n"
-"  -c=?  讀取指定的設定檔\n"
-"  -o=?  指定任意的設定選項"
-
-#: ftparchive/apt-ftparchive.cc:822
-msgid "No selections matched"
-msgstr "找不到符合的選項"
-
-#: ftparchive/apt-ftparchive.cc:907
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "套件檔案組 `%s' 少了部份檔案"
-
-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB 已損毀，檔案被更名為 %s.old"
-
-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB 過舊，嘗試升級 %s"
-
-#: ftparchive/cachedb.cc:94
-#, fuzzy
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-"資料庫格式不正確。如果您是由舊版的 apt 升級上來的，請移除並重新建立資料庫。"
-
-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "無法開啟 DB 檔 %s: %s"
-
-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "無法讀取連結 %s"
-
-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "套件檔沒有 control 記錄"
-
-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "無法取得遊標"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "無法鎖定列表目錄"
 
-#: ftparchive/writer.cc:91
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "警告：無法讀取目錄 %s\n"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
 
-#: ftparchive/writer.cc:96
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "警告：無法取得 %s 狀態\n"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
 
-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "錯誤："
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode 在還有連結結點時被呼叫"
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "警告："
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "找不到雜湊元件！"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "錯誤：套用到檔案時發生錯誤"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "在配置抽換資訊時失敗"
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "無法解析 %s"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "在 AddDiversion 發生了內部錯誤"
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "無法走訪目錄樹"
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "試圖改寫抽換資訊，%s -> %s 和 %s/%s"
 
-#: ftparchive/writer.cc:219
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Failed to open %s"
-msgstr "無法開啟 %s"
+msgid "Double add of diversion %s -> %s"
+msgstr "重複加入抽換資訊 %s -> %s"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/filelist.cc:549
 #, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgid "Duplicate conf file %s/%s"
+msgstr "重複的設定檔 %s/%s"
 
-#: ftparchive/writer.cc:286
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
 #, c-format
-msgid "Failed to readlink %s"
-msgstr "無法讀取連結 %s"
+msgid "The path %s is too long"
+msgstr "路徑 %s 過長"
 
-#: ftparchive/writer.cc:290
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Failed to unlink %s"
-msgstr "無法移除連結 %s"
+msgid "Unpacking %s more than once"
+msgstr "解開 %s 超過一次"
 
-#: ftparchive/writer.cc:298
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** 無法將 %s 連結到 %s"
+msgid "The directory %s is diverted"
+msgstr "路徑 %s 已被抽換"
 
-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:152
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " 達到了 DeLink 的上限 %sB。\n"
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "此套件試圖寫至抽換後的目標 %s/%s"
 
-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "套件檔裡沒有套件資訊"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "要進行抽換的路徑過長"
 
-#: ftparchive/writer.cc:425 ftparchive/writer.cc:684
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "  %s has no override entry\n"
-msgstr "  %s 沒有重新定義項目\n"
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "目錄 %s 已經被非目錄的檔案所取代"
+
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "在雜湊表中找不到節點"
+
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "路徑過長"
 
-#: ftparchive/writer.cc:493 ftparchive/writer.cc:840
+#: apt-inst/extract.cc:421
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s 的維護者是 %s，而非 %s\n"
+msgid "Overwrite package match with no version for %s"
+msgstr "以無版本的 %s 覆寫原始套件"
 
-#: ftparchive/writer.cc:698
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  %s 沒有原始碼重新定義項目\n"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "檔案 %s/%s 覆寫了套件 %s 中的相同檔案"
 
-#: ftparchive/writer.cc:702
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  %s 也沒有二元碼重新定義項目\n"
+msgid "Unable to stat %s"
+msgstr "無法取得 %s 的狀態"
 
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 無法配置記憶體"
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, c-format
+msgid "Failed to write file %s"
+msgstr "寫入檔案 %s 失敗"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-inst/dirstream.cc:104
 #, c-format
-msgid "Unable to open %s"
-msgstr "無法開啟 %s"
+msgid "Failed to close file %s"
+msgstr "關閉檔案 %s 失敗"
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1"
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "這是個不正確的 DEB 套件檔，沒有 '%s' 成員"
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to read the override file %s"
-msgstr "無法讀取重新定義檔 %s"
+msgid "Internal error, could not locate member %s"
+msgstr "內部錯誤，找不找到成員 %s"
 
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "無法分析的 control 檔"
 
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #2"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "無效的套件庫簽章"
 
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #3"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "讀取套件檔的成員標頭訊息時發生錯誤"
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "未知的壓縮演算法 '%s'"
+#: apt-inst/contrib/arfile.cc:96
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "無效的套件檔成員標頭"
 
-#: ftparchive/multicompress.cc:103
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "要壓縮輸出 %s 需搭配壓縮動作"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "無效的套件檔成員標頭"
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "無法建立 FILE*"
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "套件檔過短"
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "fork 時失敗"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "讀取套件檔標頭失敗"
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr "壓縮子程序"
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "無法建立管線"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "內部錯誤，無法建立 %s"
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "無法執行 gzip"
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "和子程序/檔案 IO 失敗"
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "損毀的套件檔"
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "在計算 MD5 時無法讀取到資料"
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar checksum 失敗，套件檔已損毀"
 
-#: ftparchive/multicompress.cc:359
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
-msgid "Problem unlinking %s"
-msgstr "在取消 %s 的連結時發生問題"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "未知的 TAR 標頭類型 %u，成員 %s"
 
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"用法：apt-extracttemplates 檔案1 [檔案2 ...]\n"
-"\n"
-"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n"
-"的工具\n"
-"\n"
-"選項\n"
-"  -h   本幫助訊息。\n"
-"  -t   指定暫存目錄\n"
-"  -c=? 讀取指定的設定檔\n"
-"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
+#~ msgid "Total dependency version space: "
+#~ msgstr "相依版本空間合計："
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "未知的套件記錄！"
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "在 %s 裡沒有足夠的的未使用空間"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"用法：apt-sortpkgs [選項] 檔案1 [檔案2 ...]\n"
-"\n"
-"apt-sortpkgs 是用來排序套件檔的簡單工具。-s 選項是用來指定它的檔案類型。\n"
-"\n"
-"選項：\n"
-"  -h   本幫助訊息。\n"
-"  -s   根據原始檔排序\n"
-"  -c=? 讀取指定的設定檔\n"
-"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
+#~ msgid "Done"
+#~ msgstr "完成"
+
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "放棄安裝。"
 
 #, fuzzy
 #~ msgid "Internal error, Upgrade broke stuff"
-- 
cgit v1.2.3-70-g09d2


From 2b4cead3c8eb3afb5aa5390b88c511477a7628d8 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 9 Mar 2015 15:54:39 +0100
Subject: fix some new compiler warnings reported by gcc-5

Git-Dch: Ignore
---
 apt-pkg/cacheset.cc              |  4 ++--
 apt-pkg/cacheset.h               |  4 +++-
 apt-pkg/cdrom.cc                 | 10 +++++-----
 apt-pkg/contrib/configuration.cc | 10 +++++-----
 apt-pkg/deb/debmetaindex.cc      |  9 ++++++---
 apt-pkg/sourcelist.cc            |  2 +-
 6 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index 9127a4064..0ad99713a 100644
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -754,7 +754,7 @@ 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) {
 APT_IGNORE_DEPRECATED_PUSH
@@ -784,7 +784,7 @@ 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) {
 APT_IGNORE_DEPRECATED_PUSH
diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h
index 884e8b859..97aee8c2d 100644
--- a/apt-pkg/cacheset.h
+++ b/apt-pkg/cacheset.h
@@ -225,7 +225,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 {
-		   APT_IGNORE_DEPRECATED(return getPkg().Section();)
+		   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(); }
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index aaa7b82e0..5eccbe5de 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)
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 483d5bb1b..42e35d32a 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -629,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/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 81e067424..aa2db8149 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -402,9 +402,12 @@ class APT_HIDDEN 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, ',');
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.
-- 
cgit v1.2.3-70-g09d2


From 3bf4c93ac241e270c374d1a49be11fb4d673abc1 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 9 Mar 2015 16:00:23 +0100
Subject: (error) Same iterator is used with different containers

cppcheck reports this error, its not really a problem for us as the API
can actually deal with it via implicit conversion, but being explicit
can't hurt and the less reported errors the better.

Git-Dch: Ignore
---
 cmdline/apt-mark.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index 8974397c9..47777009b 100644
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -279,7 +279,7 @@ static bool DoHold(CommandLine &CmdL)
    {
       if (Pkg->CurrentVer != 0)
 	 continue;
-      keepoffset.insert(Pkg);
+      keepoffset.insert(*Pkg);
    }
 
    if (keepoffset.empty() == false)
-- 
cgit v1.2.3-70-g09d2


From fe1f85118e0787ef5df28a045fd12d9133424b3f Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 9 Mar 2015 16:09:39 +0100
Subject: set version before updating po files

This way the 'correct' version is carried over into the po files to
reflect which version they were built for rather than the version before
the current one.

Git-Dch: Ignore
---
 prepare-release | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/prepare-release b/prepare-release
index 67f4638d6..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"
-- 
cgit v1.2.3-70-g09d2


From b209edfa318e89df31a2dcae82c3d72b48c1e77f Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Mon, 9 Mar 2015 18:11:10 +0100
Subject: parse arch-qualified Provides correctly

The underlying problem is that libapt-pkg does not correctly parse these
provides. Internally, it creates a version named "baz:i386" with
architecture amd64. Of course, such a package name is invalid and thus
this version is completely inaccessible. Thus, this bug should not cause
apt to accept a broken situation as valid. Nevertheless, it prevents
using architecture qualified depends.

Closes: 777071
---
 apt-pkg/deb/deblistparser.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 462818a03..49bc3adfc 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -853,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;
-- 
cgit v1.2.3-70-g09d2


From 25b86db159fbc3c043628e285c0c1ef24dec2c6e Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 10 Mar 2015 00:59:44 +0100
Subject: test exitcode as well as string equality

We use test{success,failure} now all over the place in the framework, so
its only consequencial to do this in the situations in which we test for
a specific output as well.

Git-Dch: Ignore
---
 test/integration/framework                         | 24 +++++-
 .../test-allow-scores-for-all-dependency-types     | 22 +++---
 .../test-apt-bug-718329-support-data.tar           | 34 ---------
 test/integration/test-apt-by-hash-update           |  4 +-
 test/integration/test-apt-cache                    | 32 ++++----
 test/integration/test-apt-cdrom                    | 18 ++---
 test/integration/test-apt-cli-list                 | 21 +++---
 test/integration/test-apt-cli-search               | 26 +++----
 test/integration/test-apt-cli-show                 |  2 +-
 test/integration/test-apt-cli-update               |  6 +-
 test/integration/test-apt-cli-upgrade              |  6 +-
 test/integration/test-apt-config                   | 24 +++---
 test/integration/test-apt-extracttemplates         |  2 +-
 test/integration/test-apt-ftparchive-cachedb       | 12 +--
 .../test-apt-ftparchive-cachedb-lp1274466          |  2 +-
 test/integration/test-apt-ftparchive-src-cachedb   |  2 +-
 test/integration/test-apt-get-autoremove           |  6 +-
 test/integration/test-apt-get-build-dep            |  6 +-
 test/integration/test-apt-get-changelog            |  4 +-
 test/integration/test-apt-get-install-deb          |  2 +-
 test/integration/test-apt-get-source               | 18 ++---
 test/integration/test-apt-get-source-arch          | 16 ++--
 test/integration/test-apt-get-source-multisources  |  4 +-
 .../integration/test-apt-get-update-unauth-warning |  8 +-
 test/integration/test-apt-get-upgrade              |  6 +-
 test/integration/test-apt-helper                   | 14 ++--
 test/integration/test-apt-key                      |  4 +-
 test/integration/test-apt-key-net-update           |  4 +-
 test/integration/test-apt-mark                     | 36 ++++-----
 test/integration/test-apt-progress-fd              | 20 ++---
 test/integration/test-apt-progress-fd-deb822       |  5 +-
 .../test-apt-translation-has-no-packages           |  4 +-
 test/integration/test-apt-update-expected-size     |  2 +-
 test/integration/test-apt-update-nofallback        | 12 +--
 test/integration/test-apt-update-rollback          | 20 ++---
 test/integration/test-apt-update-stale             |  2 +-
 .../test-architecture-specification-parsing        | 20 ++---
 test/integration/test-authentication-basic         |  2 +-
 .../test-bug-470115-new-and-tighten-recommends     | 20 ++---
 .../test-bug-507998-dist-upgrade-recommends        |  2 +-
 .../test-bug-543966-downgrade-below-1000-pin       | 10 +--
 ...est-bug-549968-install-depends-of-not-installed |  2 +-
 .../test-bug-590041-prefer-non-virtual-packages    |  8 +-
 ...g-590438-broken-provides-thanks-to-remove-order |  2 +-
 test/integration/test-bug-591882-conkeror          |  4 +-
 .../integration/test-bug-593360-modifiers-in-names | 16 ++--
 .../test-bug-596498-trusted-unsigned-repo          | 12 +--
 ...test-bug-598669-install-postfix-gets-exim-heavy |  2 +-
 test/integration/test-bug-601961-install-info      |  6 +-
 test/integration/test-bug-602412-dequote-redirect  |  2 +-
 .../integration/test-bug-604222-new-and-autoremove | 10 +--
 .../test-bug-605394-versioned-or-groups            |  2 +-
 test/integration/test-bug-611729-mark-as-manual    |  6 +-
 .../test-bug-612099-multiarch-conflicts            | 30 ++++----
 test/integration/test-bug-612557-garbage-upgrade   |  6 +-
 .../test-bug-613420-new-garbage-dependency         |  2 +-
 .../test-bug-618848-always-respect-user-requests   |  2 +-
 .../test-bug-624218-Translation-file-handling      | 17 ++---
 .../test-bug-632221-cross-dependency-satisfaction  | 30 ++++----
 ...test-bug-64141-install-dependencies-for-on-hold |  4 +-
 .../test-bug-657695-resolver-breaks-on-virtuals    |  2 +-
 .../test-bug-661537-build-profiles-support         |  8 +-
 .../test-bug-675449-essential-are-protected        | 10 +--
 .../test-bug-679371-apt-get-autoclean-multiarch    |  2 +-
 .../test-bug-680041-apt-mark-holds-correctly       | 20 ++---
 .../test-bug-683786-build-dep-on-virtual-packages  | 18 ++---
 .../test-bug-686346-package-missing-architecture   | 10 +--
 .../test-bug-689582-100-char-long-path-names       |  2 +-
 .../test-bug-691453-apt-cache-search-multi-pattern | 12 +--
 .../test-bug-709560-set-candidate-release          |  2 +-
 .../test-bug-712435-missing-descriptions           | 18 ++---
 .../test-bug-717891-abolute-uris-for-proxies       |  2 +-
 .../test-bug-718329-support-data.tar-uncompressed  | 31 ++++++++
 ...st-bug-719263-print-uris-removes-authentication |  2 +-
 test/integration/test-bug-720597-build-dep-purge   |  4 +-
 .../test-bug-722207-print-uris-even-if-very-quiet  | 14 ++--
 .../test-bug-723586-any-stripped-in-single-arch    | 10 +--
 test/integration/test-bug-728500-tempdir           |  2 +-
 test/integration/test-bug-732746-preferences       |  2 +-
 .../test-bug-735967-lib32-to-i386-unavailable      |  8 +-
 test/integration/test-bug-738785-switch-protocol   |  4 +-
 .../test-bug-745036-new-foreign-invalidates-cache  |  2 +-
 .../test-bug-745046-candidate-propagation-fails    |  4 +-
 test/integration/test-bug-753297-upgradable        |  4 +-
 .../test-bug-758153-versioned-provides-support     | 88 +++++++++++++++++++---
 test/integration/test-bug-770291-reinstall         |  8 +-
 test/integration/test-bug-multiarch-upgrade        |  2 +-
 .../test-cachecontainer-architecture-specification | 32 ++++----
 test/integration/test-compressed-indexes           | 26 +++----
 test/integration/test-conflicts-loop               |  2 +-
 .../integration/test-conflicts-real-multiarch-same |  6 +-
 .../test-cve-2013-1051-InRelease-parsing           |  8 +-
 test/integration/test-essential-force-loopbreak    |  2 +-
 .../test-external-dependency-solver-protocol       |  8 +-
 test/integration/test-handling-broken-orgroups     | 14 ++--
 .../test-ignore-provides-if-versioned-breaks       | 18 ++---
 .../test-ignore-provides-if-versioned-conflicts    | 18 ++---
 .../test-implicit-conflicts-real-not-virtual       |  8 +-
 test/integration/test-kernel-helper-autoremove     |  6 +-
 test/integration/test-multiarch-foreign            | 24 +++---
 .../test-ordering-ignore-not-matching-breaks       |  8 +-
 test/integration/test-package-reinstallation       |  2 +-
 test/integration/test-pdiff-usage                  | 12 +--
 test/integration/test-pin-non-existent-package     | 12 +--
 test/integration/test-policy-pinning               |  4 +-
 .../test-prefer-higher-priority-providers          | 14 ++--
 ...prefer-native-architecture-over-higher-priority |  2 +-
 ...prevent-markinstall-multiarch-same-versionscrew |  6 +-
 test/integration/test-provides-gone-with-upgrade   |  2 +-
 test/integration/test-release-candidate-switching  | 32 ++++----
 test/integration/test-releasefile-verification     | 30 ++++----
 .../test-resolve-by-keep-new-recommends            |  2 +-
 test/integration/test-sourceslist-trusted-options  |  4 +-
 .../test-specific-architecture-dependencies        | 30 ++++----
 .../test-suggest-installed-multiarch-silbing       | 16 ++--
 .../test-ubuntu-bug-1098738-apt-get-source-md5sum  | 20 ++---
 ...u-bug-1130419-prefer-installed-ma-same-siblings | 12 +--
 ...t-ubuntu-bug-1304403-obsolete-priority-standard |  4 +-
 test/integration/test-ubuntu-bug-614993            |  2 +-
 .../test-ubuntu-bug-761175-remove-purge            |  4 +-
 ...st-ubuntu-bug-784473-InRelease-one-message-only |  2 +-
 .../test-ubuntu-bug-802901-multiarch-early-remove  |  2 +-
 .../test-ubuntu-bug-806274-install-suggests        |  8 +-
 .../test-ubuntu-bug-859188-multiarch-reinstall     |  8 +-
 ...ubuntu-bug-985852-pre-depends-or-group-ordering |  2 +-
 .../test-unpack-different-version-unpacked         | 14 ++--
 test/integration/test-xorg-break-providers         |  6 +-
 127 files changed, 725 insertions(+), 645 deletions(-)
 delete mode 100755 test/integration/test-apt-bug-718329-support-data.tar
 create mode 100755 test/integration/test-bug-718329-support-data.tar-uncompressed

diff --git a/test/integration/framework b/test/integration/framework
index 5f13df1c0..ec23e41e6 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1338,7 +1338,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
@@ -1388,6 +1388,26 @@ 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"
+}
+
+
 testfilestats() {
 	msgtest "Test that file $1 has $2 $3" "$4"
 	if [ "$4" "$3" "$(stat --format "$2" "$1")" ]; then
@@ -1493,7 +1513,7 @@ aptautotest_apt_update() { aptautotest_aptget_update "$@"; }
 testaptautotestnodpkgwarning() {
 	local TESTCALL="$1"
 	while [ -n "$2" ]; do
-		if [ "$2" = '-s' ]; then return; fi
+		if expr match "$2" '^-[a-z]*s' >/dev/null 2>&1; then return; fi
 		shift
 	done
 	testfailure grep '^dpkg: warning:.*ignor.*' "${TMPWORKINGDIRECTORY}/rootdir/tmp-before/${TESTCALL}.output"
diff --git a/test/integration/test-allow-scores-for-all-dependency-types b/test/integration/test-allow-scores-for-all-dependency-types
index e1d805ce9..56cfc9a69 100755
--- a/test/integration/test-allow-scores-for-all-dependency-types
+++ b/test/integration/test-allow-scores-for-all-dependency-types
@@ -42,7 +42,7 @@ 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:
@@ -57,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:
@@ -76,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:
@@ -106,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
@@ -130,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
@@ -159,7 +159,7 @@ 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'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 Calculating upgrade...
 The following packages will be REMOVED:
diff --git a/test/integration/test-apt-bug-718329-support-data.tar b/test/integration/test-apt-bug-718329-support-data.tar
deleted file mode 100755
index 5cfb31917..000000000
--- a/test/integration/test-apt-bug-718329-support-data.tar
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -e
-
-test_process_package_with_compression() {
-    COMPRESSOR="$1"
-    DATA_TAR="$2"
-
-    msgtest "Testing apt-ftparchive with compression type: $COMPRESSOR"
-
-    buildsimplenativepackage 'pkg' 'all' '1.0' '' '' 'some descr' '' '' '' "$COMPRESSOR"
-    testequal "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
-usr/share/doc/pkg/FEATURES				    pkg
-usr/share/doc/pkg/changelog				    pkg
-usr/share/doc/pkg/copyright				    pkg" aptftparchive contents incoming/
-
-    rm -rf incoming/*
-}
-
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
-
-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-apt-by-hash-update b/test/integration/test-apt-by-hash-update
index d9d0b146f..8300c532c 100755
--- a/test/integration/test-apt-by-hash-update
+++ b/test/integration/test-apt-by-hash-update
@@ -29,7 +29,7 @@ mkdir -p aptarchive/dists/unstable/main/source/by-hash/SHA512
 testfailure aptget upate
 
 # 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
 
@@ -37,7 +37,7 @@ E: Unable to locate package foo" aptget install -q -s foo
 testsuccess aptget update -o APT::Acquire::By-Hash=1 -o Acquire::Languages=none
 
 # ensure it works
-testequal "Inst foo (1.0 unstable [all])
+testsuccessequal "Inst foo (1.0 unstable [all])
 Conf foo (1.0 unstable [all])" aptget install -qq -s foo
 
 # add magic string to Release file ...
diff --git a/test/integration/test-apt-cache b/test/integration/test-apt-cache
index f47c0e08b..f3db8024f 100755
--- a/test/integration/test-apt-cache
+++ b/test/integration/test-apt-cache
@@ -42,45 +42,45 @@ testsuccess aptcache dump
 cp rootdir/tmp/testsuccess.output dump.output
 testsuccess test -s dump.output
 
-testequal 'dpkg
+testsuccessequal 'dpkg
 bar
 fancy
 foo' aptcache pkgnames
-testequal 'bar' aptcache pkgnames bar
-testequal 'fancy
+testsuccessequal 'bar' aptcache pkgnames bar
+testsuccessequal 'fancy
 foo' aptcache pkgnames f
 
-testequal "       foo |          1 | file:$(readlink -f .)/aptarchive/ unstable/main amd64 Packages" aptcache madison foo
+testsuccessequal "       foo |          1 | file:$(readlink -f .)/aptarchive/ unstable/main amd64 Packages" aptcache madison foo
 
 ### depends
 
-testequal 'foo
+testsuccessequal 'foo
   Depends: bar
  |Recommends: <cool>
   Recommends: <cooler>
   Conflicts: <foobar>
   Conflicts: <foobar:i386>' aptcache depends foo
-testequal 'foo
+testsuccessequal 'foo
   Depends: bar
   Recommends: <cool>
   Conflicts: <foobar>
   Conflicts: <foobar:i386>' aptcache depends foo -o APT::Cache::ShowOnlyFirstOr=1
-testequal 'foo
+testsuccessequal 'foo
   Depends: bar
  |Recommends: <cool> (>= 2)
   Recommends: <cooler> (<< 5)
   Conflicts: <foobar>
   Conflicts: <foobar:i386>' aptcache depends foo -o APT::Cache::ShowVersion=1
-testequal 'foo
+testsuccessequal 'foo
   Depends: bar
   Conflicts: <foobar>
   Conflicts: <foobar:i386>' aptcache depends foo --no-recommends
-testequal 'foo
+testsuccessequal 'foo
   Depends: bar' aptcache depends foo --important
-testequal 'foo
+testsuccessequal 'foo
   Conflicts: <foobar>
   Conflicts: <foobar:i386>' aptcache depends foo --important --no-depends --conflicts
-testequal 'foo
+testsuccessequal 'foo
   Depends: bar
  |Recommends: <cool>
   Recommends: <cooler>
@@ -97,7 +97,7 @@ bar
 <foobar>
 <foobar:i386>
 <foo:i386>' aptcache depends foo --recurse
-testequal 'foo
+testsuccessequal 'foo
   Depends: bar
 bar
   Depends: bar
@@ -107,18 +107,18 @@ bar
 
 ## rdpends
 
-testequal 'foo
+testsuccessequal 'foo
 Reverse Depends:
   bar
   bar' aptcache rdepends foo
-testequal 'foo
+testsuccessequal 'foo
 Reverse Depends:
   Replaces: bar
   Breaks: bar' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1
-testequal 'foo
+testsuccessequal 'foo
 Reverse Depends:
   Replaces: bar (<< 1)
   Breaks: bar (<< 1)' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1 -o APT::Cache::ShowVersion=1
-testequal 'foo
+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 7f4b3c257..9906795ca 100755
--- a/test/integration/test-apt-cdrom
+++ b/test/integration/test-apt-cdrom
@@ -49,12 +49,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 +63,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 +84,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,18 +114,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
-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'
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 1a28ba4da..e86661dcb 100755
--- a/test/integration/test-apt-cli-search
+++ b/test/integration/test-apt-cli-search
@@ -25,51 +25,51 @@ setupaptarchive
 
 APTARCHIVE=$(readlink -f ./aptarchive)
 
-testequal 'E: You must give at least one search pattern' aptcache search
-testequal 'E: You must give at least one search pattern' apt search
+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
   .
@@ -77,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 930e591e0..5604620fd 100755
--- a/test/integration/test-apt-cli-show
+++ b/test/integration/test-apt-cli-show
@@ -24,7 +24,7 @@ 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
 Priority: optional
 Section: other
 Installed-Size: 43.0 kB
diff --git a/test/integration/test-apt-cli-update b/test/integration/test-apt-cli-update
index 83cc94b93..d68ab25e4 100755
--- a/test/integration/test-apt-cli-update
+++ b/test/integration/test-apt-cli-update
@@ -15,10 +15,10 @@ setupaptarchive --no-update
 
 APTARCHIVE=$(readlink -f ./aptarchive)
 
-testequal 'E: The update command takes no arguments' apt update -q arguments
+testfailureequal 'E: The update command takes no arguments' apt update -q arguments
 
-testequal "1 package can be upgraded. Run 'apt list --upgradable' to see it." apt update -q
+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'
-testequal 'All packages are up to date.' apt update -q
+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
index 2f2ff9d38..2eea9a0f8 100755
--- a/test/integration/test-apt-config
+++ b/test/integration/test-apt-config
@@ -8,29 +8,29 @@ setupenvironment
 configarchitecture 'amd64'
 
 testsuccess aptconfig dump
-testequal 'APT::Architecture "amd64";' aptconfig dump APT::Architecture
+testsuccessequal 'APT::Architecture "amd64";' aptconfig dump APT::Architecture
 testempty aptconfig dump config::which::does::not::exist
 
-testequal 'APT::Architectures "";
+testsuccessequal 'APT::Architectures "";
 APT::Architectures:: "amd64";' aptconfig dump APT::Architectures
-testequal 'APT::Architectures:: "amd64";' aptconfig dump --no-empty APT::Architectures
-testequal 'amd64' aptconfig dump --no-empty --format='%v%n' 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
-testequal 'E: Arguments not in pairs' aptconfig shell APT::Architecture
+testfailureequal 'E: Arguments not in pairs' aptconfig shell APT::Architecture
 testempty aptconfig shell APT::Architecture ARCH # incorrect order
-testequal "ARCH='amd64'" aptconfig shell ARCH APT::Architecture
+testsuccessequal "ARCH='amd64'" aptconfig shell ARCH APT::Architecture
 
 ROOTDIR="$(readlink -f rootdir)"
-testequal "CONFIG='apt.conf'" aptconfig shell CONFIG Dir::Etc::main
-testequal "CONFIG='${ROOTDIR}/etc/apt/apt.conf'" aptconfig shell CONFIG Dir::Etc::main/f
-testequal "CONFIG='etc/apt/'" aptconfig shell CONFIG Dir::Etc
-testequal "CONFIG='${ROOTDIR}/etc/apt/'" aptconfig shell CONFIG Dir::Etc/ # old style
-testequal "CONFIG='${ROOTDIR}/etc/apt/'" aptconfig shell CONFIG Dir::Etc/d
+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'
-testequal 'nodoc
+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-extracttemplates b/test/integration/test-apt-extracttemplates
index 276862464..5dadc4933 100755
--- a/test/integration/test-apt-extracttemplates
+++ b/test/integration/test-apt-extracttemplates
@@ -35,7 +35,7 @@ Description: Some bar var
 	OUT='rootdir/tmp/testsuccess.output'
 	testequal "$1" cut -f1 -d' ' $OUT
 	if [ -n "$2" ]; then
-		testequal '' cut -f2 -d' ' $OUT
+		testequal '' cut -s -f2 -d' ' $OUT
 	else
 		testequal '1.0' cut -f2 -d' ' $OUT
 	fi
diff --git a/test/integration/test-apt-ftparchive-cachedb b/test/integration/test-apt-ftparchive-cachedb
index 866e5a469..3454ee36a 100755
--- a/test/integration/test-apt-ftparchive-cachedb
+++ b/test/integration/test-apt-ftparchive-cachedb
@@ -9,14 +9,14 @@ $(dpkg-deb -I ./aptarchive/pool/main/foo_1_i386.deb | grep 'Installed-Size:' | 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 
+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"
 }
 
 #
@@ -99,8 +99,8 @@ testfileequal 'rootdir/tmp/testsuccess.output' ' Misses in Cache: 0
 
 # and clean
 rm -rf aptarchive/pool/main/*
-testequal "packages-main-i386.db" aptftparchive clean ftparchive.conf -q=0
+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
-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 "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..1f86e367f 100755
--- a/test/integration/test-apt-ftparchive-cachedb-lp1274466
+++ b/test/integration/test-apt-ftparchive-cachedb-lp1274466
@@ -26,7 +26,7 @@ testsuccess grep 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc
 testfailure grep 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc12a0e7cadb4b66764235c56e1009dbfe8a9a566fb1eedf47a992d1fff2cc3332c old-format.dump
 
 # regression test for corruption with previous generation of cachedb
-testequal "Package: foo
+testsuccessequal "Package: foo
 Priority: optional
 Section: others
 Installed-Size: 29
diff --git a/test/integration/test-apt-ftparchive-src-cachedb b/test/integration/test-apt-ftparchive-src-cachedb
index 28321e3c5..2a361ecc0 100755
--- a/test/integration/test-apt-ftparchive-src-cachedb
+++ b/test/integration/test-apt-ftparchive-src-cachedb
@@ -2,7 +2,7 @@
 set -e
 
 assert_correct_sources_file() {
-    testequal "Package: bar
+    testsuccessequal "Package: bar
 Architecture: all
 Version: 1.0
 Binary: bar
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 01f2bd393..7e81c71b6 100755
--- a/test/integration/test-apt-get-changelog
+++ b/test/integration/test-apt-get-changelog
@@ -21,9 +21,9 @@ chmod -R -w rootdir/var/cache/apt/archives
 
 echo 'Apt::Changelogs::Server "http://localhost:8080/";' > rootdir/etc/apt/apt.conf.d/changelog.conf
 
-testequal "'http://localhost:8080/pool/apt_1.0/changelog'" aptget changelog apt --print-uris
+testsuccessequal "'http://localhost:8080/pool/apt_1.0/changelog'" aptget changelog apt --print-uris
 
-testequal "'http://localhost:8080/pool/apt_1.0/changelog'
+testsuccessequal "'http://localhost:8080/pool/apt_1.0/changelog'
 'http://localhost:8080/pool/apt_1.0/changelog'" aptget changelog apt apt --print-uris
 
 cd downloaded
diff --git a/test/integration/test-apt-get-install-deb b/test/integration/test-apt-get-install-deb
index f2e5229cd..0f34692fe 100755
--- a/test/integration/test-apt-get-install-deb
+++ b/test/integration/test-apt-get-install-deb
@@ -8,7 +8,7 @@ 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
diff --git a/test/integration/test-apt-get-source b/test/integration/test-apt-get-source
index b27cbbe96..9db24370f 100755
--- a/test/integration/test-apt-get-source
+++ b/test/integration/test-apt-get-source
@@ -34,55 +34,55 @@ APTARCHIVE=$(readlink -f ./aptarchive)
 # normal operation gets highest version number
 HEADER="Reading package lists...
 Building dependency tree..."
-testequal "$HEADER
+testsuccessequal "$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
 
 # 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
+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
 
 # 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
 
 # select by version
-testequal "$HEADER
+testsuccessequal "$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
 
 # select by release with no binary package (Bug#731102) but ensure to get
 # highest version
-testequal "$HEADER
+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
 
 # 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
+testsuccessequal "$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
+testsuccessequal "$HEADER
 Need to get 0 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..c75798209 100755
--- a/test/integration/test-apt-get-source-arch
+++ b/test/integration/test-apt-get-source-arch
@@ -30,41 +30,41 @@ HEADER="Reading package lists...
 Building dependency tree..."
 
 # pick :amd64
-testequal "$HEADER
+testsuccessequal "$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
 
 # pick :i386
-testequal "$HEADER
+testsuccessequal "$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
 
 # 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
 
 # pick :i386 by version
-testequal "$HEADER
+testsuccessequal "$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
 
 # 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-multisources b/test/integration/test-apt-get-source-multisources
index cc759e8c1..03d0400a0 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
+testsuccessequal "$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
+testsuccessequal "$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
diff --git a/test/integration/test-apt-get-update-unauth-warning b/test/integration/test-apt-get-update-unauth-warning
index 80c51152d..81c01ba3e 100755
--- a/test/integration/test-apt-get-update-unauth-warning
+++ b/test/integration/test-apt-get-update-unauth-warning
@@ -19,7 +19,7 @@ APTARCHIVE=$(readlink -f ./aptarchive)
 rm -f $APTARCHIVE/dists/unstable/*Release*
 
 # update without authenticated files leads to warning
-testequal "Ign file: unstable InRelease
+testfailureequal "Ign file: unstable InRelease
   File not found
 Err file: unstable Release
   File not found
@@ -27,18 +27,18 @@ W: The repository 'file: unstable Release' does not have a Release file. This is
 E: Use --allow-insecure-repositories to force the update" aptget update --no-allow-insecure-repositories
 
 # no package foo
-testequal 'Listing...' apt list foo
+testsuccessequal 'Listing...' apt list foo
 testequal 'lock
 partial' ls rootdir/var/lib/apt/lists
 
 # allow override
-testequal "Ign file: unstable InRelease
+testwarningequal "Ign file: unstable InRelease
   File not found
 Ign file: unstable Release
   File not found
 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
 # 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..fcee95023 100755
--- a/test/integration/test-apt-get-upgrade
+++ b/test/integration/test-apt-get-upgrade
@@ -24,7 +24,7 @@ insertpackage 'stable,installed' 'conflicting-dep' 'all' '1.0'
 setupaptarchive
 
 # Test if normal upgrade works as expected
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 Calculating upgrade...
 The following packages have been kept back:
@@ -36,7 +36,7 @@ Inst upgrade-simple [1.0] (2.0 unstable [all])
 Conf upgrade-simple (2.0 unstable [all])' aptget -s upgrade
 
 # Test if apt-get upgrade --with-new-pkgs works
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 Calculating upgrade...
 The following NEW packages will be installed:
@@ -54,7 +54,7 @@ Conf upgrade-simple (2.0 unstable [all])
 Conf upgrade-with-new-dep (2.0 unstable [all])' aptget -s upgrade --with-new-pkgs
 
 # 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:
diff --git a/test/integration/test-apt-helper b/test/integration/test-apt-helper
index ff5d506b5..431210797 100755
--- a/test/integration/test-apt-helper
+++ b/test/integration/test-apt-helper
@@ -44,7 +44,7 @@ E: Download Failed'
 
 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
@@ -55,7 +55,7 @@ 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
@@ -66,14 +66,14 @@ 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
-testequal 'E: Invalid operation download' apthelper download
-testequal 'E: Must specify at least one pair url/filename' apthelper download-file
-testequal 'E: Must specify at least one pair url/filename' apthelper download-file http://example.org/
-testequal 'E: Need one URL as argument' apthelper auto-detect-proxy
+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-key b/test/integration/test-apt-key
index b6b7b7909..989fe658c 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
 
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
index 5a3ae4b2f..9b68945f9 100755
--- a/test/integration/test-apt-mark
+++ b/test/integration/test-apt-mark
@@ -21,20 +21,20 @@ testdpkginstalled dpkg
 testnoautopkg() {
 	testempty aptmark showauto
 	testempty aptcache showauto
-	testequal 'bar
+	testsuccessequal 'bar
 dpkg
 foo' aptmark showmanual
-	testequal 'bar
+	testsuccessequal 'bar
 foo' aptmark showmanual bar foo uninstalled
 }
 testfooisauto() {
-	testequal 'foo' aptmark showauto
-	testequal 'foo' aptcache showauto
-	testequal 'foo' aptmark showauto foo
-	testequal 'foo' aptcache showauto foo
-	testequal 'bar
+	testsuccessequal 'foo' aptmark showauto
+	testsuccessequal 'foo' aptcache showauto
+	testsuccessequal 'foo' aptmark showauto foo
+	testsuccessequal 'foo' aptcache showauto foo
+	testsuccessequal 'bar
 dpkg' aptmark showmanual
-	testequal 'bar' aptmark showmanual bar
+	testsuccessequal 'bar' aptmark showmanual bar
 }
 testmarkonpkgasauto() {
 	testsuccess $1 $2 foo
@@ -48,8 +48,8 @@ testmarkonpkgasauto() {
 	testnoautopkg
 }
 
-testequal 'E: No packages found' aptmark auto
-testequal 'E: No packages found' aptmark manual
+testfailureequal 'E: No packages found' aptmark auto
+testfailureequal 'E: No packages found' aptmark manual
 
 testnoautopkg
 testmarkonpkgasauto 'aptmark' 'auto' 'manual'
@@ -63,10 +63,10 @@ testnoholdpkg() {
 	testempty aptmark showholds dpkg
 }
 testpkgonhold() {
-	testequal "$1" aptmark showhold
-	testequal "$1" aptmark showholds
-	testequal "$1" aptmark showhold $1
-	testequal "$1" aptmark showholds $1
+	testsuccessequal "$1" aptmark showhold
+	testsuccessequal "$1" aptmark showholds
+	testsuccessequal "$1" aptmark showhold $1
+	testsuccessequal "$1" aptmark showholds $1
 }
 testmarkonepkgashold() {
 	testsuccess aptmark hold $1
@@ -79,8 +79,8 @@ testmarkonepkgashold() {
 	testnoholdpkg
 }
 
-testequal 'E: No packages found' aptmark hold
-testequal 'E: No packages found' aptmark unhold
+testfailureequal 'E: No packages found' aptmark hold
+testfailureequal 'E: No packages found' aptmark unhold
 
 testnoholdpkg
 testmarkonepkgashold 'foo'
@@ -97,5 +97,5 @@ fi
 testmarkonepkgashold 'uninstalled'
 testmarkonepkgashold 'uninstalled-native'
 
-testequal 'uninstalled set on hold.' aptmark hold uninstalled
-testequal 'uninstalled-native set on hold.' aptmark hold 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 90e6ef7e4..0c11aba7e 100755
--- a/test/integration/test-apt-progress-fd
+++ b/test/integration/test-apt-progress-fd
@@ -15,7 +15,7 @@ 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)
@@ -26,12 +26,12 @@ 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" cat apt-progress.log
+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)
@@ -42,12 +42,12 @@ 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" cat apt-progress.log
+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)
@@ -58,24 +58,24 @@ 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" cat apt-progress.log
+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: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" cat apt-progress.log
+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)
@@ -86,6 +86,6 @@ 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" cat apt-progress.log
+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 badc985e4..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
 
@@ -62,7 +62,6 @@ Message: Installed testing (amd64)
 Status: progress
 Percent: 83.3333
 Message: Running dpkg
-" cat apt-progress.log
-
+'
 
 rm -f apt-progress*.log
diff --git a/test/integration/test-apt-translation-has-no-packages b/test/integration/test-apt-translation-has-no-packages
index bb2353a33..440fd30cf 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,7 +33,7 @@ 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:
diff --git a/test/integration/test-apt-update-expected-size b/test/integration/test-apt-update-expected-size
index 045217a77..9711c293a 100755
--- a/test/integration/test-apt-update-expected-size
+++ b/test/integration/test-apt-update-expected-size
@@ -39,6 +39,6 @@ find aptarchive -name 'Packages*' | while read pkg; do
 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)
+testfailureequal "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
diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback
index e82a976a6..71576de81 100755
--- a/test/integration/test-apt-update-nofallback
+++ b/test/integration/test-apt-update-nofallback
@@ -31,14 +31,14 @@ EOF
 
 assert_update_is_refused_and_last_good_state_used()
 {
-    testequal "E: The repository 'file: unstable Release.gpg' is no longer signed." aptget update -qq
+    testfailureequal "E: The repository 'file: unstable Release.gpg' is no longer signed." aptget update -qq
 
     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
@@ -97,7 +97,7 @@ test_from_inrelease_to_unsigned_with_override()
     testwarning aptget update --allow-insecure-repositories \
         -o Acquire::AllowDowngradeToInsecureRepositories=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 +149,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
 
@@ -169,7 +169,7 @@ test_inrelease_to_invalid_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: 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 +193,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: unstable Release.gpg: 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-rollback b/test/integration/test-apt-update-rollback
index 9efc194a0..f4500b69d 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  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: unstable Release.gpg' 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: unstable Release.gpg' 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  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: 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
 
diff --git a/test/integration/test-apt-update-stale b/test/integration/test-apt-update-stale
index 277aa5b09..05154641a 100755
--- a/test/integration/test-apt-update-stale
+++ b/test/integration/test-apt-update-stale
@@ -39,7 +39,7 @@ 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
+testfailureequal "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
 testfileequal lists.before "$(listcurrentlistsdirectory)"
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 7e74726be..3a6897b59 100755
--- a/test/integration/test-authentication-basic
+++ b/test/integration/test-authentication-basic
@@ -38,7 +38,7 @@ testauthsuccess() {
 
 	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..d37539b9f 100755
--- a/test/integration/test-bug-543966-downgrade-below-1000-pin
+++ b/test/integration/test-bug-543966-downgrade-below-1000-pin
@@ -15,7 +15,7 @@ setupaptarchive
 STATUS=$(readlink -f rootdir/var/lib/dpkg/status)
 APTARCHIVE="$(readlink -f aptarchive)/"
 
-testequal "base-files:
+testsuccessequal "base-files:
   Installed: 5.0.0-1
   Candidate: 5.0.0-1
   Version table:
@@ -28,7 +28,7 @@ echo 'Package: base-files
 Pin: release a=unstable
 Pin-Priority: 99' > rootdir/etc/apt/preferences
 
-testequal "base-files:
+testsuccessequal "base-files:
   Installed: 5.0.0-1
   Candidate: 5.0.0-1
   Package pin: 5.0.0
@@ -42,7 +42,7 @@ echo 'Package: base-files
 Pin: release a=unstable
 Pin-Priority: 100' > rootdir/etc/apt/preferences
 
-testequal "base-files:
+testsuccessequal "base-files:
   Installed: 5.0.0-1
   Candidate: 5.0.0-1
   Package pin: 5.0.0
@@ -56,7 +56,7 @@ echo 'Package: base-files
 Pin: release a=unstable
 Pin-Priority: 999' > rootdir/etc/apt/preferences
 
-testequal "base-files:
+testsuccessequal "base-files:
   Installed: 5.0.0-1
   Candidate: 5.0.0-1
   Package pin: 5.0.0
@@ -70,7 +70,7 @@ echo 'Package: base-files
 Pin: release a=unstable
 Pin-Priority: 1000' > rootdir/etc/apt/preferences
 
-testequal "base-files:
+testsuccessequal "base-files:
   Installed: 5.0.0-1
   Candidate: 5.0.0
   Package pin: 5.0.0
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-596498-trusted-unsigned-repo b/test/integration/test-bug-596498-trusted-unsigned-repo
index 1e5e75b0e..4eb77b9a4 100755
--- a/test/integration/test-bug-596498-trusted-unsigned-repo
+++ b/test/integration/test-bug-596498-trusted-unsigned-repo
@@ -18,16 +18,16 @@ aptgetupdate() {
 PKGTEXT="$(aptget install cool --assume-no -d | head -n 7)"
 DEBFILE='rootdir/etc/apt/sources.list.d/apt-test-unstable-deb.list'
 
-testequal "$PKGTEXT
+testsuccessequal "$PKGTEXT
 Download complete and in download only mode" aptget install cool --assume-no -d
 
-testequal "$PKGTEXT
+testsuccessequal "$PKGTEXT
 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,13 +37,13 @@ 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.
@@ -52,5 +52,5 @@ Download complete and in download only mode" aptget install cool --assume-no -d
 sed -i -e 's#deb#deb [trusted=yes]#' $DEBFILE
 aptgetupdate
 
-testequal "$PKGTEXT
+testsuccessequal "$PKGTEXT
 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..d3573a79a 100755
--- a/test/integration/test-bug-602412-dequote-redirect
+++ b/test/integration/test-bug-602412-dequote-redirect
@@ -20,7 +20,7 @@ testrun() {
 	testsuccess --nomsg aptget update
 
 	# check that I-M-S header is kept in redirections
-	testequal "Hit $1 unstable InRelease
+	testsuccessequal "Hit $1 unstable InRelease
 Hit $1 unstable/main Sources
 Hit $1 unstable/main amd64 Packages
 Hit $1 unstable/main Translation-en
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 652386892..3987abff1 100755
--- a/test/integration/test-bug-624218-Translation-file-handling
+++ b/test/integration/test-bug-624218-Translation-file-handling
@@ -65,29 +65,27 @@ configallowinsecurerepositories "true";
 
 msgtest 'Download of en as forced language' 'without Index'
 testwarning --nomsg aptget update -o Acquire::Languages=en
-cp rootdir/tmp/testsuccess.output testsuccess.output
-testsuccess grep -q -e 'Translation-en ' testsuccess.output
+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'
 testwarning --nomsg aptget update -o Acquire::Languages=en
-testfailure grep -q -e 'Translation-[^e][^n] ' rootdir/tmp/testsuccess.output
+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'
 testwarning --nomsg aptget update -o Acquire::Languages=ast_DE
-cp rootdir/tmp/testsuccess.output testsuccess.output
-testsuccess grep -q -e 'Translation-ast_DE$' testsuccess.output
+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'
 testwarning --nomsg aptget update -o Acquire::Languages=ast_DE
-testfailure grep -q -e 'Translation-[^a][^s]' rootdir/tmp/testsuccess.output
+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'
 testwarning --nomsg aptget update -o Acquire::Languages=none
-testfailure grep -q -e 'Translation' rootdir/tmp/testsuccess.output
+testfailure grep -q -e 'Translation' rootdir/tmp/testwarning.output
 rm -rf rootdir/var/lib/apt/lists
 
 mkdir -p rootdir/var/lib/apt/lists
@@ -95,8 +93,7 @@ touch rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_i18n_Translat
 
 msgtest 'Download of builtin files' 'without Index'
 testwarning --nomsg aptget update
-cp rootdir/tmp/testsuccess.output testsuccess.output
-testsuccess grep -q -e 'Translation-ast_DE' testsuccess.output
+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
@@ -104,5 +101,5 @@ touch rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_i18n_Translat
 
 msgtest 'Download of nothing (even builtin) if none is forced' 'without Index'
 testwarning --nomsg aptget update -o Acquire::Languages=none
-testfailure grep -q -e 'Translation' rootdir/tmp/testsuccess.output
+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-bug-718329-support-data.tar-uncompressed b/test/integration/test-bug-718329-support-data.tar-uncompressed
new file mode 100755
index 000000000..d2845f768
--- /dev/null
+++ b/test/integration/test-bug-718329-support-data.tar-uncompressed
@@ -0,0 +1,31 @@
+#!/bin/sh
+set -e
+
+test_process_package_with_compression() {
+    COMPRESSOR="$1"
+    DATA_TAR="$2"
+
+    msgmsg "Testing apt-ftparchive with compression type: $COMPRESSOR"
+
+    buildsimplenativepackage 'pkg' 'all' '1.0' '' '' 'some descr' '' '' '' "$COMPRESSOR"
+    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)"
+
+    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/
+
+    rm -rf incoming/*
+}
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+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..2cad929cc 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
@@ -16,15 +16,15 @@ 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
+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 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 "'http://packages.debian.org/changelogs/pool/main/apt/apt_2/changelog'" aptget changelog apt -qq --print-uris
 
-testequal "'file://${APTARCHIVE}/apt_2.dsc' apt_2.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
+testsuccessequal "'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
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..f6336ffe3 100755
--- a/test/integration/test-bug-738785-switch-protocol
+++ b/test/integration/test-bug-738785-switch-protocol
@@ -23,7 +23,7 @@ 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
 
 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
+testsuccessequal "'http://localhost:8080/redirectme/pool/apt_1.0/changelog'" aptget changelog apt --print-uris
 
 cd downloaded
 testsuccess aptget changelog apt -d
@@ -52,7 +52,7 @@ cd - >/dev/null
 echo "Dir::Bin::Methods \"${COPYMETHODS}\";" >> aptconfig.conf
 
 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
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-770291-reinstall b/test/integration/test-bug-770291-reinstall
index ea1f57ede..a5b2aff07 100755
--- a/test/integration/test-bug-770291-reinstall
+++ b/test/integration/test-bug-770291-reinstall
@@ -39,7 +39,7 @@ Essential: yes'
 
 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 systemd [215-5+b1] (215-5+b1 unstable [i386])
@@ -47,7 +47,7 @@ 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
 
-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 dependsA [1] (1 unstable [i386])
@@ -68,7 +68,7 @@ testequal "E: Could not configure 'predependsdependsB:i386'. " tail -n1 rootdir/
 msgmsg 'While we are at it, lets try these loops without reinstall as well'
 cp dpkg.status rootdir/var/lib/dpkg/status
 
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   systemd systemd-sysv
@@ -78,7 +78,7 @@ 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
 
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   dependsA dependsB
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..5b966754c 100755
--- a/test/integration/test-compressed-indexes
+++ b/test/integration/test-compressed-indexes
@@ -63,7 +63,7 @@ testrun() {
 	msgtest '\tdeb file is present'; testsuccess --nomsg test -f testpkg_1.0_i386.deb
 	rm 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..e38e40cc9 100755
--- a/test/integration/test-cve-2013-1051-InRelease-parsing
+++ b/test/integration/test-cve-2013-1051-InRelease-parsing
@@ -17,7 +17,7 @@ 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:
@@ -45,15 +45,15 @@ 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 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 fd68578c5..3b9b38c39 100755
--- a/test/integration/test-external-dependency-solver-protocol
+++ b/test/integration/test-external-dependency-solver-protocol
@@ -25,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
@@ -38,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:
@@ -47,7 +47,7 @@ The following NEW packages will be installed:
 Inst coolstuff (3 experimental [amd64])
 Conf coolstuff (3 experimental [amd64])' aptget install --solver apt coolstuff -s
 
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 Execute external solver...
 The following packages will be REMOVED:
@@ -86,7 +86,7 @@ rm -f /tmp/dump.edsp
 testfailure aptget install --solver apt awesomecoolstuff:i386 -s
 
 testsuccess aptinternalsolver scenario
-testequal 'Package: stuff
+testsuccessequal 'Package: stuff
 Source: stuff
 Architecture: all
 Version: 1
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 1524ed4c7..c2fc37ee7 100755
--- a/test/integration/test-kernel-helper-autoremove
+++ b/test/integration/test-kernel-helper-autoremove
@@ -55,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:
@@ -73,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:
@@ -85,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-multiarch-foreign b/test/integration/test-multiarch-foreign
index 332466d96..490abb873 100755
--- a/test/integration/test-multiarch-foreign
+++ b/test/integration/test-multiarch-foreign
@@ -15,7 +15,7 @@ Multi-Arch: foreign'
 
 setupaptarchive
 
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 The following extra packages will be installed:
   foo
@@ -27,7 +27,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...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 The following extra packages will be installed:
   foo
@@ -39,7 +39,7 @@ 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...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   cool-foo foo
@@ -49,7 +49,7 @@ 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 +59,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
@@ -73,7 +73,7 @@ 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 +85,7 @@ 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 extra packages will be installed:
   bar
@@ -97,7 +97,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,7 +107,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 bar:amd64 -s
 
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   bar:i386 cool-bar
@@ -117,7 +117,7 @@ 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
 
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   bar:armel cool-bar
@@ -127,7 +127,7 @@ 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
 
-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:
@@ -138,7 +138,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 bar-provider -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 NEW packages will be installed:
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-pdiff-usage b/test/integration/test-pdiff-usage
index d773dcd66..4de07f1ad 100755
--- a/test/integration/test-pdiff-usage
+++ b/test/integration/test-pdiff-usage
@@ -60,7 +60,7 @@ testrun() {
 	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: $*"
@@ -90,13 +90,13 @@ SHA256-Patches:
 	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)
+	testsuccessequal "$(cat ${PKGFILE}-new)
 " aptcache show apt newstuff
 
 	msgmsg "Testcase: apply with two patches: $*"
@@ -146,7 +146,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: $*"
@@ -178,7 +178,7 @@ SHA256-Patches:
 	signreleasefiles
 	testsuccess aptget update "$@"
 	testnopackage oldstuff
-	testequal "$(cat ${PKGFILE}-new)
+	testsuccessequal "$(cat ${PKGFILE}-new)
 " aptcache show apt newstuff
 
 	msgmsg "Testcase: pdiff patch bigger than index itself: $*"
@@ -212,7 +212,7 @@ SHA256-Patches:
 	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";
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..15bf300ac 100755
--- a/test/integration/test-policy-pinning
+++ b/test/integration/test-policy-pinning
@@ -17,7 +17,7 @@ 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
@@ -126,7 +126,7 @@ testequalpolicycoolstuff() {
 		shift
 	fi
 	shift 6
-	testequal "coolstuff:
+	testsuccessequal "coolstuff:
   Installed: $INSTALLED
   Candidate: $CANDIDATE
   ${PINVERSION}Version table:${BPO2ARCHIVE}
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-verification b/test/integration/test-releasefile-verification
index 3765a4b1f..363b7fe5b 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
@@ -46,7 +46,7 @@ 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
@@ -59,7 +59,7 @@ 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
@@ -119,7 +119,7 @@ runtest() {
 	find aptarchive/ -name "$DELETEFILE" -delete
 	msgtest 'Cold archive signed by' 'Joe Sixpack'
 	updatesuccess
-	testequal "$(cat ${PKGFILE})
+	testsuccessequal "$(cat ${PKGFILE})
 " aptcache show apt
 	installaptold
 
@@ -128,7 +128,7 @@ runtest() {
 	find aptarchive/ -name "$DELETEFILE" -delete
 	msgtest 'Good warm archive signed by' 'Joe Sixpack'
 	updatesuccess
-	testequal "$(cat ${PKGFILE}-new)
+	testsuccessequal "$(cat ${PKGFILE}-new)
 " aptcache show apt
 	installaptnew
 
@@ -139,7 +139,7 @@ runtest() {
 	find aptarchive/ -name "$DELETEFILE" -delete
 	msgtest 'Cold archive signed by' 'Rex Expired'
 	updatefailure '^W: .* KEYEXPIRED'
-	testequal "$(cat ${PKGFILE})
+	testsuccessequal "$(cat ${PKGFILE})
 " aptcache show apt
 	failaptold
 	rm rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg
@@ -150,7 +150,7 @@ runtest() {
 	find aptarchive/ -name "$DELETEFILE" -delete
 	msgtest 'Cold archive signed by' 'Marvin Paranoid'
 	updatefailure '^W: .* NO_PUBKEY'
-	testequal "$(cat ${PKGFILE})
+	testsuccessequal "$(cat ${PKGFILE})
 " aptcache show apt
 	failaptold
 
@@ -164,7 +164,7 @@ runtest() {
 	find aptarchive/ -name "$DELETEFILE" -delete
 	msgtest 'Bad warm archive signed by' 'Joe Sixpack'
 	updatesuccess
-	testequal "$(cat ${PKGFILE}-new)
+	testsuccessequal "$(cat ${PKGFILE}-new)
 " aptcache show apt
 	installaptnew
 
@@ -175,7 +175,7 @@ runtest() {
 	find aptarchive/ -name "$DELETEFILE" -delete
 	msgtest 'Cold archive signed by' 'Joe Sixpack'
 	updatesuccess
-	testequal "$(cat ${PKGFILE})
+	testsuccessequal "$(cat ${PKGFILE})
 " aptcache show apt
 	installaptold
 
@@ -184,7 +184,7 @@ runtest() {
 	find aptarchive/ -name "$DELETEFILE" -delete
 	msgtest 'Good warm archive signed by' 'Marvin Paranoid'
 	updatefailure '^W: .* NO_PUBKEY'
-	testequal "$(cat ${PKGFILE})
+	testsuccessequal "$(cat ${PKGFILE})
 " aptcache show apt
 	installaptold
 
@@ -194,7 +194,7 @@ runtest() {
 	find aptarchive/ -name "$DELETEFILE" -delete
 	msgtest 'Good warm archive signed by' 'Rex Expired'
 	updatefailure '^W: .* KEYEXPIRED'
-	testequal "$(cat ${PKGFILE})
+	testsuccessequal "$(cat ${PKGFILE})
 " aptcache show apt
 	installaptold
 	rm rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg
@@ -204,7 +204,7 @@ runtest() {
 	find aptarchive/ -name "$DELETEFILE" -delete
 	msgtest 'Good warm archive signed by' 'Joe Sixpack'
 	updatesuccess
-	testequal "$(cat ${PKGFILE}-new)
+	testsuccessequal "$(cat ${PKGFILE}-new)
 " aptcache show apt
 	installaptnew
 }
@@ -223,7 +223,7 @@ runtest2() {
 	find aptarchive/ -name Release.gpg -delete
 	msgtest 'Warm archive signed by' 'nobody'
 	updatesuccess
-	testequal "$(cat ${PKGFILE}-new)
+	testsuccessequal "$(cat ${PKGFILE}-new)
 " aptcache show apt
 	failaptnew
 
@@ -231,7 +231,7 @@ runtest2() {
 	rm -rf rootdir/var/lib/apt/lists
 	msgtest 'Cold archive signed by' 'nobody'
 	updatesuccess
-	testequal "$(cat ${PKGFILE}-new)
+	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..cb6bc3cc2 100755
--- a/test/integration/test-specific-architecture-dependencies
+++ b/test/integration/test-specific-architecture-dependencies
@@ -30,7 +30,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 +42,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,7 +54,7 @@ Inst depender (1 unstable [all])
 Conf libc6:i386 (1 unstable [i386])
 Conf depender (1 unstable [all])' aptget install depender -s
 
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 The following packages will be REMOVED:
   libold libold:i386
@@ -66,7 +66,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
@@ -77,7 +77,7 @@ Remv libold:i386 [1]
 Inst breaker-x32 (1 unstable [amd64])
 Conf breaker-x32 (1 unstable [amd64])' aptget install breaker-x32 -s
 
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 The following packages will be REMOVED:
   libold
@@ -88,7 +88,7 @@ Remv libold [1]
 Inst breaker-x64:i386 (1 unstable [i386])
 Conf breaker-x64:i386 (1 unstable [i386])' aptget install breaker-x64 -s
 
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   oldconflictor
@@ -96,7 +96,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 +104,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 +112,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 +120,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,7 +132,7 @@ 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
 
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   foo-foreign-depender:i386
@@ -140,7 +140,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 +151,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 +162,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,7 +173,7 @@ 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
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..ec74a750b 100755
--- a/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
+++ b/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
@@ -145,7 +145,7 @@ 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]
@@ -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,7 +172,7 @@ 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]
@@ -186,7 +186,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,7 +196,7 @@ 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]
@@ -221,7 +221,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,7 +233,7 @@ 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]
@@ -243,7 +243,7 @@ E: Failed to fetch http://localhost:8080/pkg-mixed-sha1-bad_1.0.dsc  Hash Sum mi
 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]
@@ -256,9 +256,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-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 0b5a91246..c2e2aadf1 100755
--- a/test/integration/test-ubuntu-bug-761175-remove-purge
+++ b/test/integration/test-ubuntu-bug-761175-remove-purge
@@ -31,7 +31,7 @@ runtests() {
 	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:
@@ -39,7 +39,7 @@ The following packages will be REMOVED:
 0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded.
 Purg compiz-core-$1" aptget purge compiz-core-$1 -s
 	testsuccess aptget purge compiz-core-$1 -y
-	testequal "dpkg-query: no packages found matching compiz-core-$1" dpkg -l compiz-core-$1
+	testfailureequal "dpkg-query: no packages found matching compiz-core-$1" dpkg -l compiz-core-$1
 }
 
 msgmsg 'Test in multi arch environment'
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:
-- 
cgit v1.2.3-70-g09d2


From 40bd06bdb5e6b90aa24762300567d0650dbda751 Mon Sep 17 00:00:00 2001
From: Beatrice Torracca <beatricet@libero.it>
Date: Tue, 10 Mar 2015 09:49:16 +0100
Subject: Italian manpage translation update

Closes: 776702
---
 doc/po/apt-doc.pot |   2 +-
 doc/po/it.po       | 205 +++++++++++++++++++++++------------------------------
 2 files changed, 89 insertions(+), 118 deletions(-)

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 1e9a5127b..98c2b66b5 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "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: 2015-03-09 02:17+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/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
-- 
cgit v1.2.3-70-g09d2


From 249aec3b7397662a678ea0014f94392085477b09 Mon Sep 17 00:00:00 2001
From: Jérémy Bobbio <lunar@debian.org>
Date: Tue, 10 Mar 2015 10:09:44 +0100
Subject: stop displaying time of build in online help
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As part of the “reproducible builds” effort [1], we have noticed that
apt could not be built reproducibly.

One issue is that it uses the __DATE__ and __TIME__ macros of the C
preprocessor to display the time of build in the online help. We believe
this information not to be really useful to users as they can always
look at the package data and metadata to figure it out.

The attached patch simply removes this information. All
non-documentation packages can then be built reproducibly with our
current experimental framework.

[David: changed the string slightly to be untranslateable as well]

Closes: 774342
---
 cmdline/apt-cache.cc                        | 5 ++---
 cmdline/apt-cdrom.cc                        | 4 ++--
 cmdline/apt-config.cc                       | 5 ++---
 cmdline/apt-dump-solver.cc                  | 3 +--
 cmdline/apt-extracttemplates.cc             | 3 +--
 cmdline/apt-get.cc                          | 9 ++++-----
 cmdline/apt-helper.cc                       | 3 +--
 cmdline/apt-internal-solver.cc              | 3 +--
 cmdline/apt-mark.cc                         | 3 +--
 cmdline/apt-sortpkgs.cc                     | 3 +--
 cmdline/apt.cc                              | 3 +--
 ftparchive/apt-ftparchive.cc                | 3 +--
 test/integration/test-00-commands-have-help | 2 +-
 13 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index a5024c581..e2cf7e8b7 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1824,9 +1824,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;
 
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 327039e00..d95c169cd 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -205,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;
    
diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index e0b8a624e..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"
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 5211ee027..3e4f89286 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -219,8 +219,7 @@ bool DebFile::ParseInfo()
 /* */
 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 true;
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 33bbdd861..a0d78257c 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1607,13 +1607,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 +1621,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++)
diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index a05ae90a2..65db857ad 100644
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -83,8 +83,7 @@ static bool DoDownloadFile(CommandLine &CmdL)
 
 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;
diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 4fabeb02f..939061b93 100644
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -44,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"
diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index 47777009b..de1c80309 100644
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -443,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"
diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index 9b66ad4db..971900e4f 100644
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -146,8 +146,7 @@ static bool DoIt(string InFile)
 /* */
 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 true;
    
diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 056cd213f..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 << 
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index adf1b6d73..69b936dff 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -616,8 +616,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;
 
diff --git a/test/integration/test-00-commands-have-help b/test/integration/test-00-commands-have-help
index bbd1475eb..f2317dbdf 100755
--- a/test/integration/test-00-commands-have-help
+++ b/test/integration/test-00-commands-have-help
@@ -13,7 +13,7 @@ configarchitecture 'amd64'
 export LD_BIND_NOW=1
 
 checkversionmessage() {
-	testsuccess grep '^apt .* compiled on ' ${1}-help.output
+	testsuccess grep '^apt .* (' ${1}-help.output
 }
 
 checkhelpmessage() {
-- 
cgit v1.2.3-70-g09d2


From d01fa806061db7f5d227a0784405987c78998c84 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Fri, 20 Mar 2015 17:38:51 +0100
Subject: test/integration/test-apt-download-progress: fix test failure on fast
 hardware

---
 test/integration/test-apt-download-progress | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/test-apt-download-progress b/test/integration/test-apt-download-progress
index 0a9020bec..7092e163e 100755
--- a/test/integration/test-apt-download-progress
+++ b/test/integration/test-apt-download-progress
@@ -30,13 +30,13 @@ testsuccess dd if=/dev/zero of=./aptarchive/$TESTFILE bs=800k count=1
 msgtest 'download progress works via' 'http'
 printf '\n'
 exec 3> apt-progress.log
-testsuccess apthelper download-file "http://localhost:8080/$TESTFILE" http-$TESTFILE -o APT::Status-Fd=3 -o Acquire::http::Dl-Limit=800
+testsuccess apthelper download-file "http://localhost:8080/$TESTFILE" http-$TESTFILE -o APT::Status-Fd=3 -o Acquire::http::Dl-Limit=600
 assertprogress apt-progress.log
 
 msgtest 'download progress works via' 'https'
 printf '\n'
 exec 3> apt-progress.log
-testsuccess apthelper download-file "https://localhost:4433/$TESTFILE" https-$TESTFILE -o APT::Status-Fd=3 -o Acquire::https::Dl-Limit=800
+testsuccess apthelper download-file "https://localhost:4433/$TESTFILE" https-$TESTFILE -o APT::Status-Fd=3 -o Acquire::https::Dl-Limit=600
 assertprogress apt-progress.log
 
 # cleanup
-- 
cgit v1.2.3-70-g09d2


From 63b399509d46df71e8d16bd0d362eb23aa6558d7 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Tue, 7 Apr 2015 12:20:56 +0200
Subject: Fix crash in pkgDPkgPM::WriteApportReport(() (LP: #1436626)

---
 apt-pkg/deb/dpkgpm.cc | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index e23ca466d..b187efb40 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1900,8 +1900,19 @@ 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",
+      "reserved-1",
+      "reserved-2",
+      "reserved-3",
+      "reserved-4",
+   };
    fprintf(report, "AptOrdering:\n");
    for (vector<Item>::iterator I = List.begin(); I != List.end(); ++I)
       if ((*I).Pkg != NULL)
-- 
cgit v1.2.3-70-g09d2


From 1296bc7c466181a7978c313c40a041b34ce3eaeb Mon Sep 17 00:00:00 2001
From: Robert Edmonds <edmonds@debian.org>
Date: Sun, 22 Mar 2015 00:12:45 -0400
Subject: HttpsMethod::Fetch(): Zero the FetchResult object when leaving due to
 404

---
 methods/https.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/methods/https.cc b/methods/https.cc
index 3a5981b58..f2b00dd64 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -402,6 +402,8 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
       _error->Error("%s", err);
       // unlink, no need keep 401/404 page content in partial/
       unlink(File->Name().c_str());
+      Res.Size = 0;
+      Res.LastModified = 0;
       return false;
    }
 
-- 
cgit v1.2.3-70-g09d2


From 7fddeb55af9c022fd96343d9cd700c946dbf8a01 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 7 Mar 2015 13:11:49 +0100
Subject: fix another d(e)select-upgrade typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

You would think one instance of this is enough, but
80e8d923ebc8d5f3f84eb3f922b28ca309c25026 wasn't as
globally applied as the commit message suggested…

LP: #1399037
---
 apt-private/private-cmndline.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 0b5ba5b4f..c0f631a08 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -165,7 +165,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);
-- 
cgit v1.2.3-70-g09d2


From a2679f55b5b14092db88fab3799f06e6b68e439e Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 7 Apr 2015 14:34:04 +0200
Subject: properly handle expected filesize in https

The worker expects that the methods tell him when they start or finish
downloading a file. Various information pieces are passed along in this report
including the (expected) filesize. https is using a "global" struct for
reporting which made it 'reuse' incorrect values in some cases like a
non-existent InRelease fallbacking to Release{,.gpg} resulting in an incorrect
size-mismatch warning scaring and desensitizing users as well as being subject
to a race between the write_data and progress callbacks generating incorrect
progress reporting and potentially the same error message.

Other branches as well as the bugreports contain 'better' fixes making the
struct local and other sensible changes, but are larger as a result, so in
this version we opted for short diff with minimal effect above else instead.

Closes: 777565, 781509
Thanks: Robert Edmonds and Anders Kaseorg for initial patchs
---
 methods/https.cc | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/methods/https.cc b/methods/https.cc
index 3a5981b58..cb11159bc 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -68,6 +68,8 @@ HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
 
       me->File->Truncate(me->Server->StartPos);
       me->File->Seek(me->Server->StartPos);
+
+      me->Res.Size = me->Server->Size;
    }
    else if (me->Server->HeaderLine(line) == false)
       return 0;
@@ -97,17 +99,6 @@ HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
    return buffer_size;
 }
 
-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;
-}
-
 // HttpsServerState::HttpsServerState - Constructor			/*{{{*/
 HttpsServerState::HttpsServerState(URI Srv,HttpsMethod * /*Owner*/) : ServerState(Srv, NULL)
 {
@@ -201,10 +192,8 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    curl_easy_setopt(curl, CURLOPT_WRITEHEADER, this);
    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);
@@ -357,6 +346,7 @@ 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);
+   Res = FetchResult();
 
    // keep apt updated
    Res.Filename = Itm->DestFile;
-- 
cgit v1.2.3-70-g09d2


From 66c3875df391b1120b43831efcbe88a78569fbfe Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 7 Apr 2015 16:58:44 +0200
Subject: avoid depends on std::string implementation for
 pkgAcquire::Item::Mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In /experimental this is resolved by deprecating Mode and moving to a
new std::string, but that breaks ABI of course, so that was out of
question. We can't change to a malloc/free style c-string either as
Mode is public and hence a library user could be setting this as well.
std::string implementors actually helped us out here with copy-on-write
which means that while the variable "obviously" runs out of scope here,
in reality you get the correct result as the string we work with here
comes from the configuration in which it is still valid. Such a
dependency on magic is bad of course, but its still interesting that
only python3 seems to have an issue with it…

With some silly explicit if-else assigning we can sidestep this issue
while retaining the same output for 99.99% of all users (= noone
actually configures additional compression algorithms which are also
provided by repositories…), but even for these 0.01% its just a small
change in the display as Mode can not be used for anything else.
Example: apt/aptitude uses it in its 'update' implementations in the
one-line progress at the bottom for specific items.

Closes: 781858
---
 apt-pkg/acquire-item.cc | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 253cbdaf7..0bcafdc5c 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1194,8 +1194,18 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash,
    Desc.URI = decompProg + ":" + FileName;
    QueueURI(Desc);
 
-   // FIXME: this points to a c++ string that goes out of scope
-   Mode = decompProg.c_str();
+   if (decompProg == "copy")
+      Mode = "copy";
+   else if (decompProg == "xz")
+      Mode = "xz";
+   else if (decompProg == "lzma")
+      Mode = "lzma";
+   else if (decompProg == "bzip2")
+      Mode = "bzip2";
+   else if (decompProg == "gzip")
+      Mode = "gzip";
+   else
+      Mode = "decomp";
 }
 									/*}}}*/
 // AcqIndexTrans::pkgAcqIndexTrans - Constructor			/*{{{*/
-- 
cgit v1.2.3-70-g09d2


From 3af3768e1a0ae8519ac85fbe1eb4494eeb076fa2 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Tue, 7 Apr 2015 12:20:56 +0200
Subject: fix crash in order writing in pkgDPkgPM::WriteApportReport()

libapt can be configured to write various bits of information to a file
creating a report via apport. This is disabled by default in Debian and
apport residing only in /experimental so far, but Ubuntu and other
derivatives have this (in some versions) enabled by default and there is
no regression potentially here.

The crash is caused by a mismatch of operations vs. strings for
operations, so adding the missing strings for these operations solves
the problem.

[commit message by David Kalnischkies]

LP: #1436626
---
 apt-pkg/deb/dpkgpm.cc | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index e23ca466d..82e045fd3 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1900,8 +1900,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)
-- 
cgit v1.2.3-70-g09d2


From 7e9b7ea8236a79580c4ca47712558096d66bad53 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 7 Apr 2015 18:31:12 +0200
Subject: demote VectorizeString gcc attribute from const to pure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

g++-5 generates a slightly broken libapt which doesn't split
architecture configurations correctly resulting in e.g. Packages files
requested for the bogus architecture 'amd64,i386' instead of for amd64
and i386.

The reason is an incorrectly applied attribute marking the function as
const, while functions with pointer arguments are not allowed to be
declared as such (note that char& is a char* in disguise). Demoting the
attribute to pure fixes this issue – better would be dropping the & from
char but that is an API change…

Neither earlier g++ versions nor clang use this attribute to generate
broken code, so we don't need a rebuild of dependencies or anything and
g++-5 isn't even included in jessie, but the effect is so strange and
apt popular enough to consider avoiding this problem anyhow.
---
 apt-pkg/contrib/strutl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 185cdc3fc..f4f80834b 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -79,7 +79,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.
-- 
cgit v1.2.3-70-g09d2


From d5cf8851753dde4f45bfd3b48fcdf34247a8752a Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 7 Apr 2015 22:34:34 +0200
Subject: keyids in "apt-key del" should be case-insensitive

gnupg is case-insensitive about keyids, so back then apt-key called it
directly any keyid was accepted, but now that we work more with the
keyid ourself we regressed to require uppercase keyids by accident.

This is also inconsistent with other apt-key commands which still use
gnupg directly. A single case-insensitive grep and we are fine again.

Closes: 781696
---
 cmdline/apt-key.in            | 2 +-
 test/integration/test-apt-key | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index b4e071000..1da311d35 100644
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -180,7 +180,7 @@ update() {
 remove_key_from_keyring() {
     local GPG="$GPG_CMD --keyring $1"
     # check if the key is in this keyring: the key id is in the 5 column at the end
-    if ! $GPG --with-colons --list-keys 2>&1 | grep -q "^pub:[^:]*:[^:]*:[^:]*:[0-9A-F]*$2:"; then
+    if ! $GPG --with-colons --list-keys 2>&1 | grep -iq "^pub:[^:]*:[^:]*:[^:]*:[0-9A-F]*$2:"; then
 	return
     fi
     if [ ! -w "$1" ]; then
diff --git a/test/integration/test-apt-key b/test/integration/test-apt-key
index 47230cb55..b4f823ef1 100755
--- a/test/integration/test-apt-key
+++ b/test/integration/test-apt-key
@@ -111,3 +111,9 @@ cleanplate
 cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
 testsuccess --nomsg aptkey --fakeroot del 5A90D141DBAC8DAE
 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
-- 
cgit v1.2.3-70-g09d2


From b8eba208daebe3e3f235983e44da9c398d6f7a57 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 10 Mar 2015 14:11:54 +0100
Subject: reimplement the last uses of sprintf

Working with strings c-style is complicated and error-prune,
so by converting to c++ style we gain some simplicity and
avoid buffer overflows by later extensions.

Git-Dch: Ignore
---
 apt-pkg/contrib/cdromutl.cc |  31 ++++----
 apt-pkg/contrib/strutl.cc   | 126 ++++++++++++++------------------
 apt-private/acqprogress.cc  | 173 ++++++++++++++++++++++----------------------
 apt-private/acqprogress.h   |   4 +-
 ftparchive/writer.cc        |   8 +-
 methods/ftp.cc              |  16 ++--
 test/libapt/strutil_test.cc |  22 ++++++
 test/libapt/uri_test.cc     |  12 +++
 8 files changed, 206 insertions(+), 186 deletions(-)

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/strutl.cc b/apt-pkg/contrib/strutl.cc
index 0ac587a9e..0db4c57b2 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;
 }
 									/*}}}*/
@@ -1423,7 +1412,7 @@ size_t strv_length(const char **str_array)
       ;
    return i;
 }
-
+									/*}}}*/
 // DeEscapeString - unescape (\0XX and \xXX) from a string		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -1605,51 +1594,46 @@ 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		/*{{{*/
diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc
index 14a53eacb..e834d7d6a 100644
--- a/apt-private/acqprogress.cc
+++ b/apt-private/acqprogress.cc
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <signal.h>
 #include <iostream>
+#include <sstream>
 #include <unistd.h>
 
 #include <apti18n.h>
@@ -34,9 +35,8 @@ using namespace std;
 // ---------------------------------------------------------------------
 /* */
 AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet) :
-    pkgAcquireStatus(), ScreenWidth(ScreenWidth), ID(0), Quiet(Quiet)
+    pkgAcquireStatus(), 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,7 +48,7 @@ AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet)
 void AcqTextStatus::Start()
 {
    pkgAcquireStatus::Start();
-   BlankLine[0] = 0;
+   LastLineLength = 0;
    ID = 1;
 }
 									/*}}}*/
@@ -60,8 +60,7 @@ void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
    if (Quiet > 1)
       return;
 
-   if (Quiet <= 0)
-      cout << '\r' << BlankLine << '\r';
+   clearLastLine();
 
    cout << _("Hit ") << Itm.Description;
    cout << endl;
@@ -82,8 +81,7 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
    if (Quiet > 1)
       return;
 
-   if (Quiet <= 0)
-      cout << '\r' << BlankLine << '\r';
+   clearLastLine();
 
    cout << _("Get:") << Itm.Owner->ID << ' ' << Itm.Description;
    if (Itm.Owner->FileSize != 0)
@@ -111,8 +109,7 @@ void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm)
    if (Itm.Owner->Status == pkgAcquire::Item::StatIdle)
       return;
 
-   if (Quiet <= 0)
-      cout << '\r' << BlankLine << '\r';
+   clearLastLine();
 
    if (Itm.Owner->Status == pkgAcquire::Item::StatDone)
    {
@@ -140,8 +137,7 @@ void AcqTextStatus::Stop()
    if (Quiet > 1)
       return;
 
-   if (Quiet <= 0)
-      cout << '\r' << BlankLine << '\r' << flush;
+   clearLastLine();
 
    if (_config->FindB("quiet::NoStatistic", false) == true)
       return;
@@ -167,77 +163,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;
-      }
-
-      Shown = true;
+	    if (I->Status.empty() == false)
+	       S << " [" << I->Status << "]";
 
-      // 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);
+	    continue;
+	 }
 
-      // 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);
-      }
+	 // Add in the short description
+	 S << " [";
+	 if (I->CurrentItem->Owner->ID != 0)
+	    S << I->CurrentItem->Owner->ID << " ";
+	 S << I->CurrentItem->ShortDesc;
 
-      // 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);
+	 // Show the short mode string
+	 if (I->CurrentItem->Owner->ActiveSubprocess.empty() == false)
+	    S << " " << I->CurrentItem->Owner->ActiveSubprocess;
 
-      // 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 +233,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;
+   if (LastLineLength > Line.length())
+      clearLastLine();
    else
-      cout << '\r' << BlankLine << '\r' << Buffer << flush;
+      cout << '\r';
+   cout << Line << flush;
    if (_config->FindB("Apt::Color", false) == true)
       cout << _config->Find("APT::Color::Neutral") << flush;
 
-   memset(BlankLine,' ',strlen(Buffer));
-   BlankLine[strlen(Buffer)] = 0;
-
+   LastLineLength = Line.length();
    Update = false;
 
    return true;
@@ -296,8 +280,7 @@ bool AcqTextStatus::MediaChange(string Media,string Drive)
 
       return false;
 
-   if (Quiet <= 0)
-      cout << '\r' << BlankLine << '\r';
+   clearLastLine();
    ioprintf(cout,_("Media change: please insert the disc labeled\n"
 		   " '%s'\n"
 		   "in the drive '%s' and press enter\n"),
@@ -317,3 +300,17 @@ bool AcqTextStatus::MediaChange(string Media,string Drive)
    return bStatus;
 }
 									/*}}}*/
+void AcqTextStatus::clearLastLine() {					/*{{{*/
+   if (Quiet > 0)
+      return;
+
+   // do not try to clear more than the (now smaller) screen
+   if (LastLineLength > ScreenWidth)
+      LastLineLength = ScreenWidth;
+
+   std::cout << '\r';
+   for (size_t i = 0; i < LastLineLength; ++i)
+      std::cout << ' ';
+   std::cout << '\r' << std::flush;
+}
+									/*}}}*/
diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h
index 71a10d78a..ab8170126 100644
--- a/apt-private/acqprogress.h
+++ b/apt-private/acqprogress.h
@@ -17,10 +17,12 @@
 class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus
 {
    unsigned int &ScreenWidth;
-   char BlankLine[1024];
+   size_t LastLineLength;
    unsigned long ID;
    unsigned long Quiet;
 
+   void clearLastLine();
+
    public:
 
    virtual bool MediaChange(std::string Media,std::string Drive);
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index a63d8846b..db68c21f0 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -440,9 +440,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 &&
@@ -466,7 +463,10 @@ bool PackagesWriter::DoPackage(string FileName)
    // This lists all the changes to the fields we are going to make.
    std::vector<TFRewriteData> Changes;
 
-   Changes.push_back(SetTFRewriteData("Size", Size));
+   std::string Size;
+   strprintf(Size, "%llu", (unsigned long long) FileSize);
+   Changes.push_back(SetTFRewriteData("Size", Size.c_str()));
+
    for (HashStringList::const_iterator hs = Db.HashesList.begin(); hs != Db.HashesList.end(); ++hs)
    {
       if (hs->HashType() == "MD5Sum")
diff --git a/methods/ftp.cc b/methods/ftp.cc
index 0504e5872..7764acf6a 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
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/uri_test.cc b/test/libapt/uri_test.cc
index 1662f51f0..5d5ae9679 100644
--- a/test/libapt/uri_test.cc
+++ b/test/libapt/uri_test.cc
@@ -12,6 +12,7 @@ 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);
    // Login data
    U = URI("http://jgg:foo@ualberta.ca/blah");
    EXPECT_EQ("http", U.Access);
@@ -20,6 +21,7 @@ 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);
 }
 TEST(URITest, SingeSlashFile)
 {
@@ -30,6 +32,7 @@ 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);
 }
 TEST(URITest, BasicCDROM)
 {
@@ -40,6 +43,7 @@ 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);
 }
 TEST(URITest, RelativeGzip)
 {
@@ -50,6 +54,7 @@ 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);
 }
 TEST(URITest, NoSlashFTP)
 {
@@ -60,6 +65,7 @@ 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);
 }
 TEST(URITest, RFC2732)
 {
@@ -70,6 +76,7 @@ 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);
    // with port
    U = URI("http://[::FFFF:129.144.52.38]:80/index.html");
    EXPECT_EQ("http", U.Access);
@@ -78,6 +85,7 @@ 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);
    // extra colon
    U = URI("http://[::FFFF:129.144.52.38:]:80/index.html");
    EXPECT_EQ("http", U.Access);
@@ -86,6 +94,7 @@ 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);
    // extra colon port
    U = URI("http://[::FFFF:129.144.52.38:]/index.html");
    EXPECT_EQ("http", U.Access);
@@ -94,6 +103,7 @@ 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);
    // 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 +113,7 @@ 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);
    // no brackets
    U = URI("cdrom:Foo Bar Cow/debian/");
    EXPECT_EQ("cdrom", U.Access);
@@ -111,6 +122,7 @@ 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);
    // percent encoded
    U = URI("ftp://foo:b%40r@example.org");
    EXPECT_EQ("foo", U.User);
-- 
cgit v1.2.3-70-g09d2


From dfad5beea77d75983f6ff8a1b8296b74dd48203e Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 15 Mar 2015 22:34:54 +0100
Subject: add a simple unit test for acquire progress

This isn't testing much of the 'complex' parts,
but its better than nothing for now.

Git-Dch: Ignore
---
 apt-private/acqprogress.cc      |  53 ++++++-------
 apt-private/acqprogress.h       |   4 +-
 apt-private/private-install.cc  |   2 +-
 apt-private/private-update.cc   |   4 +-
 cmdline/apt-get.cc              |   6 +-
 cmdline/apt-helper.cc           |   2 +-
 test/libapt/acqprogress_test.cc | 170 ++++++++++++++++++++++++++++++++++++++++
 7 files changed, 205 insertions(+), 36 deletions(-)
 create mode 100644 test/libapt/acqprogress_test.cc

diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc
index e834d7d6a..0c606e48e 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							/*{{{*/
@@ -29,13 +28,11 @@
 #include <apti18n.h>
 									/*}}}*/
 
-using namespace std;
-
 // AcqTextStatus::AcqTextStatus - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet) :
-    pkgAcquireStatus(), ScreenWidth(ScreenWidth), LastLineLength(0), 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)
 {
    // testcases use it to disable pulses without disabling other user messages
    if (Quiet == 0 && _config->FindB("quiet::NoUpdate", false) == true)
@@ -62,8 +59,8 @@ void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
 
    clearLastLine();
 
-   cout << _("Hit ") << Itm.Description;
-   cout << endl;
+   out << _("Hit ") << Itm.Description;
+   out << std::endl;
    Update = true;
 }
 									/*}}}*/
@@ -83,10 +80,10 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
 
    clearLastLine();
 
-   cout << _("Get:") << Itm.Owner->ID << ' ' << Itm.Description;
+   out << _("Get:") << Itm.Owner->ID << ' ' << Itm.Description;
    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				/*{{{*/
@@ -113,15 +110,15 @@ void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm)
 
    if (Itm.Owner->Status == pkgAcquire::Item::StatDone)
    {
-      cout << _("Ign ") << Itm.Description << endl;
+      out << _("Ign ") << Itm.Description << std::endl;
       if (Itm.Owner->ErrorText.empty() == false &&
 	    _config->FindB("Acquire::Progress::Ignore::ShowErrorText", false) == true)
-	 cout << "  " << Itm.Owner->ErrorText << endl;
+	 out << "  " << Itm.Owner->ErrorText << std::endl;
    }
    else
    {
-      cout << _("Err ") << Itm.Description << endl;
-      cout << "  " << Itm.Owner->ErrorText << endl;
+      out << _("Err ") << Itm.Description << std::endl;
+      out << "  " << Itm.Owner->ErrorText << std::endl;
    }
 
    Update = true;
@@ -143,7 +140,7 @@ void AcqTextStatus::Stop()
       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());
@@ -152,7 +149,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)
 {
@@ -250,14 +247,14 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
 
    // Draw the current status
    if (_config->FindB("Apt::Color", false) == true)
-      cout << _config->Find("APT::Color::Yellow");
+      out << _config->Find("APT::Color::Yellow");
    if (LastLineLength > Line.length())
       clearLastLine();
    else
-      cout << '\r';
-   cout << Line << flush;
+      out << '\r';
+   out << Line << std::flush;
    if (_config->FindB("Apt::Color", false) == true)
-      cout << _config->Find("APT::Color::Neutral") << flush;
+      out << _config->Find("APT::Color::Neutral") << std::flush;
 
    LastLineLength = Line.length();
    Update = false;
@@ -268,7 +265,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
@@ -281,7 +278,7 @@ bool AcqTextStatus::MediaChange(string Media,string Drive)
       return false;
 
    clearLastLine();
-   ioprintf(cout,_("Media change: please insert the disc labeled\n"
+   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());
@@ -301,16 +298,16 @@ bool AcqTextStatus::MediaChange(string Media,string Drive)
 }
 									/*}}}*/
 void AcqTextStatus::clearLastLine() {					/*{{{*/
-   if (Quiet > 0)
+   if (Quiet > 0 || LastLineLength == 0)
       return;
 
    // do not try to clear more than the (now smaller) screen
    if (LastLineLength > ScreenWidth)
       LastLineLength = ScreenWidth;
 
-   std::cout << '\r';
+   out << '\r';
    for (size_t i = 0; i < LastLineLength; ++i)
-      std::cout << ' ';
-   std::cout << '\r' << std::flush;
+      out << ' ';
+   out << '\r' << std::flush;
 }
 									/*}}}*/
diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h
index ab8170126..7cf990c65 100644
--- a/apt-private/acqprogress.h
+++ b/apt-private/acqprogress.h
@@ -13,9 +13,11 @@
 #include <apt-pkg/macros.h>
 
 #include <string>
+#include <iostream>
 
 class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus
 {
+   std::ostream &out;
    unsigned int &ScreenWidth;
    size_t LastLineLength;
    unsigned long ID;
@@ -35,7 +37,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-install.cc b/apt-private/private-install.cc
index 79a22edf4..acc6d42c2 100644
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -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)
    {
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/cmdline/apt-get.cc b/cmdline/apt-get.cc
index a0d78257c..1a4f4c5a8 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -624,7 +624,7 @@ static bool DoDownload(CommandLine &CmdL)
    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);
@@ -729,7 +729,7 @@ static bool DoSource(CommandLine &CmdL)
       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()];
@@ -1550,7 +1550,7 @@ static bool DoChangelog(CommandLine &CmdL)
       return Success;
    }
 
-   AcqTextStatus Stat(ScreenWidth, _config->FindI("quiet",0));
+   AcqTextStatus Stat(std::cout, ScreenWidth,_config->FindI("quiet",0));
    Fetcher.SetLog(&Stat);
 
    bool const downOnly = _config->FindB("APT::Get::Download-Only", false);
diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index 65db857ad..a97fc903f 100644
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -48,7 +48,7 @@ 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);
 
    size_t fileind = 0;
diff --git a/test/libapt/acqprogress_test.cc b/test/libapt/acqprogress_test.cc
new file mode 100644
index 000000000..288e05aca
--- /dev/null
+++ b/test/libapt/acqprogress_test.cc
@@ -0,0 +1,170 @@
+#include <config.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, "", NULL) {}
+
+   virtual std::string DescURI() { return ""; }
+
+};
+
+TEST(AcqProgress, IMSHit)
+{
+   std::ostringstream out;
+   unsigned int width = 80;
+   AcqTextStatus Stat(out, width, 0);
+   Stat.Start();
+
+   pkgAcquire::ItemDesc hit;
+   hit.URI = "http://example.org/file";
+   hit.Description = "Example File from example.org";
+   hit.ShortDesc = "Example File";
+   hit.Owner = NULL;
+
+   EXPECT_EQ("", out.str());
+   Stat.IMSHit(hit);
+   EXPECT_EQ("Hit Example File from example.org\n", out.str());
+   Stat.IMSHit(hit);
+   EXPECT_EQ("Hit Example File from example.org\n"
+	     "Hit Example File from example.org\n", out.str());
+   Stat.Stop();
+   EXPECT_EQ("Hit Example File from example.org\n"
+	     "Hit 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:2 Example File from example.org\n", out.str());
+   Stat.Stop();
+   EXPECT_EQ("Get:1 Example File from example.org\n"
+	     "Get:2 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:2 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:2 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("", out.str());
+   fetchO.Status = pkgAcquire::Item::StatDone;
+   Stat.Fail(fetch);
+   EXPECT_EQ("Ign Example File from example.org\n", out.str());
+   fetchO.Status = pkgAcquire::Item::StatError;
+   fetchO.ErrorText = "An error test!";
+   Stat.Fail(fetch);
+   EXPECT_EQ("Ign Example File from example.org\n"
+	     "Err 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 Example File from example.org\n"
+	     "Err Example File from example.org\n"
+	     "  An error test!\n"
+	     "Ign Example File from example.org\n"
+	     "  An error test!\n", out.str());
+   _config->Set("Acquire::Progress::Ignore::ShowErrorText", true);
+   Stat.Stop();
+   EXPECT_EQ("Ign Example File from example.org\n"
+	     "Err Example File from example.org\n"
+	     "  An error test!\n"
+	     "Ign 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());
+}
-- 
cgit v1.2.3-70-g09d2


From f51401eb51939bfc932519601c43822a0aa5e343 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 10 Mar 2015 21:05:02 +0100
Subject: test for or-group choice behaviour in upgrade

In #780028 we were discussing how the or-group order should be more
important than keep-back decisions of 'upgrade'. We have this behaviour,
but to ensure it stays this way lets add a test for it.

Git-Dch: Ignore
---
 test/integration/test-apt-get-upgrade | 90 ++++++++++++++++++++++++++++++-----
 1 file changed, 79 insertions(+), 11 deletions(-)

diff --git a/test/integration/test-apt-get-upgrade b/test/integration/test-apt-get-upgrade
index fcee95023..09cbcdb7e 100755
--- a/test/integration/test-apt-get-upgrade
+++ b/test/integration/test-apt-get-upgrade
@@ -21,37 +21,47 @@ 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
-testsuccessequal '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
-testsuccessequal '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
 testsuccessequal 'Reading package lists...
@@ -60,17 +70,75 @@ 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
-- 
cgit v1.2.3-70-g09d2


From 596ec43ce34421080a58b28299c1ed9cb0dbaa25 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 12 Apr 2015 19:16:01 +0200
Subject: parse specific-arch dependencies correctly on single-arch systems
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On single-arch the parsing was creating groupnames like 'apt:amd64' even
through it should be 'apt' and a package in it belonging to architecture
amd64. The result for foreign architectures was as expected: The
dependency isn't satisfiable, but for native architecture it means the
wrong package (ala apt:amd64:amd64) is linked so this is also not
satisfiable, which is very much not expected.

No longer excluding single-arch from this codepath allows the generation
of the correct links, which still link to non-exisiting packages for
foreign dependencies, but natives link to the expected native package
just as if no architecture was given.

For negative arch-specific dependencies ala Conflicts this matter was
worse as apt will believe there isn't a Conflict to resolve, tricking it
into calculating a solution dpkg will refuse.

Architecture specific positive dependencies are rare in jessie – the
only one in amd64 main is foreign –, negative dependencies do not even
exist. Neither class has a native specimen, so no package in jessie is
effected by this bug, but it might be interesting for stretch upgrades.
This also means the regression potential is very low.

Closes: 777760
---
 apt-pkg/deb/deblistparser.cc                       |   2 +-
 test/integration/test-multiarch-foreign            | 159 ++++++++++++++-------
 .../test-specific-architecture-dependencies        | 148 ++++++++++++++++++-
 3 files changed, 254 insertions(+), 55 deletions(-)

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 4eef66c2b..213235c2b 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -770,7 +770,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);
diff --git a/test/integration/test-multiarch-foreign b/test/integration/test-multiarch-foreign
index 332466d96..240f1a4d1 100755
--- a/test/integration/test-multiarch-foreign
+++ b/test/integration/test-multiarch-foreign
@@ -7,9 +7,13 @@ 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'
 
@@ -27,28 +31,6 @@ 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...
 Building dependency tree...
 The following NEW packages will be installed:
@@ -69,10 +51,6 @@ 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...
 Building dependency tree...
 The following extra packages will be installed:
@@ -87,6 +65,60 @@ Conf cool-bar:i386 (1.0 unstable [i386])' aptget install cool-bar:i386 -s
 
 testequal '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
+
+testequal '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
+
+testequal "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() {
+	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...
+Building dependency tree...
 The following extra packages will be installed:
   bar
 The following NEW packages will be installed:
@@ -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...
+	testequal '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...
+	testequal "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...
+	testequal '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
+	testequal '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
+
+	testequal '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...
+	testequal '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-specific-architecture-dependencies b/test/integration/test-specific-architecture-dependencies
index 078a84654..ccfced150 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'
@@ -54,6 +57,54 @@ Inst depender (1 unstable [all])
 Conf libc6:i386 (1 unstable [i386])
 Conf depender (1 unstable [all])' aptget install depender -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: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:
@@ -75,7 +126,29 @@ 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
 
 testequal 'Reading package lists...
 Building dependency tree...
@@ -86,7 +159,7 @@ The following NEW packages will be installed:
 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...
 Building dependency tree...
@@ -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
 
+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
+
 testequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
@@ -180,3 +261,62 @@ The following NEW packages will be installed:
 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
-- 
cgit v1.2.3-70-g09d2


From ae37ab01c4657fc2ae32cabb4f96f5f7e5b551d4 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 13 Apr 2015 07:25:06 +0200
Subject: release 1.0.9.8

---
 configure.ac         |    2 +-
 debian/changelog     |   19 +
 doc/apt-verbatim.ent |    2 +-
 doc/po/apt-doc.pot   |    4 +-
 po/apt-all.pot       |  984 +++++++++++++++++++++++------------------------
 po/ar.po             |  986 +++++++++++++++++++++++------------------------
 po/ast.po            | 1038 ++++++++++++++++++++++++-------------------------
 po/bg.po             | 1042 +++++++++++++++++++++++++-------------------------
 po/bs.po             | 1012 ++++++++++++++++++++++++------------------------
 po/ca.po             |  992 +++++++++++++++++++++++------------------------
 po/cs.po             | 1038 ++++++++++++++++++++++++-------------------------
 po/cy.po             | 1014 ++++++++++++++++++++++++------------------------
 po/da.po             | 1034 ++++++++++++++++++++++++-------------------------
 po/de.po             |  994 +++++++++++++++++++++++------------------------
 po/dz.po             | 1032 ++++++++++++++++++++++++-------------------------
 po/el.po             |  988 +++++++++++++++++++++++------------------------
 po/es.po             | 1032 ++++++++++++++++++++++++-------------------------
 po/eu.po             | 1018 ++++++++++++++++++++++++------------------------
 po/fi.po             | 1016 ++++++++++++++++++++++++------------------------
 po/fr.po             | 1010 ++++++++++++++++++++++++------------------------
 po/gl.po             |  998 +++++++++++++++++++++++------------------------
 po/hu.po             | 1002 ++++++++++++++++++++++++------------------------
 po/it.po             |  984 +++++++++++++++++++++++------------------------
 po/ja.po             | 1030 ++++++++++++++++++++++++-------------------------
 po/km.po             | 1016 ++++++++++++++++++++++++------------------------
 po/ko.po             | 1028 ++++++++++++++++++++++++-------------------------
 po/ku.po             |  986 +++++++++++++++++++++++------------------------
 po/lt.po             | 1016 ++++++++++++++++++++++++------------------------
 po/mr.po             |  958 +++++++++++++++++++++++-----------------------
 po/nb.po             | 1032 ++++++++++++++++++++++++-------------------------
 po/ne.po             | 1032 ++++++++++++++++++++++++-------------------------
 po/nl.po             | 1000 ++++++++++++++++++++++++------------------------
 po/nn.po             | 1026 ++++++++++++++++++++++++-------------------------
 po/pl.po             |  990 +++++++++++++++++++++++------------------------
 po/pt.po             | 1034 ++++++++++++++++++++++++-------------------------
 po/pt_BR.po          |  970 +++++++++++++++++++++++-----------------------
 po/ro.po             |  988 +++++++++++++++++++++++------------------------
 po/ru.po             |  986 +++++++++++++++++++++++------------------------
 po/sk.po             | 1034 ++++++++++++++++++++++++-------------------------
 po/sl.po             |  994 +++++++++++++++++++++++------------------------
 po/sv.po             | 1032 ++++++++++++++++++++++++-------------------------
 po/th.po             | 1014 ++++++++++++++++++++++++------------------------
 po/tl.po             |  960 +++++++++++++++++++++++-----------------------
 po/tr.po             | 1000 ++++++++++++++++++++++++------------------------
 po/uk.po             |  996 +++++++++++++++++++++++------------------------
 po/vi.po             |  982 +++++++++++++++++++++++------------------------
 po/zh_CN.po          | 1014 ++++++++++++++++++++++++------------------------
 po/zh_TW.po          | 1022 ++++++++++++++++++++++++-------------------------
 48 files changed, 22200 insertions(+), 22181 deletions(-)

diff --git a/configure.ac b/configure.ac
index d728e5e6c..ebffea465 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.0.9.6"
+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")
diff --git a/debian/changelog b/debian/changelog
index 4b38ba8ba..e9634c763 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+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 ]
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index e88d39332..c913e617c 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -225,7 +225,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.0.9.6">
+<!ENTITY apt-product-version "1.0.9.8">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "wheezy">
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index c403ad8e4..d9ea5f6ad 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.0.9.5\n"
+"Project-Id-Version: apt-doc 1.0.9.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 3822dd9db..451a2c336 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.0.9.5\n"
+"Project-Id-Version: apt 1.0.9.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -998,485 +998,485 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
+#: apt-private/private-list.cc:129
+msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
 msgstr ""
 
-#: apt-private/private-install.cc:91
-msgid "Packages need to be removed but remove is disabled."
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
 msgstr ""
 
-#: apt-private/private-install.cc:110
-msgid "Internal error, Ordering didn't finish"
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
 msgstr ""
 
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
 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
-#: apt-private/private-install.cc:155
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
 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
-#: apt-private/private-install.cc:160
-#, c-format
-msgid "Need to get %sB of archives.\n"
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
 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
-#: apt-private/private-install.cc:167
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
+#: apt-private/private-cachefile.cc:111
+msgid "Unmet dependencies. Try using -f."
 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
-#: apt-private/private-install.cc:172
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
 msgstr ""
 
-#: apt-private/private-install.cc:200
+#: apt-private/private-output.cc:265
 #, c-format
-msgid "You don't have enough free space in %s."
+msgid "[installed,upgradable to: %s]"
 msgstr ""
 
-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
 msgstr ""
 
-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
 msgstr ""
 
-#. 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)
-#: apt-private/private-install.cc:220
-msgid "Yes, do as I say!"
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
 msgstr ""
 
-#: apt-private/private-install.cc:222
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
+#: apt-private/private-output.cc:274
+msgid "[installed]"
 msgstr ""
 
-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
 msgstr ""
 
-#: apt-private/private-install.cc:320
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
 msgstr ""
 
-#: apt-private/private-install.cc:324
-msgid "--fix-missing and media swapping is not currently supported"
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
 msgstr ""
 
-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
 msgstr ""
 
-#: apt-private/private-install.cc:330
-msgid "Aborting install."
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
 msgstr ""
 
-#: apt-private/private-install.cc:366
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
 msgstr ""
 
-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
+#: apt-private/private-output.cc:474
+msgid " or"
 msgstr ""
 
-#: apt-private/private-install.cc:499
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
 msgstr ""
 
-#: apt-private/private-install.cc:506
-msgid "Internal Error, AutoRemover broke stuff"
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
 msgstr ""
 
-#: apt-private/private-install.cc:513
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr ""
 
-#: apt-private/private-install.cc:517
-#, c-format
-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] ""
-msgstr[1] ""
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr ""
 
-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr ""
 
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
 msgstr ""
 
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
 msgstr ""
 
-#: apt-private/private-install.cc:638
+#: apt-private/private-output.cc:696
 msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
+"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-install.cc:659
-msgid "Broken packages"
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
 msgstr ""
 
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
 msgstr ""
 
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:825
+#: apt-private/private-output.cc:739
 #, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\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 ""
 
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\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 ""
 
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
 msgstr ""
 
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
+#. 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-install.cc:899
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
 #, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgid "Regex compilation error - %s"
 msgstr ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
 msgstr ""
 
-#: apt-private/private-install.cc:947
+#: apt-private/private-update.cc:97
 #, c-format
-msgid "Package '%s' is not installed, so not removed\n"
+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:101
+msgid "All packages are up to date."
 msgstr ""
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
+#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
+msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-show.cc:156
 #, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid "There is %i additional record. Please use the '-a' switch to see it"
 msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
+"There are %i additional records. Please use the '-a' switch to see them."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
 msgstr ""
 
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
+#: 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-cachefile.cc:99
-msgid "Unable to correct dependencies"
+#: apt-private/private-install.cc:82
+msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
+#: apt-private/private-install.cc:91
+msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
+#: apt-private/private-install.cc:110
+msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: apt-private/private-install.cc:148
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
+#. 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
+#: apt-private/private-install.cc:155
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
 msgstr ""
 
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
+#. 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:160
+#, c-format
+msgid "Need to get %sB of archives.\n"
 msgstr ""
 
-#: apt-private/private-output.cc:265
+#. 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:167
 #, c-format
-msgid "[installed,upgradable to: %s]"
+msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 
-#: apt-private/private-output.cc:268
-msgid "[installed,local]"
+#. 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:172
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
+#: apt-private/private-install.cc:200
+#, c-format
+msgid "You don't have enough free space in %s."
 msgstr ""
 
-#: apt-private/private-output.cc:272
-msgid "[installed,automatic]"
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
+msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
-#: apt-private/private-output.cc:274
-msgid "[installed]"
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
+msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: apt-private/private-output.cc:277
+#. 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)
+#: apt-private/private-install.cc:220
+msgid "Yes, do as I say!"
+msgstr ""
+
+#: apt-private/private-install.cc:222
 #, c-format
-msgid "[upgradable from: %s]"
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
 msgstr ""
 
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
+msgid "Abort."
 msgstr ""
 
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
+#: apt-private/private-install.cc:243
+msgid "Do you want to continue?"
 msgstr ""
 
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
+#: apt-private/private-install.cc:313
+msgid "Some files failed to download"
 msgstr ""
 
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
+#: apt-private/private-install.cc:320
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
 msgstr ""
 
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
+#: apt-private/private-install.cc:324
+msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
+#: apt-private/private-install.cc:329
+msgid "Unable to correct missing packages."
 msgstr ""
 
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
+#: apt-private/private-install.cc:330
+msgid "Aborting install."
 msgstr ""
 
-#: apt-private/private-output.cc:474
-msgid " or"
+#: apt-private/private-install.cc:366
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:370
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
+#: apt-private/private-install.cc:391
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
+#: apt-private/private-install.cc:499
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
 msgstr ""
 
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
+msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
+#: apt-private/private-install.cc:506
+msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr ""
+#: apt-private/private-install.cc:513
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
+#: apt-private/private-install.cc:517
+#, c-format
+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] ""
+msgstr[1] ""
 
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr ""
+#: apt-private/private-install.cc:519
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
 
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
+#: apt-private/private-install.cc:612
+msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 
-#: apt-private/private-output.cc:696
+#: apt-private/private-install.cc:614
 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, "
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
 msgstr ""
 
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
+#: apt-private/private-install.cc:638
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
 msgstr ""
 
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
+#: apt-private/private-install.cc:659
+msgid "Broken packages"
 msgstr ""
 
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
+#: apt-private/private-install.cc:712
+msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
+#: apt-private/private-install.cc:802
+msgid "Suggested packages:"
 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]"
+#: apt-private/private-install.cc:803
+msgid "Recommended packages:"
 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]"
+#: apt-private/private-install.cc:825
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
+#: apt-private/private-install.cc:829
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
+#: apt-private/private-install.cc:841
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-install.cc:846
 #, c-format
-msgid "Regex compilation error - %s"
+msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
+#: apt-private/private-install.cc:894
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-install.cc:899
 #, 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:101
-msgid "All packages are up to date."
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr ""
 
-#: apt-private/private-show.cc:156
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
 #, 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)"
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 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!"
+#: apt-private/private-install.cc:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
 msgstr ""
 
 #: apt-private/private-download.cc:36
@@ -1559,8 +1559,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1854,6 +1854,26 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr ""
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
@@ -1947,131 +1967,89 @@ msgstr ""
 msgid "extra"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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"
-msgstr ""
-
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr ""
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr ""
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr ""
-
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:190
 #, c-format
-msgid "Failed to open StateFile %s"
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid "Failed to write temporary StateFile %s"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
+msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
+msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid ""
-"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"
+msgid "Opening %s"
 msgstr ""
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "GPG error: %s: %s"
+msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371
 #, 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)"
+msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:416
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
@@ -2147,6 +2125,102 @@ msgstr ""
 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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1650
+#, 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:1666
+#, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1708
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1746
+#, 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:1768
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1936
+#, 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:2002
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2179,12 +2253,6 @@ msgstr ""
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2230,9 +2298,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
@@ -2322,134 +2391,40 @@ msgstr ""
 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:241
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:237
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:149
-#, 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)"
+#: 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)"
+#: 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)"
+#: 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)"
+#: 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:250
 #, c-format
-msgid "Opening %s"
+msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:256
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
+msgid "Failed to write temporary StateFile %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Unable to parse package file %s (2)"
 msgstr ""
 
 #: apt-pkg/cacheset.cc:489
@@ -2504,6 +2479,31 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/ar.po b/po/ar.po
index a22a38f33..6b8ca4be8 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1011,10 +1011,251 @@ msgstr "فشل الاتصال"
 msgid "Internal error"
 msgstr "خطأ داخلي"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "تصحيح المعتمدات..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " فشل."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "لم يمكن تصحيح المعتمدات"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "لم يمكن تقليص مجموعة الترقية"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " تم"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه."
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
@@ -1204,306 +1445,65 @@ msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
 "distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "حزم معطوبة"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "الحزم المقترحة:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "الحزم المستحسنة:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
-
-#: apt-private/private-install.cc:829
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "إعادة تثبيت  %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s هي النسخة الأحدث.\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "تصحيح المعتمدات..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " فشل."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "لم يمكن تصحيح المعتمدات"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "لم يمكن تقليص مجموعة الترقية"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " تم"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه."
-
-#: apt-private/private-cachefile.cc:111
-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!"
+"or been moved out of Incoming."
 msgstr ""
-"تحذير: ستتم إزالة الحزم الأساسية التالية.\n"
-"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
 
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً،  "
+#: apt-private/private-install.cc:659
+msgid "Broken packages"
+msgstr "حزم معطوبة"
 
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu أعيد تثبيتها، "
+#: apt-private/private-install.cc:712
+msgid "The following extra packages will be installed:"
+msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
 
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu مثبطة، "
+#: apt-private/private-install.cc:802
+msgid "Suggested packages:"
+msgstr "الحزم المقترحة:"
 
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
+#: apt-private/private-install.cc:803
+msgid "Recommended packages:"
+msgstr "الحزم المستحسنة:"
 
-#: apt-private/private-output.cc:739
+#: apt-private/private-install.cc:825
 #, 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"
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
 
-#. 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-install.cc:829
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-install.cc:841
 #, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "لا يقبل الأمر update أية مُعطيات"
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "إعادة تثبيت  %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-install.cc:846
 #, 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] ""
+msgid "%s is already the newest version.\n"
+msgstr "%s هي النسخة الأحدث.\n"
 
-#: apt-private/private-update.cc:101
-msgid "All packages are up to date."
-msgstr ""
+#: apt-private/private-install.cc:894
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
 
-#: 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-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
 
-#: 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:947
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
 
 #: apt-private/private-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1588,8 +1588,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1885,6 +1885,26 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum غير متطابقة"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
@@ -1978,134 +1998,89 @@ msgstr "اختياري"
 msgid "extra"
 msgstr "إضافي"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "الرجاء إدخال القرص المُسمّى  '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
-
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: 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:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "دمج المعلومات المتوفرة"
-
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "فشل فتح %s"
-
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "فشلت كتابة الملف %s"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-#, fuzzy
-msgid "Hash Sum mismatch"
-msgstr "MD5Sum غير متطابقة"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "الحجم غير متطابق"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "عمليّة غير صالحة %s"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1656
-#, fuzzy, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-
-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid ""
-"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"
-msgstr ""
+msgid "Opening %s"
+msgstr "فتح %s"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "GPG error: %s: %s"
+msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371
 #, 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)"
+msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:416
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
@@ -2181,6 +2156,104 @@ msgstr "تعذرت الكتابة إلى %s"
 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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "MD5Sum غير متطابقة"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "الحجم غير متطابق"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "عمليّة غير صالحة %s"
+
+#: apt-pkg/acquire-item.cc:1650
+#, 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:1666
+#, fuzzy, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
+
+#: apt-pkg/acquire-item.cc:1708
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1746
+#, 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:1768
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1936
+#, 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:2002
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2213,12 +2286,6 @@ msgstr ""
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2264,9 +2331,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
@@ -2358,25 +2426,32 @@ msgstr ""
 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"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "دمج المعلومات المتوفرة"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "فشل فتح %s"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "فشلت كتابة الملف %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2388,106 +2463,6 @@ msgstr ""
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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 ""
-
-#: 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:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2540,6 +2515,31 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "لاحظ، تحديد %s بدلاً من %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "لاحظ، تحديد %s بدلاً من %s\n"
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/ast.po b/po/ast.po
index 0e013f9fe..ec3f13333 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1120,10 +1120,256 @@ msgstr "Fallo la conexón"
 msgid "Internal error"
 msgstr "Fallu internu"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Iguando dependencies..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " falló."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nun pudieron iguase les dependencies"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nun pue amenorgase'l conxuntu d'actualización"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fecho"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!"
@@ -1380,258 +1626,12 @@ msgstr "Esbillada la versión %s (%s) pa %s\n"
 #: apt-private/private-install.cc:941
 #, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Iguando dependencies..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " falló."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nun pudieron iguase les dependencies"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nun pue amenorgase'l conxuntu d'actualización"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fecho"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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!"
+msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
 
 #: apt-private/private-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1716,8 +1716,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2018,6 +2018,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:116
+#, 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:118
+#, 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:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "El métodu %s nun entamó correchamente"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
@@ -2113,139 +2133,93 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
-#, 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:118
-#, 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:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El métodu %s nun entamó correchamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versiones candidates"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Xeneración de dependencies"
-
-#: 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: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/depcache.cc:250
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nun se pudo abrir el ficheru d'estáu %s"
+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/depcache.cc:256
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falló la escritura del ficheru temporal d'estáu %s"
+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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "falló'l cambiu de nome, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "La suma hash nun concasa"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "El tamañu nun concasa"
+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/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Operación incorreuta: %s"
+#: 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/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+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/acquire-item.cc:1656
-#, 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/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/acquire-item.cc:1698
-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/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/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
+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/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)"
+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/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid ""
-"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"
-msgstr ""
-"Hebo un fallu durante la verificación de la robla. El repositoriu nun ta "
-"anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n"
+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)"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "Fallu GPG: %s: %s"
+msgid "Opening %s"
+msgstr "Abriendo %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
-"necesites iguar manualmente esti paquete (por faltar una arquitectura)"
+msgid "Line %u too long in source list %s."
+msgstr "Llinia %u enforma llarga na llista d'oríxenes %s."
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:371
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal "
-"paquete %s."
+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:490
 #, fuzzy, c-format
@@ -2276,50 +2250,153 @@ msgstr "La caché tien un sistema de versiones incompatible"
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Hebo un error al procesar %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Lleendo llista de paquetes"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Recoyendo ficheros qu'apurren"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nun se pue escribir en %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "falló'l cambiu de nome, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "La suma hash nun concasa"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "El tamañu nun concasa"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Operación incorreuta: %s"
+
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
 msgstr ""
-"Coime, perpasaste'l númberu de nomes de paquete qu'esti APT ye a remanar."
 
-#: apt-pkg/pkgcachegen.cc:260
-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/acquire-item.cc:1666
+#, 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/pkgcachegen.cc:263
-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/acquire-item.cc:1708
+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/pkgcachegen.cc:266
-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/acquire-item.cc:1746
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-item.cc:1768
 #, 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"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nun se puede lleer la llista de paquetes d'oríxenes %s"
+msgid ""
+"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"
+msgstr ""
+"Hebo un fallu durante la verificación de la robla. El repositoriu nun ta "
+"anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n"
 
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Lleendo llista de paquetes"
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Fallu GPG: %s: %s"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Recoyendo ficheros qu'apurren"
+#: apt-pkg/acquire-item.cc:1936
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
+"necesites iguar manualmente esti paquete (por faltar una arquitectura)"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/acquire-item.cc:2002
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Nun se pue escribir en %s"
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Fallu de E/S al grabar caché d'oríxenes"
+#: apt-pkg/acquire-item.cc:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal "
+"paquete %s."
 
 #: apt-pkg/vendorlist.cc:85
 #, c-format
@@ -2353,15 +2430,6 @@ msgstr "Descargando ficheru %li de %li (falten %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list"
@@ -2413,10 +2481,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"
@@ -2514,25 +2586,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Creando árbol de dependencies"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versiones candidates"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Xeneración de dependencies"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nun se pudo abrir el ficheru d'estáu %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falló la escritura del ficheru temporal d'estáu %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2544,109 +2622,6 @@ msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nun se pudo parchear el ficheru release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Ensin seiciones nel ficheru release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ensin entrada Hash nel ficheru release %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2707,6 +2682,31 @@ 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/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nun se pudo parchear el ficheru release %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Ensin seiciones nel ficheru release %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Ensin entrada Hash nel ficheru release %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Entrada inválida pa 'Date' nel ficheru release %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/bg.po b/po/bg.po
index fc1d7b08a..835e5f53f 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1152,10 +1152,257 @@ msgstr "Неуспех при свързването"
 msgid "Internal error"
 msgstr "Вътрешна грешка"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Коригиране на зависимостите..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " пропадна."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Неуспех при коригирането на зависимостите"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Неуспех при минимизирането на набора актуализации"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Готово"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
+"неизправности."
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!"
@@ -1423,256 +1670,9 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Пакетът „%s“ не е инсталиран, така че не е премахнат\n"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Коригиране на зависимостите..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " пропадна."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Неуспех при коригирането на зависимостите"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Неуспех при минимизирането на набора актуализации"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Готово"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
-"неизправности."
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!"
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!"
 
 #: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
@@ -1753,8 +1753,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2050,6 +2050,26 @@ msgstr "Не е намерен oторизационен запис за: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Несъответствие на контролната сума за: %s"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Неуспех при намирането на драйвер за метод %s."
+
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Методът %s не стартира правилно"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
@@ -2146,142 +2166,97 @@ msgstr "незадължителен"
 msgid "extra"
 msgstr "допълнителен"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Неуспех при намирането на драйвер за метод %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Методът %s не стартира правилно"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
-
 #: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Не се поддържа индексен файл от типа „%s“"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Изграждане на дървото със зависимости"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Версии кандидати"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Генериране на зависимости"
-
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Четене на информацията за състоянието"
+#: 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:250
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Неуспех при отварянето на StateFile %s"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Неуспех при запис на временен StateFile %s"
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+"Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])"
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "преименуването се провали, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Несъответствие на контролната сума"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Несъответствие на размера"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"Лошо форматиран ред %lu в списъка с източници %s ([%s] не е присвояване)"
 
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Невалидна операция %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/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"Не може да се открие елемент „%s“ във файла Release (объркан ред в sources."
-"list или повреден файл)"
+"Лошо форматиран ред %lu в списъка с източници %s ([%s] ключът %s няма "
+"стойност)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Не е открита контролна сума за „%s“  във файла Release"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)"
 
-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-"Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се "
-"прилагат обновявания от това хранилище."
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+"Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid ""
-"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"
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
-"Грешка при проверка на цифровия подпис. Хранилището не е обновено и ще се "
-"използват старите индексни файлове. Грешка от GPG: %s: %s\n"
+"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "Грешка от GPG: %s: %s"
+msgid "Opening %s"
+msgstr "Отваряне на %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, 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. Това може да означава, че трябва "
-"ръчно да оправите този пакет (поради пропусната архитектура)."
+msgid "Line %u too long in source list %s."
+msgstr "Ред %u в списъка с източници %s е твърде дълъг."
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:371
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“"
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
+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:490
 #, fuzzy, c-format
@@ -2318,48 +2293,156 @@ msgstr ""
 "Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на "
 "APT."
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте броя описания, на който е способна тази версия на APT."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Четене на списъците с пакети"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Събиране на информация за „Осигурява“"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Неуспех при записа на %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Подготовка за приемане на решение"
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Външната програма за удовлетворяване на зависимости се провали без да изведе "
+"съобщение за грешка"
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "преименуването се провали, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Несъответствие на контролната сума"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Несъответствие на размера"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Невалидна операция %s"
+
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+"Не може да се открие елемент „%s“ във файла Release (объркан ред в sources."
+"list или повреден файл)"
+
+#: apt-pkg/acquire-item.cc:1666
+#, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Не е открита контролна сума за „%s“  във файла Release"
 
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Еха, надхвърлихте броя описания, на който е способна тази версия на APT."
+#: apt-pkg/acquire-item.cc:1708
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-item.cc:1746
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
 msgstr ""
-"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
+"Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се "
+"прилагат обновявания от това хранилище."
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)"
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
-msgid "Couldn't stat source package list %s"
+msgid ""
+"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"
 msgstr ""
-"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
+"Грешка при проверка на цифровия подпис. Хранилището не е обновено и ще се "
+"използват старите индексни файлове. Грешка от GPG: %s: %s\n"
 
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Четене на списъците с пакети"
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Грешка от GPG: %s: %s"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Събиране на информация за „Осигурява“"
+#: apt-pkg/acquire-item.cc:1936
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
+"ръчно да оправите този пакет (поради пропусната архитектура)."
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/acquire-item.cc:2002
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Неуспех при записа на %s"
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
+#: apt-pkg/acquire-item.cc:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
 
 #: apt-pkg/vendorlist.cc:85
 #, c-format
@@ -2393,14 +2476,6 @@ msgstr "Изтегляне на файл %li от %li (остават %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list"
@@ -2454,10 +2529,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"
@@ -2557,27 +2635,31 @@ 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Изграждане на дървото със зависимости"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Версии кандидати"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Подготовка за приемане на решение"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Генериране на зависимости"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Външната програма за удовлетворяване на зависимости се провали без да изведе "
-"съобщение за грешка"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Четене на информацията за състоянието"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Неуспех при отварянето на StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Неуспех при запис на временен StateFile %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2589,113 +2671,6 @@ msgstr "Неуспех при анализирането на пакетен ф
 msgid "Unable to parse package file %s (2)"
 msgstr "Неуспех при анализирането на пакетен файл %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Неуспех при анализиране на файл Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Във файла Release %s липсват раздели"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Във файла Release %s липсва контролна сума"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Неправилна стойност за „Valid-Until“ във файла Release %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2756,6 +2731,31 @@ msgstr ""
 "Не е възможно избиране на инсталирана версия на пакета „%s“, защото не е "
 "инсталиран"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Неуспех при анализиране на файл Release %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Във файла Release %s липсват раздели"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Във файла Release %s липсва контролна сума"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Неправилна стойност за „Valid-Until“ във файла Release %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Неправилна стойност за „Date“ във файла Release %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/bs.po b/po/bs.po
index 5bbec432a..3e8150f1b 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1018,10 +1018,250 @@ msgstr "Povezivanje neuspješno"
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Ispravljam zavisnosti..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ne mogu ispraviti zavisnosti"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Urađeno"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1220,288 +1460,48 @@ msgid "Suggested packages:"
 msgstr "Predloženi paketi:"
 
 #: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Preporučeni paketi:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
-
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Ispravljam zavisnosti..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Ne mogu ispraviti zavisnosti"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Urađeno"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:111
-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 ""
+msgid "Recommended packages:"
+msgstr "Preporučeni paketi:"
 
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
+#: apt-private/private-install.cc:825
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
+#: apt-private/private-install.cc:829
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-install.cc:841
 #, c-format
-msgid "Regex compilation error - %s"
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
+#: apt-private/private-install.cc:846
+#, c-format
+msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-install.cc:894
 #, 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:101
-msgid "All packages are up to date."
+msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 
-#: apt-private/private-show.cc:156
+#: apt-private/private-install.cc:899
 #, 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] ""
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr ""
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 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!"
+#: apt-private/private-install.cc:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
 msgstr ""
 
 #: apt-private/private-download.cc:36
@@ -1585,8 +1585,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1880,6 +1880,26 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr ""
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
@@ -1974,57 +1994,183 @@ msgstr "opcionalno"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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/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:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Čitam spiskove paketa"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Ne mogu zapisati na %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Ne mogu ukloniti %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2043,35 +2189,35 @@ msgstr ""
 msgid "Invalid file format"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1656
+#: apt-pkg/acquire-item.cc:1666
 #, 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:1698
+#: apt-pkg/acquire-item.cc:1708
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/acquire-item.cc:1746
 #, 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:1758
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2079,102 +2225,29 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, 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:1992
+#: apt-pkg/acquire-item.cc:2002
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/acquire-item.cc:2060
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Čitam spiskove paketa"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Ne mogu zapisati na %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr ""
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2207,12 +2280,6 @@ msgstr ""
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2258,9 +2325,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
@@ -2353,25 +2421,32 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Gradim stablo zavisnosti"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Verzije kandidata"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Stvaranje zavisnosti"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ne mogu ukloniti %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2383,106 +2458,6 @@ msgstr ""
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:149
-#, 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 ""
-
-#: 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:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2535,6 +2510,31 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/ca.po b/po/ca.po
index d916d73e1..eacce68d0 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1136,10 +1136,255 @@ msgstr "Ha fallat la connexió"
 msgid "Internal error"
 msgstr "Error intern"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "S'estan corregint les dependències…"
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " ha fallat."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "No es poden corregir les dependències"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "No es pot minimitzar el joc de versions revisades"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fet"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1413,254 +1658,9 @@ 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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "S'estan corregint les dependències…"
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " ha fallat."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "No es poden corregir les dependències"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "No es pot minimitzar el joc de versions revisades"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fet"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVÍS: No es poden autenticar els següents paquets!"
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVÍS: No es poden autenticar els següents paquets!"
 
 #: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
@@ -1741,8 +1741,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2043,15 +2043,35 @@ 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/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"No s'han pogut analitzar o obrir les llistes de paquets o el fitxer d'estat."
+#: apt-pkg/acquire-worker.cc:116
+#, 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/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"Potser voldreu executar apt-get update per a corregir aquests problemes"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "El mètode %s no s'ha iniciat correctament"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
+"No s'han pogut analitzar o obrir les llistes de paquets o el fitxer d'estat."
+
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr ""
+"Potser voldreu executar apt-get update per a corregir aquests problemes"
 
 #: apt-pkg/cachefile.cc:116
 msgid "The list of sources could not be read."
@@ -2138,145 +2158,93 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
-#, 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:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El mètode %s no s'ha iniciat correctament"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versions candidates"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Dependències que genera"
-
-#: 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: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/depcache.cc:250
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "No s'ha pogut obrir el fitxer d'estat %s"
+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/depcache.cc:256
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
+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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "La suma resum no concorda"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "La mida no concorda"
+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/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Operació no vàlida %s"
+#: 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/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada errònia "
-"al sources.list o fitxer malformat)"
+"Línia %lu malformada en la llista de fonts %s ([%s] la clau %s no té valor)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:206
 #, 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"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Línia %lu malformada en la llista de fonts %s (URI)"
 
-#: apt-pkg/acquire-item.cc:1698
-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/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/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-"El fitxer Release per a %s ha caducat (invàlid des de %s). Les "
-"actualitzacions per a aquest dipòsit no s'aplicaran."
+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/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)"
+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/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid ""
-"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"
-msgstr ""
-"S'ha produït un error durant la verificació de la signatura. El dipòsit no "
-"està actualitzat i s'emprarà el fitxer d'índex anterior. Error del GPG: %s: "
-"%s\n"
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "S'ha produït un error amb el GPG: %s: %s"
+msgid "Opening %s"
+msgstr "S'està obrint %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, 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 ""
-"No ha estat possible localitzar un fitxer pel paquet %s. Això podria "
-"significar que haureu d'arreglar aquest paquet manualment (segons "
-"arquitectura)."
+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/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:371
 #, 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»"
+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/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
-"per al paquet %s."
+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:490
 #, fuzzy, c-format
@@ -2358,6 +2326,115 @@ msgstr "No es pot escriure en %s"
 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:241
+msgid "Send request to solver"
+msgstr "Envia la petició al resoledor"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Prepara per a rebre una solució"
+
+#: apt-pkg/edsp.cc:327
+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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Executa un resoledor extern"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "La suma resum no concorda"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "La mida no concorda"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Operació no vàlida %s"
+
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+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:1666
+#, 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:1708
+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:1746
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+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:1768
+#, 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:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"S'ha produït un error durant la verificació de la signatura. El dipòsit no "
+"està actualitzat i s'emprarà el fitxer d'índex anterior. Error del GPG: %s: "
+"%s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "S'ha produït un error amb el GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1936
+#, 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 ""
+"No ha estat possible localitzar un fitxer pel paquet %s. Això podria "
+"significar que haureu d'arreglar aquest paquet manualment (segons "
+"arquitectura)."
+
+#: apt-pkg/acquire-item.cc:2002
+#, 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:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
+"per al paquet %s."
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2390,14 +2467,6 @@ msgstr "S'està obtenint el fitxer %li de %li (falten %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Heu de posar algunes URI 'font' en el vostre sources.list"
@@ -2451,10 +2520,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"
@@ -2554,25 +2626,31 @@ 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "S'està construint l'arbre de dependències"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Envia la petició al resoledor"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versions candidates"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Prepara per a rebre una solució"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Dependències que genera"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "El resoledor extern ha fallat sense un missatge d'error adient"
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Executa un resoledor extern"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "No s'ha pogut obrir el fitxer d'estat %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2584,109 +2662,6 @@ msgstr "No es pot analitzar el fitxer del paquet %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "No es pot analitzar el fitxer del paquet %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "No es pot analitzar el fitxer Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "No hi ha seccions al fitxer Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2749,6 +2724,31 @@ msgstr ""
 "No s'ha pogut seleccionar la versió instaŀlada del paquet %s ja que no està "
 "instaŀlada"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "No es pot analitzar el fitxer Release %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "No hi ha seccions al fitxer Release %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, 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:130
+#, 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:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "El camp «Date» al fitxer Release %s és invàlid"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/cs.po b/po/cs.po
index e90f98d28..41591627c 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1163,10 +1163,258 @@ msgstr "Spojení selhalo"
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "Vypisuje se"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Opravují se závislosti…"
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " selhalo."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nelze opravit závislosti"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nelze minimalizovat sadu pro aktualizaci"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Hotovo"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!"
@@ -1404,285 +1652,37 @@ msgstr ""
 "%s bude přeskočen, protože není nainstalován a vyžadovány jsou pouze "
 "aktualizace.\n"
 
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Přeinstalace %s není možná, protože nelze stáhnout.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s je již nejnovější verze.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Vybraná verze „%s“ (%s) pro „%s“\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Vybraná verze „%s“ (%s) pro „%s“ kvůli „%s“\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
-"Balík „%s“ není nainstalován, nelze tedy odstranit. Mysleli jste „%s“?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-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:129
-msgid "Listing"
-msgstr "Vypisuje se"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Opravují se závislosti…"
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " selhalo."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nelze opravit závislosti"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nelze minimalizovat sadu pro aktualizaci"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Hotovo"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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-install.cc:841
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Přeinstalace %s není možná, protože nelze stáhnout.\n"
 
-#: apt-private/private-update.cc:101
-msgid "All packages are up to date."
-msgstr "Všechny balíky jsou aktuální."
+#: apt-private/private-install.cc:846
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s je již nejnovější verze.\n"
 
-#: apt-private/private-show.cc:156
+#: apt-private/private-install.cc:894
 #, 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“."
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Vybraná verze „%s“ (%s) pro „%s“\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "není skutečný balík (virtuální)"
+#: apt-private/private-install.cc:899
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Vybraná verze „%s“ (%s) pro „%s“ kvůli „%s“\n"
 
-#: 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!"
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 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!"
+"Balík „%s“ není nainstalován, nelze tedy odstranit. Mysleli jste „%s“?\n"
+
+#: apt-private/private-install.cc:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Balík „%s“ není nainstalován, nelze tedy odstranit\n"
 
 #: apt-private/private-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1767,8 +1767,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2062,6 +2062,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:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Ovladač metody %s nemohl být nalezen."
+
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "Je balík %s nainstalován?"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nebyla spuštěna správně"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
@@ -2156,56 +2176,183 @@ msgstr "volitelný"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Chyba při zpracování %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Načítají se seznamy balíků"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Collecting File poskytuje"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nelze zapsat do %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr "Požadavek odeslán řešiteli"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Příprava na obdržení řešení"
+
+#: apt-pkg/edsp.cc:327
+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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Spuštění externího řešitele"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2224,7 +2371,7 @@ msgstr "Velikosti nesouhlasí"
 msgid "Invalid file format"
 msgstr "Neplatná formát souboru"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2233,16 +2380,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:1656
+#: apt-pkg/acquire-item.cc:1666
 #, 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:1698
+#: apt-pkg/acquire-item.cc:1708
 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:1736
+#: apt-pkg/acquire-item.cc:1746
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2251,12 +2398,12 @@ msgstr ""
 "Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto "
 "repositáře se nepoužijí."
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/acquire-item.cc:1768
 #, 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:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2266,12 +2413,12 @@ 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:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Chyba GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2280,91 +2427,18 @@ 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:1992
+#: apt-pkg/acquire-item.cc:2002
 #, 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:2050
+#: apt-pkg/acquire-item.cc:2060
 #, 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Chyba při zpracování %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Načítají se seznamy balíků"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Collecting File poskytuje"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nelze zapsat do %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Chyba IO při ukládání zdrojové cache"
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2397,14 +2471,6 @@ msgstr "Stahuje se soubor %li z %li (zbývá %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Do sources.list musíte zadat „zdrojové“ URI"
@@ -2457,10 +2523,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"
@@ -2557,25 +2626,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Vytváří se strom závislostí"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Požadavek odeslán řešiteli"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidátské verze"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Příprava na obdržení řešení"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generování závislostí"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku"
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Spuštění externího řešitele"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nelze otevřít stavový soubor %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nelze zapsat dočasný stavový soubor %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2587,106 +2662,6 @@ msgstr "Nelze zpracovat soubor %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Nelze zpracovat soubor %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nelze zpracovat Release soubor %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Release soubor %s neobsahuje žádné sekce"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Release soubor %s neobsahuje Hash záznam"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2741,6 +2716,31 @@ msgstr "Nelze vybrat kandidátskou verzi balíku %s, protože žádnou nemá"
 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/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nelze zpracovat Release soubor %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Release soubor %s neobsahuje žádné sekce"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Release soubor %s neobsahuje Hash záznam"
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Neplatná položka „Date“ v Release souboru %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/cy.po b/po/cy.po
index 0f2fd4c14..277c06fb0 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1146,10 +1146,256 @@ msgstr "Methodd y cysylltiad"
 msgid "Internal error"
 msgstr "Gwall mewnol"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Yn cywiro dibyniaethau..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " wedi methu."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ni ellir cywiro dibyniaethau"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni ellir bychanu y set uwchraddio"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Wedi Gorffen"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1409,259 +1655,13 @@ 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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Yn cywiro dibyniaethau..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " wedi methu."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Ni ellir cywiro dibyniaethau"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni ellir bychanu y set uwchraddio"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Wedi Gorffen"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:36
-#, fuzzy
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
+#: apt-private/private-download.cc:36
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
 msgstr ""
 
 #: apt-private/private-download.cc:45 apt-private/private-download.cc:52
@@ -1741,8 +1741,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2048,12 +2048,35 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Camgyfatebiaeth swm MD5"
 
-#: 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."
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Methwyd canfod y gyrrydd dull %s."
+
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Ni gychwynodd y dull %s yn gywir"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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."
+
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
 msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
 
 #: apt-pkg/cachefile.cc:116
@@ -2143,146 +2166,95 @@ msgstr "opsiynnol"
 msgid "extra"
 msgstr "ychwanegol"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Methwyd canfod y gyrrydd dull %s."
-
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Ni gychwynodd y dull %s yn gywir"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%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/depcache.cc:139
-#, fuzzy
-msgid "Candidate versions"
-msgstr "Fersiynau Posib"
-
-#: apt-pkg/depcache.cc:168
-#, fuzzy
-msgid "Dependency generation"
-msgstr "Cynhyrchaid Dibyniaeth"
-
-#: 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/depcache.cc:250
+#: apt-pkg/sourcelist.cc:127
 #, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Methwyd agor %s"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:170
 #, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
-
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "methwyd ailenwi, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-#, fuzzy
-msgid "Hash Sum mismatch"
-msgstr "Camgyfatebiaeth swm MD5"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Camgyfatebiaeth maint"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Gweithred annilys %s"
+#: 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/acquire-item.cc:1640
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+#: 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)"
 
-# FIXME: number?
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:190
 #, fuzzy, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+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/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
+#: 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/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid ""
-"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"
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:217
+#, 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 "GPG error: %s: %s"
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
-# FIXME: case
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:335
 #, 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 ""
-"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.)"
+msgid "Opening %s"
+msgstr "Yn agor %s"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgid "Line %u too long in source list %s."
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:371
 #, 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."
+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:490
 #, fuzzy, c-format
@@ -2361,6 +2333,109 @@ msgstr "Ni ellir ysgrifennu i %s"
 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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "methwyd ailenwi, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Camgyfatebiaeth swm MD5"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Camgyfatebiaeth maint"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Gweithred annilys %s"
+
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+
+# FIXME: number?
+#: apt-pkg/acquire-item.cc:1666
+#, 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:1708
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1746
+#, 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:1768
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+# FIXME: case
+#: apt-pkg/acquire-item.cc:1936
+#, 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 ""
+"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:2002
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2060
+#, 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/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2393,15 +2468,6 @@ msgstr ""
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
@@ -2454,10 +2520,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
@@ -2555,25 +2625,35 @@ 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/depcache.cc:138 apt-pkg/depcache.cc:167
+#, fuzzy
+msgid "Building dependency tree"
+msgstr "Yn Aideladu Coeden Dibyniaeth"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+#, fuzzy
+msgid "Candidate versions"
+msgstr "Fersiynau Posib"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+#, fuzzy
+msgid "Dependency generation"
+msgstr "Cynhyrchaid Dibyniaeth"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Methwyd agor %s"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
 
 # FIXME: number?
 #: apt-pkg/tagfile.cc:140
@@ -2586,113 +2666,6 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
 
-# FIXME: number?
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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 "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)"
-
-#: apt-pkg/sourcelist.cc:217
-#, 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)"
-
-#: apt-pkg/sourcelist.cc:335
-#, 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"
-
 #: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2745,6 +2718,33 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+# FIXME: number?
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/da.po b/po/da.po
index 2f6f9982d..95607cd6e 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1178,10 +1178,259 @@ msgstr "Forbindelsen mislykkedes"
 msgid "Internal error"
 msgstr "Intern fejl"
 
+# måske visning, kategorisering
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "Listing"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Retter afhængigheder ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " mislykkedes."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Kunne ikke rette afhængigheder"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Kunne ikke minimere opgraderingssættet"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Færdig"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!"
@@ -1423,280 +1672,31 @@ msgstr ""
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Geninstallation af %s er ikke muligt, pakken kan ikke hentes.\n"
 
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s er allerede den nyeste version.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Valgt version »%s« (%s) for »%s«\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Valgt version »%s« (%s) for »%s« på grund af »%s«\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Pakke »%s« er ikke installeret, så blev ikke fjernet. Mente du »%s«?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-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:129
-msgid "Listing"
-msgstr "Listing"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Retter afhængigheder ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " mislykkedes."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Kunne ikke rette afhængigheder"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Kunne ikke minimere opgraderingssættet"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Færdig"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-msgid "All packages are up to date."
-msgstr "Alle pakker er opdateret."
+#: apt-private/private-install.cc:846
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s er allerede den nyeste version.\n"
 
-#: apt-private/private-show.cc:156
+#: apt-private/private-install.cc:894
 #, 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."
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Valgt version »%s« (%s) for »%s«\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "ikke en reel pakke (virtuel)"
+#: apt-private/private-install.cc:899
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Valgt version »%s« (%s) for »%s« på grund af »%s«\n"
 
-#: 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!"
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "Pakke »%s« er ikke installeret, så blev ikke fjernet. Mente du »%s«?\n"
+
+#: apt-private/private-install.cc:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Pakke »%s« er ikke installeret, så blev ikke fjernet\n"
 
 #: apt-private/private-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1781,8 +1781,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2081,6 +2081,26 @@ msgstr "Kan ikke finde godkendelsesregistrering for: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hashsum stemmer ikke: %s"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Metodedriveren %s blev ikke fundet."
+
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "Er pakken %s installeret?"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startede ikke korrekt"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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."
@@ -2174,56 +2194,185 @@ msgstr "frivillig"
 msgid "extra"
 msgstr "ekstra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, 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:257
+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/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:260
+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:263
+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:266
+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:576
 #, 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:1211
 #, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Indlæser pakkelisterne"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Samler filudbud"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kunne ikke skrive til %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr "Send forespørgsel til problemløser"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Forbered for modtagelse af løsning"
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Kør ekstern problemløser"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2242,7 +2391,7 @@ msgstr "Størrelsen stemmer ikke"
 msgid "Invalid file format"
 msgstr "Ugyldigt filformat"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2251,17 +2400,17 @@ msgstr ""
 "Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-"
 "punkt eller forkert udformet fil)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/acquire-item.cc:1666
 #, 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:1698
+#: apt-pkg/acquire-item.cc:1708
 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:1736
+#: apt-pkg/acquire-item.cc:1746
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2270,12 +2419,12 @@ msgstr ""
 "Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette "
 "arkiv vil ikke blive anvendt."
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konfliktdistribution: %s (forventede %s men fik %s)"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2285,12 +2434,12 @@ 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:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-fejl: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2299,92 +2448,17 @@ 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:1992
+#: apt-pkg/acquire-item.cc:2002
 #, 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:2050
+#: apt-pkg/acquire-item.cc:2060
 #, 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Indeksfiler af typen »%s« understøttes ikke"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kunne ikke finde %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, 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:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kunne ikke finde kildepakkelisten %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Indlæser pakkelisterne"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samler filudbud"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Kunne ikke skrive til %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "IO-fejl ved gemning af kilde-mellemlageret"
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2417,14 +2491,6 @@ msgstr "Henter fil %li ud af %li (%s tilbage)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Du skal have nogle »source«-URI'er i din sources.list"
@@ -2478,10 +2544,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"
@@ -2580,25 +2649,31 @@ 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Opbygger afhængighedstræ"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Send forespørgsel til problemløser"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidatversioner"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Forbered for modtagelse af løsning"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Afhængighedsgenerering"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Kør ekstern problemløser"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Kunne ikke åbne StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Kunne ikke skrive den midlertidige StateFile %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2610,106 +2685,6 @@ msgstr "Kunne ikke tolke pakkefilen %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Kunne ikke tolke pakkefilen %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Kunne ikke fortolke udgivelsesfil %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Ingen afsnit i udgivelsesfil %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Intet hashpunkt i udgivelsesfil %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ugyldigt punkt »Valid-Until« i udgivelsesfil %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2766,6 +2741,31 @@ 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/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Kunne ikke fortolke udgivelsesfil %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Ingen afsnit i udgivelsesfil %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Intet hashpunkt i udgivelsesfil %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ugyldigt punkt »Valid-Until« i udgivelsesfil %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ugyldigt punkt »Date« i udgivelsesfil %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/de.po b/po/de.po
index 733739ce1..a55ad9349 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1222,10 +1222,266 @@ msgstr "Verbindung fehlgeschlagen"
 msgid "Internal error"
 msgstr "Interner Fehler"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "Auflistung"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Abhängigkeiten werden korrigiert ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " fehlgeschlagen."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Abhängigkeiten konnten nicht korrigiert werden."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden."
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fertig"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!"
@@ -1503,262 +1759,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:129
-msgid "Listing"
-msgstr "Auflistung"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Abhängigkeiten werden korrigiert ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " fehlgeschlagen."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Abhängigkeiten konnten nicht korrigiert werden."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden."
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fertig"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:36
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!"
@@ -1843,8 +1843,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2145,6 +2145,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:116
+#, 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:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "Ist das Paket %s installiert?"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Methode %s ist nicht korrekt gestartet."
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
@@ -2241,148 +2263,91 @@ msgstr "optional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: apt-pkg/sourcelist.cc:173
 #, 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)."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] zu kurz)"
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexdateityp »%s« wird nicht unterstützt."
-
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Abhängigkeitsbaum wird aufgebaut."
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Installationskandidat-Versionen"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Abhängigkeitsgenerierung"
-
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Statusinformationen werden eingelesen."
+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/depcache.cc:250
+#: apt-pkg/sourcelist.cc:190
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "StateFile %s konnte nicht geöffnet werden."
+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/depcache.cc:256
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Temporäres StateFile %s konnte nicht geschrieben werden."
+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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Hash-Summe stimmt nicht überein"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Größe stimmt nicht überein"
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
-msgstr "Ungültiges Dateiformat"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
-"Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden "
-"(falscher Eintrag in sources.list oder missgebildete Datei)."
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:211
 #, 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:1698
-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"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-"Release-Datei für %s ist abgelaufen (ungültig seit %s). Aktualisierungen für "
-"dieses Depot werden nicht angewendet."
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)"
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)"
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid ""
-"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"
-msgstr ""
-"Während der Überprüfung der Signatur trat ein Fehler auf. Das Repository "
-"wurde nicht aktualisiert und die vorherigen Indexdateien werden verwendet. "
-"GPG-Fehler: %s: %s\n"
+msgid "Opening %s"
+msgstr "%s wird geöffnet."
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG-Fehler: %s: %s"
+msgid "Line %u too long in source list %s."
+msgstr "Zeile %u in Quellliste %s zu lang."
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371
 #, 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 ""
-"Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass "
-"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
-"Architektur)."
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375
 #, 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."
+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/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:416
 #, 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."
+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:490
 #, c-format
@@ -2466,6 +2431,117 @@ msgstr "Schreiben nach %s nicht möglich"
 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:241
+msgid "Send request to solver"
+msgstr "Anfrage an Problemlöser senden"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Vorbereiten, eine Lösung zu erhalten"
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen."
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Externen Problemlöser ausführen"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Hash-Summe stimmt nicht überein"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Größe stimmt nicht überein"
+
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
+msgstr "Ungültiges Dateiformat"
+
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+"Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden "
+"(falscher Eintrag in sources.list oder missgebildete Datei)."
+
+#: apt-pkg/acquire-item.cc:1666
+#, 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:1708
+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:1746
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+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:1768
+#, 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:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Während der Überprüfung der Signatur trat ein Fehler auf. Das Repository "
+"wurde nicht aktualisiert und die vorherigen Indexdateien werden verwendet. "
+"GPG-Fehler: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG-Fehler: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1936
+#, 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 ""
+"Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass "
+"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
+"Architektur)."
+
+#: apt-pkg/acquire-item.cc:2002
+#, 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:2060
+#, 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/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2498,14 +2574,6 @@ msgstr "Holen der Datei %li von %li (noch %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2562,10 +2630,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"
@@ -2666,26 +2737,31 @@ 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Abhängigkeitsbaum wird aufgebaut."
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Anfrage an Problemlöser senden"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Installationskandidat-Versionen"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Vorbereiten, eine Lösung zu erhalten"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Abhängigkeitsgenerierung"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen."
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Externen Problemlöser ausführen"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "StateFile %s konnte nicht geöffnet werden."
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Temporäres StateFile %s konnte nicht geschrieben werden."
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2697,107 +2773,6 @@ msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)."
 msgid "Unable to parse package file %s (2)"
 msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)."
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Release-Datei %s kann nicht verarbeitet werden."
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Keine Bereiche (Sections) in Release-Datei %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Kein Hash-Eintrag in Release-Datei %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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/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/sourcelist.cc:371
-#, c-format
-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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2860,6 +2835,31 @@ msgstr ""
 "Die installierte Version von Paket »%s« kann nicht ausgewählt werden, da es "
 "nicht installiert ist."
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Release-Datei %s kann nicht verarbeitet werden."
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Keine Bereiche (Sections) in Release-Datei %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Kein Hash-Eintrag in Release-Datei %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/dz.po b/po/dz.po
index 76723a589..dbd5e4b2b 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1115,10 +1115,251 @@ msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོ
 msgid "Internal error"
 msgstr "ནང་འཁོད་འཛོལ་བ།"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།"
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr "འབད་ཚར་ཡི།"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1350,277 +1591,36 @@ msgstr ""
 "%s་གོམ་འགྱོ་འབད་དོ་  འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
 "འབད་བས།\n"
 
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འདི་མི་སྲིད་པ་ཅིག་ཨིན་པས་ འདི་ཕབ་ལེན་འབད་མི་བཏུབ་པས།\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།"
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr "འབད་ཚར་ཡི།"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-msgid "All packages are up to date."
-msgstr ""
+#: apt-private/private-install.cc:841
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འདི་མི་སྲིད་པ་ཅིག་ཨིན་པས་ འདི་ཕབ་ལེན་འབད་མི་བཏུབ་པས།\n"
 
-#: apt-private/private-show.cc:156
+#: apt-private/private-install.cc:846
 #, 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] ""
+msgid "%s is already the newest version.\n"
+msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
+#: apt-private/private-install.cc:894
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
 
-#: 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:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
 
 #: apt-private/private-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1706,8 +1706,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2009,6 +2009,26 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།"
+
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་ན་གནས་ཚད་ཡིག་སྣོད་ཚུ་ མིང་དཔྱད་ཡང་ན་ཁ་ཕྱེ་མ་ཚུགས།"
@@ -2103,57 +2123,184 @@ msgstr "གདམ་ཁ་ཅན།"
 msgid "extra"
 msgstr "ཐེབས།"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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:490
 #, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:263
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr " %sལུ་འབྲི་མ་ཚུགས།"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2174,35 +2321,35 @@ msgstr "ཚད་མ་མཐུན།"
 msgid "Invalid file format"
 msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1656
+#: apt-pkg/acquire-item.cc:1666
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1708
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/acquire-item.cc:1746
 #, 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:1758
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2210,12 +2357,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2224,92 +2371,18 @@ msgstr ""
 " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
 "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/acquire-item.cc:2002
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/acquire-item.cc:2060
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག  ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།"
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr " %sལུ་འབྲི་མ་ཚུགས།"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།"
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2342,15 +2415,6 @@ msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2401,10 +2465,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
@@ -2500,25 +2568,32 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ།"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "མི་ངོ་འཐོན་རིམཚུ།"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "བརྟེན་པའི་བཟོ་བཏོན།"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2530,106 +2605,6 @@ msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་
 msgid "Unable to parse package file %s (2)"
 msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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 (ཡུ་ཨར་ཨའི་)གི་ནང་ན།"
-
-#: 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 (དབྱེ་བ)་ནང་ན།"
-
-#: 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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2682,6 +2657,31 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/el.po b/po/el.po
index 4c7e02634..2b95325d8 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1130,10 +1130,253 @@ msgstr "Η σύνδεση απέτυχε"
 msgid "Internal error"
 msgstr "Εσωτερικό Σφάλμα"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Διόρθωση εξαρτήσεων..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " απέτυχε."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Ετοιμο"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
+"προβλήματα."
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
@@ -1402,252 +1645,9 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Διόρθωση εξαρτήσεων..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " απέτυχε."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Ετοιμο"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
-"προβλήματα."
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!"
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!"
 
 #: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
@@ -1728,8 +1728,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2029,19 +2029,41 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Ανόμοιο MD5Sum"
 
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"Αδύνατο το άνοιγμα ή η ανάλυση των λιστών πακέτων ή του αρχείου κατάστασης."
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί."
 
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
+"Αδύνατο το άνοιγμα ή η ανάλυση των λιστών πακέτων ή του αρχείου κατάστασης."
+
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr ""
+"Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα"
+
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
 
 #: apt-pkg/pkgcache.cc:155
 msgid "Empty package cache"
@@ -2125,139 +2147,90 @@ msgstr "προαιρετικό"
 msgid "extra"
 msgstr "επιπλέον"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί."
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
-"enter."
-
 #: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
+#: 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:139
-msgid "Candidate versions"
-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:168
-msgid "Dependency generation"
-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:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-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:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Αποτυχία ανοίγματος του αρχείου κατάστασης %s"
+#: 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/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s"
+#: 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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Ανόμοιο MD5Sum"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Ανόμοιο μέγεθος"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Μη έγκυρη λειτουργία %s"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, 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:1656
-#, fuzzy, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-
-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid ""
-"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"
-msgstr ""
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
+msgid "Opening %s"
+msgstr "Άνοιγμα του %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, 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. Αυτό ίσως σημαίνει ότι "
-"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
+msgid "Line %u too long in source list %s."
+msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s."
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:371
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
-"πακέτο %s."
+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:490
 #, fuzzy, c-format
@@ -2336,6 +2309,107 @@ msgstr "Αδύνατη η εγγραφή στο %s"
 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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Ανόμοιο MD5Sum"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Ανόμοιο μέγεθος"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Μη έγκυρη λειτουργία %s"
+
+#: apt-pkg/acquire-item.cc:1650
+#, 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:1666
+#, fuzzy, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
+
+#: apt-pkg/acquire-item.cc:1708
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n"
+
+#: apt-pkg/acquire-item.cc:1746
+#, 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:1768
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1936
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
+"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
+
+#: apt-pkg/acquire-item.cc:2002
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
+"πακέτο %s."
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2368,15 +2442,6 @@ msgstr "Κατέβασμα του αρχείου %li του %li (απομένο
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list"
@@ -2427,10 +2492,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"
@@ -2527,25 +2596,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Υποψήφιες Εκδόσεις"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Παραγωγή Εξαρτήσεων"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Αποτυχία ανοίγματος του αρχείου κατάστασης %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2557,106 +2632,6 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s
 msgid "Unable to parse package file %s (2)"
 msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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 (τύπος)"
-
-#: 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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2709,6 +2684,31 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/es.po b/po/es.po
index 3384c0e7d..794e6fff0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,7 +33,7 @@ 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\n"
 "PO-Revision-Date: 2014-11-20 02:25+0100\n"
 "Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox."
 "org>\n"
@@ -1250,10 +1250,255 @@ msgstr "Falló la conexión"
 msgid "Internal error"
 msgstr "Error interno"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "Listando"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Corrigiendo dependencias..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " falló."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "No se pueden corregir las dependencias"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "No se puede minimizar el conjunto de actualización"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Listo"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!"
@@ -1521,253 +1766,8 @@ msgstr ""
 
 #: apt-private/private-install.cc:947
 #, 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:129
-msgid "Listing"
-msgstr "Listando"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Corrigiendo dependencias..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " falló."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "No se pueden corregir las dependencias"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "No se puede minimizar el conjunto de actualización"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Listo"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-msgid "All packages are up to date."
-msgstr "Todos los paquetes están actualizados."
-
-#: 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!"
+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:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1852,8 +1852,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2155,6 +2155,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:116
+#, 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:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "¿Está instalado el paquete %s?"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "El método %s no se inició correctamente"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
@@ -2250,147 +2270,96 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: apt-pkg/sourcelist.cc:127
 #, c-format
-msgid "Is the package %s installed?"
-msgstr "¿Está instalado el paquete %s?"
+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:169
+#: 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:455
+#: apt-pkg/sourcelist.cc:173
 #, 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."
+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 "El tipo de fichero de índice «%s» no se admite"
-
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Creando árbol de dependencias"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versiones candidatas"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generación de dependencias"
-
-#: 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"
+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:250
+#: apt-pkg/sourcelist.cc:190
 #, 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 ([%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:256
+#: apt-pkg/sourcelist.cc:193
 #, 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 ([%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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "falló el cambio de nombre, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "La suma hash difiere"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "El tamaño difiere"
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
-msgstr "Formato inválido de fichero"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Línea %lu mal formada en la lista de fuentes %s (URI)"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, 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)"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Línea %lu mal formada en la lista de fuentes %s (dist)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:211
 #, 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:1698
-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"
+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/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217
 #, 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."
+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/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)"
+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/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid ""
-"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"
-msgstr ""
-"Se produjo un error durante la verificación de las firmas. El repositorio no "
-"está actualizado y se utilizarán los ficheros de índice antiguos. El error "
-"GPG es: %s: %s\n"
+msgid "Opening %s"
+msgstr "Abriendo %s"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "Error de GPG: %s: %s"
+msgid "Line %u too long in source list %s."
+msgstr "Línea %u demasiado larga en la lista de fuentes %s."
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371
 #, 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 ""
-"No se pudo localizar un archivo para el paquete %s. Esto puede significar "
-"que necesita arreglar manualmente este paquete (debido a que falta una "
-"arquitectura)"
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375
 #, 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»"
+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/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:416
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Los archivos de índice de paquetes están dañados. No existe un campo "
-"«Filename:» para el paquete %s."
+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:490
 #, c-format
@@ -2429,42 +2398,153 @@ msgstr "Excedió la cantidad de nombres de paquetes que admite este APT."
 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:263
-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:263
+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:266
+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:576
+#, 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:1211
+#, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Leyendo lista de paquetes"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Recogiendo archivos que proveen"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "No se pudo escribir en %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr "Enviar petición al solucionador"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Preparar para recibir una solución"
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "Falló solucionador externo sin un mensaje de error apropiado"
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Ejecutar solucionador externo"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "falló el cambio de nombre, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "La suma hash difiere"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "El tamaño difiere"
+
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
+msgstr "Formato inválido de fichero"
+
+#: apt-pkg/acquire-item.cc:1650
+#, 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:1666
+#, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "No se pudo leer el archivo «Release» %s"
 
-#: apt-pkg/pkgcachegen.cc:266
-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/acquire-item.cc:1708
+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/pkgcachegen.cc:576
+#: apt-pkg/acquire-item.cc:1746
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
 msgstr ""
-"No se encontró el paquete %s %s mientras se procesaban las dependencias"
+"El archivo «Release» para %s está caducado (inválido desde %s). No se "
+"aplicará ninguna actualización de este repositorio."
 
-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "No se pudo leer la lista de paquetes fuente %s"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)"
 
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Leyendo lista de paquetes"
+#: apt-pkg/acquire-item.cc:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Se produjo un error durante la verificación de las firmas. El repositorio no "
+"está actualizado y se utilizarán los ficheros de índice antiguos. El error "
+"GPG es: %s: %s\n"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Recogiendo archivos que proveen"
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Error de GPG: %s: %s"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/acquire-item.cc:1936
 #, c-format
-msgid "Unable to write to %s"
-msgstr "No se pudo escribir en %s"
+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 ""
+"No se pudo localizar un archivo para el paquete %s. Esto puede significar "
+"que necesita arreglar manualmente este paquete (debido a que falta una "
+"arquitectura)"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Error de E/S al guardar la caché fuente"
+#: apt-pkg/acquire-item.cc:2002
+#, 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:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Los archivos de índice de paquetes están dañados. No existe un campo "
+"«Filename:» para el paquete %s."
 
 #: apt-pkg/vendorlist.cc:85
 #, c-format
@@ -2498,14 +2578,6 @@ msgstr "Descargando fichero %li de %li (falta %s)"
 msgid "Retrieving file %li of %li"
 msgstr "Descargando fichero %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 ""
-"No se han podido descargar algunos archivos de índice, se han omitido, o se "
-"han utilizado unos antiguos en su lugar."
-
 #: 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"
@@ -2562,10 +2634,13 @@ msgstr ""
 "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"
@@ -2665,25 +2740,31 @@ 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 "Enviar situación al solucionador"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Creando árbol de dependencias"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Enviar petición al solucionador"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versiones candidatas"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Preparar para recibir una solución"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generación de dependencias"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Falló solucionador externo sin un mensaje de error apropiado"
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Ejecutar solucionador externo"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "No se pudo abrir el fichero de estado %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falló la escritura del fichero de estado temporal %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2695,112 +2776,6 @@ msgstr "No se pudo tratar el archivo de paquetes %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "No se pudo tratar el archivo de paquetes %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "No se pudo leer el archivo «Release» %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "No se encontraron secciones en el archivo «Release» %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, 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
-#, 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/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 analizable)"
-
-#: 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/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/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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2863,6 +2838,31 @@ msgstr ""
 "No se puede seleccionar la versión instalada del paquete «%s» puesto que no "
 "está instalado"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "No se pudo leer el archivo «Release» %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "No se encontraron secciones en el archivo «Release» %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, 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:130
+#, 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:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Entrada «Date» inválida en el archivo «Release» %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/eu.po b/po/eu.po
index 5271613ef..370bb37c6 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1116,10 +1116,251 @@ msgstr "Konexioak huts egin du"
 msgid "Internal error"
 msgstr "Barne errorea"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Mendekotasunak zuzentzen..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " : huts egin du."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ezin dira mendekotasunak zuzendu"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Eginda"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
@@ -1357,275 +1598,34 @@ msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
 
 #: apt-private/private-install.cc:841
 #, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s bertsiorik berriena da jada.\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Mendekotasunak zuzentzen..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " : huts egin du."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Ezin dira mendekotasunak zuzendu"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Eginda"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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"
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-install.cc:846
 #, 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] ""
+msgid "%s is already the newest version.\n"
+msgstr "%s bertsiorik berriena da jada.\n"
 
-#: apt-private/private-update.cc:101
-msgid "All packages are up to date."
-msgstr ""
+#: apt-private/private-install.cc:894
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
 
-#: 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-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
 
-#: 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:947
+#, fuzzy, c-format
+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-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1710,8 +1710,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2010,6 +2010,26 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Egiaztapena ez dator bat"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
+
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "%s metodoa ez da behar bezala abiarazi"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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."
@@ -2104,56 +2124,183 @@ msgstr "aukerakoa"
 msgid "extra"
 msgstr "estra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, 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:257
+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/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:260
+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:263
+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:266
+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:576
 #, 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:1211
 #, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Pakete Zerrenda irakurtzen"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Fitxategiaren erreferentziak biltzen"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s : ezin da idatzi"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2173,35 +2320,35 @@ msgstr "Tamaina ez dator bat"
 msgid "Invalid file format"
 msgstr "Eragiketa baliogabea: %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1656
+#: apt-pkg/acquire-item.cc:1666
 #, 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:1698
+#: apt-pkg/acquire-item.cc:1708
 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:1736
+#: apt-pkg/acquire-item.cc:1746
 #, 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:1758
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2209,12 +2356,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2223,12 +2370,12 @@ msgstr ""
 "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
 "beharko duzu paketea. (arkitektura falta delako)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/acquire-item.cc:2002
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/acquire-item.cc:2060
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2236,79 +2383,6 @@ msgstr ""
 "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
 "paketearentzat."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "'%s' motako indize fitxategirik ez da onartzen"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ezin da %s atzitu."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Pakete Zerrenda irakurtzen"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Fitxategiaren erreferentziak biltzen"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "%s : ezin da idatzi"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "S/I errorea iturburu katxea gordetzean"
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2341,15 +2415,6 @@ msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en"
@@ -2399,10 +2464,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"
@@ -2498,25 +2567,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Dependentzia zuhaitza eraikitzen"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Hautagaien bertsioak"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Dependentzi Sormena"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2528,106 +2603,6 @@ msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Ezin da %s pakete fitxategia analizatu (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Lerro baliogabea desbideratze fitxategian: %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2680,6 +2655,31 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ezin da %s pakete fitxategia analizatu (1)"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Lerro baliogabea desbideratze fitxategian: %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ezin da %s pakete fitxategia analizatu (1)"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/fi.po b/po/fi.po
index bf4994788..d6c864d8a 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1108,10 +1108,251 @@ msgstr "Yhteys ei toiminut"
 msgid "Internal error"
 msgstr "Sisäinen virhe"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Korjataan riippuvuuksia..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " ei onnistunut."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Riippuvuuksien korjaus ei onnistu"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Päivitysjoukon minimointi ei onnistu"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Valmis"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!"
@@ -1352,272 +1593,31 @@ msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n"
 
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s on jo uusin versio.\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Valittiin versio %s (%s) paketille %s\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Valittiin versio %s (%s) paketille %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Korjataan riippuvuuksia..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " ei onnistunut."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Riippuvuuksien korjaus ei onnistu"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Päivitysjoukon minimointi ei onnistu"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Valmis"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
+#: apt-private/private-install.cc:846
 #, 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] ""
+msgid "%s is already the newest version.\n"
+msgstr "%s on jo uusin versio.\n"
 
-#: apt-private/private-update.cc:101
-msgid "All packages are up to date."
-msgstr ""
+#: apt-private/private-install.cc:894
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Valittiin versio %s (%s) paketille %s\n"
 
-#: 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-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Valittiin versio %s (%s) paketille %s\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
 
-#: 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:947
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
 
 #: apt-private/private-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1702,8 +1702,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2004,6 +2004,26 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Kohteen %s tarkistussumma ei täsmää"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Menetelmän ajuria %s ei löytynyt"
+
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Menetelmä %s ei käynnistynyt oikein"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
@@ -2099,56 +2119,184 @@ msgstr "valinnainen"
 msgid "extra"
 msgstr "ylimääräinen"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, 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:257
+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/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:260
+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:263
+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:266
+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:576
 #, 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:1211
 #, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Luetaan pakettiluetteloita"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Kootaan tiedostojen tarjoamistietoja"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2168,35 +2316,35 @@ msgstr "Koko ei täsmää"
 msgid "Invalid file format"
 msgstr "Virheellinen toiminto %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1656
+#: apt-pkg/acquire-item.cc:1666
 #, 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:1698
+#: apt-pkg/acquire-item.cc:1708
 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:1736
+#: apt-pkg/acquire-item.cc:1746
 #, 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:1758
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2204,12 +2352,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2218,12 +2366,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:1992
+#: apt-pkg/acquire-item.cc:2002
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/acquire-item.cc:2060
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2231,80 +2379,6 @@ msgstr ""
 "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
 "kenttää."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "stat %s ei onnistu."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "stat ei toiminut lähdepakettiluettelolle %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Luetaan pakettiluetteloita"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Kootaan tiedostojen tarjoamistietoja"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2337,15 +2411,6 @@ msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI"
@@ -2394,10 +2459,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"
@@ -2492,25 +2561,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Muodostetaan riippuvuussuhteiden puu"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Mahdolliset versiot"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Luodaan riippuvuudet"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Luetaan tilatiedot"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Tilatiedoston %s avaaminen ei onnistunut"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2522,106 +2597,6 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
 msgid "Unable to parse package file %s (2)"
 msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Huomautus, valitaan %s eikä %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Virheellinen rivi korvautustiedostossa: %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2674,6 +2649,31 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Huomautus, valitaan %s eikä %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Virheellinen rivi korvautustiedostossa: %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/fr.po b/po/fr.po
index 6c3d7f20e..f1f9658d2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1191,10 +1191,255 @@ msgstr "Échec de la connexion"
 msgid "Internal error"
 msgstr "Erreur interne"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "En train de lister"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Correction des dépendances..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " a échoué."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Impossible de corriger les dépendances"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossible de minimiser le nombre des paquets mis à jour"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fait"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
@@ -1479,254 +1724,9 @@ 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:129
-msgid "Listing"
-msgstr "En train de lister"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Correction des dépendances..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " a échoué."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Impossible de corriger les dépendances"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossible de minimiser le nombre des paquets mis à jour"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fait"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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 "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-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
 
 #: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
@@ -1807,8 +1807,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2109,15 +2109,37 @@ 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/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"Les listes de paquets ou le fichier « status » ne peuvent être analysés ou "
-"lus."
+#: apt-pkg/acquire-worker.cc:116
+#, 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/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes."
+#: apt-pkg/acquire-worker.cc:118
+#, 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:169
+#, 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:455
+#, 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 ""
+"Les listes de paquets ou le fichier « status » ne peuvent être analysés ou "
+"lus."
+
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes."
 
 #: apt-pkg/cachefile.cc:116
 msgid "The list of sources could not be read."
@@ -2204,149 +2226,102 @@ msgstr "optionnel"
 msgid "extra"
 msgstr "supplémentaire"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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"
-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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versions possibles"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Génération des dépendances"
-
-#: 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"
+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/depcache.cc:250
+#: apt-pkg/sourcelist.cc:190
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Impossible d'ouvrir le fichier d'état %s"
+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/depcache.cc:256
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Erreur d'écriture du fichier d'état temporaire %s"
+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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "impossible de changer le nom, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Somme de contrôle de hachage incohérente"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Taille incohérente"
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
-msgstr "Format de fichier invalide"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, 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"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
-"Impossible de trouver la somme de contrôle de « %s » dans le fichier Release"
-
-#: apt-pkg/acquire-item.cc:1698
-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"
+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/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
-"Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises "
-"à jour depuis ce dépôt ne s'effectueront pas."
+"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)"
+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/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid ""
-"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"
-msgstr ""
-"Une erreur s'est produite lors du contrôle de la signature. Le dépôt n'est "
-"pas mis à jour et les fichiers d'index précédents seront utilisés. Erreur de "
-"GPG : %s : %s\n"
+msgid "Opening %s"
+msgstr "Ouverture de %s"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "Erreur de GPG : %s : %s"
+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/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371
 #, 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 ""
-"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
-"devrez corriger ce paquet vous-même (absence d'architecture)."
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
-"Impossible de trouver une source de téléchargement de la version « %s » de "
-"« %s »"
+"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
 
-#: apt-pkg/acquire-item.cc:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
-"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
-"pour le paquet %s."
+"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2432,6 +2407,117 @@ 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:241
+msgid "Send request to solver"
+msgstr "Envoi d'une requête au solveur"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Préparation à la réception de la solution"
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "Échec du solveur externe sans message d'erreur adapté"
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Exécution du solveur externe"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "impossible de changer le nom, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Somme de contrôle de hachage incohérente"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Taille incohérente"
+
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
+msgstr "Format de fichier invalide"
+
+#: apt-pkg/acquire-item.cc:1650
+#, 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"
+
+#: apt-pkg/acquire-item.cc:1666
+#, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr ""
+"Impossible de trouver la somme de contrôle de « %s » dans le fichier Release"
+
+#: apt-pkg/acquire-item.cc:1708
+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:1746
+#, 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."
+
+#: apt-pkg/acquire-item.cc:1768
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)"
+
+#: apt-pkg/acquire-item.cc:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Une erreur s'est produite lors du contrôle de la signature. Le dépôt n'est "
+"pas mis à jour et les fichiers d'index précédents seront utilisés. Erreur de "
+"GPG : %s : %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Erreur de GPG : %s : %s"
+
+#: apt-pkg/acquire-item.cc:1936
+#, 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 ""
+"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:2002
+#, 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:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
+"pour le paquet %s."
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2464,14 +2550,6 @@ msgstr "Téléchargement du fichier %li sur %li (%s restant)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2529,10 +2607,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"
@@ -2635,25 +2716,31 @@ 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construction de l'arbre des dépendances"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Envoi d'une requête au solveur"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versions possibles"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Préparation à la réception de la solution"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Génération des dépendances"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Échec du solveur externe sans message d'erreur adapté"
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Exécution du solveur externe"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Impossible d'ouvrir le fichier d'état %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Erreur d'écriture du fichier d'état temporaire %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2665,118 +2752,6 @@ msgstr "Impossible de traiter le fichier %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Impossible de traiter le fichier %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Impossible d'analyser le fichier Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Pas de sections dans le fichier Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2842,6 +2817,31 @@ msgstr ""
 "Impossible de choisir la version installée du paquet « %s » qui n'est pas "
 "installé"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Impossible d'analyser le fichier Release %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Pas de sections dans le fichier Release %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, 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:130
+#, 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:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Entrée « Date » non valable dans le fichier Release %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/gl.po b/po/gl.po
index 3311b9382..79ad507c3 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1135,10 +1135,256 @@ msgstr "Produciuse un fallo na conexión"
 msgid "Internal error"
 msgstr "Produciuse un erro interno"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Corrixindo as dependencias..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " fallou."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Non foi posíbel corrixir as dependencias."
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Non foi posíbel minimizar o conxunto de anovacións"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Feito"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1410,255 +1656,9 @@ 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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Corrixindo as dependencias..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " fallou."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Non foi posíbel corrixir as dependencias."
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Non foi posíbel minimizar o conxunto de anovacións"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Feito"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVISO: Non se poden autenticar os seguintes paquetes!"
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVISO: Non se poden autenticar os seguintes paquetes!"
 
 #: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
@@ -1739,8 +1739,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2039,17 +2039,37 @@ 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/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"Non foi posíbel analizar ou abrir as listas de paquetes ou ficheiro de "
-"estado."
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "Pode querer executar «apt-get update» para corrixir estes problemas"
+#: apt-pkg/acquire-worker.cc:116
+#, 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/cachefile.cc:116
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "O método %s non se iniciou correctamente"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
+"Non foi posíbel analizar ou abrir as listas de paquetes ou ficheiro de "
+"estado."
+
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Pode querer executar «apt-get update» para corrixir estes problemas"
+
+#: apt-pkg/cachefile.cc:116
 msgid "The list of sources could not be read."
 msgstr "Non foi posíbel ler a lista de orixes."
 
@@ -2135,143 +2155,94 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
-#, 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:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "O método %s non se iniciou correctamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versións candidatas"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Xeración de dependencias"
-
-#: 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: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/depcache.cc:250
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Non foi posíbel abrir o ficheiro de estado %s"
+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/depcache.cc:256
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s"
+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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "A sumas «hash» non coinciden"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Os tamaños non coinciden"
+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/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Operación incorrecta: %s"
+#: 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/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"Non é posíbel atopar a entrada agardada «%s» no ficheiro de publicación "
-"(entrada sources.list incorrecta ou ficheiro con formato incorrecto)"
+"Liña %lu mal construída na lista de fontes %s ([%s] a chave %s non ten valor)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:206
 #, 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"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Liña %lu mal construída na lista de orixes %s (URI)"
 
-#: apt-pkg/acquire-item.cc:1698
-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/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/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
+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/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)"
+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/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid ""
-"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"
-msgstr ""
-"Produciuse un erro durante a verificación da sinatura. O repositorio non foi "
-"actualizado, empregaranse os ficheiros de índice anteriores. Erro de GPG: "
-"%s: %s\n"
+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)"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "Produciuse un erro de GPG: %s %s"
+msgid "Opening %s"
+msgstr "Abrindo %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, 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 ""
-"Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que "
-"ten que arranxar este paquete a man. (Falta a arquitectura)"
+msgid "Line %u too long in source list %s."
+msgstr "Liña %u longa de máis na lista de orixes %s."
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:371
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Liña %u mal construída na lista de orixes %s (tipo)"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Os ficheiros de índices de paquetes están danados. Non hai un campo "
-"Filename: para o paquete %s."
+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:490
 #, fuzzy, c-format
@@ -2349,6 +2320,113 @@ msgstr "Non é posíbel escribir en %s"
 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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "A sumas «hash» non coinciden"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Os tamaños non coinciden"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Operación incorrecta: %s"
+
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+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:1666
+#, 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:1708
+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:1746
+#, 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:1768
+#, 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:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Produciuse un erro durante a verificación da sinatura. O repositorio non foi "
+"actualizado, empregaranse os ficheiros de índice anteriores. Erro de GPG: "
+"%s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Produciuse un erro de GPG: %s %s"
+
+#: apt-pkg/acquire-item.cc:1936
+#, 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 ""
+"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:2002
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Os ficheiros de índices de paquetes están danados. Non hai un campo "
+"Filename: para o paquete %s."
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2381,15 +2459,6 @@ msgstr "Obtendo o ficheiro %li de %li (restan %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Debe introducir algúns URI «orixe» no seu ficheiro sources.list"
@@ -2442,10 +2511,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"
@@ -2544,25 +2617,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construindo a árbore de dependencias"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versións candidatas"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Xeración de dependencias"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Non foi posíbel abrir o ficheiro de estado %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2574,110 +2653,6 @@ msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Non se puido analizar o ficheiro de publicación %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Non hai seccións no ficheiro de publicación %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2740,6 +2715,31 @@ msgstr ""
 "Non é posíbel seleccionar a versión instalada do paquete %s xa que non está "
 "instalado"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Non se puido analizar o ficheiro de publicación %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Non hai seccións no ficheiro de publicación %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, 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:130
+#, 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:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "A entrada «Date» no ficheiro de publicación %s non é válida"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/hu.po b/po/hu.po
index 3b5865600..66892cab9 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1150,10 +1150,255 @@ msgstr "Sikertelen kapcsolódás"
 msgid "Internal error"
 msgstr "Belső hiba"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Függőségek javítása..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " sikertelen."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nem lehet javítani a függőségeket"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Kész"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!"
@@ -1418,254 +1663,9 @@ 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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Függőségek javítása..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " sikertelen."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nem lehet javítani a függőségeket"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Kész"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "FIGYELMEZTETÉS: Az alábbi csomagok nem hitelesíthetők!"
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "FIGYELMEZTETÉS: Az alábbi csomagok nem hitelesíthetők!"
 
 #: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
@@ -1746,8 +1746,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2043,15 +2043,37 @@ msgstr "%s hitelesítési rekordja nem található"
 msgid "Hash mismatch for: %s"
 msgstr "%s ellenőrzőösszege nem megfelelő"
 
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"A csomaglisták vagy az állapotfájl nem dolgozhatók fel vagy nem nyithatók "
-"meg."
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "A(z) %s metódusvezérlő nem található."
 
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "Próbálja futtatni az „apt-get update” parancsot ezen hibák javításához"
+#: apt-pkg/acquire-worker.cc:118
+#, 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:169
+#, 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:455
+#, 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 ""
+"A csomaglisták vagy az állapotfájl nem dolgozhatók fel vagy nem nyithatók "
+"meg."
+
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Próbálja futtatni az „apt-get update” parancsot ezen hibák javításához"
 
 #: apt-pkg/cachefile.cc:116
 msgid "The list of sources could not be read."
@@ -2138,144 +2160,100 @@ msgstr "opcionális"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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"
-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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Lehetséges verziók"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Függőséggenerálá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"
+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/depcache.cc:250
+#: apt-pkg/sourcelist.cc:190
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s állapotfájl megnyitása sikertelen"
+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/depcache.cc:256
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s átmeneti állapotfájl írása sikertelen"
+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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "sikertelen átnevezés, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "A Hash Sum nem megfelelő"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "A méret nem megfelelő"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "%s érvénytelen művelet"
+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/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-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)"
+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/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:211
 #, 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:1698
-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"
+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/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-"A Release fájl elavult ehhez: %s (érvénytelen ez óta: %s). A tároló "
-"frissítései nem kerülnek alkalmazásra."
+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/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)"
+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/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid ""
-"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"
-msgstr ""
-"Hiba történt az aláírás ellenőrzése közben. A tároló nem frissült, és az "
-"előző indexfájl lesz használva. GPG hiba: %s: %s\n"
+msgid "Opening %s"
+msgstr "%s megnyitása"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG hiba: %s: %s"
+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/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371
 #, 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 ""
-"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)"
+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/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375
 #, 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"
+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/acquire-item.cc:2050
-#, 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/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:490
 #, fuzzy, c-format
@@ -2353,6 +2331,112 @@ msgstr "Nem lehet írni ebbe: %s"
 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:241
+msgid "Send request to solver"
+msgstr "Kérés küldése a solvernek"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Felkészülés megoldás fogadására"
+
+#: apt-pkg/edsp.cc:327
+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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Külső solver végrehajtása"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "sikertelen átnevezés, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "A Hash Sum nem megfelelő"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "A méret nem megfelelő"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "%s érvénytelen művelet"
+
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+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:1666
+#, 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:1708
+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:1746
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+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:1768
+#, 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:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Hiba történt az aláírás ellenőrzése közben. A tároló nem frissült, és az "
+"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:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG hiba: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1936
+#, 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 ""
+"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:2002
+#, 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:2060
+#, 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/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2385,14 +2469,6 @@ msgstr "%li/%li fájl letöltése (%s marad)"
 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: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"
@@ -2445,10 +2521,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"
@@ -2546,25 +2625,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Függőségi fa építése"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Kérés küldése a solvernek"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Lehetséges verziók"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Felkészülés megoldás fogadására"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Függőséggenerálás"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott"
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Külső solver végrehajtása"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s állapotfájl megnyitása sikertelen"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s átmeneti állapotfájl írása sikertelen"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2576,116 +2661,6 @@ msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "A(z) %s Release fájl nem dolgozható fel"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "A(z) %s Release fájl nem tartalmaz szakaszokat"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2743,6 +2718,31 @@ 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/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "A(z) %s Release fájl nem dolgozható fel"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "A(z) %s Release fájl nem tartalmaz szakaszokat"
+
+#: apt-pkg/indexrecords.cc:117
+#, 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:130
+#, 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:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Érvénytelen „Date” bejegyzés a(z) %s Release fájlban"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/it.po b/po/it.po
index b382fd2af..21c681b5d 100644
--- a/po/it.po
+++ b/po/it.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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\n"
 "PO-Revision-Date: 2014-05-31 17:04+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -1196,10 +1196,253 @@ msgstr "Connessione non riuscita"
 msgid "Internal error"
 msgstr "Errore interno"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "Elencazione"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Correzione delle dipendenze..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " non riuscita."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Impossibile correggere le dipendenze"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossibile minimizzare l'insieme da aggiornare"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Fatto"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+msgid "All packages are up to date."
+msgstr ""
+
 #: 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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1478,252 +1721,9 @@ 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:129
-msgid "Listing"
-msgstr "Elencazione"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Correzione delle dipendenze..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " non riuscita."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Impossibile correggere le dipendenze"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossibile minimizzare l'insieme da aggiornare"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Fatto"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati."
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati."
 
 #: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
@@ -1806,8 +1806,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2110,6 +2110,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:116
+#, 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:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "Il pacchetto %s è installato?"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Il metodo %s non si è avviato correttamente"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
@@ -2206,145 +2226,101 @@ msgstr "opzionale"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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"
-
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Generazione albero delle dipendenze"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versioni candidate"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generazione delle dipendenze"
-
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Lettura informazioni sullo stato"
+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:250
+#: apt-pkg/sourcelist.cc:190
 #, 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 ([%s] has no key)"
+msgstr ""
+"La riga %lu nel file delle sorgenti %s non è corretta ([%s] non ha una "
+"chiave)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:193
 #, 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 ([%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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "rename() non riuscita: %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Somma hash non corrispondente"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Le dimensioni non corrispondono"
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
-msgstr "Formato file non valido"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "La riga %lu nel file %s non è corretta (URI)"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
-"Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list "
-"errata o file danneggiato)"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "La riga %lu nel file %s non è corretta (dist)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:211
 #, 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:1698
-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"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "La riga %lu nel file %s non è corretta (URI parse)"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-"Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per "
-"questo repository non verranno applicati."
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "La riga %lu nel file %s non è corretta (absolute dist)"
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)"
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "La riga %lu nel file %s non è corretta (dist parse)"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid ""
-"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"
-msgstr ""
-"Si è verificato un errore nel verificare la firma. Il repository non è "
-"aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n"
+msgid "Opening %s"
+msgstr "Apertura di %s"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "Errore GPG: %s: %s"
+msgid "Line %u too long in source list %s."
+msgstr "Riga %u troppo lunga nel file %s."
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371
 #, 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 ""
-"Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
-"sistemare manualmente questo pacchetto (a causa dell'architettura mancante)."
+msgid "Malformed line %u in source list %s (type)"
+msgstr "La riga %u nel file %s non è corretta (type)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375
 #, 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\""
+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"
 
-# (ndt) sarebbe da controllare se veramente possono esistere più file indice
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:416
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
-"I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" "
-"per il pacchetto %s."
+"Tipo \"%s\" non riconosciuto nella stanza %u nel file delle sorgenti %s"
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2424,6 +2400,115 @@ msgstr "Impossibile scrivere in %s"
 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:241
+msgid "Send request to solver"
+msgstr "Invia la richiesta al solver"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Preparazione alla ricezione della soluzione"
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "Il solver esterno è terminato senza un errore di messaggio"
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Esecuzione solver esterno"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "rename() non riuscita: %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Somma hash non corrispondente"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Le dimensioni non corrispondono"
+
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
+msgstr "Formato file non valido"
+
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+"Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list "
+"errata o file danneggiato)"
+
+#: apt-pkg/acquire-item.cc:1666
+#, 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:1708
+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:1746
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+"Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per "
+"questo repository non verranno applicati."
+
+#: apt-pkg/acquire-item.cc:1768
+#, 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:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Si è verificato un errore nel verificare la firma. Il repository non è "
+"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:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Errore GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1936
+#, 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 ""
+"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:2002
+#, 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:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" "
+"per il pacchetto %s."
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2457,14 +2542,6 @@ msgstr "Scaricamento file %li di %li (%s rimanente)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2522,10 +2599,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"
@@ -2625,25 +2705,31 @@ 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Generazione albero delle dipendenze"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Invia la richiesta al solver"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versioni candidate"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Preparazione alla ricezione della soluzione"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generazione delle dipendenze"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Il solver esterno è terminato senza un errore di messaggio"
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Esecuzione solver esterno"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Apertura del file di stato %s non riuscita"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Scrittura del file temporaneo di stato %s non riuscita"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2655,117 +2741,6 @@ msgstr "Impossibile analizzare il file di pacchetto %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Impossibile analizzare il file di pacchetto %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Impossibile analizzare il file Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Nessuna sezione nel file Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Nessuna voce Hash nel file Release %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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/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: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"
-
 # (ndt) dovrebbe essere inteso il file Release
 #: apt-pkg/cacheset.cc:489
 #, c-format
@@ -2830,6 +2805,31 @@ msgstr ""
 "Impossibile selezionare la versione installata dal pacchetto %s poiché non è "
 "installato"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Impossibile analizzare il file Release %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Nessuna sezione nel file Release %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Nessuna voce Hash nel file Release %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Voce \"Date\" nel file Release %s non valida"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/ja.po b/po/ja.po
index 9da59c1cf..bb2410d57 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.9.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1185,10 +1185,255 @@ msgstr "接続失敗"
 msgid "Internal error"
 msgstr "内部エラー"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "一覧表示"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "依存関係を解決しています ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " 失敗しました。"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "依存関係を訂正できません"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "アップグレードセットを最小化できません"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " 完了"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
+"ん。"
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!"
@@ -1429,275 +1674,30 @@ msgstr "%s はダウンロードできないため、再インストールは不
 #: apt-private/private-install.cc:846
 #, c-format
 msgid "%s is already the newest version.\n"
-msgstr "%s はすでに最新版です。\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "'%3$s' のバージョン '%1$s' (%2$s) を選択しました\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%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:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
-"パッケージ '%s' はインストールされていないため削除もされません。削除したかっ"
-"たのは '%s' でしょうか?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "パッケージ '%s' はインストールされていないため、削除もされません\n"
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr "一覧表示"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "依存関係を解決しています ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " 失敗しました。"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "依存関係を訂正できません"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "アップグレードセットを最小化できません"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " 完了"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
-"ん。"
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-msgid "All packages are up to date."
-msgstr "パッケージはすべて最新です。"
+msgstr "%s はすでに最新版です。\n"
 
-#: apt-private/private-show.cc:156
+#: apt-private/private-install.cc:894
 #, 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' スイッチを付けてください。"
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "'%3$s' のバージョン '%1$s' (%2$s) を選択しました\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "実際のパッケージではありません (仮想)"
+#: apt-private/private-install.cc:899
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "'%4$s' のために '%3$s' のバージョン '%1$s' (%2$s) を選択しました\n"
 
-#: 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!"
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
-"注意: これはシミュレーションにすぎません!\n"
-"      apt-get は実際の実行に root 権限を必要とします。\n"
-"      ロックが非アクティブであることから、今この時点の状態に妥当性が\n"
-"      あるとは言い切れないことに注意してください!"
+"パッケージ '%s' はインストールされていないため削除もされません。削除したかっ"
+"たのは '%s' でしょうか?\n"
+
+#: apt-private/private-install.cc:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "パッケージ '%s' はインストールされていないため、削除もされません\n"
 
 #: apt-private/private-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1783,8 +1783,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2081,6 +2081,28 @@ msgstr "認証レコードが見つかりません: %s"
 msgid "Hash mismatch for: %s"
 msgstr "ハッシュサムが適合しません: %s"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "メソッドドライバ %s が見つかりません。"
+
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "パッケージ %s はインストールされていますか?"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "メソッド %s が正常に開始しませんでした"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
@@ -2178,58 +2200,187 @@ msgstr "任意"
 msgid "extra"
 msgstr "特別"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s を処理中にエラーが発生しました (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "この APT が対応している以上の数のパッケージが指定されました。"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "この APT が対応している以上の数のバージョンが要求されました。"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "この APT が対応している以上の数の説明が要求されました。"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "この APT が対応している以上の数の依存関係が発生しました。"
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "ソースパッケージリスト %s の状態を取得できません"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "パッケージリストを読み込んでいます"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "ファイル提供情報を収集しています"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s に書き込めません"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr "ソルバにリクエストを送信"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "解決を受け取る準備"
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました"
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "外部ソルバを実行"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2248,7 +2399,7 @@ msgstr "サイズが適合しません"
 msgid "Invalid file format"
 msgstr "不正なファイル形式"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2257,16 +2408,16 @@ msgstr ""
 "期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った "
 "sources.list エントリか、壊れたファイル)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/acquire-item.cc:1666
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Release ファイル中の '%s' のハッシュサムを見つけられません"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1708
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/acquire-item.cc:1746
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2275,14 +2426,14 @@ msgstr ""
 "%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新"
 "物は適用されません。"
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 "ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し"
 "ました)"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2292,12 +2443,12 @@ msgstr ""
 "ファイルが使われます。GPG エラー: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG エラー: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2306,12 +2457,12 @@ msgstr ""
 "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
 "で修正する必要があります (存在しないアーキテクチャのため)。"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/acquire-item.cc:2002
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/acquire-item.cc:2060
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2319,79 +2470,6 @@ msgstr ""
 "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
 "フィールドがありません。"
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s を処理中にエラーが発生しました (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "この APT が対応している以上の数のパッケージが指定されました。"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "この APT が対応している以上の数のバージョンが要求されました。"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "この APT が対応している以上の数の説明が要求されました。"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "この APT が対応している以上の数の依存関係が発生しました。"
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "ソースパッケージリスト %s の状態を取得できません"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "パッケージリストを読み込んでいます"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "ファイル提供情報を収集しています"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "%s に書き込めません"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2424,14 +2502,6 @@ msgstr "ファイルを取得しています %li/%li (残り %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "sources.list に 'ソース' URI を指定する必要があります"
@@ -2486,10 +2556,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"
@@ -2588,25 +2661,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "依存関係ツリーを作成しています"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "ソルバにリクエストを送信"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候補バージョン"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "解決を受け取る準備"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "依存関係の生成"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "状態情報を読み取っています"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "外部ソルバを実行"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "状態ファイル %s のオープンに失敗しました"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "一時状態ファイル %s の書き込みに失敗しました"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2618,110 +2697,6 @@ msgstr "パッケージファイル %s を解釈することができません (
 msgid "Unable to parse package file %s (2)"
 msgstr "パッケージファイル %s を解釈することができません (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Release ファイル %s を解釈することができません"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Release ファイル %s にセクションがありません"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Release ファイル %s に Hash エントリがありません"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Release ファイル %s に無効な 'Valid-Until' エントリがあります"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/sourcelist.cc:217
-#, c-format
-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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2779,6 +2754,31 @@ msgstr ""
 "インストールされていないので、パッケージ %s のインストール済みバージョンを選"
 "べません。"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Release ファイル %s を解釈することができません"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Release ファイル %s にセクションがありません"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Release ファイル %s に Hash エントリがありません"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Release ファイル %s に無効な 'Valid-Until' エントリがあります"
+
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Release ファイル %s に無効な 'Date' エントリがあります"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/km.po b/po/km.po
index d57d7def9..7df17b97e 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1102,10 +1102,251 @@ msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
 msgid "Internal error"
 msgstr "កំហុស​ខាង​ក្នុង​"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " បាន​បរាជ័យ ។"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " ធ្វើ​រួច"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។"
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "កំហុស​ខាងក្នុង កញ្ចប់​ដំឡើង​ត្រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​ខូច !"
@@ -1336,270 +1577,29 @@ msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវ
 
 #: apt-private/private-install.cc:846
 #, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " បាន​បរាជ័យ ។"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " ធ្វើ​រួច"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។"
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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] ""
+msgid "%s is already the newest version.\n"
+msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
 
-#: apt-private/private-update.cc:101
-msgid "All packages are up to date."
-msgstr ""
+#: apt-private/private-install.cc:894
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
 
-#: 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-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
 
-#: 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:947
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
 
 #: apt-private/private-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1685,8 +1685,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1982,6 +1982,26 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ត្រ %s ឡើយ ។"
+
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថានភាព​មិន​អាចត្រូវបាន​​ញែក ​​ឬ ត្រូវបាន​បើកបានឡើយ​​ ។"
@@ -2076,57 +2096,184 @@ msgstr "ស្រេចចិត្ត"
 msgid "extra"
 msgstr "បន្ថែម"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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/depcache.cc:250
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "បន្ទាត់​ Malformed  %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:490
 #, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​  APT នេះ​ឆបគ្នា​​  ។"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
+
+#: apt-pkg/pkgcachegen.cc:263
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "មិន​អាច​សរសេរ​ទៅ %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2147,35 +2294,35 @@ msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
 msgid "Invalid file format"
 msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1656
+#: apt-pkg/acquire-item.cc:1666
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1708
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/acquire-item.cc:1746
 #, 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:1758
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2183,12 +2330,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2197,91 +2344,17 @@ msgstr ""
 "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ "
 "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/acquire-item.cc:2002
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/acquire-item.cc:2060
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។"
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​  APT នេះ​ឆបគ្នា​​  ។"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
-
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "មិន​អាច​សរសេរ​ទៅ %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​"
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2314,14 +2387,6 @@ msgstr "កំពុង​ទៅ​យក​ឯកសារ %li នៃ %li (ន
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក"
@@ -2370,10 +2435,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
@@ -2467,25 +2535,32 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "កំពុងស្ថាបនា​មែកធាងភាពអាស្រ័យ"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "កំណែ​សាកល្បង​"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "ការបង្កើត​ភាពអាស្រ័យ​"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2497,106 +2572,6 @@ msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1
 msgid "Unable to parse package file %s (2)"
 msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ"
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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 "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 (ប្រភេទ​)"
-
-#: 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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2649,6 +2624,31 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/ko.po b/po/ko.po
index 3d7c36109..d9feb9388 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1109,10 +1109,253 @@ msgstr "연결이 실패했습니다"
 msgid "Internal error"
 msgstr "내부 오류"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "의존성을 바로잡는 중입니다..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " 실패."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "의존성을 바로잡을 수 없습니다"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "업그레이드 집합을 최소화할 수 없습니다"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " 완료"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다."
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습니다!"
@@ -1342,278 +1585,35 @@ msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "%s 패키지를 건너 뜁니다. 설치되지 않았고 업그레이드만 요청합니다.\n"
 
 #: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "%s 패키지를 다시 설치하는 건 불가능합니다. 다운로드할 수 없습니다.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s 패키지는 이미 최신 버전입니다.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "의존성을 바로잡는 중입니다..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " 실패."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "의존성을 바로잡을 수 없습니다"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "업그레이드 집합을 최소화할 수 없습니다"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " 완료"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다."
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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] ""
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s 패키지를 다시 설치하는 건 불가능합니다. 다운로드할 수 없습니다.\n"
 
-#: apt-private/private-update.cc:101
-msgid "All packages are up to date."
-msgstr ""
+#: apt-private/private-install.cc:846
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s 패키지는 이미 최신 버전입니다.\n"
 
-#: apt-private/private-show.cc:156
+#: apt-private/private-install.cc:894
 #, 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] ""
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
+#: apt-private/private-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
 
-#: 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"
-"      않도록 하십시오!"
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
 
 #: apt-private/private-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1698,8 +1698,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1994,6 +1994,27 @@ msgstr "다음의 인증 기록을 찾을 수 없습니다: %s"
 msgid "Hash mismatch for: %s"
 msgstr "다음의 해시가 다릅니다: %s"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다."
+
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 "패키지 목록이나 상태 파일을 파싱할 수 없거나 열 수 없습니다."
@@ -2088,57 +2109,184 @@ msgstr "옵션"
 msgid "extra"
 msgstr "별도"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, 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:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다."
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:576
 #, 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:1211
 #, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "패키지 목록을 읽는 중입니다"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "파일에서 제공하는 것을 모으는 중입니다"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "%s에 쓸 수 없습니다"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2158,35 +2306,35 @@ msgstr "크기가 맞지 않습니다"
 msgid "Invalid file format"
 msgstr "잘못된 작업 %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1656
+#: apt-pkg/acquire-item.cc:1666
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1708
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "다음 키 ID의 공개키가 없습니다:\n"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/acquire-item.cc:1746
 #, 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:1758
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2196,12 +2344,12 @@ msgstr ""
 "예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG 오류: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2210,91 +2358,18 @@ msgstr ""
 "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
 "니다. (아키텍쳐가 빠졌기 때문입니다)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/acquire-item.cc:2002
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/acquire-item.cc:2060
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다."
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "패키지 목록을 읽는 중입니다"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "파일에서 제공하는 것을 모으는 중입니다"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "%s에 쓸 수 없습니다"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다"
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2327,15 +2402,6 @@ msgstr "파일 받아오는 중: %2$li 중 %1$li (%3$s 남았음)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "sources.list에 '소스' URI를 써 넣어야 합니다"
@@ -2386,10 +2452,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"
@@ -2485,25 +2555,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "의존성 트리를 만드는 중입니다"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "후보 버전"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "의존성 만들기"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "상태 정보를 읽는 중입니다"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "상태파일 %s 여는데 실패했습니다"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "임시 상태파일 %s 쓰는데 실패했습니다"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2515,107 +2591,6 @@ msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Release 파일 %s에 섹션이 없습니다"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Release 파일 %s에 Hash 항목이 없습니다"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2670,6 +2645,31 @@ msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "'%s' 패키지에서 설치한 버전을 선택할 수 없습니다. 설치하지 않았습니다."
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Release 파일 %s에 섹션이 없습니다"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Release 파일 %s에 Hash 항목이 없습니다"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다"
+
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/ku.po b/po/ku.po
index 4dbe31fbb..42f20f155 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1022,10 +1022,250 @@ msgstr "Girêdan pêk nehatiye"
 msgid "Internal error"
 msgstr "Çewtiya hundirîn"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Bindestî tên serrastkirin..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " neserketî."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nikare bindestiyan rast kirin"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Temam"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1189,323 +1429,83 @@ msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
 
 #: apt-private/private-install.cc:519
 msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
-
-#: apt-private/private-install.cc:614
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-
-#: apt-private/private-install.cc:638
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-
-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Paketên şikestî"
-
-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr ""
-
-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Paketên tên pêşniyaz kirin:"
-
-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Paketên tên tawsiyê kirin:"
-
-#: apt-private/private-install.cc:825
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:829
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s jixwe guhertoya nûtirîn e.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
-
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Bindestî tên serrastkirin..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " neserketî."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nikare bindestiyan rast kirin"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Temam"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:111
-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:"
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
 
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
+#: apt-private/private-install.cc:612
+msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
+#: apt-private/private-install.cc:614
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
 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
+#: apt-private/private-install.cc:638
 msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
 msgstr ""
 
-#: 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-install.cc:659
+msgid "Broken packages"
+msgstr "Paketên şikestî"
 
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu ji nû ve sazkirî,"
+#: apt-private/private-install.cc:712
+msgid "The following extra packages will be installed:"
+msgstr ""
 
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu hatine nizmkirin."
+#: apt-private/private-install.cc:802
+msgid "Suggested packages:"
+msgstr "Paketên tên pêşniyaz kirin:"
 
-#: 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-install.cc:803
+msgid "Recommended packages:"
+msgstr "Paketên tên tawsiyê kirin:"
 
-#: apt-private/private-output.cc:739
+#: apt-private/private-install.cc:825
 #, c-format
-msgid "%lu not fully installed or removed.\n"
+msgid "Skipping %s, it is already installed and upgrade is not set.\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]"
+#: apt-private/private-install.cc:829
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\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"
+#: apt-private/private-install.cc:841
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-install.cc:846
 #, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
+msgid "%s is already the newest version.\n"
+msgstr "%s jixwe guhertoya nûtirîn e.\n"
 
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
+#: apt-private/private-install.cc:894
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-install.cc:899
 #, 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:101
-msgid "All packages are up to date."
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr ""
 
-#: apt-private/private-show.cc:156
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
 #, 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)"
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 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!"
+#: apt-private/private-install.cc:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
 msgstr ""
 
 #: apt-private/private-download.cc:36
@@ -1588,8 +1588,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1886,6 +1886,26 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum li hev nayên"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
@@ -1979,131 +1999,89 @@ msgstr "opsiyonel"
 msgid "extra"
 msgstr "ekstra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
-#, 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/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Guhartoyên berendam"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Vekirina StateFile %s biserneket"
-
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s ji hev nehate veçirandin"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "nav guherandin biserneket, %s (%s -> %s)"
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Hash Sum li hev nayên"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Mezinahî li hev nayên"
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
+msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1656
-#, 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:1698
-msgid "There is no public key available for the following key IDs:\n"
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid ""
-"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"
-msgstr ""
+msgid "Opening %s"
+msgstr "%s tê vekirin"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "GPG error: %s: %s"
+msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371
 #, 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)"
+msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:416
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
@@ -2179,6 +2157,102 @@ msgstr "Nivîsandin ji bo %s ne pêkane"
 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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "nav guherandin biserneket, %s (%s -> %s)"
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Hash Sum li hev nayên"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Mezinahî li hev nayên"
+
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1650
+#, 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:1666
+#, 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:1708
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1746
+#, 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:1768
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1936
+#, 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:2002
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2211,12 +2285,6 @@ msgstr ""
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2262,9 +2330,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
@@ -2356,25 +2425,31 @@ msgstr ""
 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"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Guhartoyên berendam"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
 msgstr ""
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Vekirina StateFile %s biserneket"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s ji hev nehate veçirandin"
 
 #: apt-pkg/tagfile.cc:140
 #, fuzzy, c-format
@@ -2386,106 +2461,6 @@ msgstr "Pakêt nehate dîtin %s"
 msgid "Unable to parse package file %s (2)"
 msgstr "Pakêt nehate dîtin %s"
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Pakêt nehate dîtin %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-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:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2538,6 +2513,31 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Pakêt nehate dîtin %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Pakêt nehate dîtin %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/lt.po b/po/lt.po
index 42959db62..92ab66e82 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1025,10 +1025,252 @@ msgstr "Prisijungti nepavyko"
 msgid "Internal error"
 msgstr "Vidinė klaida"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Taisomos priklausomybės..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " nepavyko."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nepavyko patenkinti priklausomybių"
+
+#: apt-private/private-cachefile.cc:102
+#, fuzzy
+msgid "Unable to minimize the upgrade set"
+msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Įvykdyta"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1250,282 +1492,40 @@ msgstr ""
 
 #: apt-private/private-install.cc:829
 #, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s ir taip jau yra naujausias.\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Pažymėta versija %s (%s) paketui %s\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Pažymėta versija %s (%s) paketui %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Taisomos priklausomybės..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " nepavyko."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nepavyko patenkinti priklausomybių"
-
-#: apt-private/private-cachefile.cc:102
-#, fuzzy
-msgid "Unable to minimize the upgrade set"
-msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Įvykdyta"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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"
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
+"Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35
+#: apt-private/private-install.cc:841
 #, 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"
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-install.cc:846
 #, 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] ""
+msgid "%s is already the newest version.\n"
+msgstr "%s ir taip jau yra naujausias.\n"
 
-#: apt-private/private-update.cc:101
-msgid "All packages are up to date."
-msgstr ""
+#: apt-private/private-install.cc:894
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Pažymėta versija %s (%s) paketui %s\n"
 
-#: 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-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Pažymėta versija %s (%s) paketui %s\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
 
-#: 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:947
+#, fuzzy, c-format
+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-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1610,8 +1610,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1911,6 +1911,26 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Maišos sumos nesutapimas"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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."
@@ -2006,55 +2026,182 @@ msgstr "nebūtinas"
 msgid "extra"
 msgstr "papildomas"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
-#, 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:169
+#: 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:455
+#: 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/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 "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:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Klaida apdorojant turinį %s"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Skaitomi paketų sąrašai"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nepavyko įrašyti į %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
@@ -2075,35 +2222,35 @@ msgstr "Neatitinka dydžiai"
 msgid "Invalid file format"
 msgstr "Klaidingas veiksmas %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1656
+#: apt-pkg/acquire-item.cc:1666
 #, 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:1698
+#: apt-pkg/acquire-item.cc:1708
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/acquire-item.cc:1746
 #, 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:1758
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2111,102 +2258,29 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG klaida: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, 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:1992
+#: apt-pkg/acquire-item.cc:2002
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/acquire-item.cc:2060
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Klaida apdorojant turinį %s"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Skaitomi paketų sąrašai"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Nepavyko įrašyti į %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr ""
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2239,15 +2313,6 @@ msgstr "Parsiunčiamas %li failas iš %li (liko %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2293,10 +2358,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"
@@ -2387,24 +2456,30 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Konstruojamas priklausomybių medis"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Galimos versijos"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Priklausomybių generavimas"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
+#: 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/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
 msgstr ""
 
 #: apt-pkg/tagfile.cc:140
@@ -2417,106 +2492,6 @@ msgstr ""
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nepavyko atverti DB failo %s: %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Pastaba: pažymimas %s vietoje %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Pastaba: pažymimas %s vietoje %s\n"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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 "Atveriama %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 ""
-
-#: 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:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2569,6 +2544,31 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nepavyko atverti DB failo %s: %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Pastaba: pažymimas %s vietoje %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Pastaba: pažymimas %s vietoje %s\n"
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nepavyko atverti DB failo %s: %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/mr.po b/po/mr.po
index ffc91baf6..8f6df973d 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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 "
@@ -1100,10 +1100,251 @@ msgstr "जोडणी अयशस्वी"
 msgid "Internal error"
 msgstr "अंतर्गत त्रुटी"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr "अयशस्वी/चूकीचे झाले."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे "
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr "झाले"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल."
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "अंतर्गत त्रुटी, तुटलेल्या पॅकेजेस बरोबर  संस्थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!"
@@ -1364,250 +1605,9 @@ msgstr "%s पॅकेज संस्थापित केलेले ना
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr "अयशस्वी/चूकीचे झाले."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे "
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr "झाले"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल."
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! "
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! "
 
 #: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
@@ -1689,8 +1689,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1987,6 +1987,26 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "हॅश बेरीज जुळत नाही"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. "
+
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 "पॅकेजच्या याद्या किंवा संचिकेची स्थिती स्पष्ट होऊ शकत नाही किंवा ती उघडू शकत नाही."
@@ -2081,137 +2101,90 @@ msgstr "एच्छिक"
 msgid "extra"
 msgstr "अधिक"
 
-#: apt-pkg/acquire-worker.cc:116
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. "
-
-#: apt-pkg/acquire-worker.cc:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
-
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."
-
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही"
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "अवलंबित रचना बांधणी करत आहे"
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "कंॅडिडेट आवृत्त्या"
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "अवलंबित/विसंबून असलेले उत्पादन "
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %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:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s StateFile उघडणे असफल"
+#: 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/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल"
+#: 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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "हॅश बेरीज जुळत नाही"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "आकार जुळतनाही"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "%s अवैध क्रिया"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "स्त्रोत सुची %2$s (यूआरआय) मध्ये %1$lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, 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:1656
-#, fuzzy, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-
-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "स्त्रोत सुची %2$s (डिआयएसटी) मध्ये %1$lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "स्त्रोत सुची %2$s (यूआरआय पार्स) मध्ये %1$lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "स्त्रोत सुची %2$s (absolute dist) मध्ये %1$lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid ""
-"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"
-msgstr ""
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "स्त्रोत सुची %2$s (डीआयएसटी पार्स) मध्ये %1$lu वाईट/व्यंग रेषा"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
+msgid "Opening %s"
+msgstr "%s उघडत आहे"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, 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 पॅकेजकरीता संचिका शोधण्यास  समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते "
-"स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) "
+msgid "Line %u too long in source list %s."
+msgstr "%2$s स्त्रोत सुचीमध्ये ओळ %1$u खूप लांब आहे."
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:371
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgid "Malformed line %u in source list %s (type)"
+msgstr "स्त्रोत सुची %2$s (प्रकार) मध्ये %1$u वाईट/व्यंग रेषा"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/"
-"ठिकाण %s."
+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:490
 #, fuzzy, c-format
@@ -2291,6 +2264,107 @@ msgstr "%s मध्ये लिहिण्यास असमर्थ "
 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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "हॅश बेरीज जुळत नाही"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "आकार जुळतनाही"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "%s अवैध क्रिया"
+
+#: apt-pkg/acquire-item.cc:1650
+#, 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:1666
+#, fuzzy, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
+
+#: apt-pkg/acquire-item.cc:1708
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n"
+
+#: apt-pkg/acquire-item.cc:1746
+#, 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:1768
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1936
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"मी %s पॅकेजकरीता संचिका शोधण्यास  समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते "
+"स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) "
+
+#: apt-pkg/acquire-item.cc:2002
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/"
+"ठिकाण %s."
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2323,15 +2397,6 @@ msgstr "%li ची %li(%s राहिलेले) संचिका पुन
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "तुम्ही तुमच्या उगमस्थान यादीत URI घाला"
@@ -2380,10 +2445,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"
@@ -2479,25 +2548,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "अवलंबित रचना बांधणी करत आहे"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "कंॅडिडेट आवृत्त्या"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "अवलंबित/विसंबून असलेले उत्पादन "
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "स्थिती माहिती वाचत आहे"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s StateFile उघडणे असफल"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2509,106 +2584,6 @@ msgstr "%s (1) पॅकेज फाईल पार्स करण्या
 msgid "Unable to parse package file %s (2)"
 msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ"
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/sourcelist.cc:211
-#, c-format
-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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2661,6 +2636,31 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/nb.po b/po/nb.po
index d096e9a69..c801f94ce 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1117,10 +1117,255 @@ msgstr "Forbindelsen mislykkes"
 msgid "Internal error"
 msgstr "Intern feil"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Retter på avhengighetsforhold ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " mislyktes."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Klarer ikke å rette på avhengighetsforholdene"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Klarer ikke å minimere oppgraderingsettet"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Utført"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
@@ -1357,281 +1602,36 @@ msgstr ""
 "Hopper over %s siden den ikke er installert eller kun oppgraderinger er "
 "ønsket.\n"
 
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s er allerede nyeste versjon.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Retter på avhengighetsforhold ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " mislyktes."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Klarer ikke å rette på avhengighetsforholdene"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Klarer ikke å minimere oppgraderingsettet"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Utført"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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-install.cc:841
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n"
 
-#: apt-private/private-update.cc:101
-msgid "All packages are up to date."
-msgstr ""
+#: apt-private/private-install.cc:846
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s er allerede nyeste versjon.\n"
 
-#: apt-private/private-show.cc:156
+#: apt-private/private-install.cc:894
 #, 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] ""
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
+#: apt-private/private-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
 
-#: 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."
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+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-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1716,8 +1716,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2014,6 +2014,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:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Finner ikke metode-driveren %s."
+
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startet ikke korrekt"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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."
@@ -2109,56 +2129,183 @@ msgstr "valgfri"
 msgid "extra"
 msgstr "tillegg"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, 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:257
+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/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:260
+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:263
+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:266
+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:576
 #, 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:1211
 #, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Leser pakkelister"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Samler inn filtilbud"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kan ikke skrive til %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2178,36 +2325,36 @@ msgstr "Feil størrelse"
 msgid "Invalid file format"
 msgstr "Ugyldig operasjon %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1656
+#: apt-pkg/acquire-item.cc:1666
 #, 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:1698
+#: apt-pkg/acquire-item.cc:1708
 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:1736
+#: apt-pkg/acquire-item.cc:1746
 #, 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:1758
+#: apt-pkg/acquire-item.cc:1768
 #, 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:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2217,12 +2364,12 @@ msgstr ""
 "forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-feil: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2231,90 +2378,17 @@ 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:1992
+#: apt-pkg/acquire-item.cc:2002
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/acquire-item.cc:2060
 #, 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Oversiktsfil av typen «%s» støttes ikke"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Klarer ikke finne informasjonom %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Feil oppsto under behandling av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Leser pakkelister"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samler inn filtilbud"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Kan ikke skrive til %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "IO-feil ved lagring av kildekode-lager"
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2347,15 +2421,6 @@ msgstr "Henter fil %li av %li (%s gjenværende)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2407,10 +2472,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"
@@ -2508,25 +2577,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Skaper oversikt over avhengighetsforhold"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versjons-kandidater"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Oppretter avhengighetsforhold"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Leser tilstandsinformasjon"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikke å åpne StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikke å skrive midlertidig StateFile %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2538,106 +2613,6 @@ msgstr "Klarer ikke å fortolke pakkefila %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Klarer ikke å fortolke pakkefila %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Klarer ikke å fortolke Release-fila %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Ingen avsnitt i Release-fila %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ingen sjekksumoppføring i Release-fila %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2697,6 +2672,31 @@ msgstr ""
 "Klarte ikke velge installert versjon fra pakken «%s» siden den ikke er "
 "installert"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Klarer ikke å fortolke Release-fila %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Ingen avsnitt i Release-fila %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Ingen sjekksumoppføring i Release-fila %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ugyldig «Date»-oppføring i Release-fila %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/ne.po b/po/ne.po
index 6743a9bdb..3d9b763cb 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1100,10 +1100,251 @@ msgstr "जडान असफल भयो"
 msgid "Internal error"
 msgstr "आन्तरिक त्रुटि"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "निर्भरताहरू सुधार गरिदैछ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr "असफल भयो ।"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr "काम भयो"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।"
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "आन्तरिक त्रुटि, स्थापना प्याकेजहरुलाई भाँचिएको प्याकेज भनिन्थ्यो!"
@@ -1329,277 +1570,36 @@ msgstr "%s फड्किदैछ, यो पहिल्यै स्था
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
 
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr " %s को पुन: स्थापना सम्भव छैन, यो डाउनलोड हुन सक्दैन ।\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "निर्भरताहरू सुधार गरिदैछ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr "असफल भयो ।"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr "काम भयो"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।"
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-msgid "All packages are up to date."
-msgstr ""
+#: apt-private/private-install.cc:841
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr " %s को पुन: स्थापना सम्भव छैन, यो डाउनलोड हुन सक्दैन ।\n"
 
-#: apt-private/private-show.cc:156
+#: apt-private/private-install.cc:846
 #, 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] ""
+msgid "%s is already the newest version.\n"
+msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
+#: apt-private/private-install.cc:894
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
 
-#: 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:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
 
 #: apt-private/private-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1685,8 +1685,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1984,6 +1984,26 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum मेल भएन"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।"
+
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "विधि %s सही रुपले सुरू हुन सकेन"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 "प्याकेज सूचीहरू वा वस्तुस्थिति फाइल पद वर्णन गर्न वा खोल्न सकिएन ।"
@@ -2078,57 +2098,184 @@ msgstr "वैकल्पिक"
 msgid "extra"
 msgstr "अतिरिक्त"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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/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:490
 #, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:263
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "प्याकेज सूचिहरू पढिदैछ"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr " %s मा लेख्न असक्षम"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2149,35 +2296,35 @@ msgstr "साइज मेल खाएन"
 msgid "Invalid file format"
 msgstr "अवैध सञ्चालन  %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1656
+#: apt-pkg/acquire-item.cc:1666
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1708
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/acquire-item.cc:1746
 #, 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:1758
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2185,12 +2332,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2199,91 +2346,17 @@ msgstr ""
 "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
 "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) "
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/acquire-item.cc:2002
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/acquire-item.cc:2060
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।"
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "प्याकेज सूचिहरू पढिदैछ"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr " %s मा लेख्न असक्षम"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि"
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2316,15 +2389,6 @@ msgstr "%li को %li फाइल पुन:प्राप्त गरिद
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्"
@@ -2373,10 +2437,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
@@ -2470,25 +2538,32 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "निर्भरता ट्री निर्माण गरिदैछ"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "उमेद्वार संस्करणहरू"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "निर्भरता सिर्जना"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "उपलब्ध सूचना गाँभिदैछ"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "%s खोल्न असफल"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "फाइल %s लेख्न असफल भयो"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2500,106 +2575,6 @@ msgstr "प्याकेज फाइल पद वर्णन गर्न 
 msgid "Unable to parse package file %s (2)"
 msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)"
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "द्रष्टब्य, %s को सट्टा  %s चयन भइरहेछ\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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/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 (प्रकार)"
-
-#: 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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2652,6 +2627,31 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "द्रष्टब्य, %s को सट्टा  %s चयन भइरहेछ\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/nl.po b/po/nl.po
index 74e839b78..1d0f9a4e1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@ 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1199,10 +1199,259 @@ msgstr "Verbinding mislukt"
 msgid "Internal error"
 msgstr "Interne fout"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "Bezig met oplijsten"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Vereisten worden gecorrigeerd..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " mislukt."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Kan vereisten niet corrigeren"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Klaar"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interne fout. InstallPackages is aangeroepen met defecte pakketten!"
@@ -1476,259 +1725,10 @@ msgstr ""
 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:129
-msgid "Listing"
-msgstr "Bezig met oplijsten"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Vereisten worden gecorrigeerd..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " mislukt."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Kan vereisten niet corrigeren"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Klaar"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-msgid "All packages are up to date."
-msgstr "Alle pakketten zijn up-to-date."
-
-#: 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-download.cc:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr ""
-"WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden!"
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr ""
+"WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden!"
 
 #: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
@@ -1809,8 +1809,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2114,12 +2114,34 @@ msgstr "Kan geen authenticiteitsrecord vinden voor: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash-som komt niet overeen voor: %s"
 
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"De pakketlijsten of het statusbestand konden of niet ontleed, of niet "
-"geopend worden."
-
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
+
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "Is het pakket %s geïnstalleerd?"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Methode %s startte niet op de juiste manier"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
+"De pakketlijsten of het statusbestand konden of niet ontleed, of niet "
+"geopend worden."
+
 #: apt-pkg/cachefile.cc:98
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
@@ -2210,146 +2232,94 @@ msgstr "optioneel"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: apt-pkg/sourcelist.cc:127
 #, c-format
-msgid "Is the package %s installed?"
-msgstr "Is het pakket %s geïnstalleerd?"
+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:169
+#: 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:455
+#: apt-pkg/sourcelist.cc:173
 #, 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."
+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/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexbestand van type '%s' wordt niet ondersteund"
-
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Boom van vereisten wordt opgebouwd"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidaat-versies"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Genereren van vereisten"
-
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "De statusinformatie wordt gelezen"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"Niet juist gevormde regel %lu in bronlijst %s ([%s] is geen toekenning)"
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:190
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Openen van StateFile %s is mislukt"
+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:256
+#: apt-pkg/sourcelist.cc:193
 #, 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 ([%s] key %s has no value)"
+msgstr ""
+"Niet juist gevormde regel %lu in bronlijst %s ([%s] sleutel %s heeft geen "
+"waarde)"
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "het hernoemen is mislukt, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Hash-som komt niet overeen"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Grootte komt niet overeen"
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
-msgstr "Ongeldig bestandsformaat"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Niet juist gevormde regel %lu in bronlijst %s (URI)"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, 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)"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Niet juist gevormde regel %lu in bronlijst %s (dist)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Kon de hash-som voor '%s' niet vinden in het Release-bestand"
-
-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
-"Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-ID's:\n"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Niet juist gevormde regel %lu in bronlijst %s (URI-verwerking)"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217
 #, 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."
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Niet juist gevormde regel %lu in bronlijst %s (absolute dist)"
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)"
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Niet juist gevormde regel %lu in bronlijst %s (ontleding van dist)"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid ""
-"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"
-msgstr ""
-"Er is een fout opgetreden bij de handtekeningcontrole. De pakketbron is niet "
-"bijgewerkt en de oude indexbestanden zullen worden gebruikt. GPG-fout: %s: "
-"%s\n"
+msgid "Opening %s"
+msgstr "%s wordt geopend"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG-fout: %s: %s"
+msgid "Line %u too long in source list %s."
+msgstr "Regel %u van de bronlijst %s is te lang."
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371
 #, 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 ontbrekende architectuur)"
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Niet juist gevormde regel %u in bronlijst %s (type)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr "Kan geen bron vinden om versie '%s' van '%s' op te halen"
+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/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:416
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
-"pakket %s."
+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:490
 #, c-format
@@ -2433,6 +2403,114 @@ msgstr "Kan niet naar %s schrijven"
 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:241
+msgid "Send request to solver"
+msgstr "Verzoek naar de oplosser sturen"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Instellen op het ontvangen van een oplossing"
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "Externe oplosser faalde zonder passende foutmelding"
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Externe oplosser uitvoeren"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "het hernoemen is mislukt, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Hash-som komt niet overeen"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Grootte komt niet overeen"
+
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
+msgstr "Ongeldig bestandsformaat"
+
+#: apt-pkg/acquire-item.cc:1650
+#, 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:1666
+#, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Kon de hash-som voor '%s' niet vinden in het Release-bestand"
+
+#: apt-pkg/acquire-item.cc:1708
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+"Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-ID's:\n"
+
+#: apt-pkg/acquire-item.cc:1746
+#, 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:1768
+#, 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:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Er is een fout opgetreden bij de handtekeningcontrole. De pakketbron is niet "
+"bijgewerkt en de oude indexbestanden zullen worden gebruikt. GPG-fout: %s: "
+"%s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG-fout: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1936
+#, 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 ontbrekende architectuur)"
+
+#: apt-pkg/acquire-item.cc:2002
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr "Kan geen bron vinden om versie '%s' van '%s' op te halen"
+
+#: apt-pkg/acquire-item.cc:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
+"pakket %s."
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2465,14 +2543,6 @@ msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)"
 msgid "Retrieving file %li of %li"
 msgstr "Bestand %li van %li wordt opgehaald"
 
-#: 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/srcrecords.cc:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2529,10 +2599,13 @@ msgstr ""
 "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"
@@ -2631,25 +2704,31 @@ msgstr ""
 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 "Scenario naar de oplosser sturen"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Boom van vereisten wordt opgebouwd"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Verzoek naar de oplosser sturen"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidaat-versies"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Instellen op het ontvangen van een oplossing"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Genereren van vereisten"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Externe oplosser faalde zonder passende foutmelding"
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Externe oplosser uitvoeren"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Openen van StateFile %s is mislukt"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2661,110 +2740,6 @@ msgstr "Kon pakketbestand %s niet ontleden (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Kon pakketbestand %s niet ontleden (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Kon Release-bestand %s niet ontleden"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Geen secties in Release-bestand %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Geen Hash-vermelding in Release-bestand %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ongeldige 'Valid-Until'-vermelding in Release-bestand %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ongeldige 'Date'-vermelding in Release-bestand %s"
-
-#: 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/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Niet juist gevormde 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 "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 ""
-"Niet juist gevormde 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 ""
-"Niet juist gevormde 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 ""
-"Niet juist gevormde 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 "Niet juist gevormde regel %lu in bronlijst %s (URI)"
-
-#: 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/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/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Niet juist gevormde regel %lu in bronlijst %s (absolute dist)"
-
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2826,6 +2801,31 @@ msgstr ""
 "Kan de geïnstalleerde versie van het pakket %s niet selecteren omdat het "
 "niet geïnstalleerd is"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Kon Release-bestand %s niet ontleden"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Geen secties in Release-bestand %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Geen Hash-vermelding in Release-bestand %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ongeldige 'Valid-Until'-vermelding in Release-bestand %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ongeldige 'Date'-vermelding in Release-bestand %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/nn.po b/po/nn.po
index 070feb567..2e8bda035 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1110,10 +1110,253 @@ msgstr "Sambandet mislukkast"
 msgid "Internal error"
 msgstr "Intern feil"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Rettar p krav ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " mislukkast."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Klarte ikkje retta p krav"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Klarte ikkje minimera oppgraderingsmengda"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Ferdig"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1354,269 +1597,26 @@ msgstr "%s kan ikkje installerast p
 msgid "%s is already the newest version.\n"
 msgstr "Den nyaste versjonen av %s er installert fr fr.\n"
 
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Vald versjon %s (%s) for %s\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Vald versjon %s (%s) for %s\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Rettar p krav ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " mislukkast."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Klarte ikkje retta p krav"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Klarte ikkje minimera oppgraderingsmengda"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Ferdig"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-msgid "All packages are up to date."
-msgstr ""
+#: apt-private/private-install.cc:894
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Vald versjon %s (%s) for %s\n"
 
-#: 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-install.cc:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Vald versjon %s (%s) for %s\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
 
-#: 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:947
+#, fuzzy, c-format
+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-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1701,8 +1701,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1998,6 +1998,29 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Feil MD5-sum"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Finn ikkje metodedrivaren %s."
+
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s starta ikkje rett"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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."
@@ -2093,60 +2116,184 @@ msgstr "valfri"
 msgid "extra"
 msgstr "tillegg"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
-#, 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:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Feil ved behandling av %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:257
+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:260
+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:263
+#, 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:266
+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:576
+#, 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:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Klarte ikkje f status p kjeldepakkelista %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Les pakkelister"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Samlar inn filtilbod"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Klarte ikkje skriva til %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2167,35 +2314,35 @@ msgstr "Feil storleik"
 msgid "Invalid file format"
 msgstr "Ugyldig operasjon %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1656
+#: apt-pkg/acquire-item.cc:1666
 #, 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:1698
+#: apt-pkg/acquire-item.cc:1708
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/acquire-item.cc:1746
 #, 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:1758
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2203,12 +2350,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2217,92 +2364,18 @@ msgstr ""
 "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv "
 "(fordi arkitekturen manglar)."
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/acquire-item.cc:2002
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/acquire-item.cc:2060
 #, 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Feil ved behandling av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-#, 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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Klarte ikkje f status p kjeldepakkelista %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Les pakkelister"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samlar inn filtilbod"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Klarte ikkje skriva til %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "IU-feil ved lagring av kjeldelager"
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2335,15 +2408,6 @@ msgstr ""
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Du m leggja nokre kjelde-URI-ar i fila sources.list."
@@ -2393,10 +2457,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"
@@ -2490,25 +2558,32 @@ 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Byggjer kravtre"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidatversjonar"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Genererer kravforhold"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikkje opna %s"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikkje skriva fila %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2520,106 +2595,6 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Klarte ikkje tolka pakkefila %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Klarte ikkje tolka pakkefila %s (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Merk, vel %s i staden for %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ugyldig linje i avleiingsfila: %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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 "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"
-
-#: 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/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"
-
 #: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2672,6 +2647,31 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Klarte ikkje tolka pakkefila %s (1)"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Merk, vel %s i staden for %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ugyldig linje i avleiingsfila: %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Klarte ikkje tolka pakkefila %s (1)"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/pl.po b/po/pl.po
index 32173ad87..a50e22b12 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1161,10 +1161,258 @@ msgstr "Połączenie nie powiodło się"
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Naprawianie zależności..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " nie udało się."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nie udało się naprawić zależności"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nie udało się zminimalizować zbioru aktualizacji"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Gotowe"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Błąd wewnętrzny, użyto InstallPackages z uszkodzonymi pakietami!"
@@ -1450,257 +1698,9 @@ 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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Naprawianie zależności..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " nie udało się."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nie udało się naprawić zależności"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nie udało się zminimalizować zbioru aktualizacji"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Gotowe"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!"
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!"
 
 #: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
@@ -1784,8 +1784,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2084,13 +2084,33 @@ msgstr "Nie udało się znaleźć wpisu uwierzytelnienia dla: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Błędna suma kontrolna dla: %s"
 
-#: 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."
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Nie udało się odnaleźć sterownika metody %s."
 
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "Należy uruchomić apt-get update aby naprawić te problemy."
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nie uruchomiła się poprawnie"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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."
+
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Należy uruchomić apt-get update aby naprawić te problemy."
 
 #: apt-pkg/cachefile.cc:116
 msgid "The list of sources could not be read."
@@ -2177,142 +2197,92 @@ msgstr "opcjonalny"
 msgid "extra"
 msgstr "dodatkowy"
 
-#: apt-pkg/acquire-worker.cc:116
-#, 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:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nie uruchomiła się poprawnie"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandydujące wersje"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generowanie zależności"
-
-#: 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: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/depcache.cc:250
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nie udało się otworzyć pliku stanu %s"
+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/depcache.cc:256
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
+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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "nie udało się zmienić nazwy, %s (%s -> %s)"
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Błędna suma kontrolna"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Błędny rozmiar"
+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/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Nieprawidłowa operacja %s"
+#: 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/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release "
-"(nieprawidłowy wpis sources.list lub nieprawidłowy plik)"
+"Nieprawidłowa linia %lu w liście źródeł %s ([%s] klucz %s nie ma wartości)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:206
 #, 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"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)"
 
-#: apt-pkg/acquire-item.cc:1698
-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/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/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-"Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego "
-"repozytorium nie będą wykonywane."
+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/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)"
+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/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid ""
-"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"
-msgstr ""
-"Podczas weryfikacji podpisu wystąpił błąd. Nie zaktualizowano repozytorium i "
-"w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n"
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "Błąd GPG: %s: %s"
+msgid "Opening %s"
+msgstr "Otwieranie %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba "
-"będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)."
+msgid "Line %u too long in source list %s."
+msgstr "Linia %u w liście źródeł %s jest zbyt długa."
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:371
 #, 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\""
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:375
 #, 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."
+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:490
 #, fuzzy, c-format
@@ -2388,6 +2358,114 @@ msgstr "Nie udało się pisać do %s"
 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:241
+msgid "Send request to solver"
+msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Przygotowywanie na otrzymanie rozwiązania"
+
+#: apt-pkg/edsp.cc:327
+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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "nie udało się zmienić nazwy, %s (%s -> %s)"
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Błędna suma kontrolna"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Błędny rozmiar"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Nieprawidłowa operacja %s"
+
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+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:1666
+#, 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:1708
+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:1746
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+"Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego "
+"repozytorium nie będą wykonywane."
+
+#: apt-pkg/acquire-item.cc:1768
+#, 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:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Podczas weryfikacji podpisu wystąpił błąd. Nie zaktualizowano repozytorium i "
+"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:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Błąd GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1936
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba "
+"będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)."
+
+#: apt-pkg/acquire-item.cc:2002
+#, 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:2060
+#, 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/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2420,14 +2498,6 @@ msgstr "Pobieranie pliku %li z %li (pozostało %s)"
 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: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"
@@ -2482,10 +2552,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"
@@ -2584,27 +2657,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Budowanie drzewa zależności"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandydujące wersje"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Przygotowywanie na otrzymanie rozwiązania"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generowanie zależności"
 
-#: apt-pkg/edsp.cc:327
-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/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Odczyt informacji o stanie"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nie udało się otworzyć pliku stanu %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2616,108 +2693,6 @@ msgstr "Nie udało się zanalizować pliku pakietu %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Nie udało się zanalizować pliku pakietu %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nie udało się przeanalizować pliku Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Brak sekcji w pliku Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Brak wpisu Hash w pliku Release %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2782,6 +2757,31 @@ msgstr ""
 "Nie udało się wybrać zainstalowanej wersji z pakietu %s, ponieważ nie jest "
 "zainstalowany"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nie udało się przeanalizować pliku Release %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Brak sekcji w pliku Release %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Brak wpisu Hash w pliku Release %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nieprawidłowy wpis Date w pliku Release %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/pt.po b/po/pt.po
index 8e21e97ef..609a0e00f 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1151,10 +1151,255 @@ msgstr "A ligação falhou"
 msgid "Internal error"
 msgstr "Erro interno"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "A corrigir dependências..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " falhou."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Não foi possível corrigir dependências"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Não foi possível minimizar o conjunto de actualizações"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Feito"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
@@ -1418,255 +1663,10 @@ msgstr ""
 "O pacote '%s' não está instalado, por isso não será removido. Queria dizer "
 "'%s'?\n"
 
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "O pacote '%s' não está instalado, por isso não será removido\n"
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "A corrigir dependências..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " falhou."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Não foi possível corrigir dependências"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Não foi possível minimizar o conjunto de actualizações"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Feito"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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-install.cc:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "O pacote '%s' não está instalado, por isso não será removido\n"
 
 #: apt-private/private-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1751,8 +1751,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2055,6 +2055,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:116
+#, 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:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Método %s não iniciou correctamente"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
@@ -2150,148 +2171,93 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
-#, 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:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Método %s não iniciou correctamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versões candidatas"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Geração de dependências"
-
-#: 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: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/depcache.cc:250
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Falhou abrir o StateFile %s"
+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/depcache.cc:256
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falha escrever ficheiro temporário StateFile %s"
+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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "falhou renomear, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Código de verificação hash não coincide"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Tamanho incorrecto"
+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/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Operação %s inválida"
+#: 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/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada "
-"errada em sources.list ou ficheiro malformado)"
+"Linha mal formada %lu na lista de fontes %s ([%s] chave %s não tem valor)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:206
 #, 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"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Linha mal formada %lu na lista de fontes %s (URI)"
 
-#: apt-pkg/acquire-item.cc:1698
-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/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/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-"O ficheiro Release para %s está expirado (inválido desde %s). Não serão "
-"aplicadas as actualizações para este repositório."
+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/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)"
+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/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid ""
-"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"
-msgstr ""
-"Ocorreu um erro durante a verificação da assinatura. O repositório não está "
-"actualizado e serão utilizados os ficheiros anteriores de índice. Erro do "
-"GPG: %s: %s\n"
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Linha mal formada %lu na lista de fontes %s (dist parse)"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "Erro GPG: %s: %s"
+msgid "Opening %s"
+msgstr "A abrir %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"Não foi possível localizar um ficheiro para o pacote %s. Isto pode "
-"significar que você precisa corrigir manualmente este pacote. (devido a "
-"arquitectura em falta)"
+msgid "Line %u too long in source list %s."
+msgstr "Linha %u é demasiado longa na lista de fontes %s."
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:371
 #, 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'"
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Linha mal formada %u na lista de fontes %s (tipo)"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
-"para o pacote %s."
+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:490
 #, fuzzy, c-format
@@ -2333,44 +2299,155 @@ 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:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: apt-pkg/pkgcachegen.cc:263
+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:266
+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:576
+#, 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:1211
+#, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "A ler as listas de pacotes"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "A obter File Provides"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Não conseguiu escrever para %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr "Enviar pedido para resolvedor"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Preparar para receber solução"
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Executar resolvedor externo"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "falhou renomear, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Código de verificação hash não coincide"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Tamanho incorrecto"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Operação %s inválida"
+
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
 msgstr ""
-"Uau, você excedeu o número de descrições que este APT é capaz de suportar."
+"Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada "
+"errada em sources.list ou ficheiro malformado)"
 
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-item.cc:1666
+#, 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:1708
+msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
-"Uau, você excedeu o número de dependências que este APT é capaz de suportar."
+"Não existe qualquer chave pública disponível para as seguintes IDs de "
+"chave:\n"
 
-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/acquire-item.cc:1746
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
 msgstr ""
-"O pacote %s %s não foi encontrado ao processar as dependências de ficheiros"
+"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/pkgcachegen.cc:1211
+#: apt-pkg/acquire-item.cc:1768
 #, 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"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)"
 
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "A ler as listas de pacotes"
+#: apt-pkg/acquire-item.cc:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Ocorreu um erro durante a verificação da assinatura. O repositório não está "
+"actualizado e serão utilizados os ficheiros anteriores de índice. Erro do "
+"GPG: %s: %s\n"
 
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "A obter File Provides"
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Erro GPG: %s: %s"
 
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/acquire-item.cc:1936
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Não conseguiu escrever para %s"
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Não foi possível localizar um ficheiro para o pacote %s. Isto pode "
+"significar que você precisa corrigir manualmente este pacote. (devido a "
+"arquitectura em falta)"
 
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Erro de I/O ao gravar a cache de código fonte"
+#: apt-pkg/acquire-item.cc:2002
+#, 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:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
+"para o pacote %s."
 
 #: apt-pkg/vendorlist.cc:85
 #, c-format
@@ -2404,14 +2481,6 @@ msgstr "A obter o ficheiro %li de %li (%s restantes)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
@@ -2465,10 +2534,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"
@@ -2569,25 +2641,31 @@ 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "A construir árvore de dependências"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Enviar pedido para resolvedor"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versões candidatas"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Preparar para receber solução"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Geração de dependências"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Executar resolvedor externo"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Falhou abrir o StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha escrever ficheiro temporário StateFile %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2599,109 +2677,6 @@ msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
 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:78
-#, 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:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Nenhuma secção, no ficheiro Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Nenhuma entrada hash no ficheiro Release %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2763,6 +2738,31 @@ msgstr ""
 "Não é possível seleccionar a versão instalada do pacote %s pois não está "
 "instalado"
 
+#: apt-pkg/indexrecords.cc:78
+#, 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:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Nenhuma secção, no ficheiro Release %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Nenhuma entrada hash no ficheiro Release %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Entrada, 'Date', inválida no ficheiro Release %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f50171edc..9a152b762 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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."
@@ -1124,10 +1124,252 @@ msgstr "Conexão falhou"
 msgid "Internal error"
 msgstr "Erro interno"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Corrigindo dependências..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " falhou."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Impossível corrigir dependências"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossível minimizar o conjunto de atualizações"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Pronto"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!"
@@ -1395,251 +1637,9 @@ 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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Corrigindo dependências..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " falhou."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Impossível corrigir dependências"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossível minimizar o conjunto de atualizações"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Pronto"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!"
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!"
 
 #: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
@@ -1720,8 +1720,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2025,6 +2025,27 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum incorreto"
 
+#: apt-pkg/acquire-worker.cc:116
+#, 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:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Método %s não iniciou corretamente"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
@@ -2121,139 +2142,95 @@ msgstr "opcional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
-#, 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:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Método %s não iniciou corretamente"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%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/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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versões candidatas"
+#: 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/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Geração de dependência"
+#: 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/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: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/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
+#: 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/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
+#: 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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "renomeação falhou, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Hash Sum incorreto"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Tamanho incorreto"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Operação %s inválida"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, 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:1656
-#, 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:1698
-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"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
+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/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+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/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid ""
-"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"
+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)"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
+msgid "Opening %s"
+msgstr "Abrindo %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"Não foi possível localizar um arquivo para o pacote %s. Isto pode significar "
-"que você precisa consertar manualmente este pacote. (devido a arquitetura "
-"não especificada)."
+msgid "Line %u too long in source list %s."
+msgstr "Linha %u muito longa na lista de fontes %s."
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:371
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
-"\" para o pacote %s."
+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:490
 #, fuzzy, c-format
@@ -2334,6 +2311,108 @@ msgstr "Impossível escrever para %s"
 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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "renomeação falhou, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Hash Sum incorreto"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Tamanho incorreto"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Operação %s inválida"
+
+#: apt-pkg/acquire-item.cc:1650
+#, 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:1666
+#, 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:1708
+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:1746
+#, 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:1768
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1936
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Não foi possível localizar um arquivo para o pacote %s. Isto pode significar "
+"que você precisa consertar manualmente este pacote. (devido a arquitetura "
+"não especificada)."
+
+#: apt-pkg/acquire-item.cc:2002
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
+"\" para o pacote %s."
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2366,15 +2445,6 @@ msgstr "Obtendo o arquivo %li de %li (%s restantes)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Você deve colocar algumas URIs 'source' em seu sources.list"
@@ -2424,10 +2494,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"
@@ -2524,25 +2598,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construindo árvore de dependências"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versões candidatas"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Geração de dependência"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2554,111 +2634,6 @@ msgstr "Impossível analisar arquivo de pacote %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Impossível analisar arquivo de pacote %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Impossível analisar arquivo de pacote %s (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Nota, selecionando %s ao invés de %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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 ""
-"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Abrindo %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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2711,6 +2686,31 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Impossível analisar arquivo de pacote %s (1)"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Nota, selecionando %s ao invés de %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Impossível analisar arquivo de pacote %s (1)"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/ro.po b/po/ro.po
index 522ba61f3..f21a947f5 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1125,10 +1125,254 @@ msgstr "Conectare eșuată"
 msgid "Internal error"
 msgstr "Eroare internă"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Corectez dependențele..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " eșec."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Nu s-au putut corecta dependențele"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Terminat"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
@@ -1400,253 +1644,9 @@ 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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Corectez dependențele..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " eșec."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Nu s-au putut corecta dependențele"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Terminat"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
 
 #: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
@@ -1727,8 +1727,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2031,18 +2031,39 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Nepotrivire la suma de căutare"
 
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"Listele de pachete sau fișierul de stare n-au putut fi analizate sau "
-"deschise."
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Metoda driver %s nu poate fi găsită."
 
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"Ați putea vrea să porniți 'apt-get update' pentru a corecta aceste probleme."
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
 
-#: apt-pkg/cachefile.cc:116
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nu s-a lansat corect"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
+"Listele de pachete sau fișierul de stare n-au putut fi analizate sau "
+"deschise."
+
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr ""
+"Ați putea vrea să porniți 'apt-get update' pentru a corecta aceste probleme."
+
+#: apt-pkg/cachefile.cc:116
 msgid "The list of sources could not be read."
 msgstr "Lista surselor nu poate fi citită."
 
@@ -2128,140 +2149,90 @@ msgstr "opțional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
-#, 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:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nu s-a lansat corect"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%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/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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versiuni candidat"
+#: 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/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generare dependențe"
+#: 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/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: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/depcache.cc:250
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Eșec la deschiderea fișierului de stare %s"
+#: 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/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Eșec la scrierea fișierului temporar de stare %s"
+#: 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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "redenumire eșuată, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Nepotrivire la suma de căutare"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Nepotrivire dimensiune"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Operațiune invalidă %s"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Linie greșită %lu în lista sursă %s (URI)"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, 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:1656
-#, 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:1698
-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"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Linie greșită %lu în lista sursă %s (dist)"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid ""
-"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"
-msgstr ""
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
+msgid "Opening %s"
+msgstr "Deschidere %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna "
-"că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)"
+msgid "Line %u too long in source list %s."
+msgstr "Linia %u prea lungă în lista sursă %s."
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:371
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Linie greșită %u în lista sursă %s (tip)"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la "
-"pachetul %s."
+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:490
 #, fuzzy, c-format
@@ -2342,6 +2313,109 @@ msgstr "Nu s-a putut scrie în %s"
 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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "redenumire eșuată, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Nepotrivire la suma de căutare"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Nepotrivire dimensiune"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Operațiune invalidă %s"
+
+#: apt-pkg/acquire-item.cc:1650
+#, 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:1666
+#, 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:1708
+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:1746
+#, 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:1768
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1936
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna "
+"că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)"
+
+#: apt-pkg/acquire-item.cc:2002
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la "
+"pachetul %s."
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2374,15 +2448,6 @@ msgstr "Se descarcă fișierul %li din %li (%s rămas)"
 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: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"
@@ -2432,10 +2497,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"
@@ -2532,25 +2601,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Se construiește arborele de dependență"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versiuni candidat"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generare dependențe"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Eșec la deschiderea fișierului de stare %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Eșec la scrierea fișierului temporar de stare %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2562,106 +2637,6 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Nu s-a putut analiza fișierul pachet %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, 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:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Notă, se selectează %s în locul lui %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2714,6 +2689,31 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, 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:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Notă, se selectează %s în locul lui %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index 38276c0c2..29d5be39c 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1158,10 +1158,261 @@ msgstr "Соединение разорвано"
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Исправление зависимостей…"
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " не удалось."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Невозможно скорректировать зависимости"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Невозможно минимизировать набор обновлений"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Готово"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
+"f install»."
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1440,257 +1691,6 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Пакет «%s» не установлен, поэтому не может быть удалён\n"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Исправление зависимостей…"
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " не удалось."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Невозможно скорректировать зависимости"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Невозможно минимизировать набор обновлений"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Готово"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
-"f install»."
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:36
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!"
@@ -1774,8 +1774,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2075,13 +2075,33 @@ msgstr "Не удалось найти аутентификационную за
 msgid "Hash mismatch for: %s"
 msgstr "Не совпадает хеш сумма для: %s"
 
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Списки пакетов или файл состояния не могут быть открыты или прочитаны."
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Драйвер для метода %s не найден."
 
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "Вы можете запустить «apt-get update» для исправления этих ошибок"
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Метод %s запустился не корректно"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 "Списки пакетов или файл состояния не могут быть открыты или прочитаны."
+
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Вы можете запустить «apt-get update» для исправления этих ошибок"
 
 #: apt-pkg/cachefile.cc:116
 msgid "The list of sources could not be read."
@@ -2168,141 +2188,94 @@ msgstr "необязательный"
 msgid "extra"
 msgstr "дополнительный"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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"
-msgstr "Не поддерживается индексный файл типа «%s»"
-
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Построение дерева зависимостей"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Версии-кандидаты"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Генерирование зависимостей"
-
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Чтение информации о состоянии"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Искажённая строка %lu в списке источников %s (([%s] не назначаем)"
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:190
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Не удалось открыть StateFile %s"
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Искажённая строка %lu в списке источников %s ([%s] не имеет ключа)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Не удалось записать временный StateFile %s"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Искажённая строка %lu в списке источников %s (([%s] ключ %s не имеет "
+"значения)"
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "переименовать не удалось, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Хеш сумма не совпадает"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Не совпадает размер"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Неверная операция %s"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
-"Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись "
-"в sources.list или файл)"
+"Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Невозможно найти хеш-сумму «%s» в файле Release"
-
-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "Недоступен открытый ключ для следующих ID ключей:\n"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-"Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого "
-"репозитория производиться не будет."
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Искажённая строка %lu в списке источников %s (absolute dist)"
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)"
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Искажённая строка %lu в списке источников %s (dist parse)"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid ""
-"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"
-msgstr ""
-"Произошла ошибка при проверке подписи. Репозиторий не обновлён и будут "
-"использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n"
+msgid "Opening %s"
+msgstr "Открытие %s"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "Ошибка GPG: %s: %s"
+msgid "Line %u too long in source list %s."
+msgstr "Строка %u в списке источников %s слишком длинна."
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371
 #, 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)"
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Искажённая строка %u в списке источников %s (тип)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»"
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
 
-#: apt-pkg/acquire-item.cc:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %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:490
 #, fuzzy, c-format
@@ -2383,6 +2356,111 @@ msgstr "Невозможно записать в %s"
 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:241
+msgid "Send request to solver"
+msgstr "Отправка запроса решателю"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Подготовка к приёму решения"
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке"
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Запустить внешний решатель"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "переименовать не удалось, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Хеш сумма не совпадает"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Не совпадает размер"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Неверная операция %s"
+
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+"Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись "
+"в sources.list или файл)"
+
+#: apt-pkg/acquire-item.cc:1666
+#, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Невозможно найти хеш-сумму «%s» в файле Release"
+
+#: apt-pkg/acquire-item.cc:1708
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "Недоступен открытый ключ для следующих ID ключей:\n"
+
+#: apt-pkg/acquire-item.cc:1746
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+"Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого "
+"репозитория производиться не будет."
+
+#: apt-pkg/acquire-item.cc:1768
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)"
+
+#: apt-pkg/acquire-item.cc:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Произошла ошибка при проверке подписи. Репозиторий не обновлён и будут "
+"использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Ошибка GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1936
+#, 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:2002
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»"
+
+#: apt-pkg/acquire-item.cc:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2415,14 +2493,6 @@ msgstr "Скачивается файл %li из %li (осталось %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Вы должны заполнить sources.list, поместив туда URI источников пакетов"
@@ -2477,10 +2547,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"
@@ -2578,25 +2651,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Построение дерева зависимостей"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Отправка запроса решателю"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Версии-кандидаты"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Подготовка к приёму решения"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Генерирование зависимостей"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Чтение информации о состоянии"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Запустить внешний решатель"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Не удалось открыть StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Не удалось записать временный StateFile %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2608,110 +2687,6 @@ msgstr "Невозможно разобрать содержимое пакет
 msgid "Unable to parse package file %s (2)"
 msgstr "Невозможно разобрать содержимое пакета %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Невозможно разобрать содержимое файла Release (%s)"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Отсутствуют разделы в файле Release (%s)"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Отсутствуют элементы Hash в файле Release (%s)"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Неправильный элемент «Valid-Until» в файле Release %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2773,6 +2748,31 @@ msgstr ""
 "Не удалось выбрать установленную версию из пакета %s, так как он не "
 "установлен"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Невозможно разобрать содержимое файла Release (%s)"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Отсутствуют разделы в файле Release (%s)"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Отсутствуют элементы Hash в файле Release (%s)"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Неправильный элемент «Valid-Until» в файле Release %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Неправильный элемент «Date» в файле Release %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/sk.po b/po/sk.po
index 4c40d4f2d..da5d2be60 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1138,10 +1138,258 @@ msgstr "Spojenie zlyhalo"
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Opravujú sa závislosti..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " zlyhalo."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Závislosti sa nedajú opraviť"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Sada na aktualizáciu sa nedá minimalizovať"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Hotovo"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!"
@@ -1389,281 +1637,33 @@ msgstr ""
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n"
 
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s je už najnovšej verzie.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Vybraná verzia „%s“ (%s) pre „%s“\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Vybraná verzia „%s“ (%s) pre „%s“ kvôli „%s“\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
-"Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť. Mali ste na mysli "
-"„%s“?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť\n"
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Opravujú sa závislosti..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " zlyhalo."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Závislosti sa nedajú opraviť"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Sada na aktualizáciu sa nedá minimalizovať"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Hotovo"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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-install.cc:846
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s je už najnovšej verzie.\n"
 
-#: apt-private/private-update.cc:101
-msgid "All packages are up to date."
-msgstr ""
+#: apt-private/private-install.cc:894
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Vybraná verzia „%s“ (%s) pre „%s“\n"
 
-#: apt-private/private-show.cc:156
+#: apt-private/private-install.cc:899
 #, 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] ""
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Vybraná verzia „%s“ (%s) pre „%s“ kvôli „%s“\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
+"Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť. Mali ste na mysli "
+"„%s“?\n"
 
-#: 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:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť\n"
 
 #: apt-private/private-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1748,8 +1748,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2045,6 +2045,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:116
+#, 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:118
+#, 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:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Spôsob %s nebol správne spustený"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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ť."
@@ -2138,56 +2158,186 @@ msgstr "voliteľný"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, 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:257
+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:260
+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:263
+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:266
+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:576
 #, 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:1211
 #, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Načítavajú sa zoznamy balíkov"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Collecting File poskytuje"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Do %s sa nedá zapisovať"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr "Poslať požiadavku riešiteľovi"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Pripraviť sa na prijatie riešenia"
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Spustiť externého riešiteľa"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2207,7 +2357,7 @@ msgstr "Veľkosti sa nezhodujú"
 msgid "Invalid file format"
 msgstr "Neplatná operácia %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2216,16 +2366,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:1656
+#: apt-pkg/acquire-item.cc:1666
 #, 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:1698
+#: apt-pkg/acquire-item.cc:1708
 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:1736
+#: apt-pkg/acquire-item.cc:1746
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2234,12 +2384,12 @@ 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:1758
+#: apt-pkg/acquire-item.cc:1768
 #, 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:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2249,12 +2399,12 @@ 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:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Chyba GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2263,92 +2413,17 @@ 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:1992
+#: apt-pkg/acquire-item.cc:2002
 #, 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:2050
+#: apt-pkg/acquire-item.cc:2060
 #, 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Indexový súbor typu „%s“ nie je podporovaný"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nie je možné vykonať stat %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Načítavajú sa zoznamy balíkov"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Collecting File poskytuje"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Do %s sa nedá zapisovať"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2381,14 +2456,6 @@ msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI"
@@ -2441,10 +2508,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"
@@ -2541,25 +2611,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Vytvára sa strom závislostí"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Poslať požiadavku riešiteľovi"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidátske verzie"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Pripraviť sa na prijatie riešenia"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generovanie závislostí"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Spustiť externého riešiteľa"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nie je možné otvoriť StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie je možné zapísať dočasný StateFile %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2571,107 +2647,6 @@ msgstr "Súbor %s sa nedá spracovať (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Súbor %s sa nedá spracovať (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nedá spracovať súbor Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Žiadne sekcie v Release súbore %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, 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:130
-#, 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:149
-#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2731,6 +2706,31 @@ msgstr ""
 "Nie je možné vybrať nainštalovanú verziu z balíka „%s“, pretože nie je "
 "nainštalovaný"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nedá spracovať súbor Release %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Žiadne sekcie v Release súbore %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, 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:130
+#, 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:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Chýba položka „Date“ v súbore Release %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/sl.po b/po/sl.po
index 20d2db317..223becb66 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1134,10 +1134,261 @@ msgstr "Povezava ni uspela"
 msgid "Internal error"
 msgstr "Notranja napaka"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Popravljanje odvisnosti ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " spodletelo."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ni mogoče popraviti odvisnosti"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Opravljeno"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!"
@@ -1415,257 +1666,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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Popravljanje odvisnosti ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " spodletelo."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Ni mogoče popraviti odvisnosti"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Opravljeno"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:36
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "POZOR: Naslednjih paketov ni bilo mogoče overiti!"
@@ -1749,8 +1749,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2049,13 +2049,33 @@ msgstr "Ni mogoče najti zapisa overitve za: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Neujemanje razpršila za: %s"
 
-#: 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."
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Gonilnika načinov %s ni mogoče najti."
 
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "Za odpravljanje težav poskusite zagnati apt-get update."
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Način %s se ni začel pravilno"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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."
+
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Za odpravljanje težav poskusite zagnati apt-get update."
 
 #: apt-pkg/cachefile.cc:116
 msgid "The list of sources could not be read."
@@ -2142,143 +2162,96 @@ msgstr "izbirno"
 msgid "extra"
 msgstr "dodatno"
 
-#: apt-pkg/acquire-worker.cc:116
-#, 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:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Način %s se ni začel pravilno"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Različice kandidatov"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Ustvarjanje odvisnosti"
-
-#: 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: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/depcache.cc:250
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Odpiranje DatotekeStanja %s je spodletelo"
+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/depcache.cc:256
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Pisanje začasne DatotekeStanja %s je spodletelo"
+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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "preimenovanje je spodletelo, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Neujemanje vsote razpršil"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Neujemanje velikosti"
+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/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Neveljavno opravilo %s"
+#: 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/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"Ni mogoče najti pričakovanega vnosa '%s' v datoteki Release (napačen vnos "
-"sources.list ali slabo oblikovana datoteka)"
+"Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] ključ %s nima "
+"vrednosti)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:206
 #, 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"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)"
 
-#: apt-pkg/acquire-item.cc:1698
-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/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/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-"Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to "
-"skladišče ne bo uveljavljena."
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)"
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+"Slabo oblikovana vrstica %lu v seznamu virov %s (absolutna distribucija)"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid ""
-"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"
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
-"Med preverjanjem podpisa je prišlo do napake. Skladišče ni bilo posodobljeno "
-"zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n"
+"Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev distribucije)"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "Napaka GPG: %s: %s"
+msgid "Opening %s"
+msgstr "Odpiranje %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, 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 ""
-"Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno "
-"popraviti ta paket (zaradi manjkajočega arhiva)."
+msgid "Line %u too long in source list %s."
+msgstr "Vrstica %u v seznamu virov %s je predolga."
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:371
 #, 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'"
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket "
-"%s."
+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:490
 #, fuzzy, c-format
@@ -2353,6 +2326,113 @@ msgstr "Ni mogoče pisati na %s"
 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:241
+msgid "Send request to solver"
+msgstr "Pošlji zahtevo reševalniku"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Priprava za rešitev prejemanja"
+
+#: apt-pkg/edsp.cc:327
+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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Izvedi zunanji reševalnik"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "preimenovanje je spodletelo, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Neujemanje vsote razpršil"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Neujemanje velikosti"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Neveljavno opravilo %s"
+
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+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:1666
+#, 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:1708
+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:1746
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+"Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to "
+"skladišče ne bo uveljavljena."
+
+#: apt-pkg/acquire-item.cc:1768
+#, 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:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Med preverjanjem podpisa je prišlo do napake. Skladišče ni bilo posodobljeno "
+"zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Napaka GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1936
+#, 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 ""
+"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:2002
+#, 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:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket "
+"%s."
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2385,14 +2465,6 @@ msgstr "Pridobivanje datoteke %li od %li (%s preostalo)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "V sources.list morate vstaviti URI-je z viri"
@@ -2445,10 +2517,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"
@@ -2545,25 +2620,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Gradnja drevesa odvisnosti"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Pošlji zahtevo reševalniku"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Različice kandidatov"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Priprava za rešitev prejemanja"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Ustvarjanje odvisnosti"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah"
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Izvedi zunanji reševalnik"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Odpiranje DatotekeStanja %s je spodletelo"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Pisanje začasne DatotekeStanja %s je spodletelo"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2575,112 +2656,6 @@ msgstr "Ni mogoče razčleniti datoteke paketa %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Ni mogoče razčleniti datoteke paketa %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ni mogoče razčleniti Release datoteke %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Ni izbir v Release datoteki %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ni vnosa razpršila v Release datoteki %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2737,6 +2712,31 @@ msgstr "Ni mogoče izbrati različice kandidata iz paketa %s, ker nima kandidata
 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/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ni mogoče razčleniti Release datoteke %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Ni izbir v Release datoteki %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Ni vnosa razpršila v Release datoteki %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Neveljavne vnos 'Datum' v Release datoteki %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/sv.po b/po/sv.po
index 995de1630..ee1f84481 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1125,10 +1125,255 @@ msgstr "Anslutningen misslyckades"
 msgid "Internal error"
 msgstr "Internt fel"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Korrigerar beroenden..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " misslyckades."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Kunde inte korrigera beroenden"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Kunde inte minimera uppgraderingsuppsättningen"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Färdig"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Internt fel. InstallPackages anropades med trasiga paket!"
@@ -1374,276 +1619,31 @@ msgstr ""
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n"
 
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s är redan den senaste versionen.\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-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:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Korrigerar beroenden..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " misslyckades."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Kunde inte korrigera beroenden"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Kunde inte minimera uppgraderingsuppsättningen"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Färdig"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
+#: apt-private/private-install.cc:846
 #, 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] ""
+msgid "%s is already the newest version.\n"
+msgstr "%s är redan den senaste versionen.\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
+#: apt-private/private-install.cc:894
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
 
-#: 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:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+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-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1733,8 +1733,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2034,6 +2034,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:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Metoddrivrutinen %s kunde inte hittas."
+
+#: apt-pkg/acquire-worker.cc:118
+#, 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:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startade inte korrekt"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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."
@@ -2131,57 +2152,185 @@ msgstr "valfri"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, 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:257
+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/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:260
+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:263
+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:266
+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:576
 #, 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:1211
 #, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Läser paketlistor"
+
+# Bättre ord?
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "Samlar filtillhandahållningar"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Kunde inte skriva till %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2201,35 +2350,35 @@ msgstr "Storleken stämmer inte"
 msgid "Invalid file format"
 msgstr "Felaktig åtgärd %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1656
+#: apt-pkg/acquire-item.cc:1666
 #, 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:1698
+#: apt-pkg/acquire-item.cc:1708
 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:1736
+#: apt-pkg/acquire-item.cc:1746
 #, 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:1758
+#: apt-pkg/acquire-item.cc:1768
 #, 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:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2240,12 +2389,12 @@ msgstr ""
 "%s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-fel: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2254,92 +2403,17 @@ 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:1992
+#: apt-pkg/acquire-item.cc:2002
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/acquire-item.cc:2060
 #, 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/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Indexfiler av typ \"%s\" stöds inte"
-
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kunde inte ta status på %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fel uppstod vid hantering av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-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:260
-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:263
-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:266
-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:576
-#, 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:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kunde inte ta status på källkodspaketlistan %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Läser paketlistor"
-
-# Bättre ord?
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samlar filtillhandahållningar"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Kunde inte skriva till %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "In-/utfel vid lagring av källcache"
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2372,15 +2446,6 @@ msgstr "Hämtar fil %li av %li (%s återstår)"
 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: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"
@@ -2433,10 +2498,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"
@@ -2534,25 +2603,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Bygger beroendeträd"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandiderande versioner"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Beroendegenerering"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Misslyckades med att öppna StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Misslyckades med att skriva temporär StateFile %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2564,106 +2639,6 @@ msgstr "Kunde inte tolka paketfilen %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Kunde inte tolka paketfilen %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Kunde inte tolka \"Release\"-filen %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Inga sektioner i Release-filen %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ingen Hash-post i Release-filen %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2725,6 +2700,31 @@ msgstr ""
 "Kan inte välja installerad version från paketet %s eftersom det inte är "
 "installerat"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Kunde inte tolka \"Release\"-filen %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Inga sektioner i Release-filen %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Ingen Hash-post i Release-filen %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ogiltig \"Date\"-post i Release-filen %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/th.po b/po/th.po
index c9577c01f..095b803a6 100644
--- a/po/th.po
+++ b/po/th.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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1151,10 +1151,250 @@ msgstr "เชื่อมต่อไม่สำเร็จ"
 msgid "Internal error"
 msgstr "ข้อผิดพลาดภายใน"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "กำลังแสดงรายชื่อ"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " ล้มเหลว"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " เสร็จแล้ว"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้"
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "เกิดข้อผิดพลาดภายใน: มีการเรียก InstallPackages ด้วยแพกเกจที่เสีย!"
@@ -1376,275 +1616,35 @@ msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "จะข้าม %s เนื่องจากแพกเกจไม่ได้ติดตั้งไว้ และคำสั่งมีเพียงการปรับรุ่นเท่านั้น\n"
 
 #: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ เนื่องจากไม่สามารถดาวน์โหลดได้\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว อันเนื่องมาจาก '%s'\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน คุณหมายถึง '%s' หรือเปล่า?\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n"
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr "กำลังแสดงรายชื่อ"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " ล้มเหลว"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " เสร็จแล้ว"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้"
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ เนื่องจากไม่สามารถดาวน์โหลดได้\n"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-install.cc:846
 #, 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"
+msgid "%s is already the newest version.\n"
+msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n"
 
-#: apt-private/private-update.cc:101
-msgid "All packages are up to date."
-msgstr "ปรับรุ่นทุกแพกเกจเป็นรุ่นล่าสุดแล้ว"
+#: apt-private/private-install.cc:894
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว\n"
 
-#: apt-private/private-show.cc:156
+#: apt-private/private-install.cc:899
 #, 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' หากต้องการดูเพิ่ม"
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว อันเนื่องมาจาก '%s'\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "ไม่ใช่แพกเกจจริง (เสมือน)"
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน คุณหมายถึง '%s' หรือเปล่า?\n"
 
-#: 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:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n"
 
 #: apt-private/private-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1729,8 +1729,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2024,6 +2024,26 @@ msgstr "ไม่พบระเบียนยืนยันความแท
 msgid "Hash mismatch for: %s"
 msgstr "แฮชไม่ตรงกันสำหรับ: %s"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s"
+
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "ได้ติดตั้งแพกเกจ %s ไว้หรือไม่?"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 "ไม่สามารถแจงหรือเปิดรายชื่อแพกเกจหรือสถานะแพกเกจได้"
@@ -2117,56 +2137,183 @@ msgstr "ตัวเลือก"
 msgid "extra"
 msgstr "ส่วนเสริม"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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/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
+#, 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:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "กำลังอ่านรายชื่อแพกเกจ"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "เตรียมรับคำตอบ"
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2185,7 +2332,7 @@ msgstr "ขนาดไม่ตรงกัน"
 msgid "Invalid file format"
 msgstr "รูปแบบของแฟ้มไม่ถูกต้อง"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2194,16 +2341,16 @@ msgstr ""
 "ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง "
 "หรือแฟ้มผิดรูปแบบ)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/acquire-item.cc:1666
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "ไม่พบผลรวมแฮชสำหรับ '%s' ในแฟ้ม Release"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1708
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/acquire-item.cc:1746
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2212,12 +2359,12 @@ msgstr ""
 "แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ "
 "ของคลังแพกเกจนี้"
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2227,102 +2374,29 @@ msgstr ""
 "ข้อผิดพลาดจาก GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "ข้อผิดพลาดจาก GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, 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:1992
+#: apt-pkg/acquire-item.cc:2002
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/acquire-item.cc:2060
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s"
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "กำลังอ่านรายชื่อแพกเกจ"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2355,12 +2429,6 @@ msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จ
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย"
@@ -2412,10 +2480,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"
@@ -2510,25 +2579,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "รุ่นแพกเกจที่มี"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "เตรียมรับคำตอบ"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "สร้างลำดับความสัมพันธ์"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "กำลังอ่านข้อมูลสถานะ"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2540,106 +2615,6 @@ msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1
 msgid "Unable to parse package file %s (2)"
 msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "ไม่สามารถแจงแฟ้ม Release %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "ไม่มีหัวข้อย่อยในแฟ้ม Release %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "ไม่มีรายการแฮชในแฟ้ม Release %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "รายการ 'Valid-Until' ไม่ถูกต้องในแฟ้ม Release %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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 ผิดรูปแบบ (ชนิด)"
-
-#: 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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2693,6 +2668,31 @@ msgstr "ไม่สามารถเลือกรุ่นสำหรับ
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้ของแพกเกจ '%s' ได้ เนื่องจากแพกเกจไม่ได้ติดตั้งไว้"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "ไม่สามารถแจงแฟ้ม Release %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "ไม่มีหัวข้อย่อยในแฟ้ม Release %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "ไม่มีรายการแฮชในแฟ้ม Release %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "รายการ 'Valid-Until' ไม่ถูกต้องในแฟ้ม Release %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "รายการ 'Date' ไม่ถูกต้องในแฟ้ม Release %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/tl.po b/po/tl.po
index 1060c582e..a9e3ce519 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1118,10 +1118,251 @@ msgstr "Bigo ang koneksyon"
 msgid "Internal error"
 msgstr "Internal na error"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Inaayos ang mga dependensiya..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " ay bigo."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Hindi maayos ang mga dependensiya"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Hindi mai-minimize ang upgrade set"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Tapos"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1384,251 +1625,10 @@ 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:129
-msgid "Listing"
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Inaayos ang mga dependensiya..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " ay bigo."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Hindi maayos ang mga dependensiya"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Hindi mai-minimize ang upgrade set"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Tapos"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr ""
-"BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!"
+"BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!"
 
 #: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
@@ -1710,8 +1710,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2012,6 +2012,27 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Di tugmang MD5Sum"
 
+#: apt-pkg/acquire-worker.cc:116
+#, 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:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Hindi umandar ng tama ang paraang %s"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 ""
@@ -2109,140 +2130,90 @@ msgstr "optional"
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/acquire-worker.cc:116
-#, 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:118
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
-
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Hindi umandar ng tama ang paraang %s"
-
-#: apt-pkg/acquire-worker.cc:455
-#, 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/pkgrecords.cc:38
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
 
-#: 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: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:139
-msgid "Candidate versions"
-msgstr "Bersyong Kandidato"
+#: 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:168
-msgid "Dependency generation"
-msgstr "Pagbuo ng Dependensiya"
+#: 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: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: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:250
+#: apt-pkg/sourcelist.cc:190
 #, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Bigo ang pagbukas ng %s"
+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/depcache.cc:256
+#: apt-pkg/sourcelist.cc:193
 #, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Bigo sa pagsulat ng talaksang %s"
+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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-#, fuzzy
-msgid "Hash Sum mismatch"
-msgstr "Di tugmang MD5Sum"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Di tugmang laki"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Di tanggap na operasyon %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-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, 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:1656
-#, 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:1698
-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"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
+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/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+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/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid ""
-"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"
-msgstr ""
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
+msgid "Opening %s"
+msgstr "Binubuksan %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, 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 ""
-"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
-"niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
+msgid "Line %u too long in source list %s."
+msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s."
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:371
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
-"paketeng %s."
+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"
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
 #, fuzzy, c-format
@@ -2320,6 +2291,108 @@ msgstr "Hindi makapagsulat sa %s"
 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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Di tugmang MD5Sum"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Di tugmang laki"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Di tanggap na operasyon %s"
+
+#: apt-pkg/acquire-item.cc:1650
+#, 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:1666
+#, 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:1708
+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:1746
+#, 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:1768
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1936
+#, 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 ""
+"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:2002
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
+"paketeng %s."
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2352,15 +2425,6 @@ msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list"
@@ -2410,10 +2474,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"
@@ -2511,25 +2579,32 @@ 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Ginagawa ang puno ng mga dependensiya"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Bersyong Kandidato"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Pagbuo ng Dependensiya"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: 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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Bigo ang pagbukas ng %s"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Bigo sa pagsulat ng talaksang %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2541,106 +2616,6 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-
-#: apt-pkg/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Paunawa, pinili ang %s imbes na %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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 "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"
-
-#: 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/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"
-
 #: apt-pkg/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2693,6 +2668,31 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
+
+#: apt-pkg/indexrecords.cc:86
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Paunawa, pinili ang %s imbes na %s\n"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/tr.po b/po/tr.po
index 47f8b914b..993e1c361 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1176,10 +1176,262 @@ msgstr "Bağlantı başarısız"
 msgid "Internal error"
 msgstr "İç hata"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "Listeleme"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Bağımlılıklar düzeltiliyor..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " başarısız oldu."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Bağımlılıklar düzeltilemedi"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Yükseltme kümesi küçültülemiyor"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Tamamlandı"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "İç hata, InstallPackages bozuk paketler ile çağrıldı!"
@@ -1451,258 +1703,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:129
-msgid "Listing"
-msgstr "Listeleme"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Bağımlılıklar düzeltiliyor..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " başarısız oldu."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Bağımlılıklar düzeltilemedi"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Yükseltme kümesi küçültülemiyor"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Tamamlandı"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:36
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "UYARI: Aşağıdaki paketler doğrulanamıyor!"
@@ -1786,8 +1786,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2086,11 +2086,33 @@ msgstr "%s için kimlik doğrulama kaydı bulunamadı"
 msgid "Hash mismatch for: %s"
 msgstr "Sağlama yapılamadı: %s"
 
-#: 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ı."
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Yöntem sürücüsü %s bulunamadı."
 
-#: apt-pkg/cachefile.cc:98
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "%s paketi kurulu mu?"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "%s yöntemi düzgün şekilde başlamadı"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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ı."
+
+#: apt-pkg/cachefile.cc:98
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Bu sorunları gidermek için apt-get update komutunu çalıştırabilirsiniz"
 
@@ -2179,143 +2201,102 @@ msgstr "seçimlik"
 msgid "extra"
 msgstr "ilave"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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"
-
-#: 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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Aday sürümler"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Bağımlılık oluşturma"
-
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Durum bilgisi okunuyor"
+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:250
+#: apt-pkg/sourcelist.cc:190
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Durum dosyası (StateFile) %s açılamadı"
+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:256
+#: apt-pkg/sourcelist.cc:193
 #, 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 ([%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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "yeniden adlandırma başarısız, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Sağlama toplamları eşleşmiyor"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Boyutlar eşleşmiyor"
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
-msgstr "Geçersiz dosya biçimi"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI)"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
-"'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list "
-"dosyasındaki girdi ya da satır hatalı)"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dist)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:211
 #, 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:1698
-msgid "There is no public key available for the following key IDs:\n"
+msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
-"Aşağıdaki anahtar kimlikleri için kullanılır hiçbir genel anahtar yok:\n"
+"Kaynak listesinin (%2$s)  %1$lu numaralı satırı hatalı (URI ayrıştırma)"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-"%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun "
-"güncelleştirmeleri uygulanmayacak."
+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/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)"
+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/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid ""
-"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"
-msgstr ""
-"İmza doğrulama sırasında bir hata meydana geldi. Depo güncel değil ve önceki "
-"indeks dosyaları kullanılacak. GPG hatası: %s:%s\n"
+msgid "Opening %s"
+msgstr "%s Açılıyor"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "GPG hatası: %s: %s"
+msgid "Line %u too long in source list %s."
+msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı çok uzun."
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371
 #, 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 paketindeki dosyalardan biri konumlandırılamadı. Bu durum, bu paketi elle "
-"düzeltmeniz gerektiği anlamına gelebilir. (eksik mimariden dolayı)"
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375
 #, 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ı"
+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/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:416
 #, 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."
+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:490
 #, c-format
@@ -2390,6 +2371,111 @@ msgstr "%s dosyasına yazılamıyor"
 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:241
+msgid "Send request to solver"
+msgstr "Çözücüye istek gönder"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Çözüm almak için hazırlan"
+
+#: apt-pkg/edsp.cc:327
+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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Harici çözücüyü çalıştır"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "yeniden adlandırma başarısız, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Sağlama toplamları eşleşmiyor"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Boyutlar eşleşmiyor"
+
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
+msgstr "Geçersiz dosya biçimi"
+
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+"'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list "
+"dosyasındaki girdi ya da satır hatalı)"
+
+#: apt-pkg/acquire-item.cc:1666
+#, 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:1708
+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:1746
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+"%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun "
+"güncelleştirmeleri uygulanmayacak."
+
+#: apt-pkg/acquire-item.cc:1768
+#, 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:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"İmza doğrulama sırasında bir hata meydana geldi. Depo güncel değil ve önceki "
+"indeks dosyaları kullanılacak. GPG hatası: %s:%s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG hatası: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1936
+#, 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 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:2002
+#, 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:2060
+#, 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/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2422,14 +2508,6 @@ msgstr "Alınan dosya: %li / %li (%s kaldı)"
 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: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"
@@ -2483,10 +2561,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"
@@ -2585,25 +2666,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Bağımlılık ağacı oluşturuluyor"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Çözücüye istek gönder"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Aday sürümler"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Çözüm almak için hazırlan"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Bağımlılık oluşturma"
 
-#: apt-pkg/edsp.cc:327
-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/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Durum bilgisi okunuyor"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Harici çözücüyü çalıştır"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Durum dosyası (StateFile) %s açılamadı"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2615,118 +2702,6 @@ msgstr "Paket dosyası %s ayrıştırılamadı (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Paket dosyası %s ayrıştırılamadı (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "'Release' dosyası (%s) ayrıştırılamadı"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "'Release' dosyası %s içinde hiç bölüm yok"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "'Release' dosyasında (%s) sağlama girdisi yok"
-
-#: apt-pkg/indexrecords.cc:130
-#, 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:149
-#, 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/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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2781,6 +2756,31 @@ msgstr "'%s' paketinin aday sürümü olmadığı için aday sürüm seçilemiyo
 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/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "'Release' dosyası (%s) ayrıştırılamadı"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "'Release' dosyası %s içinde hiç bölüm yok"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "'Release' dosyasında (%s) sağlama girdisi yok"
+
+#: apt-pkg/indexrecords.cc:130
+#, 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:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "'Release' dosyasında (%s) geçersiz 'Date' girdisi"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/uk.po b/po/uk.po
index 493c9002c..ed0667d1b 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1156,10 +1156,259 @@ msgstr "З'єднання не вдалося"
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Виправлення залежностей..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " невдача."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Неможливо скоригувати залежності"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "Неможливо мінімізувати набір оновлень"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Виконано"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Для виправлення цих помилок ви можете скористатися 'apt-get -f install'."
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1437,258 +1686,9 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr "Пакунок '%s' не встановлений, тому не видалений\n"
 
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Виправлення залежностей..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " невдача."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Неможливо скоригувати залежності"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Неможливо мінімізувати набір оновлень"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Виконано"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Для виправлення цих помилок ви можете скористатися 'apt-get -f install'."
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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:97
-#, 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:101
-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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!"
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!"
 
 #: apt-private/private-download.cc:40
 msgid "Authentication warning overridden.\n"
@@ -1769,8 +1769,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2073,11 +2073,32 @@ msgstr "Неможливо знайти аутентифікаційний за
 msgid "Hash mismatch for: %s"
 msgstr "Невідповідність хешу для: %s"
 
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Не можу обробити чи відкрити перелік пакунків чи статусний файл."
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Драйвер для метода %s не знайдено."
 
-#: apt-pkg/cachefile.cc:98
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Метод %s стартував некоректно"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 "Не можу обробити чи відкрити перелік пакунків чи статусний файл."
+
+#: apt-pkg/cachefile.cc:98
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Для виправлення цих помилок Ви можете виконати apt-get update"
 
@@ -2166,143 +2187,92 @@ msgstr "необов'язкові (optional)"
 msgid "extra"
 msgstr "додаткові (extra)"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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"
-msgstr "Тип '%s' індексного файлу не підтримується"
-
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Побудова дерева залежностей"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Версії кандидатів"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Ґенерація залежностей"
-
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Зчитування інформації про стан"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не є призначенням)"
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:190
 #, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Не вдалося відкрити StateFile %s"
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не має ключа)"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Не вдалося записати до тимчасового StateFile файла %s"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Спотворений рядок %lu у переліку джерел %s ([%s] ключ %s не має значення)"
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "не вдалося перейменувати, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
-msgstr "Невідповідність хешу MD5Sum"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Невідповідність розміру"
-
-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Невірна дія %s"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (проблема з URI)"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
-"Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у "
-"sources.list, або пошкоджений файл)"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (dist)"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі"
-
-#: apt-pkg/acquire-item.cc:1698
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-"Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього "
-"репозиторія не будуть застосовані."
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (absolute dist)"
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)"
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (dist parse)"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid ""
-"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"
-msgstr ""
-"Виникла помилка під час перевірки підпису. Репозиторій не оновлено, "
-"попередні індексні файли будуть використані. Помилка GPG: %s: %s\n"
+msgid "Opening %s"
+msgstr "Відкриття %s"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "Помилка GPG: %s: %s"
+msgid "Line %u too long in source list %s."
+msgstr "Рядок %u є занадто довгим у переліку джерел %s."
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371
 #, 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')"
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Спотворений рядок %u у переліку джерел %s (тип)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'"
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
 
-#: apt-pkg/acquire-item.cc:2050
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %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:490
 #, fuzzy, c-format
@@ -2378,6 +2348,118 @@ msgstr "Неможливо записати в %s"
 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:241
+#, fuzzy
+msgid "Send request to solver"
+msgstr "Відправити запит розв'язувачу"
+
+#: apt-pkg/edsp.cc:320
+#, fuzzy
+msgid "Prepare for receiving solution"
+msgstr "Пригодуватися до отримання розв'язку"
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про "
+"помилку"
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+#, fuzzy
+msgid "Execute external solver"
+msgstr "Виконати зовнішній розв'язувач"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "не вдалося перейменувати, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
+msgstr "Невідповідність хешу MD5Sum"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Невідповідність розміру"
+
+#: apt-pkg/acquire-item.cc:173
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Невірна дія %s"
+
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+"Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у "
+"sources.list, або пошкоджений файл)"
+
+#: apt-pkg/acquire-item.cc:1666
+#, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі"
+
+#: apt-pkg/acquire-item.cc:1708
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n"
+
+#: apt-pkg/acquire-item.cc:1746
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+"Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього "
+"репозиторія не будуть застосовані."
+
+#: apt-pkg/acquire-item.cc:1768
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)"
+
+#: apt-pkg/acquire-item.cc:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Виникла помилка під час перевірки підпису. Репозиторій не оновлено, "
+"попередні індексні файли будуть використані. Помилка GPG: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Помилка GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1936
+#, 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:2002
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'"
+
+#: apt-pkg/acquire-item.cc:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %s."
+
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2410,14 +2492,6 @@ msgstr "Завантажується файл %li з %li (залишилось %
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Додайте деякі посилання (URI) на вихідні тексти у ваш sources.list"
@@ -2471,10 +2545,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"
@@ -2572,31 +2649,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Побудова дерева залежностей"
 
-#: apt-pkg/edsp.cc:241
-#, fuzzy
-msgid "Send request to solver"
-msgstr "Відправити запит розв'язувачу"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Версії кандидатів"
 
-#: apt-pkg/edsp.cc:320
-#, fuzzy
-msgid "Prepare for receiving solution"
-msgstr "Пригодуватися до отримання розв'язку"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Ґенерація залежностей"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про "
-"помилку"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Зчитування інформації про стан"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-#, fuzzy
-msgid "Execute external solver"
-msgstr "Виконати зовнішній розв'язувач"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Не вдалося відкрити StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Не вдалося записати до тимчасового StateFile файла %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2608,108 +2685,6 @@ msgstr "Неможливо проаналізувати файл пакунку
 msgid "Unable to parse package file %s (2)"
 msgstr "Неможливо проаналізувати файл пакунку %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Неможливо проаналізувати 'Release' файл %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Немає секцій у 'Release' файлі %s"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Немає запису 'Hash' у 'Release' файлі %s"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Невірний запис 'Valid-Until' у 'Release' файлі %s"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2768,6 +2743,31 @@ msgstr ""
 "Неможливо вибрати встановлену версію пакунку %s, так як такий пакунок не "
 "встановлено"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Неможливо проаналізувати 'Release' файл %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Немає секцій у 'Release' файлі %s"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Немає запису 'Hash' у 'Release' файлі %s"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Невірний запис 'Valid-Until' у 'Release' файлі %s"
+
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Невірний запис 'Date' у 'Release' файлі %s"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/vi.po b/po/vi.po
index 1c36fcef3..231b18d36 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1197,10 +1197,250 @@ msgstr "Kết nối bị lỗi"
 msgid "Internal error"
 msgstr "Gặp lỗi nội bộ"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "Đang liệt kê"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Đang sửa chữa quan hệ phụ thuộc..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " gặp lỗi."
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Không thể sửa phần phụ thuộc"
+
+#: apt-private/private-cachefile.cc:102
+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:104
+msgid " Done"
+msgstr " Xong"
+
+#: apt-private/private-cachefile.cc:108
+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:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 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!"
@@ -1461,253 +1701,13 @@ 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:129
-msgid "Listing"
-msgstr "Đang liệt kê"
+#: apt-private/private-download.cc:36
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "CẢNH BÁO: Không thể xác thực những gói sau đây!"
 
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "Đang sửa chữa quan hệ phụ thuộc..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " gặp lỗi."
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Không thể sửa phần phụ thuộc"
-
-#: apt-private/private-cachefile.cc:102
-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:104
-msgid " Done"
-msgstr " Xong"
-
-#: apt-private/private-cachefile.cc:108
-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:111
-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:35
-#, 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:97
-#, 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:101
-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:36
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "CẢNH BÁO: Không thể xác thực những gói sau đây!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
-msgstr "Cảnh báo xác thực bị đè.\n"
+#: apt-private/private-download.cc:40
+msgid "Authentication warning overridden.\n"
+msgstr "Cảnh báo xác thực bị đè.\n"
 
 #: apt-private/private-download.cc:45 apt-private/private-download.cc:52
 msgid "Some packages could not be authenticated"
@@ -1784,8 +1784,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2083,6 +2083,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:116
+#, 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:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "Gói “%s” đã được cài đặt chưa?"
+
+#: apt-pkg/acquire-worker.cc:169
+#, 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:455
+#, 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."
@@ -2178,143 +2198,99 @@ msgstr "tùy chọn"
 msgid "extra"
 msgstr "bổ sung"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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”"
-
-#: 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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Phiên bản ứng cử"
-
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Tạo ra quan hệ phụ thuộc"
-
-#: 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"
+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:250
+#: apt-pkg/sourcelist.cc:190
 #, 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 ([%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:256
+#: apt-pkg/sourcelist.cc:193
 #, 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 ([%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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#: apt-pkg/sourcelist.cc:206
 #, 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:163
-msgid "Hash Sum mismatch"
-msgstr "Mã băm tổng kiểm tra không khớp"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Kích cỡ không khớp nhau"
-
-#: apt-pkg/acquire-item.cc:173
-msgid "Invalid file format"
-msgstr "Định dạng tập tập tin không hợp lệ"
+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/acquire-item.cc:1640
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-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)"
+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/acquire-item.cc:1656
+#: apt-pkg/sourcelist.cc:211
 #, 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:1698
-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"
+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/acquire-item.cc:1736
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+msgid "Malformed line %lu in source list %s (absolute dist)"
 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."
+"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/acquire-item.cc:1758
+#: apt-pkg/sourcelist.cc:224
 #, 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)"
+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/acquire-item.cc:1788
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid ""
-"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"
-msgstr ""
-"Gặp lỗi trong khi thẩm tra chữ ký.\n"
-"Kho lưu chưa được cập nhật nên dùng những tập tin chỉ mục trước.\n"
-"Lỗi GPG: %s: %s\n"
+msgid "Opening %s"
+msgstr "Đang mở %s"
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "GPG error: %s: %s"
-msgstr "Lỗi GPG: %s: %s"
+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/acquire-item.cc:1926
+#: apt-pkg/sourcelist.cc:371
 #, 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 ""
-"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."
+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/acquire-item.cc:1992
+#: apt-pkg/sourcelist.cc:375
 #, 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”"
+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/acquire-item.cc:2050
+#: apt-pkg/sourcelist.cc:416
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-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."
+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:490
 #, c-format
@@ -2389,6 +2365,113 @@ msgstr "Không thể ghi vào %s"
 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:241
+msgid "Send request to solver"
+msgstr "Gửi yêu cầu đến bộ phân giải"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "Chuẩn bị để lấy cách giải quyết"
+
+#: apt-pkg/edsp.cc:327
+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:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "Thi hành bộ phân giải từ bên ngoài"
+
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
+#, 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:163
+msgid "Hash Sum mismatch"
+msgstr "Mã băm tổng kiểm tra không khớp"
+
+#: apt-pkg/acquire-item.cc:168
+msgid "Size mismatch"
+msgstr "Kích cỡ không khớp nhau"
+
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
+msgstr "Định dạng tập tập tin không hợp lệ"
+
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+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:1666
+#, 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:1708
+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:1746
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+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:1768
+#, 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:1798
+#, c-format
+msgid ""
+"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"
+msgstr ""
+"Gặp lỗi trong khi thẩm tra chữ ký.\n"
+"Kho lưu chưa được cập nhật nên dùng những tập tin chỉ mục trước.\n"
+"Lỗi GPG: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Lỗi GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1936
+#, 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 ""
+"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:2002
+#, 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:2060
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+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/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2421,14 +2504,6 @@ msgstr "Đang tải tập tin thứ %li trong tổng số %li (còn lại %s)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
@@ -2484,10 +2559,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"
@@ -2583,25 +2661,31 @@ msgstr ""
 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/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/edsp.cc:241
-msgid "Send request to solver"
-msgstr "Gửi yêu cầu đến bộ phân giải"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Phiên bản ứng cử"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "Chuẩn bị để lấy cách giải quyết"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Tạo ra quan hệ phụ thuộc"
 
-#: apt-pkg/edsp.cc:327
-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/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/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "Thi hành bộ phân giải từ bên ngoài"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Lỗi mở tập tin tình trạng StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, 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"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2613,118 +2697,6 @@ msgstr "Không thể phân tích tập tin gói %s (1)"
 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:78
-#, 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:86
-#, 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:117
-#, 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:130
-#, 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:149
-#, 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/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/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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2781,6 +2753,34 @@ 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/indexrecords.cc:78
+#, 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:86
+#, 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:117
+#, 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:130
+#, 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:149
+#, 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"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5022016b2..b1e523851 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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"
@@ -1153,10 +1153,249 @@ msgstr "连接失败"
 msgid "Internal error"
 msgstr "内部错误"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr "正在列表"
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "正在更正依赖关系..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " 失败。"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "无法更正依赖关系"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "无法最小化要升级的软件包集合"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " 完成"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
@@ -1373,275 +1612,36 @@ msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n"
 
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "不能重新安装 %s，因为无法下载它。\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s 已经是最新的版本。\n"
-
-#: apt-private/private-install.cc:894
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
-
-#: apt-private/private-install.cc:899
-#, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%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:941
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "软件包 %s 还未安装，因而不会被卸载。您的意思是 ‘%s’ 吗？\n"
-
-#: apt-private/private-install.cc:947
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "软件包 %s 还未安装，因而不会被卸载\n"
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr "正在列表"
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "正在更正依赖关系..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " 失败。"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "无法更正依赖关系"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "无法最小化要升级的软件包集合"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " 完成"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, 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-install.cc:841
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "不能重新安装 %s，因为无法下载它。\n"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-install.cc:846
 #, 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"
+msgid "%s is already the newest version.\n"
+msgstr "%s 已经是最新的版本。\n"
 
-#: apt-private/private-update.cc:101
-msgid "All packages are up to date."
-msgstr "所有软件包均为最新。"
+#: apt-private/private-install.cc:894
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
 
-#: apt-private/private-show.cc:156
+#: apt-private/private-install.cc:899
 #, 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’ 参数来查看它们"
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "由于 %4$s，为 %3$s 选定了版本 %1$s (%2$s)\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "不是一个实包(虚包)"
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "软件包 %s 还未安装，因而不会被卸载。您的意思是 ‘%s’ 吗？\n"
 
-#: 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:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "软件包 %s 还未安装，因而不会被卸载\n"
 
 #: apt-private/private-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1726,8 +1726,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -2021,6 +2021,26 @@ msgstr "无法找到认证记录：%s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash 校验和不符：%s"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
+
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "请检查是否安装了 %s 软件包"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 "无法解析或打开软件包的列表或是状态文件。"
@@ -2114,56 +2134,183 @@ msgstr "可选"
 msgid "extra"
 msgstr "额外"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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 解析)"
 
-#: apt-pkg/acquire-worker.cc:169
+#: 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:455
+#: 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/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 "无法识别在源列表 %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:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "处理 %s (%s%d) 时出错"
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "哇，软件包数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
+
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "无法获取源软件包列表 %s 的状态"
+
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "正在读取软件包列表"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "正在收集文件所提供的软件包"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "无法写入 %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr "向solver发送请求"
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr "准备接收解决方案"
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr "外部solver出错，错误信息不恰当"
 
-#: apt-pkg/depcache.cc:256
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "无法写入临时状态文件 %s"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr "执行外部solver"
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2182,7 +2329,7 @@ msgstr "大小不符"
 msgid "Invalid file format"
 msgstr "无效的文件格式 %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2190,16 +2337,16 @@ msgid ""
 msgstr ""
 "在 Release 文件中找不到期望的条目 %s（sources.list条目有误，或者文件有误）"
 
-#: apt-pkg/acquire-item.cc:1656
+#: apt-pkg/acquire-item.cc:1666
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "在 Release 文件中找不到 %s 的哈希值"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1708
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "以下 ID 的密钥没有可用的公钥：\n"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/acquire-item.cc:1746
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -2207,12 +2354,12 @@ msgid ""
 msgstr ""
 "%s 的 Release 文件已经过期(invalid since %s)。该仓库的更新将不会被应用。"
 
-#: apt-pkg/acquire-item.cc:1758
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2221,12 +2368,12 @@ msgstr ""
 "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG 错误：%s: %s"
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2235,90 +2382,17 @@ msgstr ""
 "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
 "包。(缘于架构缺失)"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/acquire-item.cc:2002
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "没有源可以用来下载 %s 版本的 %s"
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/acquire-item.cc:2060
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "处理 %s (%s%d) 时出错"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "哇，软件包数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "无法获取源软件包列表 %s 的状态"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "正在读取软件包列表"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "正在收集文件所提供的软件包"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "无法写入 %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "无法读取或写入软件源缓存"
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2351,12 +2425,6 @@ msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
@@ -2408,10 +2476,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"
@@ -2510,25 +2579,31 @@ msgstr ""
 "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
 "系。"
 
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "向solver发送情景"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "正在分析软件包的依赖关系树"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr "向solver发送请求"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候选版本"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr "准备接收解决方案"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "生成依赖关系"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr "外部solver出错，错误信息不恰当"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "正在读取状态信息"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr "执行外部solver"
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "无法打开状态文件 %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "无法写入临时状态文件 %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2540,106 +2615,6 @@ msgstr "无法解析软件包文件 %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "无法解析软件包文件 %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "无法解析软件包仓库 Release 文件 %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
-
-#: apt-pkg/indexrecords.cc:130
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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 解析)"
-
-#: 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/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 行有错误(独立发行版)"
-
-#: 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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2692,6 +2667,31 @@ msgstr "因为软件包 %s 没有候选版本，无法进行选择"
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "无法解析软件包仓库 Release 文件 %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
+
+#: apt-pkg/indexrecords.cc:130
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
+
+#: apt-pkg/indexrecords.cc:149
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b24011151..057ab7792 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: 2015-01-16 04:37-0500\n"
+"POT-Creation-Date: 2015-04-13 07:23+0200\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."
@@ -1096,10 +1096,251 @@ msgstr "連線失敗"
 msgid "Internal error"
 msgstr "內部錯誤"
 
+#: apt-private/private-list.cc:129
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:159
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "正在修正相依關係..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr " 失敗。"
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "無法修正相依關係"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr "無法將升級計劃最小化"
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " 完成"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。"
+
+#: apt-private/private-cachefile.cc:111
+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:35
+#, 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:97
+#, 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:101
+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:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "內部錯誤，在損毀的套件上執行 InstallPackages！"
@@ -1322,279 +1563,38 @@ msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
 #: apt-private/private-install.cc:829
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
-
-#: apt-private/private-install.cc:841
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "無法重新安裝 %s，因為它無法下載。\n"
-
-#: apt-private/private-install.cc:846
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s 已經是最新版本了。\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
-
-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
-
-#: apt-private/private-install.cc:947
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
-
-#: apt-private/private-list.cc:129
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:159
-#, 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:93
-msgid "Correcting dependencies..."
-msgstr "正在修正相依關係..."
-
-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " 失敗。"
-
-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "無法修正相依關係"
-
-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "無法將升級計劃最小化"
-
-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " 完成"
-
-#: apt-private/private-cachefile.cc:108
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。"
-
-#: apt-private/private-cachefile.cc:111
-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:35
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "編譯正規表示式時發生錯誤 - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "update 指令不需任何參數"
+msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
 
-#: apt-private/private-update.cc:97
+#: apt-private/private-install.cc:841
 #, 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:101
-msgid "All packages are up to date."
-msgstr ""
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "無法重新安裝 %s，因為它無法下載。\n"
 
-#: apt-private/private-show.cc:156
+#: apt-private/private-install.cc:846
 #, 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] ""
+msgid "%s is already the newest version.\n"
+msgstr "%s 已經是最新版本了。\n"
 
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
+#: apt-private/private-install.cc:894
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
 
-#: 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:899
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
+
+#: apt-private/private-install.cc:947
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
 
 #: apt-private/private-download.cc:36
 msgid "WARNING: The following packages cannot be authenticated!"
@@ -1679,8 +1679,8 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/init.cc:111 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381
 #: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
 #: apt-pkg/contrib/cdromutl.cc:205
 #, c-format
@@ -1976,6 +1976,26 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum 不符"
 
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "找不到安裝方式的驅動程式 %s。"
+
+#: apt-pkg/acquire-worker.cc:118
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
+
+#: apt-pkg/acquire-worker.cc:169
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "安裝方式 %s 沒有正確啟動"
+
+#: apt-pkg/acquire-worker.cc:455
+#, 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 "無法分析或開啟套件清單或狀況檔。"
@@ -2070,56 +2090,183 @@ msgstr "次要"
 msgid "extra"
 msgstr "額外"
 
-#: apt-pkg/acquire-worker.cc:116
+#: 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:118
+#: 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:169
+#: 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:455
+#: 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:490
+#, 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:93
+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:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, 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:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "哇呀，您已經超過這個 APT 所能處理的套件名稱數量了。"
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "哇呀，您已經超過這個 APT 所能處理的版本數量了。"
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "哇呀，您已經超過這個 APT 所能處理的說明數量了。"
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "哇呀，您已經超過這個 APT 所能處理的相依關係數量了。"
+
+#: apt-pkg/pkgcachegen.cc:576
 #, 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:1211
 #, 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:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "正在讀取套件清單"
+
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr "正在收集檔案提供者"
+
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#, c-format
+msgid "Unable to write to %s"
+msgstr "無法寫入 %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+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:241
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
+msgstr ""
 
 #: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
@@ -2139,35 +2286,35 @@ msgstr "大小不符"
 msgid "Invalid file format"
 msgstr "無效的操作 %s"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1656
+#: apt-pkg/acquire-item.cc:1666
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "無法辨別 Release 檔 %s"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1708
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "無法取得以下的密鑰 ID 的公鑰：\n"
 
-#: apt-pkg/acquire-item.cc:1736
+#: apt-pkg/acquire-item.cc:1746
 #, 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:1758
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）"
 
-#: apt-pkg/acquire-item.cc:1788
+#: apt-pkg/acquire-item.cc:1798
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2175,12 +2322,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803
+#: apt-pkg/acquire-item.cc:1808 apt-pkg/acquire-item.cc:1813
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1926
+#: apt-pkg/acquire-item.cc:1936
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2189,90 +2336,17 @@ msgstr ""
 "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平"
 "台）"
 
-#: apt-pkg/acquire-item.cc:1992
+#: apt-pkg/acquire-item.cc:2002
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2050
+#: apt-pkg/acquire-item.cc:2060
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。"
 
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, 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:93
-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:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 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:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "在處理 %s 時發生錯誤 (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "哇呀，您已經超過這個 APT 所能處理的套件名稱數量了。"
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "哇呀，您已經超過這個 APT 所能處理的版本數量了。"
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "哇呀，您已經超過這個 APT 所能處理的說明數量了。"
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "哇呀，您已經超過這個 APT 所能處理的相依關係數量了。"
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "在計算檔案相依性時找不到套件 %s %s"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "無法取得來源套件列表 %s 的狀態"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "正在讀取套件清單"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "正在收集檔案提供者"
-
-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
-#, c-format
-msgid "Unable to write to %s"
-msgstr "無法寫入 %s"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "在儲存來源快取時 IO 錯誤"
-
 #: apt-pkg/vendorlist.cc:85
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
@@ -2305,13 +2379,6 @@ msgstr "正在取得檔案 %li/%li（還有 %s）"
 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:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "在 sources.list 中必須包含一些 'source' URI"
@@ -2359,10 +2426,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"
@@ -2455,25 +2524,31 @@ msgstr ""
 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "正在重建相依關係"
 
-#: apt-pkg/edsp.cc:241
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候選版本"
 
-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "建立相依關係"
 
-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "正在讀取狀態資料"
 
-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "無法開啟 StateFile %s"
+
+#: apt-pkg/depcache.cc:256
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "無法寫入暫存的 StateFile %s"
 
 #: apt-pkg/tagfile.cc:140
 #, c-format
@@ -2485,106 +2560,6 @@ msgstr "無法辨識套件檔 %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "無法辨識套件檔 %s (2)"
 
-#: apt-pkg/indexrecords.cc:78
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "無法辨別 Release 檔 %s"
-
-#: apt-pkg/indexrecords.cc:86
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有區段"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-
-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-
-#: apt-pkg/indexrecords.cc:149
-#, 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/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 行的格式錯誤（絕對發行版）"
-
-#: 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: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/cacheset.cc:489
 #, c-format
 msgid "Release '%s' for '%s' was not found"
@@ -2637,6 +2612,31 @@ msgstr ""
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
+#: apt-pkg/indexrecords.cc:78
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "無法辨別 Release 檔 %s"
+
+#: apt-pkg/indexrecords.cc:86
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有區段"
+
+#: apt-pkg/indexrecords.cc:117
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
+
+#: apt-pkg/indexrecords.cc:130
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
+
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:418
 #, c-format
-- 
cgit v1.2.3-70-g09d2


From 3a53f6a1510d332e24c3330a69b987f2341d1a94 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Mon, 13 Apr 2015 12:57:22 -0400
Subject: Revert "HttpsMethod::Fetch(): Zero the FetchResult object when
 leaving due to 404"

This reverts commit 1296bc7c466181a7978c313c40a041b34ce3eaeb.
---
 methods/https.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/methods/https.cc b/methods/https.cc
index f2b00dd64..3a5981b58 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -402,8 +402,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
       _error->Error("%s", err);
       // unlink, no need keep 401/404 page content in partial/
       unlink(File->Name().c_str());
-      Res.Size = 0;
-      Res.LastModified = 0;
       return false;
    }
 
-- 
cgit v1.2.3-70-g09d2


From 42fab5fbc85e243b958beff95912c46fb81abcc0 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 17 Mar 2015 16:51:29 +0100
Subject: demote missing gtest to a buildtime warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We just need it for unit tests and our debian/rules file actually skips
calling them if nocheck is given… but this fails anyhow as we declared a
hard-dependency on it. Demoting the error to a warning in configuration
and adding a test in the 'make test' path with a friendly message allows
nocheck to be useful again.

(Running unit tests is fully encouraged of course, but bootstrappers and
 co do not need to be burdened with this stuff)
---
 configure.ac         | 2 +-
 test/libapt/makefile | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 06879f839..3fb393335 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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/test/libapt/makefile b/test/libapt/makefile
index 7f23ace46..0f8df291f 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) -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,11 @@ $(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."
+	exit 100
+endif
-- 
cgit v1.2.3-70-g09d2


From bb948ef562862e5cc9fcfb3d7b5e41c70382adeb Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Fri, 27 Mar 2015 11:14:44 +0100
Subject: do not unlink https file on general error

It might be quite interesting which file (content) made curl freak out
and other methods keep the file around as well.

Git-Dch: Ignore
---
 methods/https.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/methods/https.cc b/methods/https.cc
index 32de42e4b..c69e84d3a 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -386,7 +386,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    if (success != 0)
    {
       _error->Error("%s", curl_errorstr);
-      unlink(File->Name().c_str());
       return false;
    }
 
-- 
cgit v1.2.3-70-g09d2


From 27925d82dd0cbae74d48040363fe6f6c2bae5215 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Fri, 27 Mar 2015 15:53:43 +0100
Subject: improve https method queue progress reporting

The worker expects that the methods tell him when they start or finish
downloading a file. Various information pieces are passed along in this
report including the (expected) filesize. https was using a "global"
struct for reporting which made it 'reuse' incorrect values in some
cases like a non-existent InRelease fallbacking to Release{,.gpg}
resulting in a size-mismatch warning. Reducing the scope and redesigning
the setting of the values we can fix this and related issues.

Closes: 777565, 781509
Thanks: Robert Edmonds and Anders Kaseorg for initial patchs
---
 methods/https.cc                                  | 82 ++++++++++-----------
 methods/https.h                                   |  2 +-
 methods/server.h                                  |  3 +-
 test/integration/framework                        | 20 +++++-
 test/integration/test-apt-https-no-redirect       | 15 ++--
 test/integration/test-apt-update-expected-size    | 86 +++++++++++++++--------
 test/integration/test-bug-602412-dequote-redirect |  3 +-
 7 files changed, 121 insertions(+), 90 deletions(-)

diff --git a/methods/https.cc b/methods/https.cc
index c69e84d3a..70f6a1046 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -37,11 +37,17 @@
 									/*}}}*/
 using namespace std;
 
+struct APT_HIDDEN CURLUserPointer {
+   HttpsMethod * const https;
+   HttpsMethod::FetchResult * const Res;
+   CURLUserPointer(HttpsMethod * const https, HttpsMethod::FetchResult * const Res) : https(https), Res(Res) {}
+};
+
 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)
@@ -53,23 +59,33 @@ 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->https->Server->Size == me->https->File->FileSize())
       {
-         me->Server->Result = 200;
-	 me->Server->StartPos = me->Server->Size;
+         me->https->Server->Result = 200;
+	 me->https->Server->StartPos = me->https->Server->Size;
 	 // 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->Server->JunkSize = std::numeric_limits<unsigned long long>::max();
+	 me->https->Server->JunkSize = std::numeric_limits<unsigned long long>::max();
       }
       else
-	 me->Server->StartPos = 0;
+	 me->https->Server->StartPos = 0;
+
+      me->https->File->Truncate(me->https->Server->StartPos);
+      me->https->File->Seek(me->https->Server->StartPos);
+
+      me->Res->LastModified = me->https->Server->Date;
+      me->Res->Size = me->https->Server->Size;
+      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 &&
+	    me->https->Server->JunkSize == 0 &&
+	    me->Res->Size != 0 && me->Res->Size > me->Res->ResumePoint)
+	 me->https->URIStart(*me->Res);
    }
-   else if (me->Server->HeaderLine(line) == false)
+   else if (me->https->Server->HeaderLine(line) == false)
       return 0;
 
    return size*nmemb;
@@ -85,12 +101,6 @@ HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
    if (me->Server->JunkSize != 0)
       return buffer_size;
 
-   if (me->Server->ReceivedData == false)
-   {
-      me->URIStart(me->Res);
-      me->Server->ReceivedData = true;
-   }
-
    if(me->File->Write(buffer, buffer_size) != true)
       return 0;
 
@@ -109,27 +119,15 @@ HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
    return buffer_size;
 }
 
-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;
-}
-
 // HttpsServerState::HttpsServerState - Constructor			/*{{{*/
 HttpsServerState::HttpsServerState(URI Srv,HttpsMethod * Owner) : ServerState(Srv, Owner)
 {
    TimeOut = _config->FindI("Acquire::https::Timeout",TimeOut);
-   ReceivedData = false;
    Reset();
 }
 									/*}}}*/
 
-void HttpsMethod::SetupProxy()  					/*{{{*/
+void HttpsMethod::SetupProxy()						/*{{{*/
 {
    URI ServerName = Queue->Uri;
 
@@ -207,16 +205,16 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
 
    maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc"));
 
+   FetchResult Res;
+   CURLUserPointer userp(this, &Res);
    // 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);
@@ -414,24 +412,23 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
       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)
@@ -455,7 +452,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    URIDone(Res);
 
    // cleanup
-   Res.Size = 0;
    delete File;
 
    return true;
diff --git a/methods/https.h b/methods/https.h
index 433a84680..4cc48fc34 100644
--- a/methods/https.h
+++ b/methods/https.h
@@ -65,7 +65,6 @@ class HttpsMethod : public ServerMethod
 				 double ultotal, double ulnow);
    void SetupProxy();
    CURL *curl;
-   FetchResult Res;
    ServerState *Server;
 
    // Used by ServerMethods unused by https
@@ -77,6 +76,7 @@ class HttpsMethod : public ServerMethod
 
    virtual bool Configuration(std::string Message);
    virtual ServerState * CreateServerState(URI uri);
+   using pkgAcqMethod::FetchResult;
 
    HttpsMethod() : ServerMethod("1.2",Pipeline | SendConfig), File(NULL)
    {
diff --git a/methods/server.h b/methods/server.h
index 3b232dcac..b974ec89a 100644
--- a/methods/server.h
+++ b/methods/server.h
@@ -37,7 +37,6 @@ struct ServerState
    unsigned long long Size; // size of the usable content (aka: the file)
    unsigned long long JunkSize; // size of junk content (aka: server error pages)
    unsigned long long StartPos;
-   bool ReceivedData;
    time_t Date;
    bool HaveContent;
    enum {Chunked,Stream,Closes} Encoding;
@@ -76,7 +75,7 @@ struct ServerState
 
    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; JunkSize = 0;
-		 StartPos = 0; ReceivedData = false; Encoding = Closes; time(&Date); HaveContent = false;
+		 StartPos = 0; Encoding = Closes; time(&Date); HaveContent = false;
 		 State = Header; Persistent = false; Pipeline = true; MaximumSize = 0;};
    virtual bool WriteResponse(std::string const &Data) = 0;
 
diff --git a/test/integration/framework b/test/integration/framework
index ec23e41e6..50c027a2c 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1125,8 +1125,10 @@ acquire::cdrom::autodetect 0;" > rootdir/etc/apt/apt.conf.d/00cdrom
 
 downloadfile() {
 	local PROTO="${1%%:*}"
-	apthelper -o Debug::Acquire::${PROTO}=1 -o Debug::pkgAcquire::Worker=1 \
-		download-file "$1" "$2" 2>&1 || true
+	if ! apthelper -o Debug::Acquire::${PROTO}=1 -o Debug::pkgAcquire::Worker=1 \
+		download-file "$1" "$2" 2>&1 ; then
+		return 1
+	fi
 	# only if the file exists the download was successful
 	if [ -r "$2" ]; then
 		return 0
@@ -1407,6 +1409,20 @@ testfailureequal() {
 	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"
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-update-expected-size b/test/integration/test-apt-update-expected-size
index 9711c293a..22de13ea5 100755
--- a/test/integration/test-apt-update-expected-size
+++ b/test/integration/test-apt-update-expected-size
@@ -10,35 +10,61 @@ 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() {
+	# 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=0
+}
+
+methodtest() {
+	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*
-testfailureequal "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-bug-602412-dequote-redirect b/test/integration/test-bug-602412-dequote-redirect
index d3573a79a..384c8b113 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,6 +16,7 @@ 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
 
-- 
cgit v1.2.3-70-g09d2


From 936d5613e4b6145798c5a1d0c484158115576fa8 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Fri, 27 Mar 2015 18:56:44 +0100
Subject: remove duplicated check for same file copy

Git-Dch: Ignore
---
 methods/copy.cc | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/methods/copy.cc b/methods/copy.cc
index a23c0316c..f3cd84215 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -65,17 +65,9 @@ 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)
    {
-- 
cgit v1.2.3-70-g09d2


From a09f6eb8fc67cd2d836019f448f18580396185e5 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Fri, 27 Mar 2015 19:59:44 +0100
Subject: send Alt-* info for uncompressed based on any compressions

file sends information about the uncompressed file if it can find it as
well as for the compressed file. This was done only for gzip so far, but
we support more compression types. That this information isn't used a
lot is a different story.

Git-Dch: Ignore
---
 methods/file.cc                          | 43 ++++++++++++++++++--------------
 test/integration/framework               |  2 +-
 test/integration/test-compressed-indexes |  2 +-
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/methods/file.cc b/methods/file.cc
index 12db62203..5d9d7b951 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					/*{{{*/
@@ -58,27 +59,31 @@ bool FileMethod::Fetch(FetchItem *Itm)
       if (Itm->LastModified == Buf.st_mtime && Itm->LastModified != 0)
 	 Res.IMSHit = true;
    }
-   
-   // See if we can compute a file without a .gz exentsion
-   std::string::size_type Pos = File.rfind(".gz");
-   if (Pos + 3 == File.length())
+
+   // See if the uncompressed file exists and reuse it
+   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)
+	 {
+	    FetchResult AltRes;
+	    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;
+
+	    URIDone(Res,&AltRes);
+	    return true;
+	 }
+	 // no break here as we could have situations similar to '.gz' vs '.tar.gz' here
+      }
    }
-   
+
    if (Res.Filename.empty() == true)
       return _error->Error(_("File not found"));
 
diff --git a/test/integration/framework b/test/integration/framework
index 50c027a2c..994956b74 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
diff --git a/test/integration/test-compressed-indexes b/test/integration/test-compressed-indexes
index 5b966754c..c6b292baa 100755
--- a/test/integration/test-compressed-indexes
+++ b/test/integration/test-compressed-indexes
@@ -61,7 +61,7 @@ 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
 	testsuccessequal 'Reading package lists...
 Building dependency tree...
-- 
cgit v1.2.3-70-g09d2


From 117038bac90261351518870b3f48136f134d4bfc Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 30 Mar 2015 19:52:32 +0200
Subject: handle servers closing encoded connections correctly

Servers who advertise that they close the connection get the 'Closes'
encoding flag, but this conflicts with servers who response with a
transfer-encoding (e.g. encoding) as it is saved in the same flag.

We have a better flag for the keep-alive (or not) of the connection
anyway, so we check this instead of the encoding.

This is in practice not much of a problem as real servers we talk to are
HTTP1.1 servers (with keep-alive) and there isn't much point in doing
chunked encoding if you are going to close anyway, but our simple
testserver stumbles over this if pressed and its a bit cleaner, too.

Git-Dch: Ignore
---
 methods/http.cc                         |  6 +++---
 test/interactive-helper/aptwebserver.cc | 28 +++++++++++++++++++++-------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/methods/http.cc b/methods/http.cc
index 021b284d0..947002cc6 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -442,7 +442,7 @@ 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);
@@ -524,7 +524,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)
@@ -571,7 +571,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;
diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index 644629a33..86d5c06f0 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -598,17 +598,24 @@ static void * handleClient(void * voidclient)				/*{{{*/
 {
    int client = *((int*)(voidclient));
    std::clog << "ACCEPT client " << client << std::endl;
-   std::vector<std::string> messages;
    bool closeConnection = false;
-   std::list<std::string> headers;
-   while (closeConnection == false && ReadMessages(client, messages))
+   while (closeConnection == false)
    {
-      // if we announced a closing, do the close
-      if (std::find(headers.begin(), headers.end(), std::string("Connection: close")) != headers.end())
+      std::vector<std::string> messages;
+      if (ReadMessages(client, messages) == false)
 	 break;
-      headers.clear();
+
+      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::string filename;
@@ -760,9 +767,16 @@ static void * handleClient(void * voidclient)				/*{{{*/
 	 else
 	    sendError(client, 404, *m, sendContent, "", headers);
       }
+
+      // 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);
-      messages.clear();
    }
+   _error->DumpErrors(std::cerr);
    close(client);
    std::clog << "CLOSE client " << client << std::endl;
    return NULL;
-- 
cgit v1.2.3-70-g09d2


From 9b3449e5babd9c20812cf796067d3c6090b6a228 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 29 Mar 2015 14:24:26 +0200
Subject: use SHA2 unrolled code as its a bit faster

Upstream claims its faster if combined with an optimizing compiler and
I can confirm that in some tests, so lets see how it works out in
practice.

Git-Dch: Ignore
---
 buildlib/config.h.in | 3 +++
 1 file changed, 3 insertions(+)

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
-- 
cgit v1.2.3-70-g09d2


From 76cbc9abb2d09ee5b248dfaa24948ba016fb6dee Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 30 Mar 2015 14:37:43 +0200
Subject: if we can, use gccs __builtin_swap methods

Git-Dch: Ignore
---
 apt-pkg/contrib/sha2_internal.cc | 9 +++++++++
 1 file changed, 9 insertions(+)

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 */
 
 /*
-- 
cgit v1.2.3-70-g09d2


From 9224ce3d4d1ea0428a70e75134998e08aa45b1e6 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 30 Mar 2015 20:47:13 +0200
Subject: calculate only expected hashes in methods

Methods get told which hashes are expected by the acquire system, which
means we can use this list to restrict what we calculate in the methods
as any extra we are calculating is wasted effort as we can't compare it
with anything anyway.

Adding support for a new hash algorithm is therefore 'free' now and if a
algorithm is no longer provided in a repository for a file, we
automatically stop calculating it.

In practice this results in a speed-up in Debian as we don't have SHA512
here (so far), so we practically stop calculating it.
---
 apt-pkg/contrib/hashes.cc    | 63 +++++++++++++++++++++++++++++++++-----------
 apt-pkg/contrib/hashes.h     | 21 ++++++++++++---
 ftparchive/cachedb.cc        |  4 +--
 ftparchive/writer.cc         |  4 +--
 methods/cdrom.cc             |  2 +-
 methods/copy.cc              | 10 +++----
 methods/file.cc              |  2 +-
 methods/ftp.cc               |  2 +-
 methods/gzip.cc              |  2 +-
 methods/http.cc              | 14 +++++-----
 methods/http.h               |  2 +-
 methods/https.cc             |  2 +-
 methods/https.h              |  2 +-
 methods/rred.cc              |  2 +-
 methods/rsh.cc               |  2 +-
 methods/server.cc            |  2 +-
 methods/server.h             |  2 +-
 test/libapt/hashsums_test.cc | 24 +++++++++++++++++
 18 files changed, 116 insertions(+), 46 deletions(-)

diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index 6e7080bc9..953465091 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -250,28 +250,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;
 APT_IGNORE_DEPRECATED_PUSH
-   if ((Hashes & MD5SUM) == MD5SUM)
+   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);
 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);
@@ -285,12 +291,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);
@@ -309,20 +320,29 @@ 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;
 APT_IGNORE_DEPRECATED_PUSH
-   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 ((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
    std::string SizeStr;
    strprintf(SizeStr, "%llu", d->FileSize);
@@ -330,6 +350,19 @@ APT_IGNORE_DEPRECATED_POP
    return hashes;
 }
 APT_IGNORE_DEPRECATED_PUSH
-Hashes::Hashes() { d = new PrivateHashes(); }
+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; }
 APT_IGNORE_DEPRECATED_POP
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 154862457..ac13c8ace 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -178,7 +178,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)
@@ -186,13 +187,24 @@ 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();
 
 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();
 APT_IGNORE_DEPRECATED_POP
 
@@ -208,15 +220,16 @@ APT_IGNORE_DEPRECATED_POP
    }
 
    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/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index 1dc268594..cc3527ea4 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -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/writer.cc b/ftparchive/writer.cc
index db68c21f0..593278590 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -1075,8 +1075,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();
 
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 74e2ecc6b..10cb29f66 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -266,7 +266,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    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 f3cd84215..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;
@@ -71,7 +71,7 @@ bool CopyMethod::Fetch(FetchItem *Itm)
    // just calc the hashes if the source and destination are identical
    if (File == Itm->DestFile)
    {
-      CalculateHashes(Res);
+      CalculateHashes(Itm, Res);
       URIDone(Res);
       return true;
    }
@@ -104,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 5d9d7b951..043ab04b8 100644
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -87,7 +87,7 @@ bool FileMethod::Fetch(FetchItem *Itm)
    if (Res.Filename.empty() == true)
       return _error->Error(_("File not found"));
 
-   Hashes Hash;
+   Hashes Hash(Itm->ExpectedHashes);
    FileFd Fd(Res.Filename, FileFd::ReadOnly);
    Hash.AddFD(Fd);
    Res.TakeHashes(Hash);
diff --git a/methods/ftp.cc b/methods/ftp.cc
index 7764acf6a..92d8573f1 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1064,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/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 947002cc6..e4773b0e2 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;
@@ -484,10 +484,10 @@ APT_PURE bool HttpServerState::IsOpen()					/*{{{*/
    return (ServerFd != -1);
 }
 									/*}}}*/
-bool HttpServerState::InitHashes(FileFd &File)				/*{{{*/
+bool HttpServerState::InitHashes(FileFd &File, HashStringList const &ExpectedHashes)/*{{{*/
 {
    delete In.Hash;
-   In.Hash = new Hashes;
+   In.Hash = new Hashes(ExpectedHashes);
 
    // Set the expected size and read file for the hashes
    File.Truncate(StartPos);
diff --git a/methods/http.h b/methods/http.h
index 40a88a7be..6dc872659 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(FileFd &File, 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 70f6a1046..81903b239 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -443,7 +443,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
       Res.LastModified = resultStat.st_mtime;
 
    // take hashes
-   Hashes Hash;
+   Hashes Hash(Itm->ExpectedHashes);
    FileFd Fd(Res.Filename, FileFd::ReadOnly);
    Hash.AddFD(Fd);
    Res.TakeHashes(Hash);
diff --git a/methods/https.h b/methods/https.h
index 4cc48fc34..dc0ff3322 100644
--- a/methods/https.h
+++ b/methods/https.h
@@ -42,7 +42,7 @@ 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 bool InitHashes(FileFd &/*File*/, HashStringList const &/*ExpectedHashes*/) { return false; }
    virtual Hashes * GetHashes() { return NULL; }
    virtual bool Die(FileFd &/*File*/) { return false; }
    virtual bool Flush(FileFd * const /*File*/) { return false; }
diff --git a/methods/rred.cc b/methods/rred.cc
index 774b58a40..554ac99b4 100644
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -581,7 +581,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);
 
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 91ec824d1..e403f1071 100644
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -357,7 +357,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res)
    FailFd = File->Fd();
    FailTime = Server->Date;
 
-   if (Server->InitHashes(*File) == false)
+   if (Server->InitHashes(*File, Queue->ExpectedHashes) == false)
    {
       _error->Errno("read",_("Problem hashing file"));
       return ERROR_NOT_FROM_SERVER;
diff --git a/methods/server.h b/methods/server.h
index b974ec89a..45622dd34 100644
--- a/methods/server.h
+++ b/methods/server.h
@@ -85,7 +85,7 @@ struct ServerState
    virtual bool Open() = 0;
    virtual bool IsOpen() = 0;
    virtual bool Close() = 0;
-   virtual bool InitHashes(FileFd &File) = 0;
+   virtual bool InitHashes(FileFd &File, HashStringList const &ExpectedHashes) = 0;
    virtual Hashes * GetHashes() = 0;
    virtual bool Die(FileFd &File) = 0;
    virtual bool Flush(FileFd * const File) = 0;
diff --git a/test/libapt/hashsums_test.cc b/test/libapt/hashsums_test.cc
index a19a0befd..edcd8a11a 100644
--- a/test/libapt/hashsums_test.cc
+++ b/test/libapt/hashsums_test.cc
@@ -193,6 +193,30 @@ TEST(HashSumsTest, FileBased)
       EXPECT_EQ(FileSize, list.find("Checksum-FileSize")->HashValue());
    }
    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());
-- 
cgit v1.2.3-70-g09d2


From b55ec4203f7a99d380903911f8839aba2a65e27e Mon Sep 17 00:00:00 2001
From: Milo Casagrande <milo@milo.name>
Date: Sat, 11 Apr 2015 08:11:25 +0200
Subject: Italian program translation update

Closes: 782122
---
 po/it.po | 172 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 85 insertions(+), 87 deletions(-)

diff --git a/po/it.po b/po/it.po
index f45be3013..36173e92c 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: 2015-03-09 02:17+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,7 +18,6 @@ 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
@@ -155,16 +154,7 @@ msgstr "  Gancio del pacchetto: "
 msgid "  Version table:"
 msgstr "  Tabella versione:"
 
-#: 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 %s compilato il %s %s\n"
-
-#: cmdline/apt-cache.cc:1834
+#: cmdline/apt-cache.cc:1833
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -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"
@@ -542,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"
@@ -638,7 +628,7 @@ 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"
@@ -648,8 +638,7 @@ msgstr "È necessario specificare almeno una coppia URL/nome file"
 msgid "Download Failed"
 msgstr "Scaricamento non riuscito"
 
-#: cmdline/apt-helper.cc:93
-#, fuzzy
+#: cmdline/apt-helper.cc:92
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -668,9 +657,10 @@ 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:65
 #, c-format
@@ -718,7 +708,7 @@ msgstr "Blocco su %s annullato.\n"
 msgid "Executing dpkg failed. Are you root?"
 msgstr "Esecuzione di dpkg non riuscita. È stato lanciato come root?"
 
-#: cmdline/apt-mark.cc:450
+#: cmdline/apt-mark.cc:449
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -771,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"
@@ -838,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"
 
@@ -847,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 //"
 
@@ -891,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:362 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 "
 
@@ -1411,11 +1401,15 @@ 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 ""
+msgstr "Tutti i pacchetti sono aggiornati."
 
 #: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
@@ -1771,34 +1765,33 @@ msgstr ""
 msgid "Full Text Search"
 msgstr "Ricerca sul testo"
 
-#: apt-private/acqprogress.cc:66
+#: apt-private/acqprogress.cc:62
 msgid "Hit "
 msgstr "Trovato "
 
-#: apt-private/acqprogress.cc:88
+#: apt-private/acqprogress.cc:83
 msgid "Get:"
 msgstr "Scaricamento di:"
 
 # (ndt) questa non so cosa voglia dire
-#: apt-private/acqprogress.cc:119
+#: apt-private/acqprogress.cc:113
 msgid "Ign "
 msgstr "Ign "
 
-#: apt-private/acqprogress.cc:126
+#: apt-private/acqprogress.cc:120
 msgid "Err "
 msgstr "Err "
 
-#: 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"
@@ -1901,7 +1894,7 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Unione delle informazioni disponibili"
 
-#: cmdline/apt-extracttemplates.cc:229
+#: cmdline/apt-extracttemplates.cc:228
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -1925,18 +1918,18 @@ 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:259 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:264 apt-pkg/pkgcachegen.cc:1385
+#: 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:305
+#: cmdline/apt-extracttemplates.cc:304
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Impossibile trovare la versione di debconf. È installato?"
 
@@ -1964,7 +1957,7 @@ msgstr "Errore nella scrittura dell'intestazione nel file \"contents\""
 msgid "Error processing contents %s"
 msgstr "Errore nell'elaborare i contenuti %s"
 
-#: ftparchive/apt-ftparchive.cc:625
+#: ftparchive/apt-ftparchive.cc:624
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -2045,11 +2038,11 @@ msgstr ""
 "  -c=?        Legge come configurazione il file specificato\n"
 "  -o=?        Imposta un'opzione arbitraria di configurazione"
 
-#: ftparchive/apt-ftparchive.cc:821
+#: ftparchive/apt-ftparchive.cc:820
 msgid "No selections matched"
 msgstr "Nessuna selezione corrisponde"
 
-#: ftparchive/apt-ftparchive.cc:906
+#: 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\""
@@ -2084,9 +2077,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"
@@ -2265,7 +2257,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:51
+#: cmdline/apt-internal-solver.cc:50
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -2293,7 +2285,7 @@ msgstr ""
 msgid "Unknown package record!"
 msgstr "Record del pacchetto sconosciuto."
 
-#: cmdline/apt-sortpkgs.cc:155
+#: cmdline/apt-sortpkgs.cc:154
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -2584,9 +2576,9 @@ msgstr ""
 "Tipo \"%s\" non riconosciuto nella stanza %u nel file delle sorgenti %s"
 
 #: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
-#, fuzzy, c-format
+#, c-format
 msgid "Clean of %s is not supported"
-msgstr "Il file indice di tipo \"%s\" non è supportato"
+msgstr "La pulizia di %s non è supportata"
 
 #: apt-pkg/clean.cc:64
 #, c-format
@@ -3118,31 +3110,31 @@ msgstr "Voce \"Valid-Until\" nel file Release %s non valida"
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Voce \"Date\" nel file Release %s non valida"
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
 #, 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
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%lih %limin %lis"
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
 #, c-format
 msgid "%limin %lis"
 msgstr "%limin %lis"
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1290
+#: apt-pkg/contrib/strutl.cc:1279
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selezione %s non trovata"
@@ -3348,7 +3340,7 @@ 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"
 
@@ -3792,12 +3784,18 @@ 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."
 
-- 
cgit v1.2.3-70-g09d2


From 34faa8f7ae2526f46cd1f84bb6962ad06d841e5e Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 11 Apr 2015 10:23:52 +0200
Subject: calculate hashes while downloading in https
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We do this in HTTP already to give the CPU some exercise while the disk
is heavily spinning (or flashing?) to store the data avoiding the need
to reread the entire file again later on to calculate the hashes – which
happens outside of the eyes of progress reporting, so you might ended up
with a bunch of https workers 'stuck' at 100% while they were busy
calculating hashes.

This is a bummer for everyone using apt as a connection speedtest as the
https method works slower now (not really, it just isn't reporting done
too early anymore).
---
 methods/http.cc                             |  8 +++---
 methods/http.h                              |  2 +-
 methods/https.cc                            | 38 ++++++++++++++++++++---------
 methods/https.h                             |  6 +++--
 methods/server.cc                           |  8 +++++-
 methods/server.h                            |  3 ++-
 test/integration/test-apt-download-progress |  6 +++--
 7 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/methods/http.cc b/methods/http.cc
index e4773b0e2..af3d5ccb6 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -484,16 +484,14 @@ APT_PURE bool HttpServerState::IsOpen()					/*{{{*/
    return (ServerFd != -1);
 }
 									/*}}}*/
-bool HttpServerState::InitHashes(FileFd &File, HashStringList const &ExpectedHashes)/*{{{*/
+bool HttpServerState::InitHashes(HashStringList const &ExpectedHashes)	/*{{{*/
 {
    delete In.Hash;
    In.Hash = new Hashes(ExpectedHashes);
-
-   // Set the expected size and read file for the hashes
-   File.Truncate(StartPos);
-   return In.Hash->AddFD(File, StartPos);
+   return true;
 }
 									/*}}}*/
+
 APT_PURE Hashes * HttpServerState::GetHashes()				/*{{{*/
 {
    return In.Hash;
diff --git a/methods/http.h b/methods/http.h
index 6dc872659..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, HashStringList const &ExpectedHashes);
+   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 81903b239..c6b75d9ad 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -72,18 +72,18 @@ HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
       else
 	 me->https->Server->StartPos = 0;
 
-      me->https->File->Truncate(me->https->Server->StartPos);
-      me->https->File->Seek(me->https->Server->StartPos);
-
       me->Res->LastModified = me->https->Server->Date;
       me->Res->Size = me->https->Server->Size;
       me->Res->ResumePoint = me->https->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 &&
-	    me->https->Server->JunkSize == 0 &&
-	    me->Res->Size != 0 && me->Res->Size > me->Res->ResumePoint)
-	 me->https->URIStart(*me->Res);
+      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->https->Server->HeaderLine(line) == false)
       return 0;
@@ -116,16 +116,31 @@ HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
       }
    }
 
+   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, Owner)
+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()						/*{{{*/
 {
@@ -365,6 +380,8 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    // go for it - if the file exists, append on it
    File = new FileFd(Itm->DestFile, FileFd::WriteAny);
    Server = CreateServerState(Itm->Uri);
+   if (Server->InitHashes(Itm->ExpectedHashes) == false)
+      return false;
 
    // keep apt updated
    Res.Filename = Itm->DestFile;
@@ -443,10 +460,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
       Res.LastModified = resultStat.st_mtime;
 
    // take hashes
-   Hashes Hash(Itm->ExpectedHashes);
-   FileFd Fd(Res.Filename, FileFd::ReadOnly);
-   Hash.AddFD(Fd);
-   Res.TakeHashes(Hash);
+   Res.TakeHashes(*(Server->GetHashes()));
 
    // keep apt updated
    URIDone(Res);
diff --git a/methods/https.h b/methods/https.h
index dc0ff3322..6e32e8d3d 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*/, HashStringList const &/*ExpectedHashes*/) { 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; }
diff --git a/methods/server.cc b/methods/server.cc
index e403f1071..2116926b0 100644
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -235,6 +235,12 @@ 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)			/*{{{*/
 {
@@ -357,7 +363,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res)
    FailFd = File->Fd();
    FailTime = Server->Date;
 
-   if (Server->InitHashes(*File, Queue->ExpectedHashes) == 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 45622dd34..1b1f754a3 100644
--- a/methods/server.h
+++ b/methods/server.h
@@ -72,6 +72,7 @@ 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; JunkSize = 0;
@@ -85,7 +86,7 @@ struct ServerState
    virtual bool Open() = 0;
    virtual bool IsOpen() = 0;
    virtual bool Close() = 0;
-   virtual bool InitHashes(FileFd &File, HashStringList const &ExpectedHashes) = 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/test/integration/test-apt-download-progress b/test/integration/test-apt-download-progress
index b2c9effe6..07c5e09c5 100755
--- a/test/integration/test-apt-download-progress
+++ b/test/integration/test-apt-download-progress
@@ -26,14 +26,16 @@ assertprogress() {
 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" http-$TESTFILE -o APT::Status-Fd=3 -o Acquire::http::Dl-Limit=800
+testsuccess --nomsg apthelper download-file "http://localhost:8080/$TESTFILE" 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" https-$TESTFILE -o APT::Status-Fd=3 -o Acquire::https::Dl-Limit=800
+testsuccess --nomsg apthelper download-file "https://localhost:4433/$TESTFILE" https-$TESTFILE $OPT -o Acquire::https::Dl-Limit=800
 assertprogress apt-progress.log
 
 # cleanup
-- 
cgit v1.2.3-70-g09d2


From d84da4995df24329e96d57a22136683a9e370f4e Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 11 Apr 2015 20:13:19 +0200
Subject: ensure lists/ files have correct permissions after apt-cdrom add

Its a bit unpredictable which permissons and owners we will encounter on
a CD-ROM (or a USB stick, as apt-cdrom is responsible for those too),
so we have to ensure in this codepath as well that everything is nicely
setup without waiting for a 'apt-get update' to fix up the (potential)
mess.
---
 apt-pkg/acquire-worker.cc       | 14 --------------
 apt-pkg/cdrom.cc                | 13 ++++---------
 apt-pkg/contrib/fileutl.cc      | 19 +++++++++++++++++++
 apt-pkg/contrib/fileutl.h       | 13 ++++++++++++-
 apt-pkg/indexcopy.cc            |  5 ++++-
 test/integration/framework      |  1 +
 test/integration/test-apt-cdrom |  5 +++--
 7 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index f4d1ad412..bee01e620 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			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 5eccbe5de..8cec4b78e 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -927,8 +927,7 @@ pkgUdevCdromDevices::pkgUdevCdromDevices()				/*{{{*/
 }
 									/*}}}*/
 
-bool
-pkgUdevCdromDevices::Dlopen()                     		        /*{{{*/
+bool pkgUdevCdromDevices::Dlopen()					/*{{{*/
 {
    // alread open
    if(libudev_handle != NULL)
@@ -957,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;
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 47033eadf..afc243b7f 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -874,6 +874,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/indexcopy.cc b/apt-pkg/indexcopy.cc
index 5fa57fd8b..144c508be 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -216,6 +216,7 @@ 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
@@ -546,8 +547,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;
 }
@@ -760,6 +762,7 @@ 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);
       }
       
       
diff --git a/test/integration/framework b/test/integration/framework
index 994956b74..642c5f0d0 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1525,6 +1525,7 @@ aptautotest_aptget_update() {
 	done
 }
 aptautotest_apt_update() { aptautotest_aptget_update "$@"; }
+aptautotest_aptcdrom_add() { aptautotest_aptget_update "$@"; }
 
 testaptautotestnodpkgwarning() {
 	local TESTCALL="$1"
diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom
index 9906795ca..34b35f745 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...
@@ -133,13 +134,13 @@ 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...'
 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...'
 testcdromusage
-- 
cgit v1.2.3-70-g09d2


From de1c9b8ad208ae677fc6e916a907e319f246b1e8 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 12 Apr 2015 11:20:55 +0200
Subject: unsigned Release files can expire, too

Checking Valid-Until on an unsigned Release file doesn't give us any
security brownie points as an attacker could just change the date and in
practice repositories with unsigned Release files will very likely not
have a Valid-Until date, but for symetry and the fact that being
unsigned is currently just a warning, while expired is a fatal error.
---
 apt-pkg/acquire-item.cc | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index dd85fda79..bdbdcc456 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1739,7 +1739,10 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/
       // we parse the indexes here because at this point the user wanted
       // a repository that may potentially harm him
       MetaIndexParser->Load(MetaIndexFile);
-      QueueIndexes(true);
+      if (!VerifyVendor(Message, RealURI))
+	 /* expired Release files are still a problem you need extra force for */;
+      else
+	 QueueIndexes(true);
    }
 
    // FIXME: this is used often (e.g. in pkgAcqIndexTrans) so refactor
@@ -1843,6 +1846,7 @@ bool pkgAcqMetaBase::CheckAuthDone(string Message, const string &RealURI)	/*{{{*
 
    if (!VerifyVendor(Message, RealURI))
    {
+      Status = StatAuthError;
       return false;
    }
 
@@ -2030,13 +2034,19 @@ bool pkgAcqMetaBase::VerifyVendor(string Message, const string &RealURI)/*{{{*/
        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());
+      {
+	 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."),
+	       RealURI.c_str(), TimeToStr(invalid_since).c_str());
+	 if (ErrorText.empty())
+	    ErrorText = errmsg;
+	 return _error->Error("%s", errmsg.c_str());
+      }
    }
 
    if (_config->FindB("Debug::pkgAcquire::Auth", false)) 
-- 
cgit v1.2.3-70-g09d2


From 295d848b37e1211feae5d37db27f148dc9ea3d38 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 12 Apr 2015 14:32:12 +0200
Subject: refactor calculation of final lists/ name from URI

Calculating the final name of an item which it will have after
everything is done and verified successfully is suprisingly complicated
as while they all follow a simple pattern, the URI and where it is
stored varies between the items.

With some (abibreaking) redesign we can abstract this similar to how it
is already down for the partial file location.

Git-Dch: Ignore
---
 apt-pkg/acquire-item.cc | 193 ++++++++++++++++++++----------------------------
 apt-pkg/acquire-item.h  |  83 +++++++++++----------
 2 files changed, 124 insertions(+), 152 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index bdbdcc456..f30529066 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -74,6 +74,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")
@@ -273,6 +278,12 @@ void pkgAcquire::Item::SetActiveSubprocess(const std::string &subprocess)/*{{{*/
       APT_IGNORE_DEPRECATED(Mode = ActiveSubprocess.c_str();)
 }
 									/*}}}*/
+// Acquire::Item::GetFinalFilename - Return the full final file path	/*{{{*/
+std::string pkgAcquire::Item::GetFinalFilename() const
+{
+   return GetFinalFileNameFromURI(Desc.URI);
+}
+									/*}}}*/
 // Acquire::Item::ReportMirrorFailure					/*{{{*/
 // ---------------------------------------------------------------------
 void pkgAcquire::Item::ReportMirrorFailure(string FailCode)
@@ -348,8 +359,7 @@ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner,
       std::clog << "pkgAcqDiffIndex: " << Desc.URI << std::endl;
 
    // look for the current package file
-   CurrentPackagesFile = _config->FindDir("Dir::State::lists");
-   CurrentPackagesFile += URItoFileName(RealURI);
+   CurrentPackagesFile = GetFinalFileNameFromURI(RealURI);
 
    // FIXME: this file:/ check is a hack to prevent fetching
    //        from local sources. this is really silly, and
@@ -368,6 +378,13 @@ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner,
 
    QueueURI(Desc);
 
+}
+									/*}}}*/
+// Acquire::Item::GetFinalFilename - Return the full final file path	/*{{{*/
+std::string pkgAcqDiffIndex::GetFinalFilename() const
+{
+   // the logic we inherent from pkgAcqBaseIndex isn't what we need here
+   return pkgAcquire::Item::GetFinalFilename();
 }
 									/*}}}*/
 // AcqIndex::Custom600Headers - Insert custom request headers		/*{{{*/
@@ -379,8 +396,7 @@ string pkgAcqDiffIndex::Custom600Headers() const
 string pkgAcqDiffIndex::Custom600Headers()
 #endif
 {
-   string Final = _config->FindDir("Dir::State::lists");
-   Final += URItoFileName(Desc.URI);
+   string const Final = GetFinalFilename();
 
    if(Debug)
       std::clog << "Custom600Header-IMS: " << Final << std::endl;
@@ -709,10 +725,7 @@ void pkgAcqDiffIndex::Done(string Message,unsigned long long Size,HashStringList
 
    }
 
-   string FinalFile;
-   FinalFile = _config->FindDir("Dir::State::lists");
-   FinalFile += URItoFileName(Desc.URI);
-
+   string const FinalFile = GetFinalFilename();
    if(StringToBool(LookupTag(Message,"IMS-Hit"),false))
       DestFile = FinalFile;
 
@@ -754,8 +767,7 @@ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner,
    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
@@ -797,10 +809,7 @@ void pkgAcqIndexDiffs::Finish(bool allDone)
 	 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;
@@ -1064,10 +1073,8 @@ void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,HashStri
       }
 
 
-      std::string FinalFile = _config->FindDir("Dir::State::lists");
-      FinalFile += URItoFileName(RealURI);
-
       // move the result into place
+      std::string const FinalFile = GetFinalFilename();
       if(Debug)
 	 std::clog << "Queue patched file in place: " << std::endl
 		   << DestFile << " -> " << FinalFile << std::endl;
@@ -1106,6 +1113,12 @@ bool pkgAcqBaseIndex::VerifyHashByMetaKey(HashStringList const &Hashes)
    return true;
 }
 									/*}}}*/
+// AcqBaseIndex::GetFinalFilename - Return the full final file path	/*{{{*/
+std::string pkgAcqBaseIndex::GetFinalFilename() const
+{
+   return GetFinalFileNameFromURI(RealURI);
+}
+									/*}}}*/
 // AcqIndex::AcqIndex - Constructor					/*{{{*/
 // ---------------------------------------------------------------------
 /* The package file is added to the queue and a second class is
@@ -1293,8 +1306,7 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
 // pkgAcqIndex::GetFinalFilename - Return the full final file path	/*{{{*/
 std::string pkgAcqIndex::GetFinalFilename() const
 {
-   std::string FinalFile = _config->FindDir("Dir::State::lists");
-   FinalFile += URItoFileName(RealURI);
+   std::string const FinalFile = GetFinalFileNameFromURI(RealURI);
    return GetCompressedFileName(RealURI, FinalFile, CurrentCompressionExtension);
 }
 									/*}}}*/
@@ -1566,18 +1578,16 @@ void pkgAcqMetaBase::TransactionStageRemoval(Item *I,
                                              const std::string &FinalFile)
 {
    I->PartialFile = "";
-   I->DestFile = FinalFile; 
+   I->DestFile = FinalFile;
 }
 									/*}}}*/
 // AcqMetaBase::GenerateAuthWarning - Check gpg authentication error	/*{{{*/
-bool pkgAcqMetaBase::CheckStopAuthentication(const std::string &RealURI,
-                                             const std::string &Message)
+bool pkgAcqMetaBase::CheckStopAuthentication(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);
-
+   string const Final = GetFinalFilename();
    if(FileExists(Final))
    {
       Status = StatTransientNetworkError;
@@ -1613,13 +1623,12 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
                              string MetaIndexFile,
 			     const vector<IndexTarget*>* IndexTargets,
 			     indexRecords* MetaIndexParser) :
-   pkgAcqMetaBase(Owner, IndexTargets, MetaIndexParser,
+   pkgAcqMetaBase(Owner, IndexTargets, MetaIndexParser, URI,
                   HashStringList(), TransactionManager),
-   RealURI(URI), MetaIndexFile(MetaIndexFile), URIDesc(URIDesc),
+   MetaIndexFile(MetaIndexFile), URIDesc(URIDesc),
    ShortDesc(ShortDesc)
 {
-   DestFile = _config->FindDir("Dir::State::lists") + "partial/";
-   DestFile += URItoFileName(RealURI);
+   DestFile = GetPartialFileNameFromURI(RealURI);
 
    // remove any partial downloaded sig-file in partial/.
    // it may confuse proxies and is too small to warrant a
@@ -1642,18 +1651,6 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
 									/*}}}*/
 pkgAcqMetaSig::~pkgAcqMetaSig()						/*{{{*/
 {
-}
-									/*}}}*/
-// pkgAcqMetaSig::Custom600Headers - Insert custom request headers	/*{{{*/
-// ---------------------------------------------------------------------
-#if APT_PKG_ABI >= 413
-string pkgAcqMetaSig::Custom600Headers() const
-#else
-string pkgAcqMetaSig::Custom600Headers()
-#endif
-{
-   std::string Header = GetCustom600Headers(RealURI);
-   return Header;
 }
 									/*}}}*/
 // pkgAcqMetaSig::Done - The signature was downloaded/verified		/*{{{*/
@@ -1667,7 +1664,7 @@ void pkgAcqMetaSig::Done(string Message,unsigned long long Size,
 
    if(AuthPass == false)
    {
-      if(CheckDownloadDone(Message, RealURI) == true)
+      if(CheckDownloadDone(Message) == true)
       {
          // destfile will be modified to point to MetaIndexFile for the
          // gpgv method, so we need to save it here
@@ -1676,15 +1673,8 @@ void pkgAcqMetaSig::Done(string Message,unsigned long long Size,
       }
       return;
    }
-   else
-   {
-      if(CheckAuthDone(Message, RealURI) == true)
-      {
-         std::string FinalFile = _config->FindDir("Dir::State::lists");
-         FinalFile += URItoFileName(RealURI);
-         TransactionManager->TransactionStageCopy(this, MetaIndexFileSignature, FinalFile);
-      }
-   }
+   else if(CheckAuthDone(Message) == true)
+      TransactionManager->TransactionStageCopy(this, MetaIndexFileSignature, GetFinalFilename());
 }
 									/*}}}*/
 void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/
@@ -1692,14 +1682,14 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/
    Item::Failed(Message,Cnf);
 
    // check if we need to fail at this point 
-   if (AuthPass == true && CheckStopAuthentication(RealURI, Message))
+   if (AuthPass == true && CheckStopAuthentication(Message))
          return;
 
    // FIXME: meh, this is not really elegant
-   string const Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
+   string const Final = GetFinalFileNameFromURI(RealURI);
    string const InReleaseURI = RealURI.replace(RealURI.rfind("Release.gpg"), 12,
                                          "InRelease");
-   string const FinalInRelease = _config->FindDir("Dir::State::lists") + URItoFileName(InReleaseURI);
+   string const FinalInRelease = GetFinalFileNameFromURI(InReleaseURI);
 
    if (RealFileExists(Final) || RealFileExists(FinalInRelease))
    {
@@ -1739,7 +1729,7 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/
       // we parse the indexes here because at this point the user wanted
       // a repository that may potentially harm him
       MetaIndexParser->Load(MetaIndexFile);
-      if (!VerifyVendor(Message, RealURI))
+      if (!VerifyVendor(Message))
 	 /* expired Release files are still a problem you need extra force for */;
       else
 	 QueueIndexes(true);
@@ -1760,9 +1750,9 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner,			/*{{{*/
                                  string MetaIndexSigURI,string MetaIndexSigURIDesc, string MetaIndexSigShortDesc,
 				 const vector<IndexTarget*>* IndexTargets,
 				 indexRecords* MetaIndexParser) :
-   pkgAcqMetaBase(Owner, IndexTargets, MetaIndexParser, HashStringList(),
+   pkgAcqMetaBase(Owner, IndexTargets, MetaIndexParser, URI, HashStringList(),
                   TransactionManager), 
-   RealURI(URI), URIDesc(URIDesc), ShortDesc(ShortDesc),
+   URIDesc(URIDesc), ShortDesc(ShortDesc),
    MetaIndexSigURI(MetaIndexSigURI), MetaIndexSigURIDesc(MetaIndexSigURIDesc),
    MetaIndexSigShortDesc(MetaIndexSigShortDesc)
 {
@@ -1796,24 +1786,13 @@ void pkgAcqMetaIndex::Init(std::string URIDesc, std::string ShortDesc)
    QueueURI(Desc);
 }
 									/*}}}*/
-// pkgAcqMetaIndex::Custom600Headers - Insert custom request headers	/*{{{*/
-// ---------------------------------------------------------------------
-#if APT_PKG_ABI >= 413
-string pkgAcqMetaIndex::Custom600Headers() const
-#else
-string pkgAcqMetaIndex::Custom600Headers()
-#endif
-{
-   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))
+   if(CheckDownloadDone(Message))
    {
       // we have a Release file, now download the Signature, all further
       // verify/queue for additional downloads will be done in the
@@ -1824,13 +1803,11 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long long Size,	/*{{{*/
                         MetaIndexSigShortDesc, MetaIndexFile, IndexTargets, 
                         MetaIndexParser);
 
-      string FinalFile = _config->FindDir("Dir::State::lists");
-      FinalFile += URItoFileName(RealURI);
-      TransactionManager->TransactionStageCopy(this, DestFile, FinalFile);
+      TransactionManager->TransactionStageCopy(this, DestFile, GetFinalFilename());
    }
 }
 									/*}}}*/
-bool pkgAcqMetaBase::CheckAuthDone(string Message, const string &RealURI)	/*{{{*/
+bool pkgAcqMetaBase::CheckAuthDone(string Message)			/*{{{*/
 {
    // At this point, the gpgv method has succeeded, so there is a
    // valid signature from a key in the trusted keyring.  We
@@ -1844,7 +1821,7 @@ bool pkgAcqMetaBase::CheckAuthDone(string Message, const string &RealURI)	/*{{{*
       return false;
    }
 
-   if (!VerifyVendor(Message, RealURI))
+   if (!VerifyVendor(Message))
    {
       Status = StatAuthError;
       return false;
@@ -1866,9 +1843,13 @@ bool pkgAcqMetaBase::CheckAuthDone(string Message, const string &RealURI)	/*{{{*
    return true;
 }
 									/*}}}*/
-// pkgAcqMetaBase::GetCustom600Headers - Get header for AcqMetaBase     /*{{{*/
+// pkgAcqMetaBase::Custom600Headers - Get header for AcqMetaBase	/*{{{*/
 // ---------------------------------------------------------------------
-string pkgAcqMetaBase::GetCustom600Headers(const string &RealURI) const
+#if APT_PKG_ABI >= 413
+string pkgAcqMetaBase::Custom600Headers() const
+#else
+string pkgAcqMetaBase::Custom600Headers()
+#endif
 {
    std::string Header = "\nIndex-File: true";
    std::string MaximumSize;
@@ -1876,8 +1857,7 @@ string pkgAcqMetaBase::GetCustom600Headers(const string &RealURI) const
              _config->FindI("Acquire::MaxReleaseFileSize", 10*1000*1000));
    Header += MaximumSize;
 
-   string FinalFile = _config->FindDir("Dir::State::lists");
-   FinalFile += URItoFileName(RealURI);
+   string const FinalFile = GetFinalFilename();
 
    struct stat Buf;
    if (stat(FinalFile.c_str(),&Buf) == 0)
@@ -1886,6 +1866,12 @@ string pkgAcqMetaBase::GetCustom600Headers(const string &RealURI) const
    return Header;
 }
 									/*}}}*/
+// pkgAcqMetaBase::GetFinalFilename - Return the full final file path	/*{{{*/
+std::string pkgAcqMetaBase::GetFinalFilename() const
+{
+   return GetFinalFileNameFromURI(RealURI);
+}
+									/*}}}*/
 // pkgAcqMetaBase::QueueForSignatureVerify				/*{{{*/
 void pkgAcqMetaBase::QueueForSignatureVerify(const std::string &MetaIndexFile,
                                     const std::string &MetaIndexFileSignature)
@@ -1898,8 +1884,7 @@ void pkgAcqMetaBase::QueueForSignatureVerify(const std::string &MetaIndexFile,
 }
 									/*}}}*/
 // pkgAcqMetaBase::CheckDownloadDone					/*{{{*/
-bool pkgAcqMetaBase::CheckDownloadDone(const std::string &Message,
-                                       const std::string &RealURI)
+bool pkgAcqMetaBase::CheckDownloadDone(const std::string &Message)
 {
    // We have just finished downloading a Release file (it is not
    // verified yet)
@@ -1923,11 +1908,7 @@ bool pkgAcqMetaBase::CheckDownloadDone(const std::string &Message,
    // 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;
-   }
+      DestFile = GetFinalFilename();
 
    // set Item to complete as the remaining work is all local (verify etc)
    Complete = true;
@@ -1993,7 +1974,7 @@ void pkgAcqMetaBase::QueueIndexes(bool verify)				/*{{{*/
    }
 }
 									/*}}}*/
-bool pkgAcqMetaBase::VerifyVendor(string Message, const string &RealURI)/*{{{*/
+bool pkgAcqMetaBase::VerifyVendor(string Message)			/*{{{*/
 {
    string::size_type pos;
 
@@ -2083,8 +2064,6 @@ void pkgAcqMetaIndex::Failed(string Message,
    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());
@@ -2096,7 +2075,7 @@ void pkgAcqMetaIndex::Failed(string Message,
    {
       // Done, queue for rename on transaction finished
       if (FileExists(DestFile)) 
-         TransactionManager->TransactionStageCopy(this, DestFile, FinalFile);
+         TransactionManager->TransactionStageCopy(this, DestFile, GetFinalFilename());
 
       // queue without any kind of hashsum support
       QueueIndexes(false);
@@ -2132,19 +2111,18 @@ pkgAcqMetaClearSig::~pkgAcqMetaClearSig()				/*{{{*/
 }
 									/*}}}*/
 // pkgAcqMetaClearSig::Custom600Headers - Insert custom request headers	/*{{{*/
-// ---------------------------------------------------------------------
 #if APT_PKG_ABI >= 413
 string pkgAcqMetaClearSig::Custom600Headers() const
 #else
 string pkgAcqMetaClearSig::Custom600Headers()
 #endif
 {
-   string Header = GetCustom600Headers(RealURI);
+   string Header = pkgAcqMetaBase::Custom600Headers();
    Header += "\nFail-Ignore: true";
    return Header;
 }
 									/*}}}*/
-// pkgAcqMetaClearSig::Done - We got a file                     	/*{{{*/
+// pkgAcqMetaClearSig::Done - We got a file				/*{{{*/
 // ---------------------------------------------------------------------
 void pkgAcqMetaClearSig::Done(std::string Message,unsigned long long Size,
                               HashStringList const &Hashes,
@@ -2165,21 +2143,12 @@ void pkgAcqMetaClearSig::Done(std::string Message,unsigned long long Size,
 
    if(AuthPass == false)
    {
-      if(CheckDownloadDone(Message, RealURI) == true)
+      if(CheckDownloadDone(Message) == 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);
-      }
-   }
+   else if(CheckAuthDone(Message) == true)
+      TransactionManager->TransactionStageCopy(this, DestFile, GetFinalFilename());
 }
 									/*}}}*/
 void pkgAcqMetaClearSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/
@@ -2194,9 +2163,7 @@ void pkgAcqMetaClearSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*
       // 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);
+      TransactionManager->TransactionStageRemoval(this, GetFinalFilename());
       Status = StatDone;
 
       new pkgAcqMetaIndex(Owner, TransactionManager,
@@ -2206,7 +2173,7 @@ void pkgAcqMetaClearSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*
    }
    else
    {
-      if(CheckStopAuthentication(RealURI, Message))
+      if(CheckStopAuthentication(Message))
          return;
 
       _error->Warning(_("The data from '%s' is not signed. Packages "
@@ -2224,8 +2191,7 @@ void pkgAcqMetaClearSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*
           * that PackageFile objects are correctly filled in */
          if (FileExists(DestFile))
          {
-            string FinalFile = _config->FindDir("Dir::State::lists");
-            FinalFile += URItoFileName(RealURI);
+            string FinalFile = GetFinalFilename();
             /* InRelease files become Release files, otherwise
              * they would be considered as trusted later on */
             RealURI = RealURI.replace(RealURI.rfind("InRelease"), 9,
@@ -2482,13 +2448,18 @@ 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;
 }
 									/*}}}*/
+// Acquire::Item::GetFinalFilename - Return the full final file path	/*{{{*/
+std::string pkgAcqArchive::GetFinalFilename() const
+{
+   return _config->FindDir("Dir::Cache::Archives") + flNotDir(StoreFilename);
+}
+									/*}}}*/
 // AcqArchive::Failed - Failure handler					/*{{{*/
 // ---------------------------------------------------------------------
 /* Here we try other sources */
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 1af737e00..c2759b792 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -93,6 +93,9 @@ class pkgAcquire::Item : public WeakPointable
     */
    bool Rename(std::string From,std::string To);
 
+   /** \brief Get the full pathname of the final file for the current URI */
+   virtual std::string GetFinalFilename() const;
+
    public:
 
    /** \brief The current status of this item. */
@@ -390,7 +393,13 @@ class pkgAcqMetaBase  : public pkgAcquire::Item				/*{{{*/
    bool AuthPass;
 
    // required to deal gracefully with problems caused by incorrect ims hits
-   bool IMSHit; 
+   bool IMSHit;
+
+   /** \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 Starts downloading the individual index files.
     *
@@ -411,15 +420,17 @@ 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(const std::string &Message);
 
    /** \brief Queue the downloaded Signature for verification */
    void QueueForSignatureVerify(const std::string &MetaIndexFile,
                                 const std::string &MetaIndexFileSignature);
 
-   /** \brief get the custom600 header for all pkgAcqMeta */
-   std::string GetCustom600Headers(const std::string &RealURI) const;
+#if APT_PKG_ABI >= 413
+   virtual std::string Custom600Headers() const;
+#else
+   virtual std::string Custom600Headers();
+#endif
 
    /** \brief Called when authentication succeeded.
     *
@@ -430,20 +441,24 @@ 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 Message);
 
    /** Check if the current item should fail at this point */
-   bool CheckStopAuthentication(const std::string &RealURI,
-                                const std::string &Message);
+   bool CheckStopAuthentication(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 Message);
+
+   /** \brief Get the full pathname of the final file for the current URI */
+   virtual std::string GetFinalFilename() const;
+
  public:
+   virtual std::string DescURI() {return RealURI; };
+
    // transaction code
    void Add(Item *I);
    void AbortTransaction();
@@ -462,11 +477,12 @@ class pkgAcqMetaBase  : public pkgAcquire::Item				/*{{{*/
    pkgAcqMetaBase(pkgAcquire *Owner,
                   const std::vector<IndexTarget*>* IndexTargets,
                   indexRecords* MetaIndexParser,
+		  std::string const &RealURI,
                   HashStringList const &ExpectedHashes=HashStringList(),
                   pkgAcqMetaBase *TransactionManager=NULL)
       : Item(Owner, ExpectedHashes, TransactionManager),
         MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets),
-        AuthPass(false), IMSHit(false) {};
+        AuthPass(false), IMSHit(false), RealURI(RealURI) {};
 };
 									/*}}}*/
 /** \brief An acquire item that downloads the detached signature	{{{
@@ -483,12 +499,6 @@ class APT_HIDDEN pkgAcqMetaSig : public pkgAcqMetaBase
 
    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 The file we need to verify */
    std::string MetaIndexFile;
 
@@ -502,18 +512,12 @@ class APT_HIDDEN pkgAcqMetaSig : public pkgAcqMetaBase
    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);
-#if APT_PKG_ABI >= 413
-   virtual std::string Custom600Headers() const;
-#else
-   virtual std::string Custom600Headers();
-#endif
-   virtual std::string DescURI() {return RealURI; };
 
    /** \brief Create a new pkgAcqMetaSig. */
    pkgAcqMetaSig(pkgAcquire *Owner,
@@ -540,11 +544,6 @@ 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;
 
@@ -566,12 +565,6 @@ class APT_HIDDEN pkgAcqMetaIndex : public pkgAcqMetaBase
    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);
-#if APT_PKG_ABI >= 413
-   virtual std::string Custom600Headers() const;
-#else
-   virtual std::string Custom600Headers();
-#endif
-   virtual std::string DescURI() {return RealURI; };
    virtual void Finished();
 
    /** \brief Create a new pkgAcqMetaIndex. */
@@ -652,6 +645,9 @@ class pkgAcqBaseIndex : public pkgAcquire::Item
 
    bool VerifyHashByMetaKey(HashStringList const &Hashes);
 
+   /** \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,
@@ -692,6 +688,9 @@ class APT_HIDDEN pkgAcqDiffIndex : public pkgAcqBaseIndex
     */
    bool PackagesFileReadyInPartial;
 
+   /** \brief Get the full pathname of the final file for the current URI */
+   virtual std::string GetFinalFilename() const;
+
  public:
    // Specialized action members
    virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
@@ -999,16 +998,15 @@ class APT_HIDDEN pkgAcqIndex : public pkgAcqBaseIndex
    /** \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;
+
    public:
    
    // Specialized action members
@@ -1133,9 +1131,12 @@ class pkgAcqArchive : public pkgAcquire::Item
 
    /** \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);
-- 
cgit v1.2.3-70-g09d2


From ba6b79bd0090077724fa1272ea4d3a31706fcd5a Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 12 Apr 2015 17:08:46 +0200
Subject: a hit on Release files means the indexes will be hits too

If we get a IMSHit for the Transaction-Manager (= the InRelease file or
as its still supported fallback Release + Release.gpg combo) we can
assume that every file we would queue based on this manager, but already
have locally is current and hence would get an IMSHit, too. We therefore
save us and the server the trouble and skip the queuing in this case.
Beside speeding up repetative executions of 'apt-get update' this way we
also avoid hitting hashsum errors if the indexes are in fact already
updated, but the Release file isn't yet as it is the case on well
behaving mirrors as Release files is updated last.

The implementation is a bit harder than the theory makes it sound as we
still have to keep reverifying the Release files (e.g. to detect now expired
once to avoid an attacker being able to silently stale us) and have to
handle cases in which the Release file hits, but some indexes aren't
present (e.g. user added a new foreign architecture).
---
 apt-pkg/acquire-item.cc                           |  90 ++++++++++---
 apt-pkg/acquire-item.h                            |  28 ++--
 apt-pkg/acquire.h                                 |   1 +
 test/integration/framework                        |  19 +--
 test/integration/test-apt-update-expected-size    |   4 +
 test/integration/test-apt-update-ims              | 150 +++++++++++++++-------
 test/integration/test-apt-update-not-modified     |  45 +++++++
 test/integration/test-apt-update-transactions     |   7 +
 test/integration/test-bug-602412-dequote-redirect |   3 -
 test/integration/test-pdiff-usage                 |  15 +--
 test/interactive-helper/aptwebserver.cc           |   9 +-
 11 files changed, 273 insertions(+), 98 deletions(-)
 create mode 100755 test/integration/test-apt-update-not-modified

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index f30529066..750e7daca 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -213,7 +213,7 @@ void pkgAcquire::Item::Done(string Message,unsigned long long Size,HashStringLis
    step */
 bool pkgAcquire::Item::Rename(string From,string 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;
@@ -224,9 +224,41 @@ bool pkgAcquire::Item::Rename(string From,string To)
    return false;
 }
 									/*}}}*/
-void pkgAcquire::Item::QueueURI(ItemDesc &Item)				/*{{{*/
+// Acquire::Item::QueueURI and specialisations from child classes	/*{{{*/
+/* 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 pkgAcquire::Item::QueueURI(ItemDesc &Item)
 {
+   std::string const FinalFile = GetFinalFilename();
+   if (TransactionManager != NULL && TransactionManager->IMSHit == true &&
+	 FileExists(FinalFile) == true)
+   {
+      PartialFile = DestFile = FinalFile;
+      Status = StatDone;
+      return false;
+   }
+
    Owner->Enqueue(Item);
+   return true;
+}
+/* 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)
+{
+   Owner->Enqueue(Item);
+   return true;
+}
+/* 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 (pkgAcquire::Item::QueueURI(Item) == true)
+      return true;
+   QueueOnIMSHit();
+   return false;
 }
 									/*}}}*/
 void pkgAcquire::Item::Dequeue()					/*{{{*/
@@ -408,6 +440,14 @@ string pkgAcqDiffIndex::Custom600Headers()
    return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
 }
 									/*}}}*/
+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,
+	 ExpectedHashes, MetaIndexParser);
+}
+									/*}}}*/
 bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)		/*{{{*/
 {
    // failing here is fine: our caller will take care of trying to
@@ -470,11 +510,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)		/*{{{*/
       // 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;
    }
 
@@ -1096,6 +1132,17 @@ void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,HashStri
       if(Debug)
 	 std::clog << "allDone: " << DestFile << "\n" << std::endl;
    }
+}
+									/*}}}*/
+// AcqBaseIndex - Constructor						/*{{{*/
+pkgAcqBaseIndex::pkgAcqBaseIndex(pkgAcquire *Owner,
+      pkgAcqMetaBase *TransactionManager,
+      struct IndexTarget const * const Target,
+      HashStringList const &ExpectedHashes,
+      indexRecords *MetaIndexParser)
+: Item(Owner, ExpectedHashes, TransactionManager), Target(Target),
+   MetaIndexParser(MetaIndexParser)
+{
 }
 									/*}}}*/
 // AcqBaseIndex::VerifyHashByMetaKey - verify hash for the given metakey /*{{{*/
@@ -1489,6 +1536,19 @@ void pkgAcqIndex::StageDecompressDone(string Message,
    TransactionManager->TransactionStageCopy(this, DestFile, GetFinalFilename());
 
    return;
+}
+									/*}}}*/
+// AcqMetaBase - Constructor						/*{{{*/
+pkgAcqMetaBase::pkgAcqMetaBase(pkgAcquire *Owner,
+      const std::vector<IndexTarget*>* IndexTargets,
+      indexRecords* MetaIndexParser,
+      std::string const &RealURI,
+      HashStringList const &ExpectedHashes,
+      pkgAcqMetaBase *TransactionManager)
+: Item(Owner, ExpectedHashes, TransactionManager),
+   MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets),
+   AuthPass(false), RealURI(RealURI), IMSHit(false)
+{
 }
 									/*}}}*/
 // AcqMetaBase::Add - Add a item to the current Transaction		/*{{{*/
@@ -1831,13 +1891,7 @@ bool pkgAcqMetaBase::CheckAuthDone(string Message)			/*{{{*/
       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
+   // Download further indexes with verification
    QueueIndexes(true);
 
    return true;
@@ -1908,7 +1962,13 @@ bool pkgAcqMetaBase::CheckDownloadDone(const std::string &Message)
    // make sure to verify against the right file on I-M-S hit
    IMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false);
    if(IMSHit)
+   {
+      // for simplicity, the transaction manager is always InRelease
+      // even if it doesn't exist.
+      if (TransactionManager != NULL)
+	 TransactionManager->IMSHit = true;
       DestFile = GetFinalFilename();
+   }
 
    // set Item to complete as the remaining work is all local (verify etc)
    Complete = true;
@@ -1951,7 +2011,7 @@ void pkgAcqMetaBase::QueueIndexes(bool verify)				/*{{{*/
                    << "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;
+         std::cerr << "For: " << ((Record == NULL) ? "<NULL>" : Record->MetaKeyFilename) << std::endl;
 
       }
       if (verify == true && ExpectedIndexHashes.empty() == true)
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index c2759b792..148728b3c 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -73,11 +73,16 @@ class pkgAcquire::Item : public WeakPointable
    pkgAcquire *Owner;
 
    /** \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
     */
-   void QueueURI(ItemDesc &Item);
+   virtual bool QueueURI(ItemDesc &Item);
 
    /** \brief Remove this item from its owner's queue. */
    void Dequeue();
@@ -392,9 +397,6 @@ class pkgAcqMetaBase  : public pkgAcquire::Item				/*{{{*/
     */
    bool AuthPass;
 
-   // required to deal gracefully with problems caused by incorrect ims hits
-   bool IMSHit;
-
    /** \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.
@@ -457,7 +459,11 @@ class pkgAcqMetaBase  : public pkgAcquire::Item				/*{{{*/
    virtual std::string GetFinalFilename() const;
 
  public:
+   // This refers more to the Transaction-Manager than the actual file
+   bool IMSHit;
+
    virtual std::string DescURI() {return RealURI; };
+   virtual bool QueueURI(pkgAcquire::ItemDesc &Item);
 
    // transaction code
    void Add(Item *I);
@@ -479,10 +485,7 @@ class pkgAcqMetaBase  : public pkgAcquire::Item				/*{{{*/
                   indexRecords* MetaIndexParser,
 		  std::string const &RealURI,
                   HashStringList const &ExpectedHashes=HashStringList(),
-                  pkgAcqMetaBase *TransactionManager=NULL)
-      : Item(Owner, ExpectedHashes, TransactionManager),
-        MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets),
-        AuthPass(false), IMSHit(false), RealURI(RealURI) {};
+                  pkgAcqMetaBase *TransactionManager=NULL);
 };
 									/*}}}*/
 /** \brief An acquire item that downloads the detached signature	{{{
@@ -652,9 +655,7 @@ class pkgAcqBaseIndex : public pkgAcquire::Item
                    pkgAcqMetaBase *TransactionManager,
                    struct IndexTarget const * const Target,
                    HashStringList const &ExpectedHashes,
-                   indexRecords *MetaIndexParser)
-      : Item(Owner, ExpectedHashes, TransactionManager), Target(Target), 
-        MetaIndexParser(MetaIndexParser) {};
+                   indexRecords *MetaIndexParser);
 };
 									/*}}}*/
 /** \brief An item that is responsible for fetching an index file of	{{{
@@ -691,6 +692,7 @@ class APT_HIDDEN pkgAcqDiffIndex : public pkgAcqBaseIndex
    /** \brief Get the full pathname of the final file for the current URI */
    virtual std::string GetFinalFilename() const;
 
+   virtual bool QueueURI(pkgAcquire::ItemDesc &Item);
  public:
    // Specialized action members
    virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
@@ -714,7 +716,6 @@ class APT_HIDDEN pkgAcqDiffIndex : public pkgAcqBaseIndex
     *  false otherwise.
     */
    bool ParseDiffIndex(std::string IndexDiffFile);
-   
 
    /** \brief Create a new pkgAcqDiffIndex.
     *
@@ -733,6 +734,8 @@ class APT_HIDDEN pkgAcqDiffIndex : public pkgAcqBaseIndex
                    struct IndexTarget const * const Target,
                    HashStringList const &ExpectedHashes,
                    indexRecords *MetaIndexParser);
+ private:
+   APT_HIDDEN void QueueOnIMSHit() const;
 };
 									/*}}}*/
 /** \brief An item that is responsible for fetching client-merge patches {{{
@@ -1008,7 +1011,6 @@ class APT_HIDDEN pkgAcqIndex : public pkgAcqBaseIndex
    virtual std::string GetFinalFilename() const;
 
    public:
-   
    // Specialized action members
    virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
    virtual void Done(std::string Message,unsigned long long Size, 
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index f33362922..fc90624e1 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.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;
diff --git a/test/integration/framework b/test/integration/framework
index 642c5f0d0..4229ae162 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1005,6 +1005,7 @@ signreleasefiles() {
 }
 
 webserverconfig() {
+	local WEBSERVER="${3:-http://localhost:8080}"
 	local NOCHECK=false
 	if [ "$1" = '--no-check' ]; then
 		NOCHECK=true
@@ -1016,10 +1017,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
@@ -1467,12 +1468,14 @@ 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 ###
diff --git a/test/integration/test-apt-update-expected-size b/test/integration/test-apt-update-expected-size
index 22de13ea5..9f58308aa 100755
--- a/test/integration/test-apt-update-expected-size
+++ b/test/integration/test-apt-update-expected-size
@@ -38,6 +38,10 @@ E: Some index files failed to download. They have been ignored, or old ones used
 }
 
 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
diff --git a/test/integration/test-apt-update-ims b/test/integration/test-apt-update-ims
index 0fa882d78..f091bffaa 100755
--- a/test/integration/test-apt-update-ims
+++ b/test/integration/test-apt-update-ims
@@ -6,85 +6,145 @@ 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 'ReceivedHash:' | 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 .* \(InRelease\|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 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 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..."
-
+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"
+msgmsg 'Release only'
 EXPECT="Ign http://localhost:8080 unstable InRelease
   404  Not Found
 Hit http://localhost:8080 unstable Release
 Ign 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."
+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 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 http://localhost:8080 unstable InRelease
+  404  Not Found
+Hit http://localhost:8080 unstable Release
+Hit http://localhost:8080 unstable Release.gpg
+E: Release file for http://localhost:8080/dists/unstable/Release.gpg 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 http://localhost:8080 unstable InRelease
+  404  Not Found
+Hit http://localhost:8080 unstable Release
+Ign http://localhost:8080 unstable Release.gpg
+  404  Not Found
+W: The data from 'http://localhost:8080 unstable Release.gpg' is not signed. Packages from that repository can not be authenticated.
+E: Release file for http://localhost:8080/dists/unstable/InRelease 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 http://localhost:8080 unstable InRelease
+  404  Not Found
+Ign http://localhost:8080 unstable Release
+  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 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-not-modified b/test/integration/test-apt-update-not-modified
new file mode 100755
index 000000000..2dc56e76c
--- /dev/null
+++ b/test/integration/test-apt-update-not-modified
@@ -0,0 +1,45 @@
+#!/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 with' "$1"
+	rm -rf rootdir/var/lib/apt/lists
+	# get our cache populated
+	testsuccess aptget update
+	listcurrentlistsdirectory > listsdir.lst
+
+	# hit again with a good cache
+	testsuccessequal "Hit $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 unstable InRelease
+Reading package lists..." aptget update
+	testfileequal 'listsdir-without-amd64.lst' "$(listcurrentlistsdirectory)"
+
+	# readd arch so its downloaded again
+	configarchitecture 'amd64' 'i386'
+	testsuccessequal "Hit $1 unstable InRelease
+Get:1 $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)"
+}
+
+changetowebserver
+methodtest 'http://localhost:8080'
+
+changetohttpswebserver
+methodtest 'https://localhost:4433'
diff --git a/test/integration/test-apt-update-transactions b/test/integration/test-apt-update-transactions
index b325733ac..f028ac0c7 100755
--- a/test/integration/test-apt-update-transactions
+++ b/test/integration/test-apt-update-transactions
@@ -59,6 +59,13 @@ testsetup() {
 }
 
 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
+
 testsetup 'http'
 
+changetohttpswebserver
+
+testsetup 'https'
diff --git a/test/integration/test-bug-602412-dequote-redirect b/test/integration/test-bug-602412-dequote-redirect
index 384c8b113..ca2378c19 100755
--- a/test/integration/test-bug-602412-dequote-redirect
+++ b/test/integration/test-bug-602412-dequote-redirect
@@ -22,9 +22,6 @@ testrun() {
 
 	# check that I-M-S header is kept in redirections
 	testsuccessequal "Hit $1 unstable InRelease
-Hit $1 unstable/main Sources
-Hit $1 unstable/main amd64 Packages
-Hit $1 unstable/main Translation-en
 Reading package lists..." aptget update
 
 	msgtest 'Test redirection works in' 'package download'
diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage
index 4de07f1ad..5e759e50e 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
@@ -96,6 +87,8 @@ SHA256-Patches:
 	msgmsg "Testcase: index is already up-to-date: $*"
 	find rootdir/var/lib/apt/lists -name '*diff_Index' -type f -delete
 	testsuccess aptget update "$@"
+	testequal 'Hit 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
 
diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index 86d5c06f0..6a411e24e 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -96,9 +96,12 @@ static void addFileHeaders(std::list<std::string> &headers, FileFd &data)/*{{{*/
       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 (_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)/*{{{*/
-- 
cgit v1.2.3-70-g09d2


From f4c7a238f4c29ac9b1e1172f103ab7dec5c5807d Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 16 Apr 2015 11:01:37 +0200
Subject: hide first pdiff merge failure debug message

The sibling of this message are all guarded as debug messages, just this
one had it missing an subsequently causes display issues if triggered.

Git-Dch: Ignore
---
 apt-pkg/acquire-item.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 750e7daca..00862fe23 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1044,7 +1044,8 @@ 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;
+   if (Debug)
+      std::clog << "Falling back to normal index file acquire" << std::endl;
    new pkgAcqIndex(Owner, TransactionManager, Target, ExpectedHashes, MetaIndexParser);
 }
 									/*}}}*/
-- 
cgit v1.2.3-70-g09d2


From 6c9937da76b9155d166092b9dda22d06200510c1 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Wed, 22 Apr 2015 12:06:40 +0200
Subject: remove "first package seen is native package" assumption

The fix for #777760 causes packages of foreign (and the native)
architectures, to be created correctly, but invalidates (like the
previously existing, but policy-forbidden architecture-less packages
we had to support for some upgrade scenarios) the assumption that the
first (and only) package in the cache for a single architecture system
must be the package for the native architecture (as, where should the
other architectures come from, right? Wrong.).

Depending on the order of parsing sources more or less packages can be
effected by this. The effects are strange (for apt it mostly effects
simulation/debug output, but also apt-mark on these specific packages),
which complicates debugging, but relatively harmless if understood as
most actions do not need direct named access to packages.

The problem is fixed by removing the single-arch special casing in the
paths who had them (Cache.FindPkg), so they use the same code as
multi-arch systems, which use them as a wrapper for Grp.FindPkg.

Note that single-arch system code was using Grp.FindPkg before as well
if a Grp structure was handily available, so we don't introduce new
untested code here: We remove more brittle special cases which are less
tested instead (this was planed to be done for Stretch anyhow).

Note further that the method with the assumption itself isn't fixed. As
it is a private method I opted for declaring it deprecated instead and
remove all its call positions. As it is private no-one can call this
method legally (thanks to how c++ works by default its still an exported
symbol through) and fixing it basically means reimplementing code we
already have in Grp.FindPkg.

Removing rather than fixing seems hence like a good solution.

Closes: 782777
Thanks: Axel Beckert for testing
---
 apt-pkg/pkgcache.cc                                | 14 +----
 apt-pkg/pkgcache.h                                 |  2 +-
 .../test-bug-782777-single-arch-weirdness          | 72 ++++++++++++++++++++++
 3 files changed, 74 insertions(+), 14 deletions(-)
 create mode 100755 test/integration/test-bug-782777-single-arch-weirdness

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index d7c9656b9..a7b75dae8 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -230,12 +230,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.
@@ -249,13 +244,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) */
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 5e8a9630a..a7e520bc9 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -218,7 +218,7 @@ class pkgCache								/*{{{*/
 
 private:
    bool MultiArchEnabled;
-   PkgIterator SingleArchFindPkg(const std::string &Name);
+   APT_DEPRECATED PkgIterator SingleArchFindPkg(const std::string &Name);
 };
 									/*}}}*/
 // Header structure							/*{{{*/
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
-- 
cgit v1.2.3-70-g09d2


From 4694e07d450baa13fa04482752ca369a5797c640 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Tue, 28 Apr 2015 16:15:25 +0200
Subject: releasing package apt version 1.0.9.9

---
 debian/changelog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e9634c763..00322b8c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+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 ]
-- 
cgit v1.2.3-70-g09d2


From 15901516326737a67f2a9af26cd7e434162de019 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Tue, 28 Apr 2015 17:55:00 +0200
Subject: Move sysconf(_SC_OPEN_MAX); out of the for() loop to avoid unneeded
 syscalls

---
 apt-pkg/contrib/fileutl.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 1ba4674e5..1e6d96fe9 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -778,8 +778,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);
-- 
cgit v1.2.3-70-g09d2


From 146f7715a9f36d246b461255b3c683b479296915 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 27 Apr 2015 10:59:27 +0200
Subject: improve partial/ cleanup in abort and failure cases

Especially pdiff-enhanced downloads have the tendency to fail for
various reasons from which we can recover and even a successful download
used to leave the old unpatched index in partial/.

By adding a new method responsible for making the transaction of an
individual file happen we can at specialisations especially for abort
cases to deal with the cleanup.

This also helps in keeping the compressed indexes around if another
index failed instead of keeping the decompressed files, which we
wouldn't pick up in the next call.
---
 apt-pkg/acquire-item.cc                        | 193 +++++++++++++++++--------
 apt-pkg/acquire-item.h                         |  17 ++-
 test/integration/framework                     |   6 +-
 test/integration/test-apt-update-expected-size |   2 +-
 test/integration/test-partial-file-support     |  23 ++-
 test/integration/test-pdiff-usage              |   2 +-
 6 files changed, 161 insertions(+), 82 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 00862fe23..01ce0e650 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -173,6 +173,39 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
       ReportMirrorFailure(ErrorText);
 }
 									/*}}}*/
+bool pkgAcquire::Item::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());
+	 }
+	 // mark that this transaction is finished
+	 TransactionManager = 0;
+	 break;
+   }
+   return true;
+}
+									/*}}}*/
 // Acquire::Item::Start - Item has begun to download			/*{{{*/
 // ---------------------------------------------------------------------
 /* Stash status and the file size. Note that setting Complete means 
@@ -300,6 +333,9 @@ bool pkgAcquire::Item::RenameOnError(pkgAcquire::Item::RenameOnErrorState const
 	 // the method is expected to report a good error for this
 	 Status = StatError;
 	 break;
+      case PDiffError:
+	 // no handling here, done by callers
+	 break;
    }
    return false;
 }
@@ -374,7 +410,7 @@ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner,
 				 HashStringList const &ExpectedHashes,
                                  indexRecords *MetaIndexParser)
    : pkgAcqBaseIndex(Owner, TransactionManager, Target, ExpectedHashes, 
-                     MetaIndexParser), PackagesFileReadyInPartial(false)
+                     MetaIndexParser)
 {
    
    Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
@@ -671,20 +707,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)
@@ -738,6 +760,24 @@ void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig * Cnf)/*{{{
    new pkgAcqIndex(Owner, TransactionManager, Target, ExpectedHashes, MetaIndexParser);
 }
 									/*}}}*/
+bool pkgAcqDiffIndex::TransactionState(TransactionStates const state)	/*{{{*/
+{
+   if (pkgAcquire::Item::TransactionState(state) == false)
+      return false;
+
+   switch (state)
+   {
+      case TransactionCommit:
+	 break;
+      case TransactionAbort:
+	 std::string const Partial = GetPartialFileNameFromURI(RealURI);
+	 unlink(Partial.c_str());
+	 break;
+   }
+
+   return true;
+}
+									/*}}}*/
 void pkgAcqDiffIndex::Done(string Message,unsigned long long Size,HashStringList const &Hashes,	/*{{{*/
 			   pkgAcquire::MethodConfig *Cnf)
 {
@@ -765,15 +805,21 @@ void pkgAcqDiffIndex::Done(string Message,unsigned long long Size,HashStringList
    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;
 }
 									/*}}}*/
@@ -808,6 +854,17 @@ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner,
    }
    else
    {
+      // patching needs to be bootstrapped with the 'old' version
+      std::string const PartialFile = GetPartialFileNameFromURI(RealURI);
+      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();
@@ -822,6 +879,8 @@ 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;
+   DestFile = GetPartialFileNameFromURI(Target->URI);
+   RenameOnError(PDiffError);
    new pkgAcqIndex(Owner, TransactionManager, Target, ExpectedHashes, MetaIndexParser);
    Finish();
 }
@@ -950,6 +1009,8 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size, HashStringLi
       if (fd.Size() != available_patches[0].patch_size ||
 	    available_patches[0].patch_hashes != LocalHashes)
       {
+	 // patchfiles are dated, so bad indicates a bad download, so kill it
+	 unlink(DestFile.c_str());
 	 Failed("Patch has Size/Hashsum mismatch", NULL);
 	 return;
       }
@@ -1046,6 +1107,8 @@ void pkgAcqIndexMergeDiffs::Failed(string Message,pkgAcquire::MethodConfig * Cnf
    State = StateErrorDiff;
    if (Debug)
       std::clog << "Falling back to normal index file acquire" << std::endl;
+   DestFile = GetPartialFileNameFromURI(Target->URI);
+   RenameOnError(PDiffError);
    new pkgAcqIndex(Owner, TransactionManager, Target, ExpectedHashes, MetaIndexParser);
 }
 									/*}}}*/
@@ -1069,6 +1132,8 @@ void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,HashStri
 
       if (fd.Size() != patch.patch_size || patch.patch_hashes != LocalHashes)
       {
+	 // patchfiles are dated, so bad indicates a bad download, so kill it
+	 unlink(DestFile.c_str());
 	 Failed("Patch has Size/Hashsum mismatch", NULL);
 	 return;
       }
@@ -1090,6 +1155,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;
 
@@ -1109,15 +1181,14 @@ void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,HashStri
 	 return;
       }
 
-
       // move the result into place
-      std::string const FinalFile = GetFinalFilename();
+      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();
@@ -1127,6 +1198,7 @@ void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,HashStri
 	 std::string patch = PartialFile + ".ed." + (*I)->patch.file + ".gz";
 	 unlink(patch.c_str());
       }
+      unlink(FinalFile.c_str());
 
       // all set and done
       Complete = true;
@@ -1337,12 +1409,6 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
       return;
    }
 
-   // on decompression failure, remove bad versions in partial/
-   if (Stage == STAGE_DECOMPRESS_AND_VERIFY)
-   {
-      unlink(EraseFileName.c_str());
-   }
-
    Item::Failed(Message,Cnf);
 
    if(Target->IsOptional() && ExpectedHashes.empty() && Stage == STAGE_DOWNLOAD)
@@ -1351,6 +1417,30 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
       TransactionManager->AbortTransaction();
 }
 									/*}}}*/
+bool pkgAcqIndex::TransactionState(TransactionStates const state)	/*{{{*/
+{
+   if (pkgAcquire::Item::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;
+}
+									/*}}}*/
 // pkgAcqIndex::GetFinalFilename - Return the full final file path	/*{{{*/
 std::string pkgAcqIndex::GetFinalFilename() const
 {
@@ -1530,9 +1620,6 @@ void pkgAcqIndex::StageDecompressDone(string Message,
       return;
    }
 
-   // remove the compressed version of the file
-   unlink(EraseFileName.c_str());
-
    // Done, queue for rename on transaction finished
    TransactionManager->TransactionStageCopy(this, DestFile, GetFinalFilename());
 
@@ -1568,14 +1655,7 @@ void pkgAcqMetaBase::AbortTransaction()
    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();
-      }
+      (*I)->TransactionState(TransactionAbort);
    }
    Transaction.clear();
 }
@@ -1585,10 +1665,16 @@ 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;
-
+   {
+      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;
 }
 									/*}}}*/
@@ -1603,24 +1689,7 @@ void pkgAcqMetaBase::CommitTransaction()
    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;
+      (*I)->TransactionState(TransactionCommit);
    }
    Transaction.clear();
 }
@@ -1634,7 +1703,7 @@ void pkgAcqMetaBase::TransactionStageCopy(Item *I,
    I->DestFile = To;
 }
 									/*}}}*/
-// AcqMetaBase::TransactionStageRemoval - Sage a file for removal	/*{{{*/
+// AcqMetaBase::TransactionStageRemoval - Stage a file for removal	/*{{{*/
 void pkgAcqMetaBase::TransactionStageRemoval(Item *I,
                                              const std::string &FinalFile)
 {
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 148728b3c..33a28671c 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -344,7 +344,8 @@ class pkgAcquire::Item : public WeakPointable
       InvalidFormat,
       SignatureError,
       NotClearsigned,
-      MaximumSizeExceeded
+      MaximumSizeExceeded,
+      PDiffError,
    };
 
    /** \brief Rename failed file and set error
@@ -353,6 +354,12 @@ class pkgAcquire::Item : public WeakPointable
     */
    bool RenameOnError(RenameOnErrorState const state);
 
+   enum TransactionStates {
+      TransactionCommit,
+      TransactionAbort,
+   };
+   virtual bool TransactionState(TransactionStates const state);
+
    /** \brief The HashSums of the item is supposed to have than done */
    HashStringList ExpectedHashes;
 
@@ -685,14 +692,12 @@ class APT_HIDDEN pkgAcqDiffIndex : public pkgAcqBaseIndex
     */
    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);
@@ -1010,6 +1015,8 @@ class APT_HIDDEN pkgAcqIndex : public pkgAcqBaseIndex
    /** \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);
diff --git a/test/integration/framework b/test/integration/framework
index 4229ae162..7564a0faf 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1523,9 +1523,13 @@ aptautotest_aptget_update() {
 	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 ! -name 'lock'); do
+	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 [ "$1" = '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 "$@"; }
diff --git a/test/integration/test-apt-update-expected-size b/test/integration/test-apt-update-expected-size
index 9f58308aa..7efccaa57 100755
--- a/test/integration/test-apt-update-expected-size
+++ b/test/integration/test-apt-update-expected-size
@@ -34,7 +34,7 @@ test_packagestoobig() {
 	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=0
+E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -o Debug::pkgAcquire::Worker=0 -o Debug::Acquire::Transaction=0
 }
 
 methodtest() {
diff --git a/test/integration/test-partial-file-support b/test/integration/test-partial-file-support
index b6b305d25..85046b3eb 100755
--- a/test/integration/test-partial-file-support
+++ b/test/integration/test-partial-file-support
@@ -126,18 +126,17 @@ testrun() {
 	testwebserverlaststatuscode '200' "$DOWNLOADLOG"
 }
 
-msgmsg 'http: Test with Content-Length'
-webserverconfig 'aptwebserver::chunked-transfer-encoding' 'false'
-testrun 'http://localhost:8080'
-msgmsg 'http: Test with Transfer-Encoding: chunked'
-webserverconfig 'aptwebserver::chunked-transfer-encoding' 'true'
-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
 
-msgmsg 'https: Test with Content-Length'
-webserverconfig 'aptwebserver::chunked-transfer-encoding' 'false'
-testrun 'https://localhost:4433'
-msgmsg 'https: Test with Transfer-Encoding: chunked'
-webserverconfig 'aptwebserver::chunked-transfer-encoding' 'true'
-testrun 'https://localhost:4433'
+serverconfigs 'https://localhost:4433'
diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage
index 5e759e50e..7d72a6944 100755
--- a/test/integration/test-pdiff-usage
+++ b/test/integration/test-pdiff-usage
@@ -47,7 +47,7 @@ testrun() {
 	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
-- 
cgit v1.2.3-70-g09d2


From f492283b4369ed0711f5f538b6d5fe61a8a75a0f Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 28 Apr 2015 15:06:12 +0200
Subject: do not require installed libapt-pkg-dev for gtest

Git-Dch: Ignore
---
 test/libapt/makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/libapt/makefile b/test/libapt/makefile
index 0f8df291f..61a8aaf31 100644
--- a/test/libapt/makefile
+++ b/test/libapt/makefile
@@ -8,7 +8,7 @@ APT_DOMAIN=none
 include ../../buildlib/defaults.mak
 
 .PHONY: test
-ifeq (file-okay,$(shell $(CC) -M gtest_runner.cc >/dev/null 2>&1 && echo 'file-okay'))
+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)
 
@@ -78,5 +78,6 @@ 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
-- 
cgit v1.2.3-70-g09d2


From 3f732aa6ad0a81b6a6942a61fd5ed26a26590e8e Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 28 Apr 2015 23:42:03 +0200
Subject: a pin of 1000 always means downgrade allowed

The documentation says this, but the code only agreed while evaluating
specific packages, but not generics. These needed a pin above 1000 to
have the same effect.

The code causing this makes references to a 'second pesduo status file',
but nowhere is explained what this might stand for and/or what it was,
so we do the only reasonable thing: Remove all references and do as
documented.
---
 apt-pkg/policy.cc                                  | 32 +++-----
 .../test-bug-543966-downgrade-below-1000-pin       | 84 +++++++++++---------
 test/integration/test-policy-pinning               | 92 ++++++++++------------
 3 files changed, 96 insertions(+), 112 deletions(-)

diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 3cfc32829..9a1d2977e 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];
@@ -125,7 +115,7 @@ bool pkgPolicy::InitDefaults()
 	    else
 	       PFPriority[F->ID] = Cur;
 	    
-	    if (PFPriority[F->ID] > 1000)
+	    if (PFPriority[F->ID] >= 1000)
 	       StatusOverride = true;
 	    
 	    Fixed[F->ID] = true;
@@ -166,9 +156,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
@@ -218,9 +206,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)
diff --git a/test/integration/test-bug-543966-downgrade-below-1000-pin b/test/integration/test-bug-543966-downgrade-below-1000-pin
index d37539b9f..485df999c 100755
--- a/test/integration/test-bug-543966-downgrade-below-1000-pin
+++ b/test/integration/test-bug-543966-downgrade-below-1000-pin
@@ -24,58 +24,66 @@ testsuccessequal "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
+}
 
-testsuccessequal "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
-
-testsuccessequal "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
-
-testsuccessequal "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
 
-testsuccessequal "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'
diff --git a/test/integration/test-policy-pinning b/test/integration/test-policy-pinning
index 15bf300ac..2675b51bc 100755
--- a/test/integration/test-policy-pinning
+++ b/test/integration/test-policy-pinning
@@ -25,70 +25,58 @@ testequalpolicy() {
 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"
-- 
cgit v1.2.3-70-g09d2


From ab640001ee772fa27ee789f6717805f9d46d5bce Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 28 Apr 2015 23:59:00 +0200
Subject: remove unused and strange default-value for pins
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the pin for a generic pin is 0, it get a value by strange looking
rules, if the pin is specific the rules are at least not strange, but
the value 989 is a magic number without any direct meaning… but both
never happens in practice as the parsing skips such entries with a
warning, so there always is a priority != 0 and the code therefore never
used.
---
 apt-pkg/policy.cc                                  | 34 +++++++---------------
 .../test-bug-543966-downgrade-below-1000-pin       |  4 +++
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 9a1d2977e..00693ce54 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -97,37 +97,29 @@ bool pkgPolicy::InitDefaults()
    // 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;
-	    
+	    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		/*{{{*/
@@ -324,13 +316,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)
diff --git a/test/integration/test-bug-543966-downgrade-below-1000-pin b/test/integration/test-bug-543966-downgrade-below-1000-pin
index 485df999c..e59231608 100755
--- a/test/integration/test-bug-543966-downgrade-below-1000-pin
+++ b/test/integration/test-bug-543966-downgrade-below-1000-pin
@@ -87,3 +87,7 @@ 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$/'
-- 
cgit v1.2.3-70-g09d2


From 41fadd29f136627fb5c9e733130b2a57c49fafaf Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Wed, 29 Apr 2015 10:55:08 +0200
Subject: remove available file to have same dpkg -l behavior

dpkg -l < 1.16.2 loads the available file and hence sees a package which
later versions do not see, leading to failures on travis-ci.
The different versions also have slightly different messages.

Git-Dch: Ignore
---
 test/integration/test-ubuntu-bug-761175-remove-purge | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/integration/test-ubuntu-bug-761175-remove-purge b/test/integration/test-ubuntu-bug-761175-remove-purge
index c2e2aadf1..d5dfa2acf 100755
--- a/test/integration/test-ubuntu-bug-761175-remove-purge
+++ b/test/integration/test-ubuntu-bug-761175-remove-purge
@@ -39,7 +39,8 @@ The following packages will be REMOVED:
 0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded.
 Purg compiz-core-$1" aptget purge compiz-core-$1 -s
 	testsuccess aptget purge compiz-core-$1 -y
-	testfailureequal "dpkg-query: no packages found matching compiz-core-$1" dpkg -l compiz-core-$1
+	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'
-- 
cgit v1.2.3-70-g09d2


From 98c9c26c123aa1ef6ad01b0bb60c782b920ce3b3 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 9 May 2015 12:39:22 +0200
Subject: show non-matching m-a:same versions in debug message

Slightly rewriting the code to ensure we only use two sources for the
versions as it could otherwise be confusing to look at.
---
 apt-pkg/depcache.cc | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 25c945ebb..73c5bb320 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1315,14 +1315,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
@@ -1332,7 +1336,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;
    }
 
-- 
cgit v1.2.3-70-g09d2


From ad5a4ac2bccb04f4aa74aeb2cefa90c79ed4b5e9 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 9 May 2015 14:02:59 +0200
Subject: fix macro definition for very old GCC < 3

Git-Dch: Ignore
---
 apt-pkg/contrib/macros.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h
index 14541d4d8..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
-- 
cgit v1.2.3-70-g09d2


From 353c135e45d3b76dbecc1ba1b2bd9266601181ee Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 9 May 2015 15:10:55 +0200
Subject: drop incorrect parameter implicitely converted to bool
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The helper expects to be told if it should generate messages, not where
these messages should be printed – as it isn't printing such messages,
but puts them in _error. apt-get uses in other methods a helper
specialisation which does also print stuff to a stream through, so this
is likely a copy&paste error.

Git-Dch: Ignore
---
 cmdline/apt-get.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 1a4f4c5a8..c1f78523c 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -617,7 +617,7 @@ 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);
 
@@ -1534,7 +1534,7 @@ static bool DoChangelog(CommandLine &CmdL)
    if (Cache.ReadOnlyOpen() == false)
       return false;
    
-   APT::CacheSetHelper helper(c0out);
+   APT::CacheSetHelper helper;
    APT::VersionList verset = APT::VersionList::FromCommandLine(Cache,
 		CmdL.FileList + 1, APT::CacheSetHelper::CANDIDATE, helper);
    if (verset.empty() == true)
-- 
cgit v1.2.3-70-g09d2


From 5f4fcd88bdabee993dd07244d2f0f8f3658c40f2 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 10 May 2015 00:44:29 +0200
Subject: fix 'Source' to 'Package' rename in apt-ftparchive
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This rename with value is ordered by the 'old' name 'Source', but should
be ordered by the new name… by splitting the operation in a delete and a
new field we can easily fix this problem locally for now.
---
 ftparchive/writer.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 593278590..855e0ef79 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -837,7 +837,8 @@ bool SourcesWriter::DoPackage(string FileName)
    // (5 hardcoded + checksums + maintainer + end marker)
    std::vector<TFRewriteData> Changes;
 
-   Changes.push_back(SetTFRewriteData("Source",Package.c_str(),"Package"));
+   Changes.push_back(SetTFRewriteData("Source", 0));
+   Changes.push_back(SetTFRewriteData("Package",Package.c_str()));
    if (Files.empty() == false)
       Changes.push_back(SetTFRewriteData("Files",Files.c_str()));
    if (ChecksumsSha1.empty() == false)
-- 
cgit v1.2.3-70-g09d2


From e8fb1cdfdd13e45f2b3abbd57a28b57ae6137f14 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 9 May 2015 18:55:41 +0200
Subject: sync TFRewrite*Order arrays with dpkg and dak

dpkg and dak know various field names and order them in their output,
while we have yet another order and have to play catch up with them as
we are sitting between chairs here and neither order is ideal for us,
too.

A little testcase is from now on supposed to help ensureing that we do
not derivate to far away from which fields dpkg knows and orders.
---
 apt-pkg/tagfile-order.c                            | 109 +++++++++++++++++++++
 apt-pkg/tagfile.cc                                 |  63 +-----------
 debian/tests/run-tests                             |   1 +
 test/integration/framework                         |   1 +
 test/integration/test-apt-ftparchive-cachedb       |   6 +-
 .../test-apt-ftparchive-cachedb-lp1274466          |   6 +-
 test/integration/test-apt-ftparchive-src-cachedb   |  18 ++--
 test/integration/test-apt-tagfile-fields-order     |  82 ++++++++++++++++
 8 files changed, 211 insertions(+), 75 deletions(-)
 create mode 100644 apt-pkg/tagfile-order.c
 create mode 100755 test/integration/test-apt-tagfile-fields-order

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 9c40c8c92..2f7900d93 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -623,71 +623,14 @@ APT_PURE unsigned int pkgTagSection::Count() const {			/*{{{*/
    return d->Tags.size() - 1;
 }
 									/*}}}*/
+
+#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;
-   
 bool TFRewrite(FILE *Output,pkgTagSection const &Tags,const char *Order[],
 	       TFRewriteData *Rewrite)
 {
diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index 7cc37f618..e459d7093 100644
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -11,6 +11,7 @@ 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/ \
diff --git a/test/integration/framework b/test/integration/framework
index 7564a0faf..03c188189 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -189,6 +189,7 @@ 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"}
diff --git a/test/integration/test-apt-ftparchive-cachedb b/test/integration/test-apt-ftparchive-cachedb
index 3454ee36a..962095320 100755
--- a/test/integration/test-apt-ftparchive-cachedb
+++ b/test/integration/test-apt-ftparchive-cachedb
@@ -3,12 +3,12 @@ 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
+$(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
 }
 
diff --git a/test/integration/test-apt-ftparchive-cachedb-lp1274466 b/test/integration/test-apt-ftparchive-cachedb-lp1274466
index 1f86e367f..8b768441a 100755
--- a/test/integration/test-apt-ftparchive-cachedb-lp1274466
+++ b/test/integration/test-apt-ftparchive-cachedb-lp1274466
@@ -27,12 +27,12 @@ testfailure grep 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc
 
 # regression test for corruption with previous generation of cachedb
 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 2a361ecc0..66a3b7845 100755
--- a/test/integration/test-apt-ftparchive-src-cachedb
+++ b/test/integration/test-apt-ftparchive-src-cachedb
@@ -3,16 +3,16 @@ set -e
 
 assert_correct_sources_file() {
     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() {
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
-- 
cgit v1.2.3-70-g09d2


From d38926efe1e6d2511bd852607ff4f9c8b60dc76c Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 9 May 2015 15:37:23 +0200
Subject: stop depending on copy-on-write for std::string

In 66c3875df391b1120b43831efcbe88a78569fbfe we workaround/fixed a
problem where the code makes the assumption that the compiler uses
copy-on-write implementations for std::string. Turns out that for c++11
compatibility gcc >= 5 will stop doing this by default.
---
 apt-pkg/deb/debindexfile.cc | 24 ++++++++++++------------
 apt-pkg/deb/debindexfile.h  | 18 +++++++++---------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 49c6e8cc0..d672b4fd8 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -413,8 +413,8 @@ pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const
 // TranslationsIndex::debTranslationsIndex - Contructor			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-debTranslationsIndex::debTranslationsIndex(string URI,string Dist,string Section,
-						char const * const Translation) :
+debTranslationsIndex::debTranslationsIndex(std::string const &URI, std::string const &Dist,
+						std::string const &Section, std::string const &Translation) :
 			pkgIndexFile(true), URI(URI), Dist(Dist), Section(Section),
 				Language(Translation)
 {}
@@ -458,13 +458,13 @@ string debTranslationsIndex::IndexURI(const char *Type) const
 /* 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];
+{
+   std::string S;
    if (Short == true)
-      snprintf(S,sizeof(S),"%s",Info(TranslationFile().c_str()).c_str());
+      strprintf(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());
+      strprintf(S,"%s (%s)",Info(TranslationFile().c_str()).c_str(),
+	       IndexFile(Language.c_str()).c_str());
    return S;
 }
 									/*}}}*/
@@ -488,7 +488,7 @@ string debTranslationsIndex::Info(const char *Type) const
 									/*}}}*/
 bool debTranslationsIndex::HasPackages() const				/*{{{*/
 {
-   return FileExists(IndexFile(Language));
+   return FileExists(IndexFile(Language.c_str()));
 }
 									/*}}}*/
 // TranslationsIndex::Exists - Check if the index is available		/*{{{*/
@@ -496,7 +496,7 @@ bool debTranslationsIndex::HasPackages() const				/*{{{*/
 /* */
 bool debTranslationsIndex::Exists() const
 {
-   return FileExists(IndexFile(Language));
+   return FileExists(IndexFile(Language.c_str()));
 }
 									/*}}}*/
 // TranslationsIndex::Size - Return the size of the index		/*{{{*/
@@ -509,7 +509,7 @@ unsigned long debTranslationsIndex::Size() const
    /* we need to ignore errors here; if the lists are absent, just return 0 */
    _error->PushToStack();
 
-   FileFd f(IndexFile(Language), FileFd::ReadOnly, FileFd::Extension);
+   FileFd f(IndexFile(Language.c_str()), FileFd::ReadOnly, FileFd::Extension);
    if (!f.Failed())
       size = f.Size();
 
@@ -526,7 +526,7 @@ 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 TranslationFile = IndexFile(Language.c_str());
    if (FileExists(TranslationFile))
    {
      FileFd Trans(TranslationFile,FileFd::ReadOnly, FileFd::Extension);
@@ -556,7 +556,7 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 /* */
 pkgCache::PkgFileIterator debTranslationsIndex::FindInCache(pkgCache &Cache) const
 {
-   string FileName = IndexFile(Language);
+   string FileName = IndexFile(Language.c_str());
    
    pkgCache::PkgFileIterator File = Cache.FileBegin();
    for (; File.end() == false; ++File)
diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index 81914f203..1e5882071 100644
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -97,11 +97,11 @@ class APT_HIDDEN debTranslationsIndex : public pkgIndexFile
    /** \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;
-   
+   std::string const URI;
+   std::string const Dist;
+   std::string const Section;
+   std::string 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;
@@ -109,12 +109,12 @@ class APT_HIDDEN debTranslationsIndex : public pkgIndexFile
    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;   
-   
+   virtual std::string Describe(bool Short) const;
+
    // Interface for the Cache Generator
    virtual bool Exists() const;
    virtual bool HasPackages() const;
@@ -122,7 +122,7 @@ class APT_HIDDEN debTranslationsIndex : public pkgIndexFile
    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(std::string const &URI,std::string const &Dist,std::string const &Section, std::string const &Language);
    virtual ~debTranslationsIndex();
 };
 
-- 
cgit v1.2.3-70-g09d2


From 8d058ea53b18348f81229049a27d14282bd8d8c1 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 10 May 2015 22:53:15 +0200
Subject: implement a more c++-style TFRewrite alternative

TFRewrite is okay, but it has obscure limitations (256 Tags), even more
obscure bugs (order for renames is defined by the old name) and the
interface is very c-style encouraging bad usage like we do it in
apt-ftparchive passing massive amounts of c_str() from std::string in.

The old-style is marked as deprecated accordingly. The next commit will
fix all places in the apt code to not use the old-style anymore.
---
 apt-pkg/tagfile.cc          | 148 +++++++++++++++++++++++++++++++++++++++++++-
 apt-pkg/tagfile.h           |  47 ++++++++++----
 test/libapt/tagfile_test.cc |   6 ++
 3 files changed, 187 insertions(+), 14 deletions(-)

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 2f7900d93..5ff495fbd 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -509,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;
@@ -520,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					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -623,6 +639,132 @@ APT_PURE unsigned int pkgTagSection::Count() const {			/*{{{*/
    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"
 
@@ -631,6 +773,7 @@ APT_PURE unsigned int pkgTagSection::Count() const {			/*{{{*/
 /* 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. */
+APT_IGNORE_DEPRECATED_PUSH
 bool TFRewrite(FILE *Output,pkgTagSection const &Tags,const char *Order[],
 	       TFRewriteData *Rewrite)
 {
@@ -754,6 +897,7 @@ bool TFRewrite(FILE *Output,pkgTagSection const &Tags,const char *Order[],
       
    return true;
 }
+APT_IGNORE_DEPRECATED_POP
 									/*}}}*/
 
 pkgTagSection::~pkgTagSection() { delete d; }
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index d09e7046c..118954541 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -54,13 +54,14 @@ class pkgTagSection
    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;
@@ -115,9 +116,32 @@ class pkgTagSection
       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;
@@ -141,20 +165,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/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)
-- 
cgit v1.2.3-70-g09d2


From 88593886a42025d51d76051da5929b044e42efee Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 11 May 2015 15:08:08 +0200
Subject: rewrite all TFRewrite instances to use the new pkgTagSection::Write
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While it is mostly busywork to rewrite all instances it actually fixes
bugs as the data storage used by the new method is std::string rather
than a char*, the later mostly created by c_str() from a std::string
which the caller has to ensure keeps in scope – something apt-ftparchive
actually didn't ensure and relied on copy-on-write behavior instead
which c++11 forbids and hence the new default gcc abi doesn't use it.
---
 apt-pkg/depcache.cc                       |  50 +++---
 apt-pkg/indexcopy.cc                      | 125 ++++++--------
 apt-pkg/indexcopy.h                       |   7 +-
 apt-private/private-show.cc               |  46 ++---
 cmdline/apt-cache.cc                      |  21 ++-
 cmdline/apt-sortpkgs.cc                   |  14 +-
 ftparchive/apt-ftparchive.cc              |  51 +++---
 ftparchive/contents.cc                    |  34 ++--
 ftparchive/contents.h                     |   7 +-
 ftparchive/multicompress.cc               |  19 +--
 ftparchive/multicompress.h                |   2 +-
 ftparchive/writer.cc                      | 204 +++++++++++-----------
 ftparchive/writer.h                       |  45 +++--
 test/integration/test-apt-cli-show        |   4 +-
 test/libapt/indexcopytosourcelist_test.cc |   2 +-
 test/libapt/tagsection_test.cc            | 270 ++++++++++++++++++++++++++++++
 16 files changed, 559 insertions(+), 342 deletions(-)
 create mode 100644 test/libapt/tagsection_test.cc

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 73c5bb320..b73c336db 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>
@@ -252,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");
@@ -271,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);
@@ -292,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) {
@@ -325,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;
 }
 									/*}}}*/
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 144c508be..461aa4217 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
@@ -218,39 +208,38 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
 	    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;
 }
@@ -267,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);
 }
 									/*}}}*/
@@ -433,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	/*{{{*/
@@ -478,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);
@@ -702,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(),
@@ -719,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,
@@ -740,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
@@ -764,34 +739,32 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,	/*{{{*/
 	    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;
 }
diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index 701beb075..729b0c8cb 100644
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -28,6 +28,7 @@ using std::vector;
 class pkgTagSection;
 class indexRecords;
 class pkgCdromStatus;
+class FileFd;
 
 class IndexCopy								/*{{{*/
 {
@@ -45,7 +46,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;
    
@@ -61,7 +62,7 @@ class PackageCopy : public IndexCopy					/*{{{*/
    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";};
    
@@ -72,7 +73,7 @@ class SourceCopy : public IndexCopy					/*{{{*/
    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";};
    
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/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index e2cf7e8b7..690b03bcc 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -580,6 +580,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;)
@@ -620,35 +626,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();
diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index 971900e4f..12ef8dda0 100644
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -108,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)
    {
@@ -119,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;
@@ -128,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;
 }
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index 69b936dff..62108f7ca 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -178,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);
@@ -197,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());
    
@@ -272,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));
@@ -287,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());
 
@@ -365,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;
 
@@ -384,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)
@@ -392,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 */
@@ -676,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;
@@ -704,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;
    
@@ -737,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;
    
@@ -764,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)
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/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/writer.cc b/ftparchive/writer.cc
index 855e0ef79..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;
 
@@ -461,32 +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(SetTFRewriteData("Size", Size.c_str()));
+   Changes.push_back(pkgTagSection::Tag::Rewrite("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)
 {
@@ -721,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;
@@ -752,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 ||
@@ -782,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
 	    {
@@ -805,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();
       }
 
@@ -829,54 +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", 0));
-   Changes.push_back(SetTFRewriteData("Package",Package.c_str()));
+   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++;
    
@@ -887,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			/*{{{*/
@@ -974,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)
    {
@@ -996,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");
@@ -1040,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");
@@ -1087,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/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show
index 5604620fd..43072cf03 100755
--- a/test/integration/test-apt-cli-show
+++ b/test/integration/test-apt-cli-show
@@ -25,11 +25,11 @@ 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
 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
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/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 §ion, 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());
+}
-- 
cgit v1.2.3-70-g09d2


From dcbb364fc69e1108b3fea3adb12a7ba83d9af467 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 12 May 2015 00:30:16 +0200
Subject: detect 416 complete file in partial by expected hash

If we have the expected hashes we can check with them if the file we
have in partial we got a 416 for is the expected file. We detected this
with same-size before, but not every server sends a good Content-Range
header with a 416 response.
---
 methods/https.cc                              | 37 +++++++++++++++++++++------
 methods/https.h                               |  1 +
 methods/server.cc                             | 19 +++++++++++---
 test/integration/framework                    |  2 +-
 test/integration/test-apt-update-transactions |  1 +
 test/integration/test-partial-file-support    | 10 ++++++--
 test/interactive-helper/aptwebserver.cc       |  9 ++++---
 7 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/methods/https.cc b/methods/https.cc
index c6b75d9ad..712e9ee73 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -40,7 +40,9 @@ using namespace std;
 struct APT_HIDDEN CURLUserPointer {
    HttpsMethod * const https;
    HttpsMethod::FetchResult * const Res;
-   CURLUserPointer(HttpsMethod * const https, HttpsMethod::FetchResult * const Res) : https(https), Res(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
@@ -61,13 +63,32 @@ HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
    {
       if (me->https->Server->Result != 416 && me->https->Server->StartPos != 0)
 	 ;
-      else if (me->https->Server->Result == 416 && me->https->Server->Size == me->https->File->FileSize())
+      else if (me->https->Server->Result == 416)
       {
-         me->https->Server->Result = 200;
-	 me->https->Server->StartPos = me->https->Server->Size;
-	 // 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();
+	 bool partialHit = false;
+	 if (me->Itm->ExpectedHashes.usable() == true)
+	 {
+	    Hashes resultHashes(me->Itm->ExpectedHashes);
+	    FileFd file(me->Itm->DestFile, FileFd::ReadOnly);
+	    me->https->Server->Size = 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->Size == me->https->File->FileSize())
+	    partialHit = true;
+
+	 if (partialHit == true)
+	 {
+	    me->https->Server->Result = 200;
+	    me->https->Server->StartPos = me->https->Server->Size;
+	    // 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->https->Server->StartPos = 0;
@@ -221,7 +242,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc"));
 
    FetchResult Res;
-   CURLUserPointer userp(this, &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);
diff --git a/methods/https.h b/methods/https.h
index 6e32e8d3d..57fc292ee 100644
--- a/methods/https.h
+++ b/methods/https.h
@@ -79,6 +79,7 @@ class HttpsMethod : public ServerMethod
    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)
    {
diff --git a/methods/server.cc b/methods/server.cc
index 2116926b0..bd01c3e98 100644
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -269,7 +269,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
@@ -314,7 +314,20 @@ 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->Size = 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->Size)
+	    partialHit = true;
+	 if (partialHit == true)
 	 {
 	    // the file is completely downloaded, but was not moved
 	    if (Server->HaveContent == true)
@@ -351,7 +364,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res)
    // This is some sort of 2xx 'data follows' reply
    Res.LastModified = Server->Date;
    Res.Size = Server->Size;
-   
+
    // Open the file
    delete File;
    File = new FileFd(Queue->DestFile,FileFd::WriteAny);
diff --git a/test/integration/framework b/test/integration/framework
index 03c188189..2a53e8365 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1128,7 +1128,7 @@ acquire::cdrom::autodetect 0;" > rootdir/etc/apt/apt.conf.d/00cdrom
 downloadfile() {
 	local PROTO="${1%%:*}"
 	if ! apthelper -o Debug::Acquire::${PROTO}=1 -o Debug::pkgAcquire::Worker=1 \
-		download-file "$1" "$2" 2>&1 ; then
+		download-file "$1" "$2" "$3" 2>&1 ; then
 		return 1
 	fi
 	# only if the file exists the download was successful
diff --git a/test/integration/test-apt-update-transactions b/test/integration/test-apt-update-transactions
index f028ac0c7..67dd633f9 100755
--- a/test/integration/test-apt-update-transactions
+++ b/test/integration/test-apt-update-transactions
@@ -63,6 +63,7 @@ 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'
 
diff --git a/test/integration/test-partial-file-support b/test/integration/test-partial-file-support
index 85046b3eb..c07af7bd0 100755
--- a/test/integration/test-partial-file-support
+++ b/test/integration/test-partial-file-support
@@ -17,8 +17,8 @@ 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
@@ -78,6 +78,12 @@ followuprequest() {
 	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'
diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index 6a411e24e..c933060e7 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -745,9 +745,12 @@ static void * handleClient(void * voidclient)				/*{{{*/
 		     }
 		     else
 		     {
-			std::ostringstream contentrange;
-			contentrange << "Content-Range: bytes */" << filesize;
-			headers.push_back(contentrange.str());
+			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;
 		     }
-- 
cgit v1.2.3-70-g09d2


From 495b7a615a2d8f485beadf88c6ed298f5bbe50c2 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 12 May 2015 11:18:17 +0200
Subject: implement VerifyFile as all-hashes check

It isn't used much compared to what the methodname suggests, but in the
remaining uses it can't hurt to check more than strictly necessary by
calculating and verifying with all hashes we can compare with rather
than "just" the best known hash.
---
 apt-pkg/acquire-item.cc   |  2 +-
 apt-pkg/contrib/hashes.cc | 21 ++++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 01ce0e650..1090912f5 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1175,7 +1175,7 @@ void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,HashStri
    else if (State == StateApplyDiff)
    {
       // see if we really got the expected file
-      if(ExpectedHashes.usable() && !ExpectedHashes.VerifyFile(DestFile))
+      if(ExpectedHashes.usable() && ExpectedHashes != Hashes)
       {
 	 RenameOnError(HashSumMismatch);
 	 return;
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index 953465091..0fa443b4a 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -204,15 +204,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	/*{{{*/
-- 
cgit v1.2.3-70-g09d2


From 8eafc759544298211cd0bfaa3919afc0fadd47d1 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Wed, 13 May 2015 16:09:12 +0200
Subject: detect Releasefile IMS hits even if the server doesn't

Not all servers we are talking to support If-Modified-Since and some are
not even sending Last-Modified for us, so in an effort to detect such
hits we run a hashsum check on the 'old' compared to the 'new' file, we
got the hashes for the 'new' already for "free" from the methods anyway
and hence just need to calculated the old ones.

This allows us to detect hits even with unsupported servers, which in
turn means we benefit from all the new hit behavior also here.
---
 apt-pkg/acquire-item.cc                        | 31 ++++++++++----
 apt-pkg/acquire-item.h                         |  2 +-
 apt-pkg/acquire-worker.cc                      |  8 ++--
 methods/https.cc                               |  2 +-
 test/integration/framework                     |  9 ++++
 test/integration/test-apt-update-expected-size |  1 +
 test/integration/test-apt-update-not-modified  | 58 +++++++++++++++++++++++++-
 test/integration/test-apt-update-rollback      |  1 +
 test/integration/test-apt-update-transactions  |  2 +
 9 files changed, 99 insertions(+), 15 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 1090912f5..78dace12c 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -253,7 +253,10 @@ bool pkgAcquire::Item::Rename(string From,string To)
    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;
 }
 									/*}}}*/
@@ -1794,7 +1797,7 @@ void pkgAcqMetaSig::Done(string Message,unsigned long long Size,
 
    if(AuthPass == false)
    {
-      if(CheckDownloadDone(Message) == true)
+      if(CheckDownloadDone(Message, Hashes) == true)
       {
          // destfile will be modified to point to MetaIndexFile for the
          // gpgv method, so we need to save it here
@@ -1837,7 +1840,8 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/
          Status = StatDone;
       } else {
          _error->Error("%s", downgrade_msg.c_str());
-         Rename(MetaIndexFile, MetaIndexFile+".FAILED");
+	 if (TransactionManager->IMSHit == false)
+	    Rename(MetaIndexFile, MetaIndexFile+".FAILED");
 	 Item::Failed("Message: " + downgrade_msg, Cnf);
          TransactionManager->AbortTransaction();
          return;
@@ -1922,12 +1926,12 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long long Size,	/*{{{*/
 {
    Item::Done(Message,Size,Hashes,Cfg);
 
-   if(CheckDownloadDone(Message))
+   if(CheckDownloadDone(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
-      std::string MetaIndexFile = DestFile;
+      std::string const MetaIndexFile = DestFile;
       new pkgAcqMetaSig(Owner, TransactionManager, 
                         MetaIndexSigURI, MetaIndexSigURIDesc,
                         MetaIndexSigShortDesc, MetaIndexFile, IndexTargets, 
@@ -2008,7 +2012,7 @@ void pkgAcqMetaBase::QueueForSignatureVerify(const std::string &MetaIndexFile,
 }
 									/*}}}*/
 // pkgAcqMetaBase::CheckDownloadDone					/*{{{*/
-bool pkgAcqMetaBase::CheckDownloadDone(const std::string &Message)
+bool pkgAcqMetaBase::CheckDownloadDone(const std::string &Message, HashStringList const &Hashes)
 {
    // We have just finished downloading a Release file (it is not
    // verified yet)
@@ -2031,7 +2035,18 @@ bool pkgAcqMetaBase::CheckDownloadDone(const std::string &Message)
 
    // make sure to verify against the right file on I-M-S hit
    IMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false);
-   if(IMSHit)
+   if (IMSHit == false)
+   {
+      // detect IMS-Hits servers haven't detected by Hash comparison
+      std::string FinalFile = GetFinalFilename();
+      if (RealFileExists(FinalFile) && Hashes.VerifyFile(FinalFile) == true)
+      {
+	 IMSHit = true;
+	 unlink(DestFile.c_str());
+      }
+   }
+
+   if(IMSHit == true)
    {
       // for simplicity, the transaction manager is always InRelease
       // even if it doesn't exist.
@@ -2273,7 +2288,7 @@ void pkgAcqMetaClearSig::Done(std::string Message,unsigned long long Size,
 
    if(AuthPass == false)
    {
-      if(CheckDownloadDone(Message) == true)
+      if(CheckDownloadDone(Message, Hashes) == true)
          QueueForSignatureVerify(DestFile, DestFile);
       return;
    }
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 33a28671c..646de8416 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -429,7 +429,7 @@ class pkgAcqMetaBase  : public pkgAcquire::Item				/*{{{*/
     *  \param Message The message block received from the fetch
     *  subprocess.
     */
-   bool CheckDownloadDone(const std::string &Message);
+   bool CheckDownloadDone(const std::string &Message, HashStringList const &Hashes);
 
    /** \brief Queue the downloaded Signature for verification */
    void QueueForSignatureVerify(const std::string &MetaIndexFile,
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index bee01e620..9254e20a3 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -333,13 +333,12 @@ bool pkgAcquire::Worker::RunMessages()
 
 	    // see if there is a hash to verify
 	    HashStringList ReceivedHashes;
-	    HashStringList expectedHashes = Owner->HashSums();
-	    for (HashStringList::const_iterator hs = expectedHashes.begin(); hs != expectedHashes.end(); ++hs)
+	    for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type)
 	    {
-	       std::string const tagname = hs->HashType() + "-Hash";
+	       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(hs->HashType(), hashsum));
+		  ReceivedHashes.push_back(HashString(*type, hashsum));
 	    }
 
 	    if(_config->FindB("Debug::pkgAcquire::Auth", false) == true)
@@ -349,6 +348,7 @@ bool pkgAcquire::Worker::RunMessages()
 	       for (HashStringList::const_iterator hs = ReceivedHashes.begin(); hs != ReceivedHashes.end(); ++hs)
 		  std::clog <<  "\t- " << hs->toStr() << std::endl;
 	       std::clog << "ExpectedHash:" << endl;
+	       HashStringList expectedHashes = Owner->HashSums();
 	       for (HashStringList::const_iterator hs = expectedHashes.begin(); hs != expectedHashes.end(); ++hs)
 		  std::clog <<  "\t- " << hs->toStr() << std::endl;
 	       std::clog << endl;
diff --git a/methods/https.cc b/methods/https.cc
index 712e9ee73..fa143439a 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -444,7 +444,7 @@ 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;
diff --git a/test/integration/framework b/test/integration/framework
index 2a53e8365..8c8936ead 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1005,6 +1005,15 @@ 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
diff --git a/test/integration/test-apt-update-expected-size b/test/integration/test-apt-update-expected-size
index 7efccaa57..55a5da848 100755
--- a/test/integration/test-apt-update-expected-size
+++ b/test/integration/test-apt-update-expected-size
@@ -26,6 +26,7 @@ test_inreleasetoobig() {
 }
 
 test_packagestoobig() {
+	redatereleasefiles '+1hour'
 	# 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
diff --git a/test/integration/test-apt-update-not-modified b/test/integration/test-apt-update-not-modified
index 2dc56e76c..a67ecb760 100755
--- a/test/integration/test-apt-update-not-modified
+++ b/test/integration/test-apt-update-not-modified
@@ -12,7 +12,7 @@ insertpackage 'unstable' 'apt' 'all' '1.0'
 setupaptarchive --no-update
 
 methodtest() {
-	msgmsg 'Test with' "$1"
+	msgmsg 'Test InRelease with' "$1"
 	rm -rf rootdir/var/lib/apt/lists
 	# get our cache populated
 	testsuccess aptget update
@@ -36,6 +36,62 @@ Reading package lists..." aptget update
 Get:1 $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
+	cp -a aptarchive/dists  aptarchive/dists.good
+	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 unstable InRelease
+  404  Not Found
+Hit $1 unstable Release
+Hit $1 unstable Release.gpg
+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 unstable InRelease
+  404  Not Found
+Hit $1 unstable Release
+Hit $1 unstable Release.gpg
+Reading package lists..." aptget update
+	testfileequal 'listsdir-without-amd64.lst' "$(listcurrentlistsdirectory)"
+
+	# readd arch so its downloaded again
+	configarchitecture 'amd64' 'i386'
+	testsuccessequal "Ign $1 unstable InRelease
+  404  Not Found
+Hit $1 unstable Release
+Hit $1 unstable Release.gpg
+Get:1 $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 unstable InRelease
+  404  Not Found
+Get:1 $1 unstable Release [$(stat -c '%s' 'aptarchive/dists/unstable/Release') B]
+Get:2 $1 unstable Release.gpg [$(stat -c '%s' 'aptarchive/dists/unstable/Release.gpg') 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
 }
 
 changetowebserver
diff --git a/test/integration/test-apt-update-rollback b/test/integration/test-apt-update-rollback
index f4500b69d..29fe1ab56 100755
--- a/test/integration/test-apt-update-rollback
+++ b/test/integration/test-apt-update-rollback
@@ -158,6 +158,7 @@ test_inrelease_to_broken_gzip() {
     msgmsg "Test InRelease to broken gzip"
     start_with_good_inrelease
 
+    redatereleasefiles '+2hours'
     # 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
diff --git a/test/integration/test-apt-update-transactions b/test/integration/test-apt-update-transactions
index 67dd633f9..63b318056 100755
--- a/test/integration/test-apt-update-transactions
+++ b/test/integration/test-apt-update-transactions
@@ -47,6 +47,7 @@ testrun() {
 
 testsetup() {
 	msgmsg 'Test with no initial data over' "$1"
+	redatereleasefiles 'now'
 	rm -rf rootdir/var/lib/apt/lists
 	mkdir -p rootdir/var/lib/apt/lists/partial
 	listcurrentlistsdirectory > listsdir.lst
@@ -55,6 +56,7 @@ testsetup() {
 	msgmsg 'Test with initial data over' "$1"
 	testsuccess aptget update
 	listcurrentlistsdirectory > listsdir.lst
+	redatereleasefiles '+1hour'
 	testrun 'listsdir.lst'
 }
 
-- 
cgit v1.2.3-70-g09d2


From 6bf93605fdb8e858d3f0a79a124c1d39f760094d Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 18 May 2015 22:15:06 +0200
Subject: treat older Release files than we already have as an IMSHit

Valid-Until protects us from long-living downgrade attacks, but not all
repositories have it and an attacker could still use older but still
valid files to downgrade us. While this makes it sounds like a security
improvement now, its a bit theoretical at best as an attacker with
capabilities to pull this off could just as well always keep us days
(but in the valid period) behind and always knows which state we have,
as we tell him with the If-Modified-Since header. This is also why this
is 'silently' ignored and treated as an IMSHit rather than screamed at
the user as this can at best be an annoyance for attackers.

An error here would 'regularily' be encountered by users by out-of-sync
mirrors serving a single run (e.g. load balancer) or in two consecutive
runs on the other hand, so it would just help teaching people ignore it.

That said, most of the code churn is caused by enforcing this additional
requirement. Crisscross from InRelease to Release.gpg is e.g. very
unlikely in practice, but if we would ignore it an attacker could
sidestep it this way.
---
 apt-pkg/acquire-item.cc                        | 264 ++++++++++++++++++-------
 apt-pkg/acquire-item.h                         | 105 +++++-----
 apt-pkg/indexrecords.cc                        |  28 +--
 apt-pkg/indexrecords.h                         |   2 +
 test/integration/framework                     |   7 +-
 test/integration/test-apt-update-ims           |  12 +-
 test/integration/test-apt-update-nofallback    |   5 +-
 test/integration/test-apt-update-not-modified  |   4 -
 test/integration/test-apt-update-rollback      |   4 +-
 test/integration/test-releasefile-date-older   |  62 ++++++
 test/integration/test-releasefile-valid-until  |  37 ++--
 test/integration/test-releasefile-verification |  70 +++----
 12 files changed, 383 insertions(+), 217 deletions(-)
 create mode 100755 test/integration/test-releasefile-date-older

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 78dace12c..8155b9bfe 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1637,7 +1637,7 @@ pkgAcqMetaBase::pkgAcqMetaBase(pkgAcquire *Owner,
       HashStringList const &ExpectedHashes,
       pkgAcqMetaBase *TransactionManager)
 : Item(Owner, ExpectedHashes, TransactionManager),
-   MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets),
+   MetaIndexParser(MetaIndexParser), LastMetaIndexParser(NULL), IndexTargets(IndexTargets),
    AuthPass(false), RealURI(RealURI), IMSHit(false)
 {
 }
@@ -1697,6 +1697,14 @@ void pkgAcqMetaBase::CommitTransaction()
    Transaction.clear();
 }
 									/*}}}*/
+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 pkgAcquire::Item::TransactionState(state);
+   return true;
+}
+									/*}}}*/
 // AcqMetaBase::TransactionStageCopy - Stage a file for copying		/*{{{*/
 void pkgAcqMetaBase::TransactionStageCopy(Item *I,
                                           const std::string &From,
@@ -1715,15 +1723,15 @@ void pkgAcqMetaBase::TransactionStageRemoval(Item *I,
 }
 									/*}}}*/
 // AcqMetaBase::GenerateAuthWarning - Check gpg authentication error	/*{{{*/
-bool pkgAcqMetaBase::CheckStopAuthentication(const std::string &Message)
+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 = GetFinalFilename();
+   string const Final = I->GetFinalFilename();
    if(FileExists(Final))
    {
-      Status = StatTransientNetworkError;
+      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. "
@@ -1737,7 +1745,7 @@ bool pkgAcqMetaBase::CheckStopAuthentication(const std::string &Message)
       _error->Error(_("GPG error: %s: %s"),
                     Desc.Description.c_str(),
                     LookupTag(Message,"Message").c_str());
-      Status = StatError;
+      I->Status = StatError;
       return true;
    } else {
       _error->Warning(_("GPG error: %s: %s"),
@@ -1751,17 +1759,13 @@ bool pkgAcqMetaBase::CheckStopAuthentication(const std::string &Message)
 									/*}}}*/
 // 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, URI,
-                  HashStringList(), TransactionManager),
-   MetaIndexFile(MetaIndexFile), URIDesc(URIDesc),
-   ShortDesc(ShortDesc)
+      pkgAcqMetaBase *TransactionManager,
+      string const &URI, string const &URIDesc,string const &ShortDesc,
+      pkgAcqMetaIndex * const MetaIndex) :
+   pkgAcquire::Item(Owner, HashStringList(), TransactionManager), MetaIndex(MetaIndex),
+   URIDesc(URIDesc), RealURI(URI)
 {
-   DestFile = GetPartialFileNameFromURI(RealURI);
+   DestFile = GetPartialFileNameFromURI(URI);
 
    // remove any partial downloaded sig-file in partial/.
    // it may confuse proxies and is too small to warrant a
@@ -1779,11 +1783,28 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
    Desc.ShortDesc = ShortDesc;
    Desc.URI = URI;
 
-   QueueURI(Desc);
+   // 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()						/*{{{*/
 {
+}
+									/*}}}*/
+// pkgAcqMetaSig::GetFinalFilename - Return the full final file path	/*{{{*/
+std::string pkgAcqMetaSig::GetFinalFilename() const
+{
+   return GetFinalFileNameFromURI(RealURI);
 }
 									/*}}}*/
 // pkgAcqMetaSig::Done - The signature was downloaded/verified		/*{{{*/
@@ -1793,21 +1814,32 @@ void pkgAcqMetaSig::Done(string Message,unsigned long long Size,
                          HashStringList const &Hashes,
 			 pkgAcquire::MethodConfig *Cfg)
 {
+   if (MetaIndexFileSignature.empty() == false)
+   {
+      DestFile = MetaIndexFileSignature;
+      MetaIndexFileSignature.clear();
+   }
    Item::Done(Message, Size, Hashes, Cfg);
 
-   if(AuthPass == false)
+   if(MetaIndex->AuthPass == false)
    {
-      if(CheckDownloadDone(Message, Hashes) == true)
+      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;
-         QueueForSignatureVerify(MetaIndexFile, MetaIndexFileSignature);
+	 // 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(CheckAuthDone(Message) == true)
-      TransactionManager->TransactionStageCopy(this, MetaIndexFileSignature, GetFinalFilename());
+   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 Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/
@@ -1815,20 +1847,18 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/
    Item::Failed(Message,Cnf);
 
    // check if we need to fail at this point 
-   if (AuthPass == true && CheckStopAuthentication(Message))
+   if (MetaIndex->AuthPass == true && MetaIndex->CheckStopAuthentication(this, Message))
          return;
 
-   // FIXME: meh, this is not really elegant
-   string const Final = GetFinalFileNameFromURI(RealURI);
-   string const InReleaseURI = RealURI.replace(RealURI.rfind("Release.gpg"), 12,
-                                         "InRelease");
-   string const FinalInRelease = GetFinalFileNameFromURI(InReleaseURI);
+   string const FinalRelease = MetaIndex->GetFinalFilename();
+   string const FinalReleasegpg = GetFinalFilename();
+   string const FinalInRelease = TransactionManager->GetFinalFilename();
 
-   if (RealFileExists(Final) || RealFileExists(FinalInRelease))
+   if (RealFileExists(FinalReleasegpg) || RealFileExists(FinalInRelease))
    {
       std::string downgrade_msg;
       strprintf(downgrade_msg, _("The repository '%s' is no longer signed."),
-                URIDesc.c_str());
+                MetaIndex->URIDesc.c_str());
       if(_config->FindB("Acquire::AllowDowngradeToInsecureRepositories"))
       {
          // meh, the users wants to take risks (we still mark the packages
@@ -1841,7 +1871,7 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/
       } else {
          _error->Error("%s", downgrade_msg.c_str());
 	 if (TransactionManager->IMSHit == false)
-	    Rename(MetaIndexFile, MetaIndexFile+".FAILED");
+	    Rename(MetaIndex->DestFile, MetaIndex->DestFile + ".FAILED");
 	 Item::Failed("Message: " + downgrade_msg, Cnf);
          TransactionManager->AbortTransaction();
          return;
@@ -1850,23 +1880,44 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/
    else
       _error->Warning(_("The data from '%s' is not signed. Packages "
 	       "from that repository can not be authenticated."),
-	    URIDesc.c_str());
+	    MetaIndex->URIDesc.c_str());
 
-   // this ensures that any file in the lists/ dir is removed by the
-   // transaction
-   DestFile = GetPartialFileNameFromURI(RealURI);
+   // 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(MetaIndexParser, TransactionManager, this) == true)
+   if(AllowInsecureRepositories(MetaIndex->MetaIndexParser, TransactionManager, this) == true)
    {
+      if (RealFileExists(FinalReleasegpg) || RealFileExists(FinalInRelease))
+      {
+	 // open the last Release if we have it
+	 if (TransactionManager->IMSHit == false)
+	 {
+	    MetaIndex->LastMetaIndexParser = new indexRecords;
+	    _error->PushToStack();
+	    if (RealFileExists(FinalInRelease))
+	       MetaIndex->LastMetaIndexParser->Load(FinalInRelease);
+	    else
+	       MetaIndex->LastMetaIndexParser->Load(FinalRelease);
+	    // its unlikely to happen, but if what we have is bad ignore it
+	    if (_error->PendingError())
+	    {
+	       delete MetaIndex->LastMetaIndexParser;
+	       MetaIndex->LastMetaIndexParser = NULL;
+	    }
+	    _error->RevertToStack();
+	 }
+      }
+
       // we parse the indexes here because at this point the user wanted
       // a repository that may potentially harm him
-      MetaIndexParser->Load(MetaIndexFile);
-      if (!VerifyVendor(Message))
+      MetaIndex->MetaIndexParser->Load(MetaIndex->DestFile);
+      if (MetaIndex->VerifyVendor(Message) == false)
 	 /* expired Release files are still a problem you need extra force for */;
       else
-	 QueueIndexes(true);
+	 MetaIndex->QueueIndexes(true);
+
+      TransactionManager->TransactionStageCopy(MetaIndex, MetaIndex->DestFile, MetaIndex->GetFinalFilename());
    }
 
    // FIXME: this is used often (e.g. in pkgAcqIndexTrans) so refactor
@@ -1926,18 +1977,14 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long long Size,	/*{{{*/
 {
    Item::Done(Message,Size,Hashes,Cfg);
 
-   if(CheckDownloadDone(Message, Hashes))
+   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
-      std::string const MetaIndexFile = DestFile;
-      new pkgAcqMetaSig(Owner, TransactionManager, 
+      new pkgAcqMetaSig(Owner, TransactionManager,
                         MetaIndexSigURI, MetaIndexSigURIDesc,
-                        MetaIndexSigShortDesc, MetaIndexFile, IndexTargets, 
-                        MetaIndexParser);
-
-      TransactionManager->TransactionStageCopy(this, DestFile, GetFinalFilename());
+                        MetaIndexSigShortDesc, this);
    }
 }
 									/*}}}*/
@@ -1948,6 +1995,40 @@ bool pkgAcqMetaBase::CheckAuthDone(string Message)			/*{{{*/
    // 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))
+      {
+	 LastMetaIndexParser = new indexRecords;
+	 _error->PushToStack();
+	 if (RealFileExists(FinalInRelease))
+	    LastMetaIndexParser->Load(FinalInRelease);
+	 else
+	    LastMetaIndexParser->Load(FinalRelease);
+	 // its unlikely to happen, but if what we have is bad ignore it
+	 if (_error->PendingError())
+	 {
+	    delete LastMetaIndexParser;
+	    LastMetaIndexParser = NULL;
+	 }
+	 _error->RevertToStack();
+      }
+   }
+
    if (!MetaIndexParser->Load(DestFile))
    {
       Status = StatAuthError;
@@ -2001,48 +2082,47 @@ std::string pkgAcqMetaBase::GetFinalFilename() const
 }
 									/*}}}*/
 // pkgAcqMetaBase::QueueForSignatureVerify				/*{{{*/
-void pkgAcqMetaBase::QueueForSignatureVerify(const std::string &MetaIndexFile,
-                                    const std::string &MetaIndexFileSignature)
+void pkgAcqMetaBase::QueueForSignatureVerify(pkgAcquire::Item * const I, std::string const &File, std::string const &Signature)
 {
    AuthPass = true;
-   Desc.URI = "gpgv:" + MetaIndexFileSignature;
-   DestFile = MetaIndexFile;
-   QueueURI(Desc);
-   SetActiveSubprocess("gpgv");
+   I->Desc.URI = "gpgv:" + Signature;
+   I->DestFile = File;
+   QueueURI(I->Desc);
+   I->SetActiveSubprocess("gpgv");
 }
 									/*}}}*/
 // pkgAcqMetaBase::CheckDownloadDone					/*{{{*/
-bool pkgAcqMetaBase::CheckDownloadDone(const std::string &Message, HashStringList const &Hashes)
+bool pkgAcqMetaBase::CheckDownloadDone(pkgAcquire::Item * const I, const std::string &Message, HashStringList const &Hashes) const
 {
    // We have just finished downloading a Release file (it is not
    // verified yet)
 
-   string FileName = LookupTag(Message,"Filename");
+   string const FileName = LookupTag(Message,"Filename");
    if (FileName.empty() == true)
    {
-      Status = StatError;
-      ErrorText = "Method gave a blank filename";
+      I->Status = StatError;
+      I->ErrorText = "Method gave a blank filename";
       return false;
    }
 
-   if (FileName != DestFile)
+   if (FileName != I->DestFile)
    {
-      Local = true;
-      Desc.URI = "copy:" + FileName;
-      QueueURI(Desc);
+      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
-   IMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false);
-   if (IMSHit == false)
+   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 FinalFile = GetFinalFilename();
+      std::string const FinalFile = I->GetFinalFilename();
       if (RealFileExists(FinalFile) && Hashes.VerifyFile(FinalFile) == true)
       {
 	 IMSHit = true;
-	 unlink(DestFile.c_str());
+	 unlink(I->DestFile.c_str());
       }
    }
 
@@ -2052,11 +2132,11 @@ bool pkgAcqMetaBase::CheckDownloadDone(const std::string &Message, HashStringLis
       // even if it doesn't exist.
       if (TransactionManager != NULL)
 	 TransactionManager->IMSHit = true;
-      DestFile = GetFinalFilename();
+      I->PartialFile = I->DestFile = I->GetFinalFilename();
    }
 
    // set Item to complete as the remaining work is all local (verify etc)
-   Complete = true;
+   I->Complete = true;
 
    return true;
 }
@@ -2175,6 +2255,19 @@ bool pkgAcqMetaBase::VerifyVendor(string Message)			/*{{{*/
       }
    }
 
+   /* 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 && LastMetaIndexParser != NULL &&
+	 LastMetaIndexParser->GetDate() > MetaIndexParser->GetDate())
+   {
+      TransactionManager->IMSHit = true;
+      unlink(DestFile.c_str());
+      PartialFile = DestFile = GetFinalFilename();
+      delete MetaIndexParser;
+      MetaIndexParser = LastMetaIndexParser;
+      LastMetaIndexParser = NULL;
+   }
+
    if (_config->FindB("Debug::pkgAcquire::Auth", false)) 
    {
       std::cerr << "Got Codename: " << MetaIndexParser->GetDist() << std::endl;
@@ -2248,7 +2341,6 @@ pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire *Owner,		/*{{{*/
 {
    // index targets + (worst case:) Release/Release.gpg
    ExpectedAdditionalItems = IndexTargets->size() + 2;
-
 }
 									/*}}}*/
 pkgAcqMetaClearSig::~pkgAcqMetaClearSig()				/*{{{*/
@@ -2268,14 +2360,25 @@ string pkgAcqMetaClearSig::Custom600Headers()
 }
 									/*}}}*/
 // pkgAcqMetaClearSig::Done - We got a file				/*{{{*/
-// ---------------------------------------------------------------------
+class APT_HIDDEN DummyItem : public pkgAcquire::Item
+{
+   std::string URI;
+   public:
+   virtual std::string DescURI() {return URI;};
+
+   DummyItem(pkgAcquire *Owner, std::string const &URI) : pkgAcquire::Item(Owner), URI(URI)
+   {
+      Status = StatDone;
+      DestFile = GetFinalFileNameFromURI(URI);
+   }
+};
 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
+   // 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))
@@ -2288,12 +2391,23 @@ void pkgAcqMetaClearSig::Done(std::string Message,unsigned long long Size,
 
    if(AuthPass == false)
    {
-      if(CheckDownloadDone(Message, Hashes) == true)
-         QueueForSignatureVerify(DestFile, DestFile);
+      if(CheckDownloadDone(this, Message, Hashes) == true)
+         QueueForSignatureVerify(this, DestFile, DestFile);
       return;
    }
    else if(CheckAuthDone(Message) == true)
-      TransactionManager->TransactionStageCopy(this, DestFile, GetFinalFilename());
+   {
+      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 DummyItem(Owner, MetaIndexURI);
+	 new DummyItem(Owner, MetaSigURI);
+      }
+   }
 }
 									/*}}}*/
 void pkgAcqMetaClearSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/
@@ -2318,7 +2432,7 @@ void pkgAcqMetaClearSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*
    }
    else
    {
-      if(CheckStopAuthentication(Message))
+      if(CheckStopAuthentication(this, Message))
          return;
 
       _error->Warning(_("The data from '%s' is not signed. Packages "
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 646de8416..07c86f31b 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -394,6 +394,7 @@ class pkgAcqMetaBase  : public pkgAcquire::Item				/*{{{*/
 
    /** \brief A package-system-specific parser for the meta-index file. */
    indexRecords *MetaIndexParser;
+   indexRecords *LastMetaIndexParser;
 
    /** \brief The index files which should be looked up in the meta-index
     *  and then downloaded.
@@ -429,11 +430,10 @@ class pkgAcqMetaBase  : public pkgAcquire::Item				/*{{{*/
     *  \param Message The message block received from the fetch
     *  subprocess.
     */
-   bool CheckDownloadDone(const std::string &Message, HashStringList const &Hashes);
+   bool CheckDownloadDone(pkgAcquire::Item * 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(pkgAcquire::Item * const I, std::string const &File, std::string const &Signature);
 
 #if APT_PKG_ABI >= 413
    virtual std::string Custom600Headers() const;
@@ -453,7 +453,7 @@ class pkgAcqMetaBase  : public pkgAcquire::Item				/*{{{*/
    bool CheckAuthDone(std::string Message);
 
    /** Check if the current item should fail at this point */
-   bool CheckStopAuthentication(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.
@@ -462,8 +462,7 @@ class pkgAcqMetaBase  : public pkgAcquire::Item				/*{{{*/
     */
    bool VerifyVendor(std::string Message);
 
-   /** \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:
    // This refers more to the Transaction-Manager than the actual file
@@ -487,6 +486,9 @@ class pkgAcqMetaBase  : public pkgAcquire::Item				/*{{{*/
     */
    void TransactionStageRemoval(Item *I, const std::string &FinalFile);
 
+   /** \brief Get the full pathname of the final file for the current URI */
+   virtual std::string GetFinalFilename() const;
+
    pkgAcqMetaBase(pkgAcquire *Owner,
                   const std::vector<IndexTarget*>* IndexTargets,
                   indexRecords* MetaIndexParser,
@@ -495,50 +497,6 @@ class pkgAcqMetaBase  : public pkgAcquire::Item				/*{{{*/
                   pkgAcqMetaBase *TransactionManager=NULL);
 };
 									/*}}}*/
-/** \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 pkgAcqMetaBase
-{
-   void *d;
-
-   protected:
-
-   /** \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);
-
-   /** \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();
-};
-									/*}}}*/
 /** \brief An item that is responsible for downloading the meta-index	{{{
  *  file (i.e., Release) itself and verifying its signature.
  *
@@ -584,6 +542,53 @@ class APT_HIDDEN pkgAcqMetaIndex : public pkgAcqMetaBase
                    std::string MetaIndexSigURI, std::string MetaIndexSigURIDesc, std::string MetaIndexSigShortDesc,
 		   const std::vector<IndexTarget*>* IndexTargets,
 		   indexRecords* MetaIndexParser);
+
+   friend class pkgAcqMetaSig;
+};
+									/*}}}*/
+/** \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 pkgAcquire::Item
+{
+   void *d;
+
+   pkgAcqMetaIndex * const MetaIndex;
+
+   /** \brief The file we use to verify the MetaIndexFile with (not always set!) */
+   std::string MetaIndexFileSignature;
+
+   protected:
+
+   /** \brief Long URI description used in the acquire system */
+   std::string URIDesc;
+
+   /** \brief URI used to get the file */
+   std::string RealURI;
+
+   /** \brief Get the full pathname of the final file for the current URI */
+   virtual std::string GetFinalFilename() const;
+
+   public:
+   virtual std::string DescURI() {return RealURI;};
+
+   // 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);
+
+   /** \brief Create a new pkgAcqMetaSig. */
+   pkgAcqMetaSig(pkgAcquire *Owner,
+	 pkgAcqMetaBase *TransactionManager,
+	 std::string const &URI,std::string const &URIDesc,
+	 std::string const &ShortDesc, pkgAcqMetaIndex * const MetaIndex);
+   virtual ~pkgAcqMetaSig();
 };
 									/*}}}*/
 /** \brief An item repsonsible for downloading clearsigned metaindexes	{{{*/
diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index d65266f64..de2617833 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);
@@ -133,9 +138,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)
@@ -158,20 +169,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;
    }
diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h
index 35e534c12..6ed5f0c2b 100644
--- a/apt-pkg/indexrecords.h
+++ b/apt-pkg/indexrecords.h
@@ -36,6 +36,7 @@ class indexRecords
    std::string Dist;
    std::string Suite;
    std::string ExpectedDist;
+   time_t Date;
    time_t ValidUntil;
    bool SupportsAcquireByHash;
 
@@ -62,6 +63,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 */
diff --git a/test/integration/framework b/test/integration/framework
index 8c8936ead..b253deb91 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1164,9 +1164,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
 }
 
@@ -1547,7 +1547,8 @@ 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
+		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"
diff --git a/test/integration/test-apt-update-ims b/test/integration/test-apt-update-ims
index f091bffaa..7385e701a 100755
--- a/test/integration/test-apt-update-ims
+++ b/test/integration/test-apt-update-ims
@@ -43,7 +43,7 @@ runtest() {
     testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
 
     # ensure that we still do a hash check for other files on ims hit of Release
-    if grep -q '^Hit .* \(InRelease\|Release.gpg\)$' expected.output ; then
+    if grep -q '^Hit .* InRelease$' expected.output || ! grep -q '^Ign .* Release\(\.gpg\)\?$' expected.output; then
 	    $TEST aptget update -o Debug::Acquire::gpgv=1
 	    cp rootdir/tmp/${TEST}.output goodsign.output
 	    testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
@@ -66,7 +66,6 @@ msgmsg 'Release/Release.gpg'
 EXPECT='Ign http://localhost:8080 unstable InRelease
   404  Not Found
 Hit http://localhost:8080 unstable Release
-Hit http://localhost:8080 unstable Release.gpg
 Reading package lists...'
 find aptarchive -name 'InRelease' -delete
 echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
@@ -81,7 +80,7 @@ Hit http://localhost:8080 unstable Release
 Ign http://localhost:8080 unstable Release.gpg
   404  Not Found
 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'
@@ -108,8 +107,7 @@ msgmsg 'expired Release/Release.gpg'
 EXPECT='Ign http://localhost:8080 unstable InRelease
   404  Not Found
 Hit http://localhost:8080 unstable Release
-Hit http://localhost:8080 unstable Release.gpg
-E: Release file for http://localhost:8080/dists/unstable/Release.gpg is expired (invalid since). Updates for this repository will not be applied.'
+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'
@@ -122,8 +120,8 @@ EXPECT="Ign http://localhost:8080 unstable InRelease
 Hit http://localhost:8080 unstable Release
 Ign http://localhost:8080 unstable Release.gpg
   404  Not Found
-W: The data from 'http://localhost:8080 unstable Release.gpg' is not signed. Packages from that repository can not be authenticated.
-E: Release file for http://localhost:8080/dists/unstable/InRelease is expired (invalid since). Updates for this repository will not be applied."
+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'
diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback
index 71576de81..db4430ea3 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
@@ -31,7 +32,7 @@ EOF
 
 assert_update_is_refused_and_last_good_state_used()
 {
-    testfailureequal "E: The repository 'file: unstable Release.gpg' is no longer signed." aptget update -qq
+    testfailuremsg "E: The repository 'file: unstable Release' is no longer signed." aptget update
 
     assert_repo_is_intact
 }
@@ -193,7 +194,7 @@ test_release_gpg_to_invalid_release_release_gpg()
     echo "Some evil data" >>  $APTARCHIVE/dists/unstable/Release
     inject_evil_package
 
-    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: 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: 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
index a67ecb760..b1d55c156 100755
--- a/test/integration/test-apt-update-not-modified
+++ b/test/integration/test-apt-update-not-modified
@@ -56,7 +56,6 @@ Reading package lists..." aptget update
 	testsuccessequal "Ign $1 unstable InRelease
   404  Not Found
 Hit $1 unstable Release
-Hit $1 unstable Release.gpg
 Reading package lists..." aptget update
 	testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
 
@@ -66,7 +65,6 @@ Reading package lists..." aptget update
 	testsuccessequal "Ign $1 unstable InRelease
   404  Not Found
 Hit $1 unstable Release
-Hit $1 unstable Release.gpg
 Reading package lists..." aptget update
 	testfileequal 'listsdir-without-amd64.lst' "$(listcurrentlistsdirectory)"
 
@@ -75,7 +73,6 @@ Reading package lists..." aptget update
 	testsuccessequal "Ign $1 unstable InRelease
   404  Not Found
 Hit $1 unstable Release
-Hit $1 unstable Release.gpg
 Get:1 $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)"
@@ -85,7 +82,6 @@ Reading package lists..." aptget update
 	testsuccessequal "Ign $1 unstable InRelease
   404  Not Found
 Get:1 $1 unstable Release [$(stat -c '%s' 'aptarchive/dists/unstable/Release') B]
-Get:2 $1 unstable Release.gpg [$(stat -c '%s' 'aptarchive/dists/unstable/Release.gpg') B]
 Reading package lists..." aptget update
 	webserverconfig 'aptwebserver::support::modified-since' 'true'
 	webserverconfig 'aptwebserver::support::last-modified' 'true'
diff --git a/test/integration/test-apt-update-rollback b/test/integration/test-apt-update-rollback
index 29fe1ab56..b464a04a1 100755
--- a/test/integration/test-apt-update-rollback
+++ b/test/integration/test-apt-update-rollback
@@ -78,7 +78,7 @@ test_inrelease_to_valid_release() {
     rm $APTARCHIVE/dists/unstable/Release.gpg
 
     # update fails
-    testfailureequal "E: The repository 'file: unstable Release.gpg' is no longer signed." aptget update -qq
+    testfailureequal "E: The repository 'file: 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
-    testfailureequal "E: The repository 'file: unstable Release.gpg' is no longer signed." aptget update -qq # -o Debug::acquire::transaction=1
+    testfailureequal "E: The repository 'file: 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)"
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 363b7fe5b..469ed34d2 100755
--- a/test/integration/test-releasefile-verification
+++ b/test/integration/test-releasefile-verification
@@ -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,8 +101,8 @@ runtest() {
 	rm -rf rootdir/var/lib/apt/lists
 	signreleasefiles 'Joe Sixpack'
 	find aptarchive/ -name "$DELETEFILE" -delete
-	msgtest 'Cold archive signed by' 'Joe Sixpack'
-	updatesuccess
+	msgmsg 'Cold archive signed by' 'Joe Sixpack'
+	testsuccess aptget update
 	testsuccessequal "$(cat ${PKGFILE})
 " aptcache show apt
 	installaptold
@@ -126,8 +110,8 @@ runtest() {
 	prepare ${PKGFILE}-new
 	signreleasefiles 'Joe Sixpack'
 	find aptarchive/ -name "$DELETEFILE" -delete
-	msgtest 'Good warm archive signed by' 'Joe Sixpack'
-	updatesuccess
+	msgmsg 'Good warm archive signed by' 'Joe Sixpack'
+	testsuccess aptget update
 	testsuccessequal "$(cat ${PKGFILE}-new)
 " aptcache show apt
 	installaptnew
@@ -137,8 +121,8 @@ 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'
+	msgmsg 'Cold archive signed by' 'Rex Expired'
+	updatewithwarnings '^W: .* KEYEXPIRED'
 	testsuccessequal "$(cat ${PKGFILE})
 " aptcache show apt
 	failaptold
@@ -148,8 +132,8 @@ 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'
+	msgmsg 'Cold archive signed by' 'Marvin Paranoid'
+	updatewithwarnings '^W: .* NO_PUBKEY'
 	testsuccessequal "$(cat ${PKGFILE})
 " aptcache show apt
 	failaptold
@@ -162,8 +146,8 @@ runtest() {
 	done
 	signreleasefiles 'Joe Sixpack'
 	find aptarchive/ -name "$DELETEFILE" -delete
-	msgtest 'Bad warm archive signed by' 'Joe Sixpack'
-	updatesuccess
+	msgmsg 'Bad warm archive signed by' 'Joe Sixpack'
+	testsuccess aptget update
 	testsuccessequal "$(cat ${PKGFILE}-new)
 " aptcache show apt
 	installaptnew
@@ -173,8 +157,8 @@ runtest() {
 	rm -rf rootdir/var/lib/apt/lists
 	signreleasefiles 'Joe Sixpack'
 	find aptarchive/ -name "$DELETEFILE" -delete
-	msgtest 'Cold archive signed by' 'Joe Sixpack'
-	updatesuccess
+	msgmsg 'Cold archive signed by' 'Joe Sixpack'
+	testsuccess aptget update
 	testsuccessequal "$(cat ${PKGFILE})
 " aptcache show apt
 	installaptold
@@ -182,8 +166,8 @@ runtest() {
 	prepare ${PKGFILE}-new
 	signreleasefiles 'Marvin Paranoid'
 	find aptarchive/ -name "$DELETEFILE" -delete
-	msgtest 'Good warm archive signed by' 'Marvin Paranoid'
-	updatefailure '^W: .* NO_PUBKEY'
+	msgmsg 'Good warm archive signed by' 'Marvin Paranoid'
+	updatewithwarnings '^W: .* NO_PUBKEY'
 	testsuccessequal "$(cat ${PKGFILE})
 " aptcache show apt
 	installaptold
@@ -192,8 +176,8 @@ 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'
+	msgmsg 'Good warm archive signed by' 'Rex Expired'
+	updatewithwarnings '^W: .* KEYEXPIRED'
 	testsuccessequal "$(cat ${PKGFILE})
 " aptcache show apt
 	installaptold
@@ -202,8 +186,8 @@ runtest() {
 	prepare ${PKGFILE}-new
 	signreleasefiles
 	find aptarchive/ -name "$DELETEFILE" -delete
-	msgtest 'Good warm archive signed by' 'Joe Sixpack'
-	updatesuccess
+	msgmsg 'Good warm archive signed by' 'Joe Sixpack'
+	testsuccess aptget update
 	testsuccessequal "$(cat ${PKGFILE}-new)
 " aptcache show apt
 	installaptnew
@@ -213,24 +197,24 @@ 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
+	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
+	msgmsg 'Cold archive signed by' 'nobody'
+	updatewithwarnings 'W: .* is not signed.'
 	testsuccessequal "$(cat ${PKGFILE}-new)
 " aptcache show apt
 	failaptnew
-- 
cgit v1.2.3-70-g09d2


From ceafe8a6edc815df2923ba892894617829e9d3c2 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Fri, 22 May 2015 15:28:53 +0200
Subject: Fix endless loop in apt-get update that can cause disk fillup

The apt http code parses Content-Length and Content-Range. For
both requests the variable "Size" is used and the semantic for
this Size is the total file size. However Content-Length is not
the entire file size for partital file requests. For servers that
send the Content-Range header first and then the Content-Length
header this can lead to globbing of Size so that its less than
the real file size. This may lead to a subsequent passing of a
negative number into the CircleBuf which leads to a endless
loop that writes data.

Thanks to Anton Blanchard for the analysis and initial patch.

LP: #1445239
---
 methods/http.cc                         |  2 +-
 methods/server.cc                       | 20 +++++++++++++++-----
 methods/server.h                        |  3 ++-
 test/interactive-helper/aptwebserver.cc |  6 +++---
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/methods/http.cc b/methods/http.cc
index 1b996db98..ad90c9891 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -443,7 +443,7 @@ bool HttpServerState::RunData(FileFd * const File)
       else if (JunkSize != 0)
 	 In.Limit(JunkSize);
       else
-	 In.Limit(Size - StartPos);
+	 In.Limit(DownloadSize);
       
       // Just transfer the whole block.
       do
diff --git a/methods/server.cc b/methods/server.cc
index e321e0230..ba0a8864b 100644
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -164,15 +164,22 @@ bool ServerState::HeaderLine(string Line)
 	 Encoding = Stream;
       HaveContent = true;
 
-      unsigned long long * SizePtr = &Size;
+      unsigned long long * DownloadSizePtr = &DownloadSize;
       if (Result == 416)
-	 SizePtr = &JunkSize;
+	 DownloadSizePtr = &JunkSize;
 
-      *SizePtr = strtoull(Val.c_str(), NULL, 10);
-      if (*SizePtr >= 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 (*SizePtr == 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 && Size == 0)
+         Size = DownloadSize;
+
       return true;
    }
 
@@ -193,6 +200,9 @@ bool ServerState::HeaderLine(string Line)
 	 return _error->Error(_("The HTTP server sent an invalid Content-Range header"));
       if ((unsigned long long)StartPos > Size)
 	 return _error->Error(_("This HTTP server has broken range support"));
+
+      // figure out what we will download
+      DownloadSize = Size - StartPos;
       return true;
    }
 
diff --git a/methods/server.h b/methods/server.h
index 1b81e3549..ed3cb456a 100644
--- a/methods/server.h
+++ b/methods/server.h
@@ -34,7 +34,8 @@ struct ServerState
    char Code[360];
 
    // These are some statistics from the last parsed header lines
-   unsigned long long Size; // size of the usable content (aka: the file)
+   unsigned long long Size; // total size of the usable content (aka: the file)
+   unsigned long long DownloadSize; // size we actually download (can be smaller than Size if we have partial content)
    unsigned long long JunkSize; // size of junk content (aka: server error pages)
    unsigned long long StartPos;
    time_t Date;
diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index cd52da692..9c67b67e4 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -654,13 +654,13 @@ static void * handleClient(void * voidclient)				/*{{{*/
 		     if (filesize > filestart)
 		     {
 			data.Skip(filestart);
-			std::ostringstream contentlength;
-			contentlength << "Content-Length: " << (filesize - filestart);
-			headers.push_back(contentlength.str());
 			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, headers, data);
-- 
cgit v1.2.3-70-g09d2


From 6291f60e86718697f261519a6818e1d5ee433216 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Fri, 22 May 2015 15:40:18 +0200
Subject: Rename "Size" in ServerState to TotalFileSize

The variable "Size" was misleading and caused bug #1445239. To
avoid similar issues in the future, rename it to make the meaning
more obvious.

git-dch: ignore
---
 methods/https.cc  |  4 ++--
 methods/server.cc | 20 ++++++++++----------
 methods/server.h  | 14 ++++++++++----
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/methods/https.cc b/methods/https.cc
index 3a5981b58..12fc6c70f 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -55,10 +55,10 @@ HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
    {
       if (me->Server->Result != 416 && me->Server->StartPos != 0)
 	 ;
-      else if (me->Server->Result == 416 && me->Server->Size == me->File->FileSize())
+      else if (me->Server->Result == 416 && me->Server->TotalFileSize == me->File->FileSize())
       {
          me->Server->Result = 200;
-	 me->Server->StartPos = me->Server->Size;
+	 me->Server->StartPos = me->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->Server->JunkSize = std::numeric_limits<unsigned long long>::max();
diff --git a/methods/server.cc b/methods/server.cc
index ba0a8864b..6c05700a5 100644
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -54,7 +54,7 @@ ServerState::RunHeadersResult ServerState::RunHeaders(FileFd * const File,
    Major = 0; 
    Minor = 0; 
    Result = 0; 
-   Size = 0; 
+   TotalFileSize = 0;
    JunkSize = 0;
    StartPos = 0;
    Encoding = Closes;
@@ -177,8 +177,8 @@ bool ServerState::HeaderLine(string Line)
       // 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 && Size == 0)
-         Size = DownloadSize;
+      if(Result != 206 && TotalFileSize == 0)
+         TotalFileSize = DownloadSize;
 
       return true;
    }
@@ -194,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)
+      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,&Size) != 2)
+      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 = Size - StartPos;
+      DownloadSize = TotalFileSize - StartPos;
       return true;
    }
 
@@ -313,7 +313,7 @@ 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)
+	 if ((unsigned long long)SBuf.st_size == Server->TotalFileSize)
 	 {
 	    // the file is completely downloaded, but was not moved
 	    if (Server->HaveContent == true)
@@ -323,7 +323,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res)
 	       Server->RunData(&DevNull);
 	    }
 	    Server->HaveContent = false;
-	    Server->StartPos = Server->Size;
+	    Server->StartPos = Server->TotalFileSize;
 	    Server->Result = 200;
 	 }
 	 else if (unlink(Queue->DestFile.c_str()) == 0)
@@ -349,7 +349,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;
diff --git a/methods/server.h b/methods/server.h
index ed3cb456a..8c14282b6 100644
--- a/methods/server.h
+++ b/methods/server.h
@@ -34,10 +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 DownloadSize; // size we actually download (can be smaller than Size if we have partial content)
-   unsigned long long JunkSize; // size of junk content (aka: server error pages)
+
+   // 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;
@@ -73,7 +79,7 @@ struct ServerState
    RunHeadersResult RunHeaders(FileFd * const File, const std::string &Uri);
 
    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; JunkSize = 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;};
    virtual bool WriteResponse(std::string const &Data) = 0;
-- 
cgit v1.2.3-70-g09d2


From f4a91278c65b156c1addf27b0b05b029692959e8 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Fri, 22 May 2015 16:05:05 +0200
Subject: Add regression test for LP: #1445239

Add a regression test that reproduced the hang of apt when a
partial file is present.

Git-Dch: ignore
---
 test/integration/test-bug-lp1445239-download-loop | 29 +++++++++++++++++++++++
 test/interactive-helper/aptwebserver.cc           |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100755 test/integration/test-bug-lp1445239-download-loop

diff --git a/test/integration/test-bug-lp1445239-download-loop b/test/integration/test-bug-lp1445239-download-loop
new file mode 100755
index 000000000..342e3c61e
--- /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=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/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index 9c67b67e4..e02caa2b3 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -654,6 +654,8 @@ static void * handleClient(void * voidclient)				/*{{{*/
 		     if (filesize > filestart)
 		     {
 			data.Skip(filestart);
+                        // 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;
-- 
cgit v1.2.3-70-g09d2


From 314b47542c57d0a12c55dd1dd334cf233a33fcfb Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Mon, 9 Mar 2015 18:11:10 +0100
Subject: parse arch-qualified Provides correctly

The underlying problem is that libapt-pkg does not correctly parse these
provides. Internally, it creates a version named "baz:i386" with
architecture amd64. Of course, such a package name is invalid and thus
this version is completely inaccessible. Thus, this bug should not cause
apt to accept a broken situation as valid. Nevertheless, it prevents
using architecture qualified depends.

Closes: 777071
---
 apt-pkg/deb/deblistparser.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 4eef66c2b..3941cf2f2 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -817,10 +817,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;
-- 
cgit v1.2.3-70-g09d2


From 65759e00eff0513c34f584b99420b72fe0e5073e Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Fri, 22 May 2015 16:27:08 +0200
Subject: Update methods/https.cc now that ServerState::Size is renamed

Git-Dch: ignore
---
 methods/https.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/methods/https.cc b/methods/https.cc
index 81060122c..c97367323 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -69,7 +69,7 @@ HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
       me->File->Truncate(me->Server->StartPos);
       me->File->Seek(me->Server->StartPos);
 
-      me->Res.Size = me->Server->Size;
+      me->Res.Size = me->Server->TotalFileSize;
    }
    else if (me->Server->HeaderLine(line) == false)
       return 0;
-- 
cgit v1.2.3-70-g09d2


From 58702f8563a443a7c6e66253b259c2488b877290 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 19 May 2015 10:40:55 +0200
Subject: don't try other compressions on hashsum mismatch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If we e.g. fail on hash verification for Packages.xz its highly unlikely
that it will be any better with Packages.gz, so we just waste download
bandwidth and time. It also causes us always to fallback to the
uncompressed Packages file for which the error will finally be reported,
which in turn confuses users as the file usually doesn't exist on the
mirrors, so a bug in apt is suspected for even trying it…
---
 apt-pkg/acquire-item.cc                       | 33 +++++++++++++++++++--------
 test/integration/test-apt-update-not-modified | 23 +++++++++++++++++--
 test/integration/test-apt-update-rollback     |  4 ++--
 test/integration/test-apt-update-transactions |  8 +++++--
 4 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 8155b9bfe..cf89717c4 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -154,7 +154,18 @@ 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();
    }
@@ -167,7 +178,7 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
       RenameOnError(MaximumSizeExceeded);
 
    // 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);
@@ -1403,17 +1414,19 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
 {
    Item::Failed(Message,Cnf);
 
-   size_t const nextExt = CompressionExtensions.find(' ');
-   if (nextExt != std::string::npos)
+   // authorisation matches will not be fixed by other compression types
+   if (Status != StatAuthError)
    {
-      CompressionExtensions = CompressionExtensions.substr(nextExt+1);
-      Init(RealURI, Desc.Description, Desc.ShortDesc);
-      Status = StatIdle;
-      return;
+      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;
+      }
    }
 
-   Item::Failed(Message,Cnf);
-
    if(Target->IsOptional() && ExpectedHashes.empty() && Stage == STAGE_DOWNLOAD)
       Status = StatDone;
    else
diff --git a/test/integration/test-apt-update-not-modified b/test/integration/test-apt-update-not-modified
index b1d55c156..bac33d531 100755
--- a/test/integration/test-apt-update-not-modified
+++ b/test/integration/test-apt-update-not-modified
@@ -14,6 +14,7 @@ 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
@@ -30,8 +31,27 @@ Reading package lists..." aptget update
 Reading package lists..." aptget update
 	testfileequal 'listsdir-without-amd64.lst' "$(listcurrentlistsdirectory)"
 
-	# readd arch so its downloaded again
+	# 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 unstable InRelease
+Get:1 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists.good/unstable/main/binary-amd64/Packages.gz') B]
+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 unstable InRelease
 Get:1 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
 Reading package lists..." aptget update
@@ -46,7 +66,6 @@ Reading package lists..." aptget update
 
 	msgmsg 'Test Release.gpg with' "$1"
 	rm -rf rootdir/var/lib/apt/lists
-	cp -a aptarchive/dists  aptarchive/dists.good
 	find aptarchive/dists -name 'InRelease' -delete
 	# get our cache populated
 	testsuccess aptget update
diff --git a/test/integration/test-apt-update-rollback b/test/integration/test-apt-update-rollback
index b464a04a1..6fd901715 100755
--- a/test/integration/test-apt-update-rollback
+++ b/test/integration/test-apt-update-rollback
@@ -60,7 +60,7 @@ test_inrelease_to_broken_hash_reverts_all() {
     break_repository_sources_index '+1hour'
 
     # test the error condition
-    testfailureequal "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
@@ -127,7 +127,7 @@ E: There are problems and -y was used without --force-yes" aptget install -qq -y
     add_new_package '+1hour'
     break_repository_sources_index '+1hour'
 
-    testfailureequal "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
 
diff --git a/test/integration/test-apt-update-transactions b/test/integration/test-apt-update-transactions
index 63b318056..152e1617a 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,6 +25,7 @@ EOF
 }
 restorefile() {
 	mv "${1}.bak" "$1"
+	mv "${1}.gz.bak" "${1}.gz"
 }
 
 testrun() {
@@ -54,7 +57,8 @@ testsetup() {
 	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
 	redatereleasefiles '+1hour'
 	testrun 'listsdir.lst'
-- 
cgit v1.2.3-70-g09d2


From 448c38bdcd72b52f11ec5f326f822cf57653f81c Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 6 Jun 2015 12:28:00 +0200
Subject: rework hashsum verification in the acquire system
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Having every item having its own code to verify the file(s) it handles
is an errorprune process and easy to break, especially if items move
through various stages (download, uncompress, patching, …). With a giant
rework we centralize (most of) the verification to have a better
enforcement rate and (hopefully) less chance for bugs, but it breaks the
ABI bigtime in exchange – and as we break it anyway, it is broken even
harder.

It shouldn't effect most frontends as they don't deal with the acquire
system at all or implement their own items, but some do and will need to
be patched (might be an opportunity to use apt on-board material).

The theory is simple: Items implement methods to decide if hashes need to
be checked (in this stage) and to return the expected hashes for this
item (in this stage). The verification itself is done in worker message
passing which has the benefit that a hashsum error is now a proper error
for the acquire system rather than a Done() which is later revised to a
Failed().
---
 apt-pkg/acquire-item.cc                            | 3750 ++++++++++----------
 apt-pkg/acquire-item.h                             |  677 ++--
 apt-pkg/acquire-method.cc                          |    5 +-
 apt-pkg/acquire-worker.cc                          |  189 +-
 apt-pkg/contrib/hashes.cc                          |   10 +
 apt-pkg/contrib/hashes.h                           |    9 +
 apt-pkg/deb/debindexfile.cc                        |    4 +-
 apt-pkg/deb/debmetaindex.cc                        |   78 +-
 apt-pkg/indexrecords.cc                            |    2 +-
 apt-pkg/pkgcache.h                                 |    7 +-
 methods/file.cc                                    |    6 +-
 test/integration/test-apt-get-source-authenticated |    2 +-
 test/integration/test-apt-sources-deb822           |   55 +-
 test/integration/test-apt-update-expected-size     |    2 +-
 test/integration/test-apt-update-file              |    4 +
 test/integration/test-apt-update-nofallback        |   11 +-
 test/integration/test-apt-update-not-modified      |   30 +-
 test/integration/test-apt-update-stale             |    9 +-
 .../test-bug-595691-empty-and-broken-archive-files |    2 +-
 .../test-ubuntu-bug-1098738-apt-get-source-md5sum  |    8 +
 test/libapt/acqprogress_test.cc                    |    6 +-
 test/libapt/hashsums_test.cc                       |    3 +
 22 files changed, 2411 insertions(+), 2458 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index cf89717c4..ec6ec6e84 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -107,36 +107,296 @@ static bool AllowInsecureRepositories(indexRecords const * const MetaIndexParser
 }
 									/*}}}*/
 
+// 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
+{
+   /* FIXME: We have only hashes for uncompressed pdiffs.
+      rred uncompresses them on the fly while parsing.
+      In StateFetchDiff state we also uncompress on the fly for hash check.
+      Hashes are checked while searching for (next) patch to apply. */
+   return false;
+}
+HashStringList pkgAcqIndexDiffs::GetExpectedHashes() const
+{
+   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 */
+   return State == StateApplyDiff;
+}
+HashStringList pkgAcqIndexMergeDiffs::GetExpectedHashes() const
+{
+   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(DataTarget.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;
+}
+									/*}}}*/
 
 // Acquire::Item::Item - Constructor					/*{{{*/
 APT_IGNORE_DEPRECATED_PUSH
-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)
+pkgAcquire::Item::Item(pkgAcquire * const Owner) :
+   FileSize(0), PartialSize(0), Mode(0), Complete(false), Local(false),
+    QueueCounter(0), ExpectedAdditionalItems(0), Owner(Owner)
 {
    Owner->Add(this);
    Status = StatIdle;
-   if(TransactionManager != NULL)
-      TransactionManager->Add(this);
 }
 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 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");
@@ -169,59 +429,28 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
       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.empty() == false)
+   if (FailReason.empty() == false)
       ReportMirrorFailure(FailReason);
    else
       ReportMirrorFailure(ErrorText);
-}
-									/*}}}*/
-bool pkgAcquire::Item::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());
-	 }
-	 // mark that this transaction is finished
-	 TransactionManager = 0;
-	 break;
-   }
-   return true;
+   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();
@@ -230,22 +459,24 @@ 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)
+   unsigned long long const downloadedSize = Hashes.FileSize();
+   if (downloadedSize != 0)
    {
-      if (Owner->Log != 0)
-	 Owner->Log->Fetched(Size,atoi(LookupTag(Message,"Resume-Point","0").c_str()));
-   }
+      if (Complete == false && !Local && FileName == DestFile)
+      {
+	 if (Owner->Log != 0)
+	    Owner->Log->Fetched(Hashes.FileSize(),atoi(LookupTag(Message,"Resume-Point","0").c_str()));
+      }
 
-   if (FileSize == 0)
-      FileSize= Size;
+      if (FileSize == 0)
+	 FileSize= downloadedSize;
+   }
    Status = StatDone;
    ErrorText = string();
    Owner->Dequeue(this);
@@ -255,7 +486,7 @@ 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 (From == To || rename(From.c_str(),To.c_str()) == 0)
       return true;
@@ -271,76 +502,40 @@ bool pkgAcquire::Item::Rename(string From,string To)
    return false;
 }
 									/*}}}*/
-// Acquire::Item::QueueURI and specialisations from child classes	/*{{{*/
-/* 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 pkgAcquire::Item::QueueURI(ItemDesc &Item)
+void pkgAcquire::Item::Dequeue()					/*{{{*/
 {
-   std::string const FinalFile = GetFinalFilename();
-   if (TransactionManager != NULL && TransactionManager->IMSHit == true &&
-	 FileExists(FinalFile) == true)
-   {
-      PartialFile = DestFile = FinalFile;
-      Status = StatDone;
-      return false;
-   }
-
-   Owner->Enqueue(Item);
-   return true;
+   Owner->Dequeue(this);
 }
-/* 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)
-{
-   Owner->Enqueue(Item);
-   return true;
-}
-/* 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 (pkgAcquire::Item::QueueURI(Item) == true)
-      return true;
-   QueueOnIMSHit();
-   return false;
-}
-									/*}}}*/
-void pkgAcquire::Item::Dequeue()					/*{{{*/
-{
-   Owner->Dequeue(this);
-}
-									/*}}}*/
-bool pkgAcquire::Item::RenameOnError(pkgAcquire::Item::RenameOnErrorState const error)/*{{{*/
+									/*}}}*/
+bool pkgAcquire::Item::RenameOnError(pkgAcquire::Item::RenameOnErrorState const error)/*{{{*/
 {
    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:
@@ -351,6 +546,8 @@ bool pkgAcquire::Item::RenameOnError(pkgAcquire::Item::RenameOnErrorState const
 	 // no handling here, done by callers
 	 break;
    }
+   if (ErrorText.empty())
+      ErrorText = errtext;
    return false;
 }
 									/*}}}*/
@@ -360,15 +557,8 @@ void pkgAcquire::Item::SetActiveSubprocess(const std::string &subprocess)/*{{{*/
       APT_IGNORE_DEPRECATED(Mode = ActiveSubprocess.c_str();)
 }
 									/*}}}*/
-// Acquire::Item::GetFinalFilename - Return the full final file path	/*{{{*/
-std::string pkgAcquire::Item::GetFinalFilename() const
-{
-   return GetFinalFileNameFromURI(Desc.URI);
-}
-									/*}}}*/
 // 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())
@@ -411,2083 +601,1897 @@ void pkgAcquire::Item::ReportMirrorFailure(string FailCode)
    }
 }
 									/*}}}*/
-// AcqDiffIndex::AcqDiffIndex - Constructor				/*{{{*/
-// ---------------------------------------------------------------------
-/* Get the DiffIndex file first and see if there are patches available
- * If so, create a pkgAcqIndexDiffs fetcher that will get and apply the
- * 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)
+std::string pkgAcquire::Item::HashSum() const				/*{{{*/
 {
-   
-   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";
-
-   DestFile = GetPartialFileNameFromURI(Desc.URI);
+   HashStringList const hashes = GetExpectedHashes();
+   HashString const * const hs = hashes.find(NULL);
+   return hs != NULL ? hs->toStr() : "";
+}
+									/*}}}*/
 
-   if(Debug)
-      std::clog << "pkgAcqDiffIndex: " << Desc.URI << std::endl;
+pkgAcqTransactionItem::pkgAcqTransactionItem(pkgAcquire * const Owner,	/*{{{*/
+      pkgAcqMetaBase * const TransactionManager, IndexTarget const * 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	/*{{{*/
+{
+   if (TransactionManager->MetaIndexParser == NULL)
+      return HashStringList();
+   indexRecords::checkSum * const R = TransactionManager->MetaIndexParser->Lookup(MetaKey);
+   if (R == NULL)
+      return HashStringList();
+   return R->Hashes;
+}
+									/*}}}*/
 
-   // look for the current package file
-   CurrentPackagesFile = GetFinalFileNameFromURI(RealURI);
+// AcqMetaBase - Constructor						/*{{{*/
+pkgAcqMetaBase::pkgAcqMetaBase(pkgAcquire * const Owner,
+      pkgAcqMetaBase * const TransactionManager,
+      std::vector<IndexTarget*> const * const IndexTargets,
+      IndexTarget const &DataTarget,
+      indexRecords * const MetaIndexParser)
+: pkgAcqTransactionItem(Owner, TransactionManager, NULL), DataTarget(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;
 
-   // 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:/")
+   // ensure the toplevel is in error state too
+   for (std::vector<pkgAcqTransactionItem*>::iterator I = Transaction.begin();
+        I != Transaction.end(); ++I)
    {
-      // 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;
+      (*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;
 
-   if(Debug)
-      std::clog << "pkgAcqDiffIndex::pkgAcqDiffIndex(): "
-	 << CurrentPackagesFile << std::endl;
-
-   QueueURI(Desc);
-
+   // 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();
 }
 									/*}}}*/
-// Acquire::Item::GetFinalFilename - Return the full final file path	/*{{{*/
-std::string pkgAcqDiffIndex::GetFinalFilename() const
+// AcqMetaBase::TransactionStageCopy - Stage a file for copying		/*{{{*/
+void pkgAcqMetaBase::TransactionStageCopy(pkgAcqTransactionItem * const I,
+                                          const std::string &From,
+                                          const std::string &To)
 {
-   // the logic we inherent from pkgAcqBaseIndex isn't what we need here
-   return pkgAcquire::Item::GetFinalFilename();
+   I->PartialFile = From;
+   I->DestFile = To;
 }
 									/*}}}*/
-// AcqIndex::Custom600Headers - Insert custom request headers		/*{{{*/
+// 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		/*{{{*/
 // ---------------------------------------------------------------------
-/* The only header we use is the last-modified header. */
-#if APT_PKG_ABI >= 413
-string pkgAcqDiffIndex::Custom600Headers() const
-#else
-string pkgAcqDiffIndex::Custom600Headers()
-#endif
+string pkgAcqMetaBase::Custom600Headers() const
 {
-   string const Final = GetFinalFilename();
+   std::string Header = "\nIndex-File: true";
+   std::string MaximumSize;
+   strprintf(MaximumSize, "\nMaximum-Size: %i",
+             _config->FindI("Acquire::MaxReleaseFileSize", 10*1000*1000));
+   Header += MaximumSize;
 
-   if(Debug)
-      std::clog << "Custom600Header-IMS: " << Final << std::endl;
+   string const FinalFile = GetFinalFilename();
 
    struct stat Buf;
-   if (stat(Final.c_str(),&Buf) != 0)
-      return "\nIndex-File: true";
-   
-   return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
+   if (stat(FinalFile.c_str(),&Buf) == 0)
+      Header += "\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
+
+   return Header;
 }
 									/*}}}*/
-void pkgAcqDiffIndex::QueueOnIMSHit() const				/*{{{*/
+// AcqMetaBase::QueueForSignatureVerify					/*{{{*/
+void pkgAcqMetaBase::QueueForSignatureVerify(pkgAcqTransactionItem * const I, std::string const &File, std::string const &Signature)
 {
-   // 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);
+   AuthPass = true;
+   I->Desc.URI = "gpgv:" + Signature;
+   I->DestFile = File;
+   QueueURI(I->Desc);
+   I->SetActiveSubprocess("gpgv");
 }
 									/*}}}*/
-bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)		/*{{{*/
+// AcqMetaBase::CheckDownloadDone					/*{{{*/
+bool pkgAcqMetaBase::CheckDownloadDone(pkgAcqTransactionItem * const I, const std::string &Message, HashStringList const &Hashes) const
 {
-   // failing here is fine: our caller will take care of trying to
-   // get the complete file if patching fails
-   if(Debug)
-      std::clog << "pkgAcqDiffIndex::ParseIndexDiff() " << IndexDiffFile
-	 << std::endl;
-
-   FileFd Fd(IndexDiffFile,FileFd::ReadOnly);
-   pkgTagFile TF(&Fd);
-   if (_error->PendingError() == true)
-      return false;
-
-   pkgTagSection Tags;
-   if(unlikely(TF.Step(Tags) == false))
-      return false;
-
-   HashStringList ServerHashes;
-   unsigned long long ServerSize = 0;
+   // We have just finished downloading a Release file (it is not
+   // verified yet)
 
-   for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type)
+   string const FileName = LookupTag(Message,"Filename");
+   if (FileName.empty() == true)
    {
-      std::string tagname = *type;
-      tagname.append("-Current");
-      std::string const tmp = Tags.FindS(tagname.c_str());
-      if (tmp.empty() == true)
-	 continue;
-
-      string hash;
-      unsigned long long size;
-      std::stringstream ss(tmp);
-      ss >> hash >> size;
-      if (unlikely(hash.empty() == true))
-	 continue;
-      if (unlikely(ServerSize != 0 && ServerSize != size))
-	 continue;
-      ServerHashes.push_back(HashString(*type, hash));
-      ServerSize = size;
+      I->Status = StatError;
+      I->ErrorText = "Method gave a blank filename";
+      return false;
    }
 
-   if (ServerHashes.usable() == false)
+   if (FileName != I->DestFile)
    {
-      if (Debug == true)
-	 std::clog << "pkgAcqDiffIndex: " << IndexDiffFile << ": Did not find a good hashsum in the index" << std::endl;
+      I->Local = true;
+      I->Desc.URI = "copy:" + FileName;
+      I->QueueURI(I->Desc);
       return false;
    }
 
-   if (ServerHashes != HashSums())
+   // 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())
    {
-      if (Debug == true)
+      // detect IMS-Hits servers haven't detected by Hash comparison
+      std::string const FinalFile = I->GetFinalFilename();
+      if (RealFileExists(FinalFile) && Hashes.VerifyFile(FinalFile) == true)
       {
-	 std::clog << "pkgAcqDiffIndex: " << IndexDiffFile << ": Index has different hashes than parser, probably older, so fail pdiffing" << std::endl;
-         printHashSumComparision(CurrentPackagesFile, ServerHashes, HashSums());
+	 IMSHit = true;
+	 unlink(I->DestFile.c_str());
       }
-      return false;
    }
 
-   if (ServerHashes.VerifyFile(CurrentPackagesFile) == true)
+   if(IMSHit == true)
    {
-      // 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;
-      QueueOnIMSHit();
-      return 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();
    }
 
-   FileFd fd(CurrentPackagesFile, FileFd::ReadOnly);
-   Hashes LocalHashesCalc;
-   LocalHashesCalc.AddFD(fd);
-   HashStringList const LocalHashes = LocalHashesCalc.GetHashStringList();
+   // set Item to complete as the remaining work is all local (verify etc)
+   I->Complete = true;
 
-   if(Debug)
-      std::clog << "Server-Current: " << ServerHashes.find(NULL)->toStr() << " and we start at "
-	 << fd.Name() << " " << fd.FileSize() << " " << LocalHashes.find(NULL)->toStr() << std::endl;
+   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
 
-   // parse all of (provided) history
-   vector<DiffInfo> available_patches;
-   bool firstAcceptedHashes = true;
-   for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type)
+   if (TransactionManager->IMSHit == false)
    {
-      if (LocalHashes.find(*type) == NULL)
-	 continue;
-
-      std::string tagname = *type;
-      tagname.append("-History");
-      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);
-
-      while (ss >> hash >> size >> filename)
+      // 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"))
       {
-	 if (unlikely(hash.empty() == true || filename.empty() == true))
-	    continue;
-
-	 // 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 || unlikely(cur->result_size != size))
-	       continue;
-	    cur->result_hashes.push_back(HashString(*type, hash));
-	    break;
-	 }
-	 if (cur != available_patches.end())
-	    continue;
-	 if (firstAcceptedHashes == true)
-	 {
-	    DiffInfo next;
-	    next.file = filename;
-	    next.result_hashes.push_back(HashString(*type, hash));
-	    next.result_size = size;
-	    next.patch_size = 0;
-	    available_patches.push_back(next);
-	 }
+	 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())
 	 {
-	    if (Debug == true)
-	       std::clog << "pkgAcqDiffIndex: " << IndexDiffFile << ": File " << filename
-		  << " wasn't in the list for the first parsed hash! (history)" << std::endl;
-	    break;
+	    delete TransactionManager->LastMetaIndexParser;
+	    TransactionManager->LastMetaIndexParser = NULL;
 	 }
+	 _error->RevertToStack();
       }
-      firstAcceptedHashes = false;
    }
 
-   if (unlikely(available_patches.empty() == true))
+   if (TransactionManager->MetaIndexParser->Load(DestFile) == false)
    {
-      if (Debug)
-	 std::clog << "pkgAcqDiffIndex: " << IndexDiffFile << ": "
-	    << "Couldn't find any patches for the patch series." << std::endl;
+      Status = StatAuthError;
+      ErrorText = TransactionManager->MetaIndexParser->ErrorText;
       return false;
    }
 
-   for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type)
+   if (!VerifyVendor(Message))
    {
-      if (LocalHashes.find(*type) == NULL)
-	 continue;
+      Status = StatAuthError;
+      return false;
+   }
 
-      std::string tagname = *type;
-      tagname.append("-Patches");
-      std::string const tmp = Tags.FindS(tagname.c_str());
-      if (tmp.empty() == true)
-	 continue;
+   if (_config->FindB("Debug::pkgAcquire::Auth", false))
+      std::cerr << "Signature verification succeeded: "
+                << DestFile << std::endl;
 
-      string hash, filename;
-      unsigned long long size;
-      std::stringstream ss(tmp);
+   // Download further indexes with verification
+   QueueIndexes(true);
 
-      while (ss >> hash >> size >> filename)
+   return true;
+}
+									/*}}}*/
+void pkgAcqMetaBase::QueueIndexes(bool const verify)			/*{{{*/
+{
+   // at this point the real Items are loaded in the fetcher
+   ExpectedAdditionalItems = 0;
+
+   vector <IndexTarget*>::const_iterator Target;
+   for (Target = IndexTargets->begin();
+        Target != IndexTargets->end();
+        ++Target)
+   {
+      if (verify == true && TransactionManager->MetaIndexParser->Exists((*Target)->MetaKey) == false)
       {
-	 if (unlikely(hash.empty() == true || filename.empty() == true))
+	 // optional target that we do not have in the Release file are skipped
+	 if ((*Target)->IsOptional())
 	    continue;
 
-	 // 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 (unlikely(cur->patch_size != 0 && cur->patch_size != size))
-	       continue;
-	    cur->patch_hashes.push_back(HashString(*type, hash));
-	    cur->patch_size = size;
-	    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! (patches)" << std::endl;
-	 break;
+         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;
       }
+
+      /* 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 ||
+          TransactionManager->MetaIndexParser->Exists((*Target)->MetaKey + ".diff/Index") == true))
+         new pkgAcqDiffIndex(Owner, TransactionManager, *Target);
+      else
+         new pkgAcqIndex(Owner, TransactionManager, *Target);
    }
+}
+									/*}}}*/
+bool pkgAcqMetaBase::VerifyVendor(string const &Message)		/*{{{*/
+{
+   string::size_type pos;
 
-   bool foundStart = false;
-   for (std::vector<DiffInfo>::iterator cur = available_patches.begin();
-	 cur != available_patches.end(); ++cur)
+   // 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)
    {
-      if (LocalHashes != cur->result_hashes)
-	 continue;
-
-      available_patches.erase(available_patches.begin(), cur);
-      foundStart = true;
-      break;
+      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());
 
-   if (foundStart == false || unlikely(available_patches.empty() == true))
+   string Transformed = TransactionManager->MetaIndexParser->GetExpectedDist();
+
+   if (Transformed == "../project/experimental")
    {
-      if (Debug)
-	 std::clog << "pkgAcqDiffIndex: " << IndexDiffFile << ": "
-	    << "Couldn't find the start of the patch series." << std::endl;
-      return false;
+      Transformed = "experimental";
    }
 
-   // patching with too many files is rather slow compared to a fast download
-   unsigned long const fileLimit = _config->FindI("Acquire::PDiffs::FileLimit", 0);
-   if (fileLimit != 0 && fileLimit < available_patches.size())
+   pos = Transformed.rfind('/');
+   if (pos != string::npos)
    {
-      if (Debug)
-	 std::clog << "Need " << available_patches.size() << " diffs (Limit is " << fileLimit
-	    << ") so fallback to complete download" << std::endl;
-      return false;
+      Transformed = Transformed.substr(0, pos);
    }
 
-   // calculate the size of all patches we have to get
-   // note that all sizes are uncompressed, while we download compressed files
-   unsigned long long patchesSize = 0;
-   for (std::vector<DiffInfo>::const_iterator cur = available_patches.begin();
-	 cur != available_patches.end(); ++cur)
-      patchesSize += cur->patch_size;
-   unsigned long long const sizeLimit = ServerSize * _config->FindI("Acquire::PDiffs::SizeLimit", 100);
-   if (sizeLimit > 0 && (sizeLimit/100) < patchesSize)
+   if (Transformed == ".")
    {
-      if (Debug)
-	 std::clog << "Need " << patchesSize << " bytes (Limit is " << sizeLimit/100
-	    << ") so fallback to complete download" << std::endl;
-      return false;
+      Transformed = "";
    }
 
-   // we have something, queue the diffs
-   string::size_type const last_space = Description.rfind(" ");
-   if(last_space != string::npos)
-      Description.erase(last_space, Description.size()-last_space);
+   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."),
+	       DataTarget.URI.c_str(), TimeToStr(invalid_since).c_str());
+	 if (ErrorText.empty())
+	    ErrorText = errmsg;
+	 return _error->Error("%s", errmsg.c_str());
+      }
+   }
 
-   /* decide if we should download patches one by one or in one go:
-      The first is good if the server merges patches, but many don't so client
-      based merging can be attempt in which case the second is better.
-      "bad things" will happen if patches are merged on the server,
-      but client side merging is attempt as well */
-   bool pdiff_merge = _config->FindB("Acquire::PDiffs::Merge", true);
-   if (pdiff_merge == true)
+   /* 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())
    {
-      // reprepro adds this flag if it has merged patches on the server
-      std::string const precedence = Tags.FindS("X-Patch-Precedence");
-      pdiff_merge = (precedence != "merged");
+      TransactionManager->IMSHit = true;
+      unlink(DestFile.c_str());
+      PartialFile = DestFile = GetFinalFilename();
+      delete TransactionManager->MetaIndexParser;
+      TransactionManager->MetaIndexParser = TransactionManager->LastMetaIndexParser;
+      TransactionManager->LastMetaIndexParser = NULL;
    }
 
-   if (pdiff_merge == false)
+   if (_config->FindB("Debug::pkgAcquire::Auth", false)) 
    {
-      new pkgAcqIndexDiffs(Owner, TransactionManager, Target, ExpectedHashes, 
-                           MetaIndexParser, available_patches);
+      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;
    }
-   else
+
+   if (TransactionManager->MetaIndexParser->CheckDist(Transformed) == false)
    {
-      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);
+      // 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());
+      }
    }
 
-   Complete = false;
-   Status = StatDone;
-   Dequeue();
    return true;
 }
 									/*}}}*/
-void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig * Cnf)/*{{{*/
-{
-   Item::Failed(Message,Cnf);
-   Status = StatDone;
-
-   if(Debug)
-      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);
+pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire * const Owner,	/*{{{*/
+      IndexTarget const &ClearsignedTarget,
+      IndexTarget const &DetachedDataTarget, IndexTarget const &DetachedSigTarget,
+      const 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);
 }
 									/*}}}*/
-bool pkgAcqDiffIndex::TransactionState(TransactionStates const state)	/*{{{*/
+pkgAcqMetaClearSig::~pkgAcqMetaClearSig()				/*{{{*/
 {
-   if (pkgAcquire::Item::TransactionState(state) == false)
-      return false;
-
-   switch (state)
-   {
-      case TransactionCommit:
-	 break;
-      case TransactionAbort:
-	 std::string const Partial = GetPartialFileNameFromURI(RealURI);
-	 unlink(Partial.c_str());
-	 break;
-   }
-
-   return true;
 }
 									/*}}}*/
-void pkgAcqDiffIndex::Done(string Message,unsigned long long Size,HashStringList const &Hashes,	/*{{{*/
-			   pkgAcquire::MethodConfig *Cnf)
+// pkgAcqMetaClearSig::Custom600Headers - Insert custom request headers	/*{{{*/
+string pkgAcqMetaClearSig::Custom600Headers() const
 {
-   if(Debug)
-      std::clog << "pkgAcqDiffIndex::Done(): " << Desc.URI << std::endl;
-
-   Item::Done(Message, Size, Hashes, Cnf);
+   string Header = pkgAcqMetaBase::Custom600Headers();
+   Header += "\nFail-Ignore: true";
+   return Header;
+}
+									/*}}}*/
+// pkgAcqMetaClearSig::Done - We got a file				/*{{{*/
+class APT_HIDDEN DummyItem : public pkgAcquire::Item
+{
+   IndexTarget const * const Target;
+   public:
+   virtual std::string DescURI() const {return Target->URI;};
+   virtual HashStringList GetExpectedHashes()  const {return HashStringList();};
 
-   // verify the index target
-   if(Target && Target->MetaKey != "" && MetaIndexParser && Hashes.usable())
+   DummyItem(pkgAcquire * const Owner, IndexTarget const * const Target) :
+      pkgAcquire::Item(Owner), Target(Target)
    {
-      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;
-      }
-
+      Status = StatDone;
+      DestFile = GetFinalFileNameFromURI(Target->URI);
    }
+};
+void pkgAcqMetaClearSig::Done(std::string const &Message,
+                              HashStringList const &Hashes,
+                              pkgAcquire::MethodConfig const * const Cnf)
+{
+   Item::Done(Message, Hashes, Cnf);
 
-   string const FinalFile = GetFinalFilename();
-   if(StringToBool(LookupTag(Message,"IMS-Hit"),false))
-      DestFile = FinalFile;
-
-   if(ParseDiffIndex(DestFile) == false)
+   // 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))
    {
-      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);
+      pkgAcquire::Item::Failed(Message, Cnf);
+      RenameOnError(NotClearsigned);
+      TransactionManager->AbortTransaction();
       return;
    }
 
-   TransactionManager->TransactionStageCopy(this, DestFile, FinalFile);
-
-   Complete = true;
-   Status = StatDone;
-   Dequeue();
-
-   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 DummyItem(Owner, &DetachedDataTarget);
+	 new DummyItem(Owner, &DetachedSigTarget);
+      }
+   }
 }
 									/*}}}*/
-// 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),
-     available_patches(diffs)
+void pkgAcqMetaClearSig::Failed(string const &Message,pkgAcquire::MethodConfig const * const Cnf) /*{{{*/
 {
-   DestFile = GetPartialFileNameFromURI(Target->URI);
-
-   Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
+   Item::Failed(Message, Cnf);
 
-   RealURI = Target->URI;
-   Desc.Owner = this;
-   Description = Target->Description;
-   Desc.ShortDesc = Target->ShortDesc;
+   // we failed, we will not get additional items from this method
+   ExpectedAdditionalItems = 0;
 
-   if(available_patches.empty() == true)
+   if (AuthPass == false)
    {
-      // we are done (yeah!), check hashes against the final file
-      DestFile = GetFinalFileNameFromURI(Target->URI);
-      Finish(true);
+      // 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
    {
-      // patching needs to be bootstrapped with the 'old' version
-      std::string const PartialFile = GetPartialFileNameFromURI(RealURI);
-      if (RealFileExists(PartialFile) == false)
+      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)
       {
-	 if (symlink(GetFinalFilename().c_str(), PartialFile.c_str()) != 0)
+	 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))
 	 {
-	    Failed("Link creation of " + PartialFile + " to " + GetFinalFilename() + " failed", NULL);
-	    return;
+	    // 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();
+	    }
 	 }
-      }
 
-      // get the next diff
-      State = StateFetchDiff;
-      QueueNextDiff();
+	 // 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);
+      }
    }
 }
 									/*}}}*/
-void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig * Cnf)/*{{{*/
-{
-   Item::Failed(Message,Cnf);
-   Status = StatDone;
 
-   if(Debug)
-      std::clog << "pkgAcqIndexDiffs failed: " << Desc.URI << " with " << Message << std::endl
-		<< "Falling back to normal index file acquire" << std::endl;
-   DestFile = GetPartialFileNameFromURI(Target->URI);
-   RenameOnError(PDiffError);
-   new pkgAcqIndex(Owner, TransactionManager, Target, ExpectedHashes, MetaIndexParser);
-   Finish();
-}
-									/*}}}*/
-// Finish - helper that cleans the item out of the fetcher queue	/*{{{*/
-void pkgAcqIndexDiffs::Finish(bool allDone)
+pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire * const Owner,		/*{{{*/
+                                 pkgAcqMetaBase * const TransactionManager,
+				 IndexTarget const &DataTarget,
+				 IndexTarget const &DetachedSigTarget,
+				 vector<IndexTarget*> const * const IndexTargets,
+				 indexRecords * const MetaIndexParser) :
+   pkgAcqMetaBase(Owner, TransactionManager, IndexTargets, DataTarget, MetaIndexParser),
+   DetachedSigTarget(DetachedSigTarget)
 {
-   if(Debug)
-      std::clog << "pkgAcqIndexDiffs::Finish(): " 
-                << allDone << " "
-                << Desc.URI << std::endl;
-
-   // we restore the original name, this is required, otherwise
-   // the file will be cleaned
-   if(allDone) 
-   {
-      if(HashSums().usable() && !HashSums().VerifyFile(DestFile))
-      {
-	 RenameOnError(HashSumMismatch);
-	 Dequeue();
-	 return;
-      }
+   if(_config->FindB("Debug::Acquire::Transaction", false) == true)
+      std::clog << "New pkgAcqMetaIndex with TransactionManager "
+                << this->TransactionManager << std::endl;
 
-      TransactionManager->TransactionStageCopy(this, DestFile, GetFinalFilename());
+   DestFile = GetPartialFileNameFromURI(DataTarget.URI);
 
-      // this is for the "real" finish
-      Complete = true;
-      Status = StatDone;
-      Dequeue();
-      if(Debug)
-	 std::clog << "\n\nallDone: " << DestFile << "\n" << std::endl;
-      return;
-   }
+   // Create the item
+   Desc.Description = DataTarget.Description;
+   Desc.Owner = this;
+   Desc.ShortDesc = DataTarget.ShortDesc;
+   Desc.URI = DataTarget.URI;
 
-   if(Debug)
-      std::clog << "Finishing: " << Desc.URI << std::endl;
-   Complete = false;
-   Status = StatDone;
-   Dequeue();
-   return;
+   // we expect more item
+   ExpectedAdditionalItems = IndexTargets->size();
+   QueueURI(Desc);
 }
 									/*}}}*/
-bool pkgAcqIndexDiffs::QueueNextDiff()					/*{{{*/
+void pkgAcqMetaIndex::Done(string const &Message,			/*{{{*/
+                           HashStringList const &Hashes,
+			   pkgAcquire::MethodConfig const * const Cfg)
 {
-   // calc sha1 of the just patched file
-   std::string const FinalFile = GetPartialFileNameFromURI(RealURI);
+   Item::Done(Message,Hashes,Cfg);
 
-   if(!FileExists(FinalFile))
+   if(CheckDownloadDone(this, Message, Hashes))
    {
-      Failed("Message: No FinalFile " + FinalFile + " available", NULL);
-      return false;
+      // 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;
 
-   FileFd fd(FinalFile, FileFd::ReadOnly);
-   Hashes LocalHashesCalc;
-   LocalHashesCalc.AddFD(fd);
-   HashStringList const LocalHashes = LocalHashesCalc.GetHashStringList();
-
-   if(Debug)
-      std::clog << "QueueNextDiff: " << FinalFile << " (" << LocalHashes.find(NULL)->toStr() << ")" << std::endl;
+   _error->Warning(_("The repository '%s' does not have a Release file. "
+                     "This is deprecated, please contact the owner of the "
+                     "repository."), DataTarget.Description.c_str());
 
-   if (unlikely(LocalHashes.usable() == false || ExpectedHashes.usable() == false))
+   // 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)
    {
-      Failed("Local/Expected hashes are not usable", NULL);
-      return false;
-   }
-
+      // ensure old Release files are removed
+      TransactionManager->TransactionStageRemoval(this, GetFinalFilename());
+      delete TransactionManager->MetaIndexParser;
+      TransactionManager->MetaIndexParser = NULL;
 
-   // final file reached before all patches are applied
-   if(LocalHashes == ExpectedHashes)
-   {
-      Finish(true);
-      return true;
-   }
-
-   // remove all patches until the next matching patch is found
-   // this requires the Index file to be ordered
-   for(vector<DiffInfo>::iterator I = available_patches.begin();
-       available_patches.empty() == false &&
-	  I != available_patches.end() &&
-	  I->result_hashes != LocalHashes;
-       ++I)
-   {
-      available_patches.erase(I);
+      // 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 DataTarget.URI;
+}
+									/*}}}*/
 
-   // error checking and falling back if no patch was found
-   if(available_patches.empty() == true)
-   {
-      Failed("No patches left to reach target", NULL);
-      return false;
-   }
+// AcqMetaSig::AcqMetaSig - Constructor					/*{{{*/
+pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire * const Owner,
+      pkgAcqMetaBase * const TransactionManager,
+      IndexTarget const * const Target,
+      pkgAcqMetaIndex * const MetaIndex) :
+   pkgAcqTransactionItem(Owner, TransactionManager, Target), MetaIndex(MetaIndex)
+{
+   DestFile = GetPartialFileNameFromURI(Target->URI);
 
-   // queue the right diff
-   Desc.URI = RealURI + ".diff/" + available_patches[0].file + ".gz";
-   Desc.Description = Description + " " + available_patches[0].file + string(".pdiff");
-   DestFile = GetPartialFileNameFromURI(RealURI + ".diff/" + available_patches[0].file);
+   // 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());
 
-   if(Debug)
-      std::clog << "pkgAcqIndexDiffs::QueueNextDiff(): " << Desc.URI << std::endl;
+   // set the TransactionManager
+   if(_config->FindB("Debug::Acquire::Transaction", false) == true)
+      std::clog << "New pkgAcqMetaSig with TransactionManager "
+                << TransactionManager << std::endl;
 
-   QueueURI(Desc);
+   // Create the item
+   Desc.Description = Target->Description;
+   Desc.Owner = this;
+   Desc.ShortDesc = Target->ShortDesc;
+   Desc.URI = Target->URI;
 
-   return true;
+   // 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);
 }
 									/*}}}*/
-void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size, HashStringList const &Hashes,	/*{{{*/
-			    pkgAcquire::MethodConfig *Cnf)
+pkgAcqMetaSig::~pkgAcqMetaSig()						/*{{{*/
 {
-   if(Debug)
-      std::clog << "pkgAcqIndexDiffs::Done(): " << Desc.URI << std::endl;
-
-   Item::Done(Message, Size, Hashes, Cnf);
-
-   // FIXME: verify this download too before feeding it to rred
-   std::string const FinalFile = GetPartialFileNameFromURI(RealURI);
-
-   // success in downloading a diff, enter ApplyDiff state
-   if(State == StateFetchDiff)
+}
+									/*}}}*/
+// 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)
    {
-      FileFd fd(DestFile, FileFd::ReadOnly, FileFd::Gzip);
-      class Hashes LocalHashesCalc;
-      LocalHashesCalc.AddFD(fd);
-      HashStringList const LocalHashes = LocalHashesCalc.GetHashStringList();
+      DestFile = MetaIndexFileSignature;
+      MetaIndexFileSignature.clear();
+   }
+   Item::Done(Message, Hashes, Cfg);
 
-      if (fd.Size() != available_patches[0].patch_size ||
-	    available_patches[0].patch_hashes != LocalHashes)
+   if(MetaIndex->AuthPass == false)
+   {
+      if(MetaIndex->CheckDownloadDone(this, Message, Hashes) == true)
       {
-	 // patchfiles are dated, so bad indicates a bad download, so kill it
-	 unlink(DestFile.c_str());
-	 Failed("Patch has Size/Hashsum mismatch", NULL);
-	 return;
+	 // 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);
 
-      // rred excepts the patch as $FinalFile.ed
-      Rename(DestFile,FinalFile+".ed");
+   // check if we need to fail at this point
+   if (MetaIndex->AuthPass == true && MetaIndex->CheckStopAuthentication(this, Message))
+         return;
 
-      if(Debug)
-	 std::clog << "Sending to rred method: " << FinalFile << std::endl;
+   string const FinalRelease = MetaIndex->GetFinalFilename();
+   string const FinalReleasegpg = GetFinalFilename();
+   string const FinalInRelease = TransactionManager->GetFinalFilename();
 
-      State = StateApplyDiff;
-      Local = true;
-      Desc.URI = "rred:" + FinalFile;
-      QueueURI(Desc);
-      SetActiveSubprocess("rred");
-      return;
-   } 
+   if (RealFileExists(FinalReleasegpg) || RealFileExists(FinalInRelease))
+   {
+      std::string downgrade_msg;
+      strprintf(downgrade_msg, _("The repository '%s' is no longer signed."),
+                MetaIndex->DataTarget.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->DataTarget.Description.c_str());
 
+   // ensures that a Release.gpg file in the lists/ is removed by the transaction
+   TransactionManager->TransactionStageRemoval(this, DestFile);
 
-   // success in download/apply a diff, queue next (if needed)
-   if(State == StateApplyDiff)
+   // only allow going further if the users explicitely wants it
+   if(AllowInsecureRepositories(TransactionManager->MetaIndexParser, TransactionManager, this) == true)
    {
-      // remove the just applied patch
-      available_patches.erase(available_patches.begin());
-      unlink((FinalFile + ".ed").c_str());
-
-      // move into place
-      if(Debug) 
+      if (RealFileExists(FinalReleasegpg) || RealFileExists(FinalInRelease))
       {
-	 std::clog << "Moving patched file in place: " << std::endl
-		   << DestFile << " -> " << FinalFile << std::endl;
+	 // 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();
+	 }
       }
-      Rename(DestFile,FinalFile);
-      chmod(FinalFile.c_str(),0644);
 
-      // see if there is more to download
-      if(available_patches.empty() == false) {
-	 new pkgAcqIndexDiffs(Owner, TransactionManager, Target,
-			      ExpectedHashes, MetaIndexParser,
-			      available_patches);
-	 return Finish();
-      } else 
-         // update
-         DestFile = FinalFile;
-	 return Finish(true);
+      // 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;
    }
 }
 									/*}}}*/
-// AcqIndexMergeDiffs::AcqIndexMergeDiffs - Constructor			/*{{{*/
-pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire *Owner,
-                                             pkgAcqMetaBase *TransactionManager,
-                                             struct IndexTarget const * const Target,
-                                             HashStringList const &ExpectedHashes,
-                                             indexRecords *MetaIndexParser,
-                                             DiffInfo const &patch,
-                                             std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches)
-  : pkgAcqBaseIndex(Owner, TransactionManager, Target, ExpectedHashes, MetaIndexParser),
-     patch(patch), allPatches(allPatches), State(StateFetchDiff)
+
+
+// AcqBaseIndex - Constructor						/*{{{*/
+pkgAcqBaseIndex::pkgAcqBaseIndex(pkgAcquire * const Owner,
+      pkgAcqMetaBase * const TransactionManager,
+      IndexTarget const * const Target)
+: pkgAcqTransactionItem(Owner, TransactionManager, Target)
+{
+}
+									/*}}}*/
+
+// AcqDiffIndex::AcqDiffIndex - Constructor				/*{{{*/
+// ---------------------------------------------------------------------
+/* Get the DiffIndex file first and see if there are patches available
+ * If so, create a pkgAcqIndexDiffs fetcher that will get and apply the
+ * patches. If anything goes wrong in that process, it will fall back to
+ * the original packages file
+ */
+pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire * const Owner,
+                                 pkgAcqMetaBase * const TransactionManager,
+                                 IndexTarget const * const Target)
+   : pkgAcqBaseIndex(Owner, TransactionManager, Target)
 {
    Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
 
-   RealURI = Target->URI;
    Desc.Owner = this;
-   Description = Target->Description;
+   Desc.Description = Target->Description + ".diff/Index";
    Desc.ShortDesc = Target->ShortDesc;
+   Desc.URI = Target->URI + ".diff/Index";
 
-   Desc.URI = RealURI + ".diff/" + patch.file + ".gz";
-   Desc.Description = Description + " " + patch.file + string(".pdiff");
+   DestFile = GetPartialFileNameFromURI(Desc.URI);
+
+   if(Debug)
+      std::clog << "pkgAcqDiffIndex: " << Desc.URI << std::endl;
 
-   DestFile = GetPartialFileNameFromURI(RealURI + ".diff/" + patch.file);
+   // look for the current package file
+   CurrentPackagesFile = GetFinalFileNameFromURI(Target->URI);
+
+   // 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 << "pkgAcqIndexMergeDiffs: " << Desc.URI << std::endl;
+      std::clog << "pkgAcqDiffIndex::pkgAcqDiffIndex(): "
+	 << CurrentPackagesFile << std::endl;
 
    QueueURI(Desc);
+
 }
 									/*}}}*/
-void pkgAcqIndexMergeDiffs::Failed(string Message,pkgAcquire::MethodConfig * Cnf)/*{{{*/
+// AcqIndex::Custom600Headers - Insert custom request headers		/*{{{*/
+// ---------------------------------------------------------------------
+/* The only header we use is the last-modified header. */
+string pkgAcqDiffIndex::Custom600Headers() const
 {
-   if(Debug)
-      std::clog << "pkgAcqIndexMergeDiffs failed: " << Desc.URI << " with " << Message << std::endl;
-
-   Item::Failed(Message,Cnf);
-   Status = StatDone;
+   string const Final = GetFinalFilename();
 
-   // check if we are the first to fail, otherwise we are done here
-   State = StateDoneDiff;
-   for (std::vector<pkgAcqIndexMergeDiffs *>::const_iterator I = allPatches->begin();
-	 I != allPatches->end(); ++I)
-      if ((*I)->State == StateErrorDiff)
-	 return;
+   if(Debug)
+      std::clog << "Custom600Header-IMS: " << Final << std::endl;
 
-   // first failure means we should fallback
-   State = StateErrorDiff;
-   if (Debug)
-      std::clog << "Falling back to normal index file acquire" << std::endl;
-   DestFile = GetPartialFileNameFromURI(Target->URI);
-   RenameOnError(PDiffError);
-   new pkgAcqIndex(Owner, TransactionManager, Target, ExpectedHashes, MetaIndexParser);
+   struct stat Buf;
+   if (stat(Final.c_str(),&Buf) != 0)
+      return "\nIndex-File: true";
+   
+   return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
+}
+									/*}}}*/
+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);
 }
 									/*}}}*/
-void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,HashStringList const &Hashes,	/*{{{*/
-			    pkgAcquire::MethodConfig *Cnf)
+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
    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);
-
-   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)
-      {
-	 // patchfiles are dated, so bad indicates a bad download, so kill it
-	 unlink(DestFile.c_str());
-	 Failed("Patch has Size/Hashsum mismatch", NULL);
-	 return;
-      }
+      std::clog << "pkgAcqDiffIndex::ParseIndexDiff() " << IndexDiffFile
+	 << std::endl;
 
-      // rred expects the patch as $FinalFile.ed.$patchname.gz
-      Rename(DestFile, FinalFile + ".ed." + patch.file + ".gz");
+   FileFd Fd(IndexDiffFile,FileFd::ReadOnly);
+   pkgTagFile TF(&Fd);
+   if (_error->PendingError() == true)
+      return false;
 
-      // check if this is the last completed diff
-      State = StateDoneDiff;
-      for (std::vector<pkgAcqIndexMergeDiffs *>::const_iterator I = allPatches->begin();
-	    I != allPatches->end(); ++I)
-	 if ((*I)->State != StateDoneDiff)
-	 {
-	    if(Debug)
-	       std::clog << "Not the last done diff in the batch: " << Desc.URI << std::endl;
-	    return;
-	 }
+   pkgTagSection Tags;
+   if(unlikely(TF.Step(Tags) == false))
+      return false;
 
-      // this is the last completed diff, so we are ready to apply now
-      State = StateApplyDiff;
+   HashStringList ServerHashes;
+   unsigned long long ServerSize = 0;
 
-      // 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;
-      }
+   for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type)
+   {
+      std::string tagname = *type;
+      tagname.append("-Current");
+      std::string const tmp = Tags.FindS(tagname.c_str());
+      if (tmp.empty() == true)
+	 continue;
 
-      if(Debug)
-	 std::clog << "Sending to rred method: " << FinalFile << std::endl;
+      string hash;
+      unsigned long long size;
+      std::stringstream ss(tmp);
+      ss >> hash >> size;
+      if (unlikely(hash.empty() == true))
+	 continue;
+      if (unlikely(ServerSize != 0 && ServerSize != size))
+	 continue;
+      ServerHashes.push_back(HashString(*type, hash));
+      ServerSize = size;
+   }
 
-      Local = true;
-      Desc.URI = "rred:" + FinalFile;
-      QueueURI(Desc);
-      SetActiveSubprocess("rred");
-      return;
+   if (ServerHashes.usable() == false)
+   {
+      if (Debug == true)
+	 std::clog << "pkgAcqDiffIndex: " << IndexDiffFile << ": Did not find a good hashsum in the index" << std::endl;
+      return false;
    }
-   // success in download/apply all diffs, clean up
-   else if (State == StateApplyDiff)
+
+   HashStringList const TargetFileHashes = GetExpectedHashesFor(Target->MetaKey);
+   if (TargetFileHashes.usable() == false || ServerHashes != TargetFileHashes)
    {
-      // see if we really got the expected file
-      if(ExpectedHashes.usable() && ExpectedHashes != Hashes)
+      if (Debug == true)
       {
-	 RenameOnError(HashSumMismatch);
-	 return;
+	 std::clog << "pkgAcqDiffIndex: " << IndexDiffFile << ": Index has different hashes than parser, probably older, so fail pdiffing" << std::endl;
+         printHashSumComparision(CurrentPackagesFile, ServerHashes, TargetFileHashes);
       }
+      return false;
+   }
 
-      // move the result into place
-      std::string const Final = GetFinalFilename();
+   if (ServerHashes.VerifyFile(CurrentPackagesFile) == true)
+   {
+      // we have the same sha1 as the server so we are done here
       if(Debug)
-	 std::clog << "Queue patched file in place: " << std::endl
-		   << DestFile << " -> " << Final << std::endl;
+	 std::clog << "pkgAcqDiffIndex: Package file " << CurrentPackagesFile << " is up-to-date" << std::endl;
+      QueueOnIMSHit();
+      return true;
+   }
 
-      // queue for copy by the transaction manager
-      TransactionManager->TransactionStageCopy(this, DestFile, Final);
+   FileFd fd(CurrentPackagesFile, FileFd::ReadOnly);
+   Hashes LocalHashesCalc;
+   LocalHashesCalc.AddFD(fd);
+   HashStringList const LocalHashes = LocalHashesCalc.GetHashStringList();
 
-      // 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";
-	 unlink(patch.c_str());
-      }
-      unlink(FinalFile.c_str());
+   if(Debug)
+      std::clog << "Server-Current: " << ServerHashes.find(NULL)->toStr() << " and we start at "
+	 << fd.Name() << " " << fd.FileSize() << " " << LocalHashes.find(NULL)->toStr() << std::endl;
 
-      // all set and done
-      Complete = true;
-      if(Debug)
-	 std::clog << "allDone: " << DestFile << "\n" << std::endl;
-   }
-}
-									/*}}}*/
-// AcqBaseIndex - Constructor						/*{{{*/
-pkgAcqBaseIndex::pkgAcqBaseIndex(pkgAcquire *Owner,
-      pkgAcqMetaBase *TransactionManager,
-      struct IndexTarget const * const Target,
-      HashStringList const &ExpectedHashes,
-      indexRecords *MetaIndexParser)
-: Item(Owner, ExpectedHashes, TransactionManager), Target(Target),
-   MetaIndexParser(MetaIndexParser)
-{
-}
-									/*}}}*/
-// AcqBaseIndex::VerifyHashByMetaKey - verify hash for the given metakey /*{{{*/
-bool pkgAcqBaseIndex::VerifyHashByMetaKey(HashStringList const &Hashes)
-{
-   if(MetaKey != "" && Hashes.usable())
+   // parse all of (provided) history
+   vector<DiffInfo> available_patches;
+   bool firstAcceptedHashes = true;
+   for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type)
    {
-      indexRecords::checkSum *Record = MetaIndexParser->Lookup(MetaKey);
-      if(Record && Record->Hashes.usable() && Hashes != Record->Hashes)
-      {
-         printHashSumComparision(RealURI, Record->Hashes, Hashes);
-         return false;
-      }
-   }
-   return true;
-}
-									/*}}}*/
-// AcqBaseIndex::GetFinalFilename - Return the full final file path	/*{{{*/
-std::string pkgAcqBaseIndex::GetFinalFilename() const
-{
-   return GetFinalFileNameFromURI(RealURI);
-}
-									/*}}}*/
-// 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;
-
-   AutoSelectCompression();
-   Init(URI, URIDesc, ShortDesc);
+      if (LocalHashes.find(*type) == NULL)
+	 continue;
 
-   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)
-{
-   RealURI = Target->URI;
+      std::string tagname = *type;
+      tagname.append("-History");
+      std::string const tmp = Tags.FindS(tagname.c_str());
+      if (tmp.empty() == true)
+	 continue;
 
-   // autoselect the compression method
-   AutoSelectCompression();
-   Init(Target->URI, Target->Description, Target->ShortDesc);
+      string hash, filename;
+      unsigned long long size;
+      std::stringstream ss(tmp);
 
-   if(_config->FindB("Debug::Acquire::Transaction", false) == true)
-      std::clog << "New pkgIndex with TransactionManager "
-                << TransactionManager << std::endl;
-}
-									/*}}}*/
-// AcqIndex::AutoSelectCompression - Select compression			/*{{{*/
-void pkgAcqIndex::AutoSelectCompression()
-{
-   std::vector<std::string> types = APT::Configuration::getCompressionTypes();
-   CompressionExtensions = "";
-   if (ExpectedHashes.usable())
-   {
-      for (std::vector<std::string>::const_iterator t = types.begin();
-           t != types.end(); ++t)
+      while (ss >> hash >> size >> filename)
       {
-         std::string CompressedMetaKey = string(Target->MetaKey).append(".").append(*t);
-         if (*t == "uncompressed" ||
-             MetaIndexParser->Exists(CompressedMetaKey) == true)
-            CompressionExtensions.append(*t).append(" ");
+	 if (unlikely(hash.empty() == true || filename.empty() == true))
+	    continue;
+
+	 // 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 || unlikely(cur->result_size != size))
+	       continue;
+	    cur->result_hashes.push_back(HashString(*type, hash));
+	    break;
+	 }
+	 if (cur != available_patches.end())
+	    continue;
+	 if (firstAcceptedHashes == true)
+	 {
+	    DiffInfo next;
+	    next.file = filename;
+	    next.result_hashes.push_back(HashString(*type, hash));
+	    next.result_size = size;
+	    next.patch_size = 0;
+	    available_patches.push_back(next);
+	 }
+	 else
+	 {
+	    if (Debug == true)
+	       std::clog << "pkgAcqDiffIndex: " << IndexDiffFile << ": File " << filename
+		  << " wasn't in the list for the first parsed hash! (history)" << std::endl;
+	    break;
+	 }
       }
+      firstAcceptedHashes = false;
    }
-   else
+
+   if (unlikely(available_patches.empty() == true))
    {
-      for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t)
-	 CompressionExtensions.append(*t).append(" ");
+      if (Debug)
+	 std::clog << "pkgAcqDiffIndex: " << IndexDiffFile << ": "
+	    << "Couldn't find any patches for the patch series." << std::endl;
+      return false;
    }
-   if (CompressionExtensions.empty() == false)
-      CompressionExtensions.erase(CompressionExtensions.end()-1);
-}
-									/*}}}*/
-// AcqIndex::Init - defered Constructor					/*{{{*/
-void pkgAcqIndex::Init(string const &URI, string const &URIDesc,
-                       string const &ShortDesc)
-{
-   Stage = STAGE_DOWNLOAD;
-
-   DestFile = GetPartialFileNameFromURI(URI);
 
-   CurrentCompressionExtension = CompressionExtensions.substr(0, CompressionExtensions.find(' '));
-   if (CurrentCompressionExtension == "uncompressed")
+   for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type)
    {
-      Desc.URI = URI;
-      if(Target)
-         MetaKey = string(Target->MetaKey);
-   }
-   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);
-   }
-
-   Desc.Description = URIDesc;
-   Desc.Owner = this;
-   Desc.ShortDesc = ShortDesc;
-
-   QueueURI(Desc);
-}
-									/*}}}*/
-// AcqIndex::AdjustForByHash - modify URI for by-hash support		/*{{{*/
-void pkgAcqIndex::InitByHashIfNeeded(const std::string MetaKey)
-{
-   // TODO:
-   //  - (maybe?) add support for by-hash into the sources.list as flag
-   //  - make apt-ftparchive generate the hashes (and expire?)
-   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())
-   {
-      indexRecords::checkSum *Record = MetaIndexParser->Lookup(MetaKey);
-      if(Record)
-      {
-         // 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("/");
-         Desc.URI = Desc.URI.replace(
-            trailing_slash,
-            Desc.URI.substr(trailing_slash+1).size()+1,
-            ByHash);
-      } else {
-         _error->Warning(
-            "Fetching ByHash requested but can not find record for %s",
-            MetaKey.c_str());
-      }
-   }
-}
-									/*}}}*/
-// AcqIndex::Custom600Headers - Insert custom request headers		/*{{{*/
-// ---------------------------------------------------------------------
-/* The only header we use is the last-modified header. */
-#if APT_PKG_ABI >= 413
-string pkgAcqIndex::Custom600Headers() const
-#else
-string pkgAcqIndex::Custom600Headers()
-#endif
-{
-   string Final = GetFinalFilename();
-
-   string msg = "\nIndex-File: true";
-   struct stat Buf;
-   if (stat(Final.c_str(),&Buf) == 0)
-      msg += "\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
+      if (LocalHashes.find(*type) == NULL)
+	 continue;
 
-   if(Target->IsOptional())
-      msg += "\nFail-Ignore: true";
+      std::string tagname = *type;
+      tagname.append("-Patches");
+      std::string const tmp = Tags.FindS(tagname.c_str());
+      if (tmp.empty() == true)
+	 continue;
 
-   return msg;
-}
-									/*}}}*/
-// pkgAcqIndex::Failed - getting the indexfile failed			/*{{{*/
-void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
-{
-   Item::Failed(Message,Cnf);
+      string hash, filename;
+      unsigned long long size;
+      std::stringstream ss(tmp);
 
-   // authorisation matches will not be fixed by other compression types
-   if (Status != StatAuthError)
-   {
-      size_t const nextExt = CompressionExtensions.find(' ');
-      if (nextExt != std::string::npos)
+      while (ss >> hash >> size >> filename)
       {
-	 CompressionExtensions = CompressionExtensions.substr(nextExt+1);
-	 Init(RealURI, Desc.Description, Desc.ShortDesc);
-	 Status = StatIdle;
-	 return;
-      }
-   }
-
-   if(Target->IsOptional() && ExpectedHashes.empty() && Stage == STAGE_DOWNLOAD)
-      Status = StatDone;
-   else
-      TransactionManager->AbortTransaction();
-}
-									/*}}}*/
-bool pkgAcqIndex::TransactionState(TransactionStates const state)	/*{{{*/
-{
-   if (pkgAcquire::Item::TransactionState(state) == false)
-      return false;
+	 if (unlikely(hash.empty() == true || filename.empty() == true))
+	    continue;
 
-   switch (state)
-   {
-      case TransactionAbort:
-	 if (Stage == STAGE_DECOMPRESS_AND_VERIFY)
+	 // see if we have a record for this file already
+	 std::vector<DiffInfo>::iterator cur = available_patches.begin();
+	 for (; cur != available_patches.end(); ++cur)
 	 {
-	    // keep the compressed file, but drop the decompressed
-	    EraseFileName.clear();
-	    if (PartialFile.empty() == false && flExtension(PartialFile) == "decomp")
-	       unlink(PartialFile.c_str());
+	    if (cur->file != filename)
+	       continue;
+	    if (unlikely(cur->patch_size != 0 && cur->patch_size != size))
+	       continue;
+	    cur->patch_hashes.push_back(HashString(*type, hash));
+	    cur->patch_size = size;
+	    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! (patches)" << std::endl;
 	 break;
-      case TransactionCommit:
-	 if (EraseFileName.empty() == false)
-	    unlink(EraseFileName.c_str());
-	 break;
-   }
-   return true;
-}
-									/*}}}*/
-// pkgAcqIndex::GetFinalFilename - Return the full final file path	/*{{{*/
-std::string pkgAcqIndex::GetFinalFilename() const
-{
-   std::string const FinalFile = GetFinalFileNameFromURI(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);
-
-   // copy FinalFile into partial/ so that we check the hash again
-   string FinalFile = GetFinalFilename();
-   Stage = STAGE_DECOMPRESS_AND_VERIFY;
-   Desc.URI = "copy:" + FinalFile;
-   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
-   method could possibly return an alternate filename which points
-   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,
-                       HashStringList const &Hashes,
-		       pkgAcquire::MethodConfig *Cfg)
-{
-   Item::Done(Message,Size,Hashes,Cfg);
-
-   switch(Stage) 
-   {
-      case STAGE_DOWNLOAD:
-         StageDownloadDone(Message, Hashes, Cfg);
-         break;
-      case STAGE_DECOMPRESS_AND_VERIFY:
-         StageDecompressDone(Message, Hashes, Cfg);
-         break;
-   }
-}
-									/*}}}*/
-// AcqIndex::StageDownloadDone - Queue for decompress and verify	/*{{{*/
-void pkgAcqIndex::StageDownloadDone(string Message,
-                                    HashStringList const &Hashes,
-                                    pkgAcquire::MethodConfig *Cfg)
-{
-   // 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
-   string FileName = LookupTag(Message,"Alt-Filename");
-   if (FileName.empty() == false)
-   {
-      Stage = STAGE_DECOMPRESS_AND_VERIFY;
-      Local = true;
-      DestFile += ".decomp";
-      Desc.URI = "copy:" + FileName;
-      QueueURI(Desc);
-      SetActiveSubprocess("copy");
-      return;
-   }
-
-   FileName = LookupTag(Message,"Filename");
-   if (FileName.empty() == true)
-   {
-      Status = StatError;
-      ErrorText = "Method gave a blank filename";
-   }
-
-   // 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)
-      Local = true;
-   else
-      EraseFileName = FileName;
-
-   // we need to verify the file against the current Release file again
-   // on if-modfied-since hit to avoid a stale attack against us
-   if(StringToBool(LookupTag(Message,"IMS-Hit"),false) == true)
-   {
-      // The files timestamp matches, reverify by copy into partial/
-      EraseFileName = "";
-      ReverifyAfterIMS();
-      return;
-   }
-
-   // If we have compressed indexes enabled, queue for hash verification
-   if (_config->FindB("Acquire::GzipIndexes",false))
-   {
-      DestFile = GetPartialFileNameFromURI(RealURI + '.' + CurrentCompressionExtension);
-      EraseFileName = "";
-      Stage = STAGE_DECOMPRESS_AND_VERIFY;
-      Desc.URI = "copy:" + FileName;
-      QueueURI(Desc);
-      SetActiveSubprocess("copy");
-      return;
-    }
-
-   // get the binary name for your used compression type
-   string decompProg;
-   if(CurrentCompressionExtension == "uncompressed")
-      decompProg = "copy";
-   else
-      decompProg = _config->Find(string("Acquire::CompressionTypes::").append(CurrentCompressionExtension),"");
-   if(decompProg.empty() == true)
-   {
-      _error->Error("Unsupported extension: %s", CurrentCompressionExtension.c_str());
-      return;
-   }
-
-   // queue uri for the next stage
-   Stage = STAGE_DECOMPRESS_AND_VERIFY;
-   DestFile += ".decomp";
-   Desc.URI = decompProg + ":" + FileName;
-   QueueURI(Desc);
-   SetActiveSubprocess(decompProg);
-}
-									/*}}}*/
-// pkgAcqIndex::StageDecompressDone - Final verification		/*{{{*/
-void pkgAcqIndex::StageDecompressDone(string Message,
-                                      HashStringList const &Hashes,
-                                      pkgAcquire::MethodConfig *Cfg)
-{
-   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;
-   }
-
-   // Done, queue for rename on transaction finished
-   TransactionManager->TransactionStageCopy(this, DestFile, GetFinalFilename());
-
-   return;
-}
-									/*}}}*/
-// AcqMetaBase - Constructor						/*{{{*/
-pkgAcqMetaBase::pkgAcqMetaBase(pkgAcquire *Owner,
-      const std::vector<IndexTarget*>* IndexTargets,
-      indexRecords* MetaIndexParser,
-      std::string const &RealURI,
-      HashStringList const &ExpectedHashes,
-      pkgAcqMetaBase *TransactionManager)
-: Item(Owner, ExpectedHashes, TransactionManager),
-   MetaIndexParser(MetaIndexParser), LastMetaIndexParser(NULL), IndexTargets(IndexTargets),
-   AuthPass(false), RealURI(RealURI), IMSHit(false)
-{
-}
-									/*}}}*/
-// 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)
-   {
-      (*I)->TransactionState(TransactionAbort);
-   }
-   Transaction.clear();
-}
-									/*}}}*/
-// AcqMetaBase::TransactionHasError - Check for errors in Transaction	/*{{{*/
-bool pkgAcqMetaBase::TransactionHasError()
-{
-   for (pkgAcquire::ItemIterator 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<Item*>::iterator I = Transaction.begin();
-        I != Transaction.end(); ++I)
-   {
-      (*I)->TransactionState(TransactionCommit);
-   }
-   Transaction.clear();
-}
-									/*}}}*/
-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 pkgAcquire::Item::TransactionState(state);
-   return true;
-}
-									/*}}}*/
-// 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 - Stage 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(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());
+   bool foundStart = false;
+   for (std::vector<DiffInfo>::iterator cur = available_patches.begin();
+	 cur != available_patches.end(); ++cur)
+   {
+      if (LocalHashes != cur->result_hashes)
+	 continue;
+
+      available_patches.erase(available_patches.begin(), cur);
+      foundStart = true;
+      break;
    }
-   // gpgv method failed
-   ReportMirrorFailure("GPGFailure");
-   return false;
-}
-									/*}}}*/
-// AcqMetaSig::AcqMetaSig - Constructor					/*{{{*/
-pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
-      pkgAcqMetaBase *TransactionManager,
-      string const &URI, string const &URIDesc,string const &ShortDesc,
-      pkgAcqMetaIndex * const MetaIndex) :
-   pkgAcquire::Item(Owner, HashStringList(), TransactionManager), MetaIndex(MetaIndex),
-   URIDesc(URIDesc), RealURI(URI)
-{
-   DestFile = GetPartialFileNameFromURI(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());
+   if (foundStart == false || unlikely(available_patches.empty() == true))
+   {
+      if (Debug)
+	 std::clog << "pkgAcqDiffIndex: " << IndexDiffFile << ": "
+	    << "Couldn't find the start of the patch series." << std::endl;
+      return false;
+   }
 
-   // set the TransactionManager
-   if(_config->FindB("Debug::Acquire::Transaction", false) == true)
-      std::clog << "New pkgAcqMetaSig with TransactionManager "
-                << TransactionManager << std::endl;
+   // patching with too many files is rather slow compared to a fast download
+   unsigned long const fileLimit = _config->FindI("Acquire::PDiffs::FileLimit", 0);
+   if (fileLimit != 0 && fileLimit < available_patches.size())
+   {
+      if (Debug)
+	 std::clog << "Need " << available_patches.size() << " diffs (Limit is " << fileLimit
+	    << ") so fallback to complete download" << std::endl;
+      return false;
+   }
 
-   // Create the item
-   Desc.Description = URIDesc;
-   Desc.Owner = this;
-   Desc.ShortDesc = ShortDesc;
-   Desc.URI = URI;
+   // calculate the size of all patches we have to get
+   // note that all sizes are uncompressed, while we download compressed files
+   unsigned long long patchesSize = 0;
+   for (std::vector<DiffInfo>::const_iterator cur = available_patches.begin();
+	 cur != available_patches.end(); ++cur)
+      patchesSize += cur->patch_size;
+   unsigned long long const sizeLimit = ServerSize * _config->FindI("Acquire::PDiffs::SizeLimit", 100);
+   if (sizeLimit > 0 && (sizeLimit/100) < patchesSize)
+   {
+      if (Debug)
+	 std::clog << "Need " << patchesSize << " bytes (Limit is " << sizeLimit/100
+	    << ") so fallback to complete download" << std::endl;
+      return false;
+   }
 
-   // 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()))
+   // we have something, queue the diffs
+   string::size_type const last_space = Description.rfind(" ");
+   if(last_space != string::npos)
+      Description.erase(last_space, Description.size()-last_space);
+
+   /* decide if we should download patches one by one or in one go:
+      The first is good if the server merges patches, but many don't so client
+      based merging can be attempt in which case the second is better.
+      "bad things" will happen if patches are merged on the server,
+      but client side merging is attempt as well */
+   bool pdiff_merge = _config->FindB("Acquire::PDiffs::Merge", true);
+   if (pdiff_merge == true)
    {
-      Complete = true;
-      Status = StatDone;
-      PartialFile = DestFile = GetFinalFilename();
-      MetaIndexFileSignature = DestFile;
-      MetaIndex->QueueForSignatureVerify(this, MetaIndex->DestFile, DestFile);
+      // reprepro adds this flag if it has merged patches on the server
+      std::string const precedence = Tags.FindS("X-Patch-Precedence");
+      pdiff_merge = (precedence != "merged");
    }
+
+   if (pdiff_merge == false)
+      new pkgAcqIndexDiffs(Owner, TransactionManager, Target, available_patches);
    else
-      QueueURI(Desc);
-}
-									/*}}}*/
-pkgAcqMetaSig::~pkgAcqMetaSig()						/*{{{*/
-{
+   {
+      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,
+	       available_patches[i],
+	       diffs);
+   }
+
+   Complete = false;
+   Status = StatDone;
+   Dequeue();
+   return true;
 }
 									/*}}}*/
-// pkgAcqMetaSig::GetFinalFilename - Return the full final file path	/*{{{*/
-std::string pkgAcqMetaSig::GetFinalFilename() const
+void pkgAcqDiffIndex::Failed(string const &Message,pkgAcquire::MethodConfig const * const Cnf)/*{{{*/
 {
-   return GetFinalFileNameFromURI(RealURI);
+   Item::Failed(Message,Cnf);
+   Status = StatDone;
+
+   if(Debug)
+      std::clog << "pkgAcqDiffIndex failed: " << Desc.URI << " with " << Message << std::endl
+		<< "Falling back to normal index file acquire" << std::endl;
+
+   new pkgAcqIndex(Owner, TransactionManager, Target);
 }
 									/*}}}*/
-// 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)
+void pkgAcqDiffIndex::Done(string const &Message,HashStringList const &Hashes,	/*{{{*/
+			   pkgAcquire::MethodConfig const * const Cnf)
 {
-   if (MetaIndexFileSignature.empty() == false)
-   {
-      DestFile = MetaIndexFileSignature;
-      MetaIndexFileSignature.clear();
-   }
-   Item::Done(Message, Size, Hashes, Cfg);
+   if(Debug)
+      std::clog << "pkgAcqDiffIndex::Done(): " << Desc.URI << std::endl;
 
-   if(MetaIndex->AuthPass == false)
+   Item::Done(Message, Hashes, Cnf);
+
+   string const FinalFile = GetFinalFilename();
+   if(StringToBool(LookupTag(Message,"IMS-Hit"),false))
+      DestFile = FinalFile;
+
+   if(ParseDiffIndex(DestFile) == 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);
-      }
+      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;
    }
-   else if(MetaIndex->CheckAuthDone(Message) == true)
-   {
-      if (TransactionManager->IMSHit == false)
-      {
-	 TransactionManager->TransactionStageCopy(this, DestFile, GetFinalFilename());
-	 TransactionManager->TransactionStageCopy(MetaIndex, MetaIndex->DestFile, MetaIndex->GetFinalFilename());
-      }
-   }
+
+   TransactionManager->TransactionStageCopy(this, DestFile, FinalFile);
+
+   Complete = true;
+   Status = StatDone;
+   Dequeue();
+
+   return;
 }
 									/*}}}*/
-void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/
+
+// AcqIndexDiffs::AcqIndexDiffs - Constructor				/*{{{*/
+// ---------------------------------------------------------------------
+/* The package diff is added to the queue. one object is constructed
+ * for each diff and the index
+ */
+pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire * const Owner,
+                                   pkgAcqMetaBase * const TransactionManager,
+                                   IndexTarget const * const Target,
+				   vector<DiffInfo> const &diffs)
+   : pkgAcqBaseIndex(Owner, TransactionManager, Target),
+     available_patches(diffs)
 {
-   Item::Failed(Message,Cnf);
+   DestFile = GetPartialFileNameFromURI(Target->URI);
 
-   // check if we need to fail at this point 
-   if (MetaIndex->AuthPass == true && MetaIndex->CheckStopAuthentication(this, Message))
-         return;
+   Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
 
-   string const FinalRelease = MetaIndex->GetFinalFilename();
-   string const FinalReleasegpg = GetFinalFilename();
-   string const FinalInRelease = TransactionManager->GetFinalFilename();
+   Desc.Owner = this;
+   Description = Target->Description;
+   Desc.ShortDesc = Target->ShortDesc;
 
-   if (RealFileExists(FinalReleasegpg) || RealFileExists(FinalInRelease))
+   if(available_patches.empty() == true)
    {
-      std::string downgrade_msg;
-      strprintf(downgrade_msg, _("The repository '%s' is no longer signed."),
-                MetaIndex->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());
-	 if (TransactionManager->IMSHit == false)
-	    Rename(MetaIndex->DestFile, MetaIndex->DestFile + ".FAILED");
-	 Item::Failed("Message: " + downgrade_msg, Cnf);
-         TransactionManager->AbortTransaction();
-         return;
-      }
+      // we are done (yeah!), check hashes against the final file
+      DestFile = GetFinalFileNameFromURI(Target->URI);
+      Finish(true);
    }
    else
-      _error->Warning(_("The data from '%s' is not signed. Packages "
-	       "from that repository can not be authenticated."),
-	    MetaIndex->URIDesc.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(MetaIndex->MetaIndexParser, TransactionManager, this) == true)
    {
-      if (RealFileExists(FinalReleasegpg) || RealFileExists(FinalInRelease))
+      // patching needs to be bootstrapped with the 'old' version
+      std::string const PartialFile = GetPartialFileNameFromURI(Target->URI);
+      if (RealFileExists(PartialFile) == false)
       {
-	 // open the last Release if we have it
-	 if (TransactionManager->IMSHit == false)
+	 if (symlink(GetFinalFilename().c_str(), PartialFile.c_str()) != 0)
 	 {
-	    MetaIndex->LastMetaIndexParser = new indexRecords;
-	    _error->PushToStack();
-	    if (RealFileExists(FinalInRelease))
-	       MetaIndex->LastMetaIndexParser->Load(FinalInRelease);
-	    else
-	       MetaIndex->LastMetaIndexParser->Load(FinalRelease);
-	    // its unlikely to happen, but if what we have is bad ignore it
-	    if (_error->PendingError())
-	    {
-	       delete MetaIndex->LastMetaIndexParser;
-	       MetaIndex->LastMetaIndexParser = NULL;
-	    }
-	    _error->RevertToStack();
+	    Failed("Link creation of " + PartialFile + " to " + GetFinalFilename() + " failed", NULL);
+	    return;
 	 }
       }
 
-      // we parse the indexes here because at this point the user wanted
-      // a repository that may potentially harm him
-      MetaIndex->MetaIndexParser->Load(MetaIndex->DestFile);
-      if (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());
+      // get the next diff
+      State = StateFetchDiff;
+      QueueNextDiff();
    }
+}
+									/*}}}*/
+void pkgAcqIndexDiffs::Failed(string const &Message,pkgAcquire::MethodConfig const * const Cnf)/*{{{*/
+{
+   Item::Failed(Message,Cnf);
+   Status = StatDone;
 
-   // FIXME: this is used often (e.g. in pkgAcqIndexTrans) so refactor
-   if (Cnf->LocalOnly == true ||
-       StringToBool(LookupTag(Message,"Transient-Failure"),false) == false)
+   if(Debug)
+      std::clog << "pkgAcqIndexDiffs failed: " << Desc.URI << " with " << Message << std::endl
+		<< "Falling back to normal index file acquire" << std::endl;
+   DestFile = GetPartialFileNameFromURI(Target->URI);
+   RenameOnError(PDiffError);
+   new pkgAcqIndex(Owner, TransactionManager, Target);
+   Finish();
+}
+									/*}}}*/
+// Finish - helper that cleans the item out of the fetcher queue	/*{{{*/
+void pkgAcqIndexDiffs::Finish(bool allDone)
+{
+   if(Debug)
+      std::clog << "pkgAcqIndexDiffs::Finish(): " 
+                << allDone << " "
+                << Desc.URI << std::endl;
+
+   // we restore the original name, this is required, otherwise
+   // the file will be cleaned
+   if(allDone)
    {
-      // Ignore this
+      TransactionManager->TransactionStageCopy(this, DestFile, GetFinalFilename());
+
+      // this is for the "real" finish
+      Complete = true;
       Status = StatDone;
+      Dequeue();
+      if(Debug)
+	 std::clog << "\n\nallDone: " << DestFile << "\n" << std::endl;
+      return;
    }
+
+   if(Debug)
+      std::clog << "Finishing: " << Desc.URI << std::endl;
+   Complete = false;
+   Status = StatDone;
+   Dequeue();
+   return;
 }
 									/*}}}*/
-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, URI, HashStringList(),
-                  TransactionManager), 
-   URIDesc(URIDesc), ShortDesc(ShortDesc),
-   MetaIndexSigURI(MetaIndexSigURI), MetaIndexSigURIDesc(MetaIndexSigURIDesc),
-   MetaIndexSigShortDesc(MetaIndexSigShortDesc)
+bool pkgAcqIndexDiffs::QueueNextDiff()					/*{{{*/
 {
-   if(TransactionManager == NULL)
+   // calc sha1 of the just patched file
+   std::string const FinalFile = GetPartialFileNameFromURI(Target->URI);
+
+   if(!FileExists(FinalFile))
    {
-      this->TransactionManager = this;
-      this->TransactionManager->Add(this);
+      Failed("Message: No FinalFile " + FinalFile + " available", NULL);
+      return false;
    }
 
-   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;
+   FileFd fd(FinalFile, FileFd::ReadOnly);
+   Hashes LocalHashesCalc;
+   LocalHashesCalc.AddFD(fd);
+   HashStringList const LocalHashes = LocalHashesCalc.GetHashStringList();
 
-   // we expect more item
-   ExpectedAdditionalItems = IndexTargets->size();
-   QueueURI(Desc);
-}
-									/*}}}*/
-void pkgAcqMetaIndex::Done(string Message,unsigned long long Size,	/*{{{*/
-                           HashStringList const &Hashes,
-			   pkgAcquire::MethodConfig *Cfg)
-{
-   Item::Done(Message,Size,Hashes,Cfg);
+   if(Debug)
+      std::clog << "QueueNextDiff: " << FinalFile << " (" << LocalHashes.find(NULL)->toStr() << ")" << std::endl;
 
-   if(CheckDownloadDone(this, Message, Hashes))
+   HashStringList const TargetFileHashes = GetExpectedHashesFor(Target->MetaKey);
+   if (unlikely(LocalHashes.usable() == false || TargetFileHashes.usable() == false))
    {
-      // 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,
-                        MetaIndexSigURI, MetaIndexSigURIDesc,
-                        MetaIndexSigShortDesc, this);
+      Failed("Local/Expected hashes are not usable", NULL);
+      return false;
    }
-}
-									/*}}}*/
-bool pkgAcqMetaBase::CheckAuthDone(string 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)
+
+   // final file reached before all patches are applied
+   if(LocalHashes == TargetFileHashes)
    {
-      // 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))
-      {
-	 LastMetaIndexParser = new indexRecords;
-	 _error->PushToStack();
-	 if (RealFileExists(FinalInRelease))
-	    LastMetaIndexParser->Load(FinalInRelease);
-	 else
-	    LastMetaIndexParser->Load(FinalRelease);
-	 // its unlikely to happen, but if what we have is bad ignore it
-	 if (_error->PendingError())
-	 {
-	    delete LastMetaIndexParser;
-	    LastMetaIndexParser = NULL;
-	 }
-	 _error->RevertToStack();
-      }
+      Finish(true);
+      return true;
    }
 
-   if (!MetaIndexParser->Load(DestFile))
+   // remove all patches until the next matching patch is found
+   // this requires the Index file to be ordered
+   for(vector<DiffInfo>::iterator I = available_patches.begin();
+       available_patches.empty() == false &&
+	  I != available_patches.end() &&
+	  I->result_hashes != LocalHashes;
+       ++I)
    {
-      Status = StatAuthError;
-      ErrorText = MetaIndexParser->ErrorText;
-      return false;
+      available_patches.erase(I);
    }
 
-   if (!VerifyVendor(Message))
+   // error checking and falling back if no patch was found
+   if(available_patches.empty() == true)
    {
-      Status = StatAuthError;
+      Failed("No patches left to reach target", NULL);
       return false;
    }
 
-   if (_config->FindB("Debug::pkgAcquire::Auth", false))
-      std::cerr << "Signature verification succeeded: "
-                << DestFile << std::endl;
+   // queue the right diff
+   Desc.URI = Target->URI + ".diff/" + available_patches[0].file + ".gz";
+   Desc.Description = Description + " " + available_patches[0].file + string(".pdiff");
+   DestFile = GetPartialFileNameFromURI(Target->URI + ".diff/" + available_patches[0].file);
 
-   // Download further indexes with verification
-   QueueIndexes(true);
+   if(Debug)
+      std::clog << "pkgAcqIndexDiffs::QueueNextDiff(): " << Desc.URI << std::endl;
+
+   QueueURI(Desc);
 
    return true;
 }
 									/*}}}*/
-// pkgAcqMetaBase::Custom600Headers - Get header for AcqMetaBase	/*{{{*/
-// ---------------------------------------------------------------------
-#if APT_PKG_ABI >= 413
-string pkgAcqMetaBase::Custom600Headers() const
-#else
-string pkgAcqMetaBase::Custom600Headers()
-#endif
+void pkgAcqIndexDiffs::Done(string const &Message, HashStringList const &Hashes,	/*{{{*/
+			    pkgAcquire::MethodConfig const * const Cnf)
 {
-   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();
+   if(Debug)
+      std::clog << "pkgAcqIndexDiffs::Done(): " << Desc.URI << std::endl;
 
-   struct stat Buf;
-   if (stat(FinalFile.c_str(),&Buf) == 0)
-      Header += "\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
+   Item::Done(Message, Hashes, Cnf);
 
-   return Header;
-}
-									/*}}}*/
-// pkgAcqMetaBase::GetFinalFilename - Return the full final file path	/*{{{*/
-std::string pkgAcqMetaBase::GetFinalFilename() const
-{
-   return GetFinalFileNameFromURI(RealURI);
-}
-									/*}}}*/
-// pkgAcqMetaBase::QueueForSignatureVerify				/*{{{*/
-void pkgAcqMetaBase::QueueForSignatureVerify(pkgAcquire::Item * 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");
-}
-									/*}}}*/
-// pkgAcqMetaBase::CheckDownloadDone					/*{{{*/
-bool pkgAcqMetaBase::CheckDownloadDone(pkgAcquire::Item * const I, const std::string &Message, HashStringList const &Hashes) const
-{
-   // We have just finished downloading a Release file (it is not
-   // verified yet)
+   // FIXME: verify this download too before feeding it to rred
+   std::string const FinalFile = GetPartialFileNameFromURI(Target->URI);
 
-   string const FileName = LookupTag(Message,"Filename");
-   if (FileName.empty() == true)
+   // success in downloading a diff, enter ApplyDiff state
+   if(State == StateFetchDiff)
    {
-      I->Status = StatError;
-      I->ErrorText = "Method gave a blank filename";
-      return false;
-   }
+      FileFd fd(DestFile, FileFd::ReadOnly, FileFd::Gzip);
+      class Hashes LocalHashesCalc;
+      LocalHashesCalc.AddFD(fd);
+      HashStringList const LocalHashes = LocalHashesCalc.GetHashStringList();
 
-   if (FileName != I->DestFile)
-   {
-      I->Local = true;
-      I->Desc.URI = "copy:" + FileName;
-      I->QueueURI(I->Desc);
-      return false;
-   }
+      if (fd.Size() != available_patches[0].patch_size ||
+	    available_patches[0].patch_hashes != LocalHashes)
+      {
+	 // patchfiles are dated, so bad indicates a bad download, so kill it
+	 unlink(DestFile.c_str());
+	 Failed("Patch has Size/Hashsum mismatch", NULL);
+	 return;
+      }
 
-   // 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())
+      // rred excepts the patch as $FinalFile.ed
+      Rename(DestFile,FinalFile+".ed");
+
+      if(Debug)
+	 std::clog << "Sending to rred method: " << FinalFile << std::endl;
+
+      State = StateApplyDiff;
+      Local = true;
+      Desc.URI = "rred:" + FinalFile;
+      QueueURI(Desc);
+      SetActiveSubprocess("rred");
+      return;
+   } 
+
+
+   // success in download/apply a diff, queue next (if needed)
+   if(State == StateApplyDiff)
    {
-      // detect IMS-Hits servers haven't detected by Hash comparison
-      std::string const FinalFile = I->GetFinalFilename();
-      if (RealFileExists(FinalFile) && Hashes.VerifyFile(FinalFile) == true)
+      // remove the just applied patch
+      available_patches.erase(available_patches.begin());
+      unlink((FinalFile + ".ed").c_str());
+
+      // move into place
+      if(Debug) 
       {
-	 IMSHit = true;
-	 unlink(I->DestFile.c_str());
+	 std::clog << "Moving patched file in place: " << std::endl
+		   << DestFile << " -> " << FinalFile << std::endl;
       }
-   }
+      Rename(DestFile,FinalFile);
+      chmod(FinalFile.c_str(),0644);
 
-   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();
+      // see if there is more to download
+      if(available_patches.empty() == false) {
+	 new pkgAcqIndexDiffs(Owner, TransactionManager, Target,
+			      available_patches);
+	 return Finish();
+      } else 
+         // update
+         DestFile = FinalFile;
+	 return Finish(true);
    }
+}
+									/*}}}*/
+
+// AcqIndexMergeDiffs::AcqIndexMergeDiffs - Constructor			/*{{{*/
+pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire * const Owner,
+                                             pkgAcqMetaBase * const TransactionManager,
+                                             IndexTarget const * const Target,
+                                             DiffInfo const &patch,
+                                             std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches)
+  : pkgAcqBaseIndex(Owner, TransactionManager, Target),
+     patch(patch), allPatches(allPatches), State(StateFetchDiff)
+{
+   Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
+
+   Desc.Owner = this;
+   Description = Target->Description;
+   Desc.ShortDesc = Target->ShortDesc;
+
+   Desc.URI = Target->URI + ".diff/" + patch.file + ".gz";
+   Desc.Description = Description + " " + patch.file + string(".pdiff");
+
+   DestFile = GetPartialFileNameFromURI(Target->URI + ".diff/" + patch.file);
+
+   if(Debug)
+      std::clog << "pkgAcqIndexMergeDiffs: " << Desc.URI << std::endl;
+
+   QueueURI(Desc);
+}
+									/*}}}*/
+void pkgAcqIndexMergeDiffs::Failed(string const &Message,pkgAcquire::MethodConfig const * const Cnf)/*{{{*/
+{
+   if(Debug)
+      std::clog << "pkgAcqIndexMergeDiffs failed: " << Desc.URI << " with " << Message << std::endl;
 
-   // set Item to complete as the remaining work is all local (verify etc)
-   I->Complete = true;
+   Item::Failed(Message,Cnf);
+   Status = StatDone;
 
-   return true;
+   // check if we are the first to fail, otherwise we are done here
+   State = StateDoneDiff;
+   for (std::vector<pkgAcqIndexMergeDiffs *>::const_iterator I = allPatches->begin();
+	 I != allPatches->end(); ++I)
+      if ((*I)->State == StateErrorDiff)
+	 return;
+
+   // first failure means we should fallback
+   State = StateErrorDiff;
+   if (Debug)
+      std::clog << "Falling back to normal index file acquire" << std::endl;
+   DestFile = GetPartialFileNameFromURI(Target->URI);
+   RenameOnError(PDiffError);
+   new pkgAcqIndex(Owner, TransactionManager, Target);
 }
 									/*}}}*/
-void pkgAcqMetaBase::QueueIndexes(bool verify)				/*{{{*/
+void pkgAcqIndexMergeDiffs::Done(string const &Message, HashStringList const &Hashes,	/*{{{*/
+			    pkgAcquire::MethodConfig const * const Cnf)
 {
-   // at this point the real Items are loaded in the fetcher
-   ExpectedAdditionalItems = 0;
+   if(Debug)
+      std::clog << "pkgAcqIndexMergeDiffs::Done(): " << Desc.URI << std::endl;
 
-   vector <struct IndexTarget*>::const_iterator Target;
-   for (Target = IndexTargets->begin();
-        Target != IndexTargets->end();
-        ++Target)
-   {
-      HashStringList ExpectedIndexHashes;
-      const indexRecords::checkSum *Record = MetaIndexParser->Lookup((*Target)->MetaKey);
+   Item::Done(Message, Hashes, Cnf);
 
-      // optional target that we do not have in the Release file are 
-      // skipped
-      if (verify == true && Record == NULL && (*Target)->IsOptional())
-         continue;
+   // FIXME: verify download before feeding it to rred
+   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();
 
-      // targets without a hash record are a error when verify is required
-      if (verify == true && Record == NULL)
+      if (fd.Size() != patch.patch_size || patch.patch_hashes != LocalHashes)
       {
-         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;
+	 // patchfiles are dated, so bad indicates a bad download, so kill it
+	 unlink(DestFile.c_str());
+	 Failed("Patch has Size/Hashsum mismatch", NULL);
+	 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 == NULL) ? "<NULL>" : Record->MetaKeyFilename) << std::endl;
+      // rred expects the patch as $FinalFile.ed.$patchname.gz
+      Rename(DestFile, FinalFile + ".ed." + patch.file + ".gz");
+
+      // check if this is the last completed diff
+      State = StateDoneDiff;
+      for (std::vector<pkgAcqIndexMergeDiffs *>::const_iterator I = allPatches->begin();
+	    I != allPatches->end(); ++I)
+	 if ((*I)->State != StateDoneDiff)
+	 {
+	    if(Debug)
+	       std::clog << "Not the last done diff in the batch: " << Desc.URI << std::endl;
+	    return;
+	 }
+
+      // 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 (verify == true && ExpectedIndexHashes.empty() == true)
+
+      if(Debug)
+	 std::clog << "Sending to rred method: " << FinalFile << std::endl;
+
+      Local = true;
+      Desc.URI = "rred:" + FinalFile;
+      QueueURI(Desc);
+      SetActiveSubprocess("rred");
+      return;
+   }
+   // success in download/apply all diffs, clean up
+   else if (State == StateApplyDiff)
+   {
+      // move the result into place
+      std::string const Final = GetFinalFilename();
+      if(Debug)
+	 std::clog << "Queue patched file in place: " << std::endl
+		   << DestFile << " -> " << Final << std::endl;
+
+      // queue for copy by the transaction manager
+      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)
       {
-         Status = StatAuthError;
-         strprintf(ErrorText, _("Unable to find hash sum for '%s' in Release file"), (*Target)->MetaKey.c_str());
-         return;
+	 std::string const PartialFile = GetPartialFileNameFromURI(Target->URI);
+	 std::string patch = PartialFile + ".ed." + (*I)->patch.file + ".gz";
+	 unlink(patch.c_str());
       }
+      unlink(FinalFile.c_str());
 
-      /* 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);
+      // all set and done
+      Complete = true;
+      if(Debug)
+	 std::clog << "allDone: " << DestFile << "\n" << std::endl;
    }
 }
 									/*}}}*/
-bool pkgAcqMetaBase::VerifyVendor(string Message)			/*{{{*/
+
+// AcqIndex::AcqIndex - Constructor					/*{{{*/
+pkgAcqIndex::pkgAcqIndex(pkgAcquire * const Owner,
+                         pkgAcqMetaBase * const TransactionManager,
+                         IndexTarget const * const Target)
+   : pkgAcqBaseIndex(Owner, TransactionManager, Target)
 {
-   string::size_type pos;
+   // autoselect the compression method
+   AutoSelectCompression();
+   Init(Target->URI, Target->Description, Target->ShortDesc);
 
-   // 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)
+   if(_config->FindB("Debug::Acquire::Transaction", false) == true)
+      std::clog << "New pkgIndex with TransactionManager "
+                << TransactionManager << std::endl;
+}
+									/*}}}*/
+// AcqIndex::AutoSelectCompression - Select compression			/*{{{*/
+void pkgAcqIndex::AutoSelectCompression()
+{
+   std::vector<std::string> types = APT::Configuration::getCompressionTypes();
+   CompressionExtensions = "";
+   if (TransactionManager->MetaIndexParser != NULL && TransactionManager->MetaIndexParser->Exists(Target->MetaKey))
    {
-      string::size_type start = pos+strlen("NO_PUBKEY ");
-      string Fingerprint = Message.substr(start, Message.find("\n")-start);
-      missingkeys += (Fingerprint);
+      for (std::vector<std::string>::const_iterator t = types.begin();
+           t != types.end(); ++t)
+      {
+         std::string CompressedMetaKey = string(Target->MetaKey).append(".").append(*t);
+         if (*t == "uncompressed" ||
+             TransactionManager->MetaIndexParser->Exists(CompressedMetaKey) == true)
+            CompressionExtensions.append(*t).append(" ");
+      }
    }
-   if(!missingkeys.empty())
-      _error->Warning("%s", (msg + missingkeys).c_str());
-
-   string Transformed = MetaIndexParser->GetExpectedDist();
-
-   if (Transformed == "../project/experimental")
+   else
    {
-      Transformed = "experimental";
+      for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t)
+	 CompressionExtensions.append(*t).append(" ");
    }
+   if (CompressionExtensions.empty() == false)
+      CompressionExtensions.erase(CompressionExtensions.end()-1);
+}
+									/*}}}*/
+// AcqIndex::Init - defered Constructor					/*{{{*/
+void pkgAcqIndex::Init(string const &URI, string const &URIDesc,
+                       string const &ShortDesc)
+{
+   Stage = STAGE_DOWNLOAD;
 
-   pos = Transformed.rfind('/');
-   if (pos != string::npos)
-   {
-      Transformed = Transformed.substr(0, pos);
-   }
+   DestFile = GetPartialFileNameFromURI(URI);
 
-   if (Transformed == ".")
+   size_t const nextExt = CompressionExtensions.find(' ');
+   if (nextExt == std::string::npos)
    {
-      Transformed = "";
+      CurrentCompressionExtension = CompressionExtensions;
+      CompressionExtensions.clear();
    }
-
-   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)
-      {
-	 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."),
-	       RealURI.c_str(), TimeToStr(invalid_since).c_str());
-	 if (ErrorText.empty())
-	    ErrorText = errmsg;
-	 return _error->Error("%s", errmsg.c_str());
-      }
+   else
+   {
+      CurrentCompressionExtension = CompressionExtensions.substr(0, nextExt);
+      CompressionExtensions = CompressionExtensions.substr(nextExt+1);
    }
 
-   /* 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 && LastMetaIndexParser != NULL &&
-	 LastMetaIndexParser->GetDate() > MetaIndexParser->GetDate())
+   if (CurrentCompressionExtension == "uncompressed")
    {
-      TransactionManager->IMSHit = true;
-      unlink(DestFile.c_str());
-      PartialFile = DestFile = GetFinalFilename();
-      delete MetaIndexParser;
-      MetaIndexParser = LastMetaIndexParser;
-      LastMetaIndexParser = NULL;
+      Desc.URI = URI;
    }
-
-   if (_config->FindB("Debug::pkgAcquire::Auth", false)) 
+   else if (unlikely(CurrentCompressionExtension.empty()))
+      return;
+   else
    {
-      std::cerr << "Got Codename: " << MetaIndexParser->GetDist() << std::endl;
-      std::cerr << "Expecting Dist: " << MetaIndexParser->GetExpectedDist() << std::endl;
-      std::cerr << "Transformed Dist: " << Transformed << std::endl;
+      Desc.URI = URI + '.' + CurrentCompressionExtension;
+      DestFile = DestFile + '.' + CurrentCompressionExtension;
    }
 
-   if (MetaIndexParser->CheckDist(Transformed) == false)
+   if(TransactionManager->MetaIndexParser != NULL)
+      InitByHashIfNeeded();
+
+   Desc.Description = URIDesc;
+   Desc.Owner = this;
+   Desc.ShortDesc = ShortDesc;
+
+   QueueURI(Desc);
+}
+									/*}}}*/
+// AcqIndex::AdjustForByHash - modify URI for by-hash support		/*{{{*/
+void pkgAcqIndex::InitByHashIfNeeded()
+{
+   // TODO:
+   //  - (maybe?) add support for by-hash into the sources.list as flag
+   //  - make apt-ftparchive generate the hashes (and expire?)
+   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 ||
+      TransactionManager->MetaIndexParser->GetSupportsAcquireByHash())
    {
-      // This might become fatal one day
-//       Status = StatAuthError;
-//       ErrorText = "Conflicting distribution; expected "
-//          + MetaIndexParser->GetExpectedDist() + " but got "
-//          + MetaIndexParser->GetDist();
-//       return false;
-      if (!Transformed.empty())
+      HashStringList const Hashes = GetExpectedHashes();
+      if(Hashes.usable())
       {
-         _error->Warning(_("Conflicting distribution: %s (expected %s but got %s)"),
-                         Desc.Description.c_str(),
-                         Transformed.c_str(),
-                         MetaIndexParser->GetDist().c_str());
+         // FIXME: should we really use the best hash here? or a fixed one?
+         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,
+            ByHash);
+      } else {
+         _error->Warning(
+            "Fetching ByHash requested but can not find record for %s",
+            GetMetaKey().c_str());
       }
    }
-
-   return true;
 }
 									/*}}}*/
-// pkgAcqMetaIndex::Failed - no Release file present			/*{{{*/
-void pkgAcqMetaIndex::Failed(string Message,
-                             pkgAcquire::MethodConfig * Cnf)
+// AcqIndex::Custom600Headers - Insert custom request headers		/*{{{*/
+// ---------------------------------------------------------------------
+/* The only header we use is the last-modified header. */
+string pkgAcqIndex::Custom600Headers() const
 {
-   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."), URIDesc.c_str());
+   string Final = GetFinalFilename();
 
-   // 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, GetFinalFilename());
+   string msg = "\nIndex-File: true";
+   struct stat Buf;
+   if (stat(Final.c_str(),&Buf) == 0)
+      msg += "\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
 
-      // queue without any kind of hashsum support
-      QueueIndexes(false);
-   }
+   if(Target->IsOptional())
+      msg += "\nFail-Ignore: true";
+
+   return msg;
 }
 									/*}}}*/
-void pkgAcqMetaIndex::Finished()					/*{{{*/
+// AcqIndex::Failed - getting the indexfile failed			/*{{{*/
+void pkgAcqIndex::Failed(string const &Message,pkgAcquire::MethodConfig const * const Cnf)
 {
-   if(_config->FindB("Debug::Acquire::Transaction", false) == true)
-      std::clog << "Finished: " << DestFile <<std::endl;
-   if(TransactionManager != NULL &&
-      TransactionManager->TransactionHasError() == false)
-      TransactionManager->CommitTransaction();
+   Item::Failed(Message,Cnf);
+
+   // authorisation matches will not be fixed by other compression types
+   if (Status != StatAuthError)
+   {
+      if (CompressionExtensions.empty() == false)
+      {
+	 Init(Target->URI, Desc.Description, Desc.ShortDesc);
+	 Status = StatIdle;
+	 return;
+      }
+   }
+
+   if(Target->IsOptional() && GetExpectedHashes().empty() && Stage == STAGE_DOWNLOAD)
+      Status = StatDone;
+   else
+      TransactionManager->AbortTransaction();
 }
 									/*}}}*/
-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)
+// AcqIndex::ReverifyAfterIMS - Reverify index after an ims-hit		/*{{{*/
+void pkgAcqIndex::ReverifyAfterIMS()
 {
-   // index targets + (worst case:) Release/Release.gpg
-   ExpectedAdditionalItems = IndexTargets->size() + 2;
+   // update destfile to *not* include the compression extension when doing
+   // a reverify (as its uncompressed on disk already)
+   DestFile = GetCompressedFileName(Target->URI, GetPartialFileNameFromURI(Target->URI), CurrentCompressionExtension);
+
+   // copy FinalFile into partial/ so that we check the hash again
+   string FinalFile = GetFinalFilename();
+   Stage = STAGE_DECOMPRESS_AND_VERIFY;
+   Desc.URI = "copy:" + FinalFile;
+   QueueURI(Desc);
 }
 									/*}}}*/
-pkgAcqMetaClearSig::~pkgAcqMetaClearSig()				/*{{{*/
+// 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;
 }
 									/*}}}*/
-// pkgAcqMetaClearSig::Custom600Headers - Insert custom request headers	/*{{{*/
-#if APT_PKG_ABI >= 413
-string pkgAcqMetaClearSig::Custom600Headers() const
-#else
-string pkgAcqMetaClearSig::Custom600Headers()
-#endif
+// AcqIndex::Done - Finished a fetch					/*{{{*/
+// ---------------------------------------------------------------------
+/* This goes through a number of states.. On the initial fetch the
+   method could possibly return an alternate filename which points
+   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 const &Message,
+                       HashStringList const &Hashes,
+		       pkgAcquire::MethodConfig const * const Cfg)
 {
-   string Header = pkgAcqMetaBase::Custom600Headers();
-   Header += "\nFail-Ignore: true";
-   return Header;
+   Item::Done(Message,Hashes,Cfg);
+
+   switch(Stage) 
+   {
+      case STAGE_DOWNLOAD:
+         StageDownloadDone(Message, Hashes, Cfg);
+         break;
+      case STAGE_DECOMPRESS_AND_VERIFY:
+         StageDecompressDone(Message, Hashes, Cfg);
+         break;
+   }
 }
 									/*}}}*/
-// pkgAcqMetaClearSig::Done - We got a file				/*{{{*/
-class APT_HIDDEN DummyItem : public pkgAcquire::Item
+// AcqIndex::StageDownloadDone - Queue for decompress and verify	/*{{{*/
+void pkgAcqIndex::StageDownloadDone(string const &Message, HashStringList const &,
+                                    pkgAcquire::MethodConfig const * const)
 {
-   std::string URI;
-   public:
-   virtual std::string DescURI() {return URI;};
+   Complete = true;
 
-   DummyItem(pkgAcquire *Owner, std::string const &URI) : pkgAcquire::Item(Owner), URI(URI)
+   // Handle the unzipd case
+   string FileName = LookupTag(Message,"Alt-Filename");
+   if (FileName.empty() == false)
    {
-      Status = StatDone;
-      DestFile = GetFinalFileNameFromURI(URI);
+      Stage = STAGE_DECOMPRESS_AND_VERIFY;
+      Local = true;
+      DestFile += ".decomp";
+      Desc.URI = "copy:" + FileName;
+      QueueURI(Desc);
+      SetActiveSubprocess("copy");
+      return;
    }
-};
-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 (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))
+   FileName = LookupTag(Message,"Filename");
+   if (FileName.empty() == true)
    {
-      pkgAcquire::Item::Failed(Message, Cnf);
-      RenameOnError(NotClearsigned);
-      TransactionManager->AbortTransaction();
-      return;
+      Status = StatError;
+      ErrorText = "Method gave a blank filename";
    }
 
-   if(AuthPass == false)
+   // 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)
+      Local = true;
+   else
+      EraseFileName = FileName;
+
+   // we need to verify the file against the current Release file again
+   // on if-modfied-since hit to avoid a stale attack against us
+   if(StringToBool(LookupTag(Message,"IMS-Hit"),false) == true)
    {
-      if(CheckDownloadDone(this, Message, Hashes) == true)
-         QueueForSignatureVerify(this, DestFile, DestFile);
+      // The files timestamp matches, reverify by copy into partial/
+      EraseFileName = "";
+      ReverifyAfterIMS();
       return;
    }
-   else if(CheckAuthDone(Message) == true)
+
+   // If we have compressed indexes enabled, queue for hash verification
+   if (_config->FindB("Acquire::GzipIndexes",false))
    {
-      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 DummyItem(Owner, MetaIndexURI);
-	 new DummyItem(Owner, MetaSigURI);
-      }
+      DestFile = GetPartialFileNameFromURI(Target->URI + '.' + CurrentCompressionExtension);
+      EraseFileName = "";
+      Stage = STAGE_DECOMPRESS_AND_VERIFY;
+      Desc.URI = "copy:" + FileName;
+      QueueURI(Desc);
+      SetActiveSubprocess("copy");
+      return;
+    }
+
+   // get the binary name for your used compression type
+   string decompProg;
+   if(CurrentCompressionExtension == "uncompressed")
+      decompProg = "copy";
+   else
+      decompProg = _config->Find(string("Acquire::CompressionTypes::").append(CurrentCompressionExtension),"");
+   if(decompProg.empty() == true)
+   {
+      _error->Error("Unsupported extension: %s", CurrentCompressionExtension.c_str());
+      return;
    }
+
+   // queue uri for the next stage
+   Stage = STAGE_DECOMPRESS_AND_VERIFY;
+   DestFile += ".decomp";
+   Desc.URI = decompProg + ":" + FileName;
+   QueueURI(Desc);
+   SetActiveSubprocess(decompProg);
 }
 									/*}}}*/
-void pkgAcqMetaClearSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/
+// AcqIndex::StageDecompressDone - Final verification			/*{{{*/
+void pkgAcqIndex::StageDecompressDone(string const &Message,
+                                      HashStringList const &,
+                                      pkgAcquire::MethodConfig const * const Cfg)
 {
-   Item::Failed(Message, Cnf);
-
-   // we failed, we will not get additional items from this method
-   ExpectedAdditionalItems = 0;
-
-   if (AuthPass == false)
+   if(!ValidateFile(DestFile))
    {
-      // 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,
-			MetaIndexURI, MetaIndexURIDesc, MetaIndexShortDesc,
-			MetaSigURI, MetaSigURIDesc, MetaSigShortDesc,
-			IndexTargets, MetaIndexParser);
+      RenameOnError(InvalidFormat);
+      Failed(Message, Cfg);
+      return;
    }
-   else
-   {
-      if(CheckStopAuthentication(this, 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;
+   // Done, queue for rename on transaction finished
+   TransactionManager->TransactionStageCopy(this, DestFile, GetFinalFilename());
 
-         /* Always move the meta index, even if gpgv failed. This ensures
-          * that PackageFile objects are correctly filled in */
-         if (FileExists(DestFile))
-         {
-            string FinalFile = GetFinalFilename();
-            /* 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);
-      }
-   }
+   return;
 }
 									/*}}}*/
+
+
 // 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);
@@ -2573,15 +2577,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->Flags & pkgCache::Flag::NotSource) != 0)
 	 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->Flags & pkgCache::Flag::LocalSource) == pkgCache::Flag::LocalSource;
+
       // only try to get a trusted package from another source if that source
       // is also trusted
       if(Trusted && !Index->IsTrusted()) 
@@ -2681,25 +2687,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");
@@ -2726,23 +2717,17 @@ void pkgAcqArchive::Done(string Message,unsigned long long Size, HashStringList
    Complete = true;
 }
 									/*}}}*/
-// Acquire::Item::GetFinalFilename - Return the full final file path	/*{{{*/
-std::string pkgAcqArchive::GetFinalFilename() const
-{
-   return _config->FindDir("Dir::Cache::Archives") + flNotDir(StoreFilename);
-}
-									/*}}}*/
 // 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();
@@ -2770,21 +2755,12 @@ void pkgAcqArchive::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
    }
 }
 									/*}}}*/
-// AcqArchive::IsTrusted - Determine whether this archive comes from a trusted source /*{{{*/
-// ---------------------------------------------------------------------
-#if APT_PKG_ABI >= 413
-APT_PURE bool pkgAcqArchive::IsTrusted() const
-#else
-APT_PURE bool pkgAcqArchive::IsTrusted()
-#endif
+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)
@@ -2792,17 +2768,26 @@ void pkgAcqArchive::Finished()
    StoreFilename = string();
 }
 									/*}}}*/
+std::string pkgAcqArchive::DescURI() const				/*{{{*/
+{
+   return Desc.URI;
+}
+									/*}}}*/
+std::string pkgAcqArchive::ShortDesc() const				/*{{{*/
+{
+   return Desc.ShortDesc;
+}
+									/*}}}*/
+
 // 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())
@@ -2817,7 +2802,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;
@@ -2834,21 +2819,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)
    {
@@ -2858,11 +2833,11 @@ 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)
    {
@@ -2874,7 +2849,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)
@@ -2882,7 +2857,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)
       {
@@ -2894,14 +2869,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);
 
@@ -2918,14 +2893,7 @@ void pkgAcqFile::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
 
 }
 									/*}}}*/
-// AcqIndex::Custom600Headers - Insert custom request headers		/*{{{*/
-// ---------------------------------------------------------------------
-/* The only header we use is the last-modified header. */
-#if APT_PKG_ABI >= 413
-string pkgAcqFile::Custom600Headers() const
-#else
-string pkgAcqFile::Custom600Headers()
-#endif
+string pkgAcqFile::Custom600Headers() const				/*{{{*/
 {
    if (IsIndexFile)
       return "\nIndex-File: true";
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 07c86f31b..97d5ea1dd 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -6,15 +6,15 @@
    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
@@ -49,7 +49,48 @@ class pkgSourceList;
 class IndexTarget;
 class pkgAcqMetaBase;
 
-/** \brief Represents the process by which a pkgAcquire object should	{{{
+class APT_HIDDEN IndexTarget						/*{{{*/
+/** \brief Information about an index file. */
+{
+   public:
+   /** \brief A URI from which the index file can be downloaded. */
+   std::string const URI;
+
+   /** \brief A description of the index file. */
+   std::string const Description;
+
+   /** \brief A shorter description of the index file. */
+   std::string const ShortDesc;
+
+   /** \brief The key by which this index file should be
+    *  looked up within the meta signature file.
+    */
+   std::string const MetaKey;
+
+   virtual bool IsOptional() const {
+      return false;
+   }
+
+   IndexTarget(std::string const &MetaKey, std::string const &ShortDesc,
+	 std::string const &LongDesc, std::string const &URI) :
+      URI(URI), Description(LongDesc), ShortDesc(ShortDesc), MetaKey(MetaKey) {}
+};
+									/*}}}*/
+class APT_HIDDEN OptionalIndexTarget : public IndexTarget		/*{{{*/
+/** \brief Information about an optional index file. */
+{
+   public:
+   virtual bool IsOptional() const {
+      return true;
+   }
+
+   OptionalIndexTarget(std::string const &MetaKey, std::string const &ShortDesc,
+	 std::string const &LongDesc, std::string const &URI) :
+      IndexTarget(MetaKey, ShortDesc, LongDesc, URI) {}
+};
+									/*}}}*/
+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,46 +102,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.
-    *
-    *  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 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);
-
-   /** \brief Get the full pathname of the final file for the current URI */
-   virtual std::string GetFinalFilename() const;
-
+{
    public:
 
    /** \brief The current status of this item. */
@@ -125,7 +127,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,
@@ -153,11 +155,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;
 
@@ -173,6 +175,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
@@ -185,9 +188,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.
     *
@@ -197,15 +197,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.
     *
@@ -219,7 +216,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.
@@ -234,25 +231,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.
     *
@@ -262,61 +258,55 @@ class pkgAcquire::Item : public WeakPointable
     *  line, so they should (if nonempty) have a leading newline and
     *  no trailing newline.
     */
-#if APT_PKG_ABI >= 413
-   virtual std::string Custom600Headers() const {return std::string();};
-#else
-   virtual std::string Custom600Headers() {return std::string();};
-#endif
+   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;};
-#if APT_PKG_ABI < 413
-   pkgAcquire *GetOwner() {return Owner;};
-#endif
+   pkgAcquire *GetOwner() const;
 
    /** \return \b true if this object is being fetched from a trusted source. */
-#if APT_PKG_ABI >= 413
-   virtual bool IsTrusted() const {return false;};
-#else
-   virtual bool IsTrusted() {return false;};
-#endif
-   
+   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.
     *
@@ -325,11 +315,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.
@@ -337,6 +324,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,
@@ -354,63 +346,99 @@ class pkgAcquire::Item : public WeakPointable
     */
    bool RenameOnError(RenameOnErrorState const state);
 
+   /** \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 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;
+};
+									/*}}}*/
+class APT_HIDDEN pkgAcqTransactionItem: public pkgAcquire::Item		/*{{{*/
+/** \brief baseclass for the indexes files to manage them all together */
+{
+   protected:
+   IndexTarget const * const Target;
+   HashStringList GetExpectedHashesFor(std::string const MetaKey) const;
+
+   bool QueueURI(pkgAcquire::ItemDesc &Item);
+
+   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);
 
-   /** \brief The HashSums of the item is supposed to have than done */
-   HashStringList ExpectedHashes;
+   virtual std::string DescURI() const { return Target->URI; }
+   virtual HashStringList GetExpectedHashes() const;
+   virtual std::string GetMetaKey() const;
+   virtual bool HashesRequired() const;
 
-   /** \brief The item that is currently being downloaded. */
-   pkgAcquire::ItemDesc Desc;
-};
-									/*}}}*/
-/** \brief Information about an index patch (aka diff). */		/*{{{*/
-struct APT_HIDDEN DiffInfo {
-   /** The filename of the diff. */
-   std::string file;
 
-   /** The hashes of the diff */
-   HashStringList result_hashes;
-
-   /** The hashes of the file after the diff is applied */
-   HashStringList patch_hashes;
+   pkgAcqTransactionItem(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager, IndexTarget const * const Target);
+   virtual ~pkgAcqTransactionItem();
 
-   /** The size of the file after the diff is applied */
-   unsigned long long result_size;
-
-   /** The size of the diff itself */
-   unsigned long long patch_size;
+   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;
 
+   IndexTarget const DataTarget;
+ 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;
+   const std::vector<IndexTarget*>* const IndexTargets;
 
    /** \brief If \b true, the index's signature is currently being verified.
     */
    bool AuthPass;
 
-   /** \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 Starts downloading the individual index files.
     *
     *  \param verify If \b true, only indices whose expected hashsum
@@ -419,7 +447,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.
     *
@@ -430,16 +458,12 @@ class pkgAcqMetaBase  : public pkgAcquire::Item				/*{{{*/
     *  \param Message The message block received from the fetch
     *  subprocess.
     */
-   bool CheckDownloadDone(pkgAcquire::Item * const I, const std::string &Message, HashStringList const &Hashes) const;
+   bool CheckDownloadDone(pkgAcqTransactionItem * const I, const std::string &Message, HashStringList const &Hashes) const;
 
    /** \brief Queue the downloaded Signature for verification */
-   void QueueForSignatureVerify(pkgAcquire::Item * const I, std::string const &File, std::string const &Signature);
+   void QueueForSignatureVerify(pkgAcqTransactionItem * const I, std::string const &File, std::string const &Signature);
 
-#if APT_PKG_ABI >= 413
    virtual std::string Custom600Headers() const;
-#else
-   virtual std::string Custom600Headers();
-#endif
 
    /** \brief Called when authentication succeeded.
     *
@@ -450,7 +474,7 @@ class pkgAcqMetaBase  : public pkgAcquire::Item				/*{{{*/
     *  \param Message The message block received from the fetch
     *  subprocess.
     */
-   bool CheckAuthDone(std::string Message);
+   bool CheckAuthDone(std::string const &Message);
 
    /** Check if the current item should fail at this point */
    bool CheckStopAuthentication(pkgAcquire::Item * const I, const std::string &Message);
@@ -460,7 +484,7 @@ class pkgAcqMetaBase  : public pkgAcquire::Item				/*{{{*/
     *
     *  \return \b true if no fatal errors were encountered.
     */
-   bool VerifyVendor(std::string Message);
+   bool VerifyVendor(std::string const &Message);
 
    virtual bool TransactionState(TransactionStates const state);
 
@@ -468,33 +492,32 @@ class pkgAcqMetaBase  : public pkgAcquire::Item				/*{{{*/
    // This refers more to the Transaction-Manager than the actual file
    bool IMSHit;
 
-   virtual std::string DescURI() {return RealURI; };
    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 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 committed
     */
-   void TransactionStageRemoval(Item *I, const std::string &FinalFile);
+   void TransactionStageRemoval(pkgAcqTransactionItem * const I, const std::string &FinalFile);
 
    /** \brief Get the full pathname of the final file for the current URI */
    virtual std::string GetFinalFilename() const;
 
-   pkgAcqMetaBase(pkgAcquire *Owner,
-                  const std::vector<IndexTarget*>* IndexTargets,
-                  indexRecords* MetaIndexParser,
-		  std::string const &RealURI,
-                  HashStringList const &ExpectedHashes=HashStringList(),
-                  pkgAcqMetaBase *TransactionManager=NULL);
+   pkgAcqMetaBase(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
+		  std::vector<IndexTarget*> const * const IndexTargets,
+		  IndexTarget const &DataTarget,
+		  indexRecords* const MetaIndexParser);
 };
 									/*}}}*/
 /** \brief An item that is responsible for downloading the meta-index	{{{
@@ -512,36 +535,24 @@ class APT_HIDDEN pkgAcqMetaIndex : public pkgAcqMetaBase
    void *d;
 
    protected:
-   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 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,
+		   const std::vector<IndexTarget*>* const IndexTargets, indexRecords * const MetaIndexParser);
 
    friend class pkgAcqMetaSig;
 };
@@ -554,7 +565,7 @@ class APT_HIDDEN pkgAcqMetaIndex : public pkgAcqMetaBase
  *
  *  \sa pkgAcqMetaIndex
  */
-class APT_HIDDEN pkgAcqMetaSig : public pkgAcquire::Item
+class APT_HIDDEN pkgAcqMetaSig : public pkgAcqTransactionItem
 {
    void *d;
 
@@ -565,29 +576,20 @@ class APT_HIDDEN pkgAcqMetaSig : public pkgAcquire::Item
 
    protected:
 
-   /** \brief Long URI description used in the acquire system */
-   std::string URIDesc;
-
-   /** \brief URI used to get the file */
-   std::string RealURI;
-
    /** \brief Get the full pathname of the final file for the current URI */
    virtual std::string GetFinalFilename() const;
 
    public:
-   virtual std::string DescURI() {return RealURI;};
+   virtual bool HashesRequired() const { return false; }
 
    // 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);
 
    /** \brief Create a new pkgAcqMetaSig. */
-   pkgAcqMetaSig(pkgAcquire *Owner,
-	 pkgAcqMetaBase *TransactionManager,
-	 std::string const &URI,std::string const &URIDesc,
-	 std::string const &ShortDesc, pkgAcqMetaIndex * const MetaIndex);
+   pkgAcqMetaSig(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager, IndexTarget const * const Target,
+	 pkgAcqMetaIndex * const MetaIndex);
    virtual ~pkgAcqMetaSig();
 };
 									/*}}}*/
@@ -596,78 +598,37 @@ class APT_HIDDEN pkgAcqMetaClearSig : public pkgAcqMetaIndex
 {
    void *d;
 
-   /** \brief The URI of the meta-index file for the detached signature */
-   std::string MetaIndexURI;
-
-   /** \brief A "URI-style" description of the meta-index file */
-   std::string MetaIndexURIDesc;
-
-   /** \brief A brief description of the meta-index file */
-   std::string MetaIndexShortDesc;
-
-   /** \brief The URI of the detached meta-signature file if the clearsigned one failed. */
-   std::string MetaSigURI;
-
-   /** \brief A "URI-style" description of the meta-signature file */
-   std::string MetaSigURIDesc;
-
-   /** \brief A brief description of the meta-signature file */
-   std::string MetaSigShortDesc;
+   IndexTarget const ClearsignedTarget;
+   IndexTarget const DetachedDataTarget;
+   IndexTarget const DetachedSigTarget;
 
 public:
-   virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
-#if APT_PKG_ABI >= 413
+   virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf);
    virtual std::string Custom600Headers() const;
-#else
-   virtual std::string Custom600Headers();
-#endif
-   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 * 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);
+   pkgAcqBaseIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
+                   IndexTarget const * const Target);
 };
 									/*}}}*/
 /** \brief An item that is responsible for fetching an index file of	{{{
@@ -705,15 +666,12 @@ class APT_HIDDEN pkgAcqDiffIndex : public pkgAcqBaseIndex
    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";};
-#if APT_PKG_ABI >= 413
+   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;
-#else
-   virtual std::string Custom600Headers();
-#endif
+   virtual std::string GetMetaKey() const;
 
    /** \brief Parse the Index file for a set of Packages diffs.
     *
@@ -725,7 +683,7 @@ class APT_HIDDEN 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.
     *
@@ -736,18 +694,30 @@ class APT_HIDDEN 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 * const Target);
  private:
    APT_HIDDEN void QueueOnIMSHit() const;
 };
 									/*}}}*/
+struct APT_HIDDEN DiffInfo {						/*{{{*/
+   /** The filename of the diff. */
+   std::string file;
+
+   /** The hashes of the diff */
+   HashStringList result_hashes;
+
+   /** The hashes of the file after the diff is applied */
+   HashStringList patch_hashes;
+
+   /** The size of the file after the diff is applied */
+   unsigned long long result_size;
+
+   /** The size of the diff itself */
+   unsigned long long patch_size;
+};
+									/*}}}*/
 /** \brief An item that is responsible for fetching client-merge patches {{{
  *  that need to be applied to a given package index file.
  *
@@ -801,10 +771,12 @@ class APT_HIDDEN 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 DescURI() const {return Target->URI + "Index";};
+   virtual HashStringList GetExpectedHashes() const;
+   virtual bool HashesRequired() const;
 
    /** \brief Create an index merge-diff item.
     *
@@ -817,22 +789,15 @@ class APT_HIDDEN 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 * const Target,
+                         DiffInfo const &patch,
                          std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches);
 };
 									/*}}}*/
@@ -875,7 +840,7 @@ class APT_HIDDEN 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:
 
@@ -905,26 +870,25 @@ class APT_HIDDEN 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 DescURI() const {return Target->URI + "IndexDiffs";};
+   virtual HashStringList GetExpectedHashes() const;
+   virtual bool HashesRequired() const;
 
    /** \brief Create an index diff item.
     *
@@ -940,20 +904,13 @@ class APT_HIDDEN 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 * const Target,
+		    std::vector<DiffInfo> const &diffs=std::vector<DiffInfo>());
 };
 									/*}}}*/
 /** \brief An acquire item that is responsible for fetching an index	{{{
@@ -981,16 +938,16 @@ class APT_HIDDEN 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.
@@ -1006,7 +963,7 @@ class APT_HIDDEN 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();
@@ -1015,7 +972,7 @@ class APT_HIDDEN pkgAcqIndex : public pkgAcqBaseIndex
    void ReverifyAfterIMS();
 
    /** \brief Validate the downloaded index file */
-   bool ValidateFile(const std::string &FileName);
+   bool ValidateFile(std::string const &FileName);
 
    /** \brief Get the full pathname of the final file for the current URI */
    virtual std::string GetFinalFilename() const;
@@ -1024,82 +981,20 @@ class APT_HIDDEN pkgAcqIndex : public pkgAcqBaseIndex
 
    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);
-#if APT_PKG_ABI >= 413
+   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;
-#else
-   virtual std::string Custom600Headers();
-#endif
-   virtual std::string DescURI() {return Desc.URI;};
+   virtual std::string DescURI() const {return Desc.URI;};
+   virtual std::string GetMetaKey() const;
+
+   pkgAcqIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
+               IndexTarget const * const Target);
 
-   /** \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 APT_HIDDEN IndexTarget
-{
-   void *d;
-
- 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 signature file.
-    */
-   std::string MetaKey;
-
-   virtual bool IsOptional() const {
-      return false;
-   }
-};
-									/*}}}*/
-/** \brief Information about an optional index file. */			/*{{{*/
-class APT_HIDDEN OptionalIndexTarget : public IndexTarget
-{
-   void *d;
-
-   virtual bool IsOptional() const {
-      return true;
-   }
-};
-									/*}}}*/
 /** \brief An item that is responsible for fetching a package file.	{{{
  *
  *  If the package file already exists in the cache, nothing will be
@@ -1109,6 +1004,9 @@ class pkgAcqArchive : public pkgAcquire::Item
 {
    void *d;
 
+   bool LocalSource;
+   HashStringList ExpectedHashes;
+
    protected:
    /** \brief The package version being fetched. */
    pkgCache::VerIterator Version;
@@ -1141,7 +1039,7 @@ 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();
@@ -1151,17 +1049,15 @@ class pkgAcqArchive : public pkgAcquire::Item
 
    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();
-#if APT_PKG_ABI >= 413
    virtual bool IsTrusted() const;
-#else
-   virtual bool IsTrusted();
-#endif
+   virtual HashStringList GetExpectedHashes() const;
+   virtual bool HashesRequired() const;
 
    /** \brief Create a new pkgAcqArchive.
     *
@@ -1181,8 +1077,8 @@ 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);
 };
 									/*}}}*/
@@ -1200,22 +1096,21 @@ 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;};
-#if APT_PKG_ABI >= 413
+   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;
-#else
-   virtual std::string Custom600Headers();
-#endif
 
    /** \brief Create a new pkgAcqFile object.
     *
@@ -1248,10 +1143,10 @@ 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);
 };
 									/*}}}*/
 /** @} */
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index c29ef469e..b77096efd 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
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 9254e20a3..099a1f87d 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -55,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		/*{{{*/
@@ -70,8 +70,8 @@ pkgAcquire::Worker::Worker(MethodConfig *Cnf)
    CurrentItem = 0;
    TotalSize = 0;
    CurrentSize = 0;
-   
-   Construct();   
+
+   Construct();
 }
 									/*}}}*/
 // Worker::Construct - Constructor helper				/*{{{*/
@@ -136,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)
@@ -145,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;
@@ -165,7 +165,7 @@ bool pkgAcquire::Worker::Start()
    close(Pipes[2]);
    OutReady = false;
    InReady = true;
-   
+
    // Read the configuration data
    if (WaitFd(InFd) == false ||
        ReadMessages() == false)
@@ -174,7 +174,7 @@ bool pkgAcquire::Worker::Start()
    RunMessages();
    if (OwnerQ != 0)
       SendConfiguration();
-   
+
    return true;
 }
 									/*}}}*/
@@ -201,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);
@@ -215,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)
       {
@@ -232,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:
          {
@@ -252,7 +252,7 @@ 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;
 
@@ -272,7 +272,7 @@ bool pkgAcquire::Worker::RunMessages()
 	       Log->Done(Desc);
             break;
          }
-   
+
 	 // 200 URI Start
 	 case 200:
 	 {
@@ -281,23 +281,23 @@ 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));
+	    Itm->Owner->Start(Message, TotalSize);
 
 	    // Display update before completion
 	    if (Log != 0 && Log->MorePulses == true)
 	       Log->Pulse(Itm->Owner->GetOwner());
-	    
+
 	    if (Log != 0)
 	       Log->Fetch(*Itm);
 
 	    break;
 	 }
-	 
+
 	 // 201 URI Done
 	 case 201:
 	 {
@@ -306,7 +306,7 @@ bool pkgAcquire::Worker::RunMessages()
 	       _error->Error("Method gave invalid 201 URI Done message");
 	       break;
 	    }
-	    
+
 	    pkgAcquire::Item *Owner = Itm->Owner;
 	    pkgAcquire::ItemDesc Desc = *Itm;
 
@@ -316,22 +316,11 @@ bool pkgAcquire::Worker::RunMessages()
 	    // 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 const ExpectedHashes = Owner->GetExpectedHashes();
+	    // see if we got hashes to verify
 	    HashStringList ReceivedHashes;
 	    for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type)
 	    {
@@ -340,6 +329,18 @@ bool pkgAcquire::Worker::RunMessages()
 	       if (hashsum.empty() == false)
 		  ReceivedHashes.push_back(HashString(*type, hashsum));
 	    }
+	    // not all methods always sent Hashes our way
+	    if (ExpectedHashes.usable() == true && ReceivedHashes.usable() == false)
+	    {
+	       std::string const filename = LookupTag(Message, "Filename", Owner->DestFile.c_str());
+	       if (filename.empty() == false && RealFileExists(filename))
+	       {
+		  Hashes calc(ExpectedHashes);
+		  FileFd file(filename, FileFd::ReadOnly, FileFd::None);
+		  calc.AddFD(file);
+		  ReceivedHashes = calc.GetHashStringList();
+	       }
+	    }
 
 	    if(_config->FindB("Debug::pkgAcquire::Auth", false) == true)
 	    {
@@ -348,30 +349,66 @@ bool pkgAcquire::Worker::RunMessages()
 	       for (HashStringList::const_iterator hs = ReceivedHashes.begin(); hs != ReceivedHashes.end(); ++hs)
 		  std::clog <<  "\t- " << hs->toStr() << std::endl;
 	       std::clog << "ExpectedHash:" << endl;
-	       HashStringList expectedHashes = Owner->HashSums();
-	       for (HashStringList::const_iterator hs = expectedHashes.begin(); hs != expectedHashes.end(); ++hs)
+	       for (HashStringList::const_iterator hs = ExpectedHashes.begin(); hs != ExpectedHashes.end(); ++hs)
 		  std::clog <<  "\t- " << hs->toStr() << std::endl;
 	       std::clog << endl;
 	    }
-	    Owner->Done(Message, ServerSize, ReceivedHashes, Config);
-	    ItemDone();
 
-	    // Log that we are done
-	    if (Log != 0)
+	    // decide if what we got is what we expected
+	    bool consideredOkay = false;
+	    bool const isIMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false) ||
+	       StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false);
+	    if (ExpectedHashes.usable())
 	    {
-	       if (isHit)
+	       if (ReceivedHashes.usable() == false)
 	       {
-		  /* Hide 'hits' for local only sources - we also manage to
-		     hide gets */
-		  if (Config->LocalOnly == false)
-		     Log->IMSHit(Desc);
-	       }	       
+		  /* 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
-		  Log->Done(Desc);
+		  consideredOkay = false;
+
+	    }
+	    else if (Owner->HashesRequired() == true)
+	       consideredOkay = false;
+	    else
+	       consideredOkay = true;
+
+	    if (consideredOkay == true)
+	    {
+	       Owner->Done(Message, ReceivedHashes, Config);
+	       ItemDone();
+
+	       // Log that we are done
+	       if (Log != 0)
+	       {
+		  if (isIMSHit)
+		  {
+		     /* Hide 'hits' for local only sources - we also manage to
+			hide gets */
+		     if (Config->LocalOnly == false)
+			Log->IMSHit(Desc);
+		  }
+		  else
+		     Log->Done(Desc);
+	       }
+	    }
+	    else
+	    {
+	       Owner->Status = pkgAcquire::Item::StatAuthError;
+	       Owner->Failed(Message,Config);
+	       ItemDone();
+
+	       if (Log != 0)
+		  Log->Fail(Desc);
 	    }
 	    break;
-	 }	 
-	 
+	 }
+
 	 // 400 URI Failure
 	 case 400:
 	 {
@@ -408,18 +445,18 @@ bool pkgAcquire::Worker::RunMessages()
 	       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;
 }
@@ -432,7 +469,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);
@@ -447,13 +484,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;
 }
 									/*}}}*/
@@ -463,10 +500,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' "
@@ -536,12 +573,12 @@ 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->Owner->GetExpectedHashes();
    for (HashStringList::const_iterator hs = hsl.begin(); hs != hsl.end(); ++hs)
       Message += "\nExpected-" + hs->HashType() + ": " + hs->HashValue();
    if(Item->Owner->FileSize > 0)
@@ -564,7 +601,7 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item)
       clog << " -> " << Access << ':' << QuoteString(Message,"\n") << endl;
    OutQueue += Message;
    OutReady = true;
-   
+
    return true;
 }
 									/*}}}*/
@@ -586,7 +623,7 @@ bool pkgAcquire::Worker::OutFdReady()
    OutQueue.erase(0,Res);
    if (OutQueue.empty() == true)
       OutReady = false;
-   
+
    return true;
 }
 									/*}}}*/
@@ -608,7 +645,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;
@@ -620,26 +657,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		/*{{{*/
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index 0fa443b4a..11a7e479b 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,15 @@ 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::supported(char const * const type)			/*{{{*/
 {
    for (char const * const * t = HashString::SupportedHashes(); *t != NULL; ++t)
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index ac13c8ace..176ce4faa 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -87,6 +87,15 @@ 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;
+
    /** check if the given hash type is supported
     *
     * @param type to check
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index d672b4fd8..185248619 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -742,13 +742,13 @@ bool debDebPkgFileIndex::Merge(pkgCacheGenerator& Gen, OpProgress* Prog) const
 
    // and give it to the list parser
    debDebFileParser Parser(DebControl, DebFile);
-   if(Gen.SelectFile(DebFile, "local", *this) == false)
+   if(Gen.SelectFile(DebFile, "local", *this, 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());
 
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index aa2db8149..eb5e78e3b 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -192,11 +192,13 @@ vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
 		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);
+			char const * const ShortDesc = "Sources";
+			IndexTarget * const Target = new IndexTarget(
+			      SourceIndexURISuffix(ShortDesc, (*I)->Section),
+			      ShortDesc,
+			      Info(ShortDesc, (*I)->Section),
+			      SourceIndexURI(ShortDesc, (*I)->Section)
+			      );
 			IndexTargets->push_back (Target);
 		}
 	}
@@ -212,11 +214,13 @@ vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
 			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);
+			char const * const ShortDesc = "Packages";
+			IndexTarget * const Target = new IndexTarget(
+			      IndexURISuffix(ShortDesc, (*I)->Section, a->first),
+			      ShortDesc,
+			      Info (ShortDesc, (*I)->Section, a->first),
+			      IndexURI(ShortDesc, (*I)->Section, a->first)
+			      );
 			IndexTargets->push_back (Target);
 			sections.insert((*I)->Section);
 		}
@@ -235,11 +239,13 @@ vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
 	     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);
+			std::string const ShortDesc = "Translation-" + *l;
+			IndexTarget * const Target = new OptionalIndexTarget(
+			      TranslationIndexURISuffix(l->c_str(), *s),
+			      ShortDesc,
+			      Info (ShortDesc.c_str(), *s),
+			      TranslationIndexURI(l->c_str(), *s)
+			      );
 			IndexTargets->push_back(Target);
 		}
 	}
@@ -249,8 +255,6 @@ vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
 									/*}}}*/
 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);
@@ -258,37 +262,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);
+   vector <IndexTarget *> const * const targets = ComputeIndexTargets();
+#define APT_TARGET(X) IndexTarget("", X, MetaIndexInfo(X), MetaIndexURI(X))
+   pkgAcqMetaBase * const TransactionManager = new pkgAcqMetaClearSig(Owner,
+	 APT_TARGET("InRelease"), APT_TARGET("Release"), APT_TARGET("Release.gpg"),
+	 targets, iR);
+#undef APT_TARGET
+   if (GetAll)
+   {
+      for (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;
 }
diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index de2617833..c26868cac 100644
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -73,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)				/*{{{*/
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 2ba23c5c0..b4d56611a 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -190,7 +190,12 @@ 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 */
+	 NotAutomatic=(1<<1), /*!< archive has a default pin of 1 */
+	 ButAutomaticUpgrades=(1<<2), /*!< (together with the previous) archive has a default pin of 100 */
+	 LocalSource=(1<<3), /*!< local sources can't and will not be verified by hashes */
+      };
    };
    
    protected:
diff --git a/methods/file.cc b/methods/file.cc
index 043ab04b8..353e54bd5 100644
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -57,7 +57,11 @@ 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;
+      }
    }
 
    // See if the uncompressed file exists and reuse it
diff --git a/test/integration/test-apt-get-source-authenticated b/test/integration/test-apt-get-source-authenticated
index 685bc566b..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
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-update-expected-size b/test/integration/test-apt-update-expected-size
index 55a5da848..55bba8188 100755
--- a/test/integration/test-apt-update-expected-size
+++ b/test/integration/test-apt-update-expected-size
@@ -35,7 +35,7 @@ test_packagestoobig() {
 	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=0 -o Debug::Acquire::Transaction=0
+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() {
diff --git a/test/integration/test-apt-update-file b/test/integration/test-apt-update-file
index 1ecf9a38a..665f94fa5 100755
--- a/test/integration/test-apt-update-file
+++ b/test/integration/test-apt-update-file
@@ -22,6 +22,10 @@ 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'
+
 testsuccess aptget update -o Debug::pkgAcquire::Auth=1
 cp -a rootdir/tmp/testsuccess.output rootdir/tmp/update.output
 
diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback
index db4430ea3..f132bcf8e 100755
--- a/test/integration/test-apt-update-nofallback
+++ b/test/integration/test-apt-update-nofallback
@@ -28,6 +28,7 @@ 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()
@@ -87,16 +88,16 @@ 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
     testfailureequal "WARNING: The following packages cannot be authenticated!
   evil
@@ -167,7 +168,7 @@ 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
 
     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: unstable InRelease: 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
index bac33d531..a490f00de 100755
--- a/test/integration/test-apt-update-not-modified
+++ b/test/integration/test-apt-update-not-modified
@@ -43,7 +43,9 @@ Version: 1
 EOF
 	compressfile aptarchive/dists/unstable/main/binary-amd64/Packages
 	testfailureequal "Hit $1 unstable InRelease
-Get:1 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists.good/unstable/main/binary-amd64/Packages.gz') B]
+Get:1 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
+Err $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
@@ -87,8 +89,32 @@ Hit $1 unstable Release
 Reading package lists..." aptget update
 	testfileequal 'listsdir-without-amd64.lst' "$(listcurrentlistsdirectory)"
 
-	# readd arch so its downloaded again
+	# 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 unstable InRelease
+  404  Not Found
+Hit $1 unstable Release
+Get:1 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
+Err $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 unstable InRelease
   404  Not Found
 Hit $1 unstable Release
diff --git a/test/integration/test-apt-update-stale b/test/integration/test-apt-update-stale
index 05154641a..8a2703fd1 100755
--- a/test/integration/test-apt-update-stale
+++ b/test/integration/test-apt-update-stale
@@ -18,7 +18,7 @@ setupaptarchive --no-update
 changetowebserver
 
 echo "Acquire::Languages \"none\";" > rootdir/etc/apt/apt.conf.d/00nolanguages
-testsuccess aptget update
+testsuccess aptget update -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1
 listcurrentlistsdirectory > lists.before
 
 # insert new version
@@ -26,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
 
@@ -39,7 +39,6 @@ cp -p aptarchive/dists/unstable/main/binary-i386/saved/Packages* \
      aptarchive/dists/unstable/main/binary-i386/
 
 # ensure this raises an error
-testfailureequal "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-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files
index bca07268c..486b8ba02 100755
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -12,7 +12,7 @@ setupflataptarchive
 
 testaptgetupdate() {
 	rm -rf rootdir/var/lib/apt
-	aptget update 2>> testaptgetupdate.diff >> testaptgetupdate.diff || true
+	aptget update >testaptgetupdate.diff 2>&1 || true
 	sed -i -e '/Ign /,+1d' -e '/Release/ d' -e 's#Get:[0-9]\+ #Get: #' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
 	GIVEN="$1"
 	shift
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 ec74a750b..555d8fcaa 100755
--- a/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
+++ b/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
@@ -176,7 +176,11 @@ testmismatch() {
 Building dependency tree...
 Need to get 6 B of source archives.
 Get:1 http://localhost:8080/  $1 1.0 (dsc) [3 B]
+Err http://localhost:8080/  $1 1.0 (dsc)
+  Hash Sum mismatch
 Get:2 http://localhost:8080/  $1 1.0 (tar) [3 B]
+Err 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
@@ -238,6 +242,8 @@ 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]
+Err 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
@@ -247,6 +253,8 @@ 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]
+Err 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
 
diff --git a/test/libapt/acqprogress_test.cc b/test/libapt/acqprogress_test.cc
index 288e05aca..c634733d4 100644
--- a/test/libapt/acqprogress_test.cc
+++ b/test/libapt/acqprogress_test.cc
@@ -1,4 +1,5 @@
 #include <config.h>
+#include <apt-pkg/hashes.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/configuration.h>
@@ -10,9 +11,10 @@
 class TestItem: public pkgAcquire::Item
 {
 public:
-   TestItem(pkgAcquire * const Acq) : pkgAcquire::Item(Acq, "", NULL) {}
+   TestItem(pkgAcquire * const Acq) : pkgAcquire::Item(Acq) {}
 
-   virtual std::string DescURI() { return ""; }
+   virtual std::string DescURI() const { return ""; }
+   virtual HashStringList GetExpectedHashes() const { return HashStringList(); }
 
 };
 
diff --git a/test/libapt/hashsums_test.cc b/test/libapt/hashsums_test.cc
index edcd8a11a..63c63ecd3 100644
--- a/test/libapt/hashsums_test.cc
+++ b/test/libapt/hashsums_test.cc
@@ -306,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;
@@ -316,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");
-- 
cgit v1.2.3-70-g09d2


From 3679515479136179e0d95325a6559fcc6d0af7f8 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 6 Jun 2015 19:16:45 +0200
Subject: check patch hashes in rred worker instead of in the handler
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

rred is responsible for unpacking and reading the patch files in one go,
but we currently only have hashes for the uncompressed patch files, so
the handler read the entire patch file before dispatching it to the
worker which would read it again – both with an implicit uncompress.
Worse, while the workers operate in parallel the handler is the central
orchestration unit, so having it busy with work means the workers do
(potentially) nothing.

This means rred is working with 'untrusted' data, which is bad. Yet,
having the unpack in the handler meant that the untrusted uncompress was
done as root which isn't better either. Now, we have it at least
contained in a binary which we can harden a bit better. In the long run,
we want hashes for the compressed patch files through to be safe.
---
 apt-pkg/acquire-item.cc           | 95 +++++++++++++++++++++++----------------
 apt-pkg/acquire-item.h            |  2 +
 apt-pkg/acquire-method.cc         | 14 +++---
 apt-pkg/acquire-method.h          |  5 ++-
 methods/rred.cc                   | 62 ++++++++++++++++++++-----
 test/integration/test-pdiff-usage |  2 +
 6 files changed, 121 insertions(+), 59 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index ec6ec6e84..7b69ee993 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -95,6 +95,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)
@@ -1860,6 +1873,9 @@ void pkgAcqIndexDiffs::Failed(string const &Message,pkgAcquire::MethodConfig con
 		<< "Falling back to normal index file acquire" << std::endl;
    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();
 }
@@ -1968,28 +1984,13 @@ void pkgAcqIndexDiffs::Done(string const &Message, HashStringList const &Hashes,
 
    Item::Done(Message, Hashes, Cnf);
 
-   // FIXME: verify this download too before feeding it to rred
    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)
-      {
-	 // patchfiles are dated, so bad indicates a bad download, so kill it
-	 unlink(DestFile.c_str());
-	 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;
@@ -2000,18 +2001,17 @@ void pkgAcqIndexDiffs::Done(string const &Message, HashStringList const &Hashes,
       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;
@@ -2031,6 +2031,18 @@ void pkgAcqIndexDiffs::Done(string const &Message, HashStringList const &Hashes,
    }
 }
 									/*}}}*/
+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();
+}
+									/*}}}*/
 
 // AcqIndexMergeDiffs::AcqIndexMergeDiffs - Constructor			/*{{{*/
 pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire * const Owner,
@@ -2079,6 +2091,9 @@ void pkgAcqIndexMergeDiffs::Failed(string const &Message,pkgAcquire::MethodConfi
       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);
 }
 									/*}}}*/
@@ -2090,26 +2105,10 @@ void pkgAcqIndexMergeDiffs::Done(string const &Message, HashStringList const &Ha
 
    Item::Done(Message, Hashes, Cnf);
 
-   // FIXME: verify download before feeding it to rred
    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)
-      {
-	 // patchfiles are dated, so bad indicates a bad download, so kill it
-	 unlink(DestFile.c_str());
-	 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;
@@ -2158,7 +2157,7 @@ void pkgAcqIndexMergeDiffs::Done(string const &Message, HashStringList const &Ha
 	    I != allPatches->end(); ++I)
       {
 	 std::string const PartialFile = GetPartialFileNameFromURI(Target->URI);
-	 std::string patch = PartialFile + ".ed." + (*I)->patch.file + ".gz";
+	 std::string const patch = GetMergeDiffsPatchFileName(PartialFile, (*I)->patch.file);
 	 unlink(patch.c_str());
       }
       unlink(FinalFile.c_str());
@@ -2170,6 +2169,24 @@ void pkgAcqIndexMergeDiffs::Done(string const &Message, HashStringList const &Ha
    }
 }
 									/*}}}*/
+std::string pkgAcqIndexMergeDiffs::Custom600Headers() const		/*{{{*/
+{
+   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)
+   {
+      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;
+   }
+   patchhashes << pkgAcqBaseIndex::Custom600Headers();
+   return patchhashes.str();
+}
+									/*}}}*/
 
 // AcqIndex::AcqIndex - Constructor					/*{{{*/
 pkgAcqIndex::pkgAcqIndex(pkgAcquire * const Owner,
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 97d5ea1dd..f24af1aec 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -774,6 +774,7 @@ class APT_HIDDEN pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex
    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;
@@ -886,6 +887,7 @@ class APT_HIDDEN pkgAcqIndexDiffs : public pkgAcqBaseIndex
 
    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;
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index b77096efd..a8fc75f8e 100644
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -388,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();
@@ -403,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
 {
diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index 399454892..6480eb4b5 100644
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -76,11 +76,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/methods/rred.cc b/methods/rred.cc
index 554ac99b4..3da33c126 100644
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -388,7 +388,7 @@ class Patch {
 
    public:
 
-   void read_diff(FileFd &f)
+   void read_diff(FileFd &f, Hashes * const h)
    {
       char buffer[BLOCK_SIZE];
       bool cmdwanted = true;
@@ -396,6 +396,8 @@ class Patch {
       Change ch(0);
       while(f.ReadLine(buffer, sizeof(buffer)))
       {
+	 if (h != NULL)
+	    h->Add(buffer);
 	 if (cmdwanted) {
 	    char *m, *c;
 	    size_t s, e;
@@ -519,8 +521,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 +557,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,18 +575,27 @@ 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;
@@ -569,8 +607,12 @@ class RredMethod : public pkgAcqMethod {
 	       _error->DumpErrors(std::cerr);
 	       abort();
 	    }
-	    patch.read_diff(p);
+	    Hashes patch_hash(I->ExpectedHashes);
+	    patch.read_diff(p, &patch_hash);
 	    p.Close();
+	    HashStringList const hsl = patch_hash.GetHashStringList();
+	    if (hsl != I->ExpectedHashes)
+	       return _error->Error("Patch %s doesn't have the expected hashsum", patch_name.c_str());
 	 }
 
 	 if (Debug == true)
@@ -643,7 +685,7 @@ int main(int argc, char **argv)
 	 _error->DumpErrors(std::cerr);
 	 exit(1);
       }
-      patch.read_diff(p);
+      patch.read_diff(p, NULL);
    }
 
    if (just_diff) {
diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage
index 7d72a6944..73df61895 100755
--- a/test/integration/test-pdiff-usage
+++ b/test/integration/test-pdiff-usage
@@ -170,6 +170,8 @@ SHA256-Patches:
 	generatereleasefiles '+1hour'
 	signreleasefiles
 	testsuccess aptget update "$@"
+	cp -f rootdir/tmp/testsuccess.output rootdir/tmp/aptgetupdate.output
+	testsuccess grep 'have the expected hashsum' rootdir/tmp/aptgetupdate.output
 	testnopackage oldstuff
 	testsuccessequal "$(cat ${PKGFILE}-new)
 " aptcache show apt newstuff
-- 
cgit v1.2.3-70-g09d2


From 6d3e5bd8e08564c5eb12ecd869de5bd71e25f59d Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 7 Jun 2015 02:17:15 +0200
Subject: add more parsing error checking for rred

The rred parser is very accepting regarding 'invalid' files. Given that
we can't trust the input it might be a bit too relaxed. In any case,
checking for more errors can't hurt given that we support only a very
specific subset of ed commands.
---
 methods/rred.cc                   |  70 +++++++++-----
 test/integration/test-method-rred | 194 ++++++++++++++++++++++++++++++++++++++
 test/integration/test-pdiff-usage |   3 +-
 3 files changed, 245 insertions(+), 22 deletions(-)
 create mode 100755 test/integration/test-method-rred

diff --git a/methods/rred.cc b/methods/rred.cc
index 3da33c126..81ecf8553 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;
@@ -388,30 +389,37 @@ class Patch {
 
    public:
 
-   void read_diff(FileFd &f, Hashes * const h)
+   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 == ULONG_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 == ULONG_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;
@@ -422,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;
@@ -430,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;
@@ -437,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 {
@@ -465,7 +479,8 @@ class Patch {
 	       }
 	    }
 	 }
-      }
+      } while(f.ReadLine(buffer, sizeof(buffer)));
+      return true;
    }
 
    void write_diff(FILE *f)
@@ -601,14 +616,14 @@ class RredMethod : public pkgAcqMethod {
 		  << 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;
 	    }
-	    Hashes patch_hash(I->ExpectedHashes);
-	    patch.read_diff(p, &patch_hash);
 	    p.Close();
 	    HashStringList const hsl = patch_hash.GetHashStringList();
 	    if (hsl != I->ExpectedHashes)
@@ -624,7 +639,6 @@ class RredMethod : public pkgAcqMethod {
 	 FILE *out = fopen(Itm->DestFile.c_str(), "w");
 
 	 Hashes hash(Itm->ExpectedHashes);
-
 	 patch.apply_against_file(out, inp, &hash);
 
 	 fclose(out);
@@ -657,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) {}
 };
@@ -685,7 +709,11 @@ int main(int argc, char **argv)
 	 _error->DumpErrors(std::cerr);
 	 exit(1);
       }
-      patch.read_diff(p, NULL);
+      if (patch.read_diff(p, NULL) == false)
+      {
+	 _error->DumpErrors(std::cerr);
+	 exit(2);
+      }
    }
 
    if (just_diff) {
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-pdiff-usage b/test/integration/test-pdiff-usage
index 73df61895..7a9f6496b 100755
--- a/test/integration/test-pdiff-usage
+++ b/test/integration/test-pdiff-usage
@@ -165,7 +165,8 @@ 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
+	# 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
-- 
cgit v1.2.3-70-g09d2


From fec55559451dc1c440c4770ee3faa116522fc59c Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sun, 7 Jun 2015 09:35:37 +0200
Subject: fix download-file using testcases to run as root

Git-Dch: Ignore
---
 test/integration/test-apt-download-progress |  7 ++++---
 test/integration/test-apt-helper            | 26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/test/integration/test-apt-download-progress b/test/integration/test-apt-download-progress
index 65c438e8f..7caeca971 100755
--- a/test/integration/test-apt-download-progress
+++ b/test/integration/test-apt-download-progress
@@ -24,18 +24,19 @@ assertprogress() {
 # 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 
+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" http-$TESTFILE $OPT -o Acquire::http::Dl-Limit=800
+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" https-$TESTFILE $OPT -o Acquire::https::Dl-Limit=800
+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-helper b/test/integration/test-apt-helper
index 431210797..00d859ad5 100755
--- a/test/integration/test-apt-helper
+++ b/test/integration/test-apt-helper
@@ -14,32 +14,32 @@ test_apt_helper_download() {
     echo 'bar' > aptarchive/foo2
 
     msgtest 'apt-file download-file md5sum'
-    testsuccess --nomsg apthelper download-file http://localhost:8080/foo foo2 MD5Sum:d3b07384d113edec49eaa6238ad5ff00
-    testfileequal foo2 'foo'
+    testsuccess --nomsg apthelper download-file http://localhost:8080/foo ./downloaded/foo2 MD5Sum:d3b07384d113edec49eaa6238ad5ff00
+    testfileequal ./downloaded/foo2 'foo'
 
     msgtest 'apt-file download-file sha1'
-    testsuccess --nomsg apthelper download-file http://localhost:8080/foo foo1 SHA1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
-    testfileequal foo1 'foo'
+    testsuccess --nomsg apthelper download-file http://localhost:8080/foo ./downloaded/foo1 SHA1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
+    testfileequal ./downloaded/foo1 'foo'
 
     msgtest 'apt-file download-file sha256'
-    testsuccess --nomsg apthelper download-file http://localhost:8080/foo foo3 SHA256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c
-    testfileequal foo3 'foo'
+    testsuccess --nomsg apthelper download-file http://localhost:8080/foo ./downloaded/foo3 SHA256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c
+    testfileequal ./downloaded/foo3 'foo'
 
     msgtest 'apt-file download-file no-hash'
-    testsuccess --nomsg apthelper download-file http://localhost:8080/foo foo4
-    testfileequal foo4 'foo'
+    testsuccess --nomsg apthelper download-file http://localhost:8080/foo ./downloaded/foo4
+    testfileequal ./downloaded/foo4 'foo'
     
     msgtest 'apt-file download-file wrong hash'
-    testfailure --nomsg apthelper -qq download-file http://localhost:8080/foo foo5 MD5Sum:aabbcc
+    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 foo5.FAILED 'foo'
+    testfileequal ./downloaded/foo5.FAILED 'foo'
 
     msgtest 'apt-file download-file md5sum sha1'
-    testsuccess --nomsg apthelper download-file http://localhost:8080/foo foo6 MD5Sum:d3b07384d113edec49eaa6238ad5ff00 http://localhost:8080/foo2 foo7 SHA1:e242ed3bffccdf271b7fbaf34ed72d089537b42f
-    testfileequal foo6 'foo'
-    testfileequal foo7 'bar'
+    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() {
-- 
cgit v1.2.3-70-g09d2


From 4f51fd8636592a96aecf17c8bf4cfdb3ea2207cc Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 8 Jun 2015 00:06:41 +0200
Subject: support hashes for compressed pdiff files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

At the moment we only have hashes for the uncompressed pdiff files, but
via the new '$HASH-Download' field in the .diff/Index hashes can be
provided for the .gz compressed pdiff file, which apt will pick up now
and use to verify the download. Now, we "just" need a buy in from the
creators of repositories…
---
 apt-pkg/acquire-item.cc           | 72 ++++++++++++++++++++++++++++++++-------
 apt-pkg/acquire-item.h            | 11 +++---
 apt-pkg/contrib/hashes.cc         | 11 ++++--
 apt-pkg/contrib/hashes.h          |  7 ++++
 apt-pkg/indexrecords.cc           |  4 +--
 methods/rred.cc                   |  2 +-
 test/integration/test-pdiff-usage | 46 +++++++++++++++++++++++--
 7 files changed, 125 insertions(+), 28 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 7b69ee993..a3f47242f 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -152,14 +152,18 @@ HashStringList pkgAcqMetaBase::GetExpectedHashes() const
 
 APT_CONST bool pkgAcqIndexDiffs::HashesRequired() const
 {
-   /* FIXME: We have only hashes for uncompressed pdiffs.
-      rred uncompresses them on the fly while parsing.
-      In StateFetchDiff state we also uncompress on the fly for hash check.
-      Hashes are checked while searching for (next) patch to apply. */
+   /* 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();
 }
 
@@ -168,11 +172,15 @@ 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 == StateApplyDiff)
+   if (State == StateFetchDiff)
+      return patch.download_hashes;
+   else if (State == StateApplyDiff)
       return GetExpectedHashesFor(Target->MetaKey);
    return HashStringList();
 }
@@ -1618,7 +1626,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string const &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;
@@ -1630,8 +1638,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string const &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
@@ -1679,10 +1686,9 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string const &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())
@@ -1694,6 +1700,48 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string const &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)
@@ -1729,7 +1777,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string const &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 (sizeLimit > 0 && (sizeLimit/100) < patchesSize)
    {
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index f24af1aec..910e4131b 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -705,17 +705,14 @@ struct APT_HIDDEN DiffInfo {						/*{{{*/
    /** The filename of the diff. */
    std::string file;
 
-   /** The hashes of the diff */
+   /** The hashes of the file after the diff is applied */
    HashStringList result_hashes;
 
-   /** The hashes of the file after the diff is applied */
+   /** The hashes of the diff */
    HashStringList patch_hashes;
 
-   /** The size of the file after the diff is applied */
-   unsigned long long result_size;
-
-   /** The size of the diff itself */
-   unsigned long long patch_size;
+   /** The hashes of the compressed diff */
+   HashStringList download_hashes;
 };
 									/*}}}*/
 /** \brief An item that is responsible for fetching client-merge patches {{{
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index 11a7e479b..46cf0ba08 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -188,6 +188,13 @@ unsigned long long HashStringList::FileSize() const			/*{{{*/
    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)
@@ -361,9 +368,7 @@ APT_IGNORE_DEPRECATED_PUSH
    if ((d->CalcHashes & SHA512SUM) == SHA512SUM)
       hashes.push_back(HashString("SHA512", SHA512.Result().Value()));
 APT_IGNORE_DEPRECATED_POP
-   std::string SizeStr;
-   strprintf(SizeStr, "%llu", d->FileSize);
-   hashes.push_back(HashString("Checksum-FileSize", SizeStr));
+   hashes.FileSize(d->FileSize);
    return hashes;
 }
 APT_IGNORE_DEPRECATED_PUSH
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 176ce4faa..e8d84da9e 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -96,6 +96,13 @@ class HashStringList
     */
    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
diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index c26868cac..7e6da9558 100644
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -121,9 +121,7 @@ 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));
+	    Sum->Hashes.FileSize(Size);
             APT_IGNORE_DEPRECATED(Sum->Hash = HashString(HashString::SupportedHashes()[i],Hash);)
             Entries[Name] = Sum;
          }
diff --git a/methods/rred.cc b/methods/rred.cc
index 81ecf8553..12cf2b4a5 100644
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -627,7 +627,7 @@ class RredMethod : public pkgAcqMethod {
 	    p.Close();
 	    HashStringList const hsl = patch_hash.GetHashStringList();
 	    if (hsl != I->ExpectedHashes)
-	       return _error->Error("Patch %s doesn't have the expected hashsum", patch_name.c_str());
+	       return _error->Error("Hash Sum mismatch for uncompressed patch %s", patch_name.c_str());
 	 }
 
 	 if (Debug == true)
diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage
index 7a9f6496b..3295d5497 100755
--- a/test/integration/test-pdiff-usage
+++ b/test/integration/test-pdiff-usage
@@ -42,6 +42,8 @@ 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'
@@ -76,6 +78,15 @@ 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
@@ -131,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
@@ -150,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:
@@ -165,14 +188,22 @@ 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
 	# needs to look like a valid command, otherwise the parser will fail before hashes are checked
-	echo '1d' >> $PATCHFILE
+	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 'have the expected hashsum' rootdir/tmp/aptgetupdate.output
+	testsuccess grep 'Hash Sum mismatch' rootdir/tmp/aptgetupdate.output
 	testnopackage oldstuff
 	testsuccessequal "$(cat ${PKGFILE}-new)
 " aptcache show apt newstuff
@@ -201,6 +232,14 @@ SHA256-History:
 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
@@ -215,6 +254,9 @@ 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
-- 
cgit v1.2.3-70-g09d2


From 9b8c28f430a8fbe73252cc3e87b6e88e9d5063d9 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 8 Jun 2015 11:20:01 +0200
Subject: cleanup pdiff support detection decision

Its a bit unclean to create an item just to let the item decide that it
can't do anything and let it fail, so instead we let the item creator
decide in all cases if patching should be attempted.

Also pulls a small trick to get the hashes for the current file without
calculating them by looking at the 'old' Release file if we have it.

Git-Dch: Ignore
---
 apt-pkg/acquire-item.cc | 85 ++++++++++++++++++++++++++-----------------------
 apt-pkg/acquire-item.h  |  5 ---
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index a3f47242f..13e971e9f 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -925,24 +925,36 @@ void pkgAcqMetaBase::QueueIndexes(bool const verify)			/*{{{*/
         Target != IndexTargets->end();
         ++Target)
    {
-      if (verify == true && TransactionManager->MetaIndexParser->Exists((*Target)->MetaKey) == false)
+      bool trypdiff = _config->FindB("Acquire::PDiffs", true);
+      if (verify == true)
       {
-	 // optional target that we do not have in the Release file are skipped
-	 if ((*Target)->IsOptional())
-	    continue;
+	 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;
+	    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;
+	 }
+
+	 // 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));
 
-      /* 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 ||
-          TransactionManager->MetaIndexParser->Exists((*Target)->MetaKey + ".diff/Index") == true))
+      // 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);
@@ -1477,26 +1489,7 @@ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire * const Owner,
    if(Debug)
       std::clog << "pkgAcqDiffIndex: " << Desc.URI << std::endl;
 
-   // look for the current package file
-   CurrentPackagesFile = GetFinalFileNameFromURI(Target->URI);
-
-   // 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		/*{{{*/
@@ -1570,6 +1563,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string const &IndexDiffFile)	/*{{{*/
       return false;
    }
 
+   std::string const CurrentPackagesFile = GetFinalFileNameFromURI(Target->URI);
    HashStringList const TargetFileHashes = GetExpectedHashesFor(Target->MetaKey);
    if (TargetFileHashes.usable() == false || ServerHashes != TargetFileHashes)
    {
@@ -1581,7 +1575,23 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string const &IndexDiffFile)	/*{{{*/
       return false;
    }
 
-   if (ServerHashes.VerifyFile(CurrentPackagesFile) == true)
+   HashStringList LocalHashes;
+   // try avoiding calculating the hash here as this is costly
+   if (TransactionManager->LastMetaIndexParser != NULL)
+   {
+      indexRecords::checkSum * const R = TransactionManager->LastMetaIndexParser->Lookup(Target->MetaKey);
+      if (R != NULL)
+	 LocalHashes = R->Hashes;
+   }
+   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)
@@ -1590,14 +1600,9 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string const &IndexDiffFile)	/*{{{*/
       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;
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 910e4131b..e823a64d2 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -648,11 +648,6 @@ class APT_HIDDEN 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).
     */
-- 
cgit v1.2.3-70-g09d2


From 8d041b4f4f353079268039dcbfd8b5e575196b66 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 8 Jun 2015 15:22:01 +0200
Subject: do not request files if we expect an IMS hit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If we have a file on disk and the hashes are the same in the new Release
file and the old one we have on disk we know that if we ask the server
for the file, we will at best get an IMS hit – at worse the server
doesn't support this and sends us the (unchanged) file and we have to
run all our checks on it again for nothing. So, we can save ourselves
(and the servers) some unneeded requests if we figure this out on our
own.
---
 apt-pkg/acquire-item.cc                            | 77 ++++++++++++++--------
 test/integration/framework                         |  4 +-
 test/integration/test-apt-update-expected-size     |  4 +-
 test/integration/test-apt-update-file              | 25 +++++--
 test/integration/test-apt-update-not-modified      | 19 ++++++
 test/integration/test-apt-update-rollback          |  6 +-
 test/integration/test-apt-update-transactions      | 24 +++++--
 .../test-cve-2013-1051-InRelease-parsing           | 13 ++--
 8 files changed, 127 insertions(+), 45 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 13e971e9f..511bbbc64 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -119,6 +119,16 @@ 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.
@@ -372,6 +382,25 @@ bool pkgAcqDiffIndex::TransactionState(TransactionStates const state)
 }
 									/*}}}*/
 
+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 * const Target;
+   public:
+   virtual std::string DescURI() const {return Target->URI;};
+   virtual HashStringList GetExpectedHashes()  const {return HashStringList();};
+
+   NoActionItem(pkgAcquire * const Owner, IndexTarget const * const Target) :
+      pkgAcquire::Item(Owner), Target(Target)
+   {
+      Status = StatDone;
+      DestFile = GetFinalFileNameFromURI(Target->URI);
+   }
+};
+									/*}}}*/
+
 // Acquire::Item::Item - Constructor					/*{{{*/
 APT_IGNORE_DEPRECATED_PUSH
 pkgAcquire::Item::Item(pkgAcquire * const Owner) :
@@ -644,12 +673,7 @@ pkgAcqTransactionItem::~pkgAcqTransactionItem()				/*{{{*/
 									/*}}}*/
 HashStringList pkgAcqTransactionItem::GetExpectedHashesFor(std::string const MetaKey) const	/*{{{*/
 {
-   if (TransactionManager->MetaIndexParser == NULL)
-      return HashStringList();
-   indexRecords::checkSum * const R = TransactionManager->MetaIndexParser->Lookup(MetaKey);
-   if (R == NULL)
-      return HashStringList();
-   return R->Hashes;
+   return GetExpectedHashesFromFor(TransactionManager->MetaIndexParser, MetaKey);
 }
 									/*}}}*/
 
@@ -939,6 +963,23 @@ void pkgAcqMetaBase::QueueIndexes(bool const verify)			/*{{{*/
 	    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");
       }
@@ -1085,20 +1126,6 @@ string pkgAcqMetaClearSig::Custom600Headers() const
 }
 									/*}}}*/
 // pkgAcqMetaClearSig::Done - We got a file				/*{{{*/
-class APT_HIDDEN DummyItem : public pkgAcquire::Item
-{
-   IndexTarget const * const Target;
-   public:
-   virtual std::string DescURI() const {return Target->URI;};
-   virtual HashStringList GetExpectedHashes()  const {return HashStringList();};
-
-   DummyItem(pkgAcquire * const Owner, IndexTarget const * const Target) :
-      pkgAcquire::Item(Owner), Target(Target)
-   {
-      Status = StatDone;
-      DestFile = GetFinalFileNameFromURI(Target->URI);
-   }
-};
 void pkgAcqMetaClearSig::Done(std::string const &Message,
                               HashStringList const &Hashes,
                               pkgAcquire::MethodConfig const * const Cnf)
@@ -1131,8 +1158,8 @@ void pkgAcqMetaClearSig::Done(std::string const &Message,
 	 // 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 DummyItem(Owner, &DetachedDataTarget);
-	 new DummyItem(Owner, &DetachedSigTarget);
+	 new NoActionItem(Owner, &DetachedDataTarget);
+	 new NoActionItem(Owner, &DetachedSigTarget);
       }
    }
 }
@@ -1578,11 +1605,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string const &IndexDiffFile)	/*{{{*/
    HashStringList LocalHashes;
    // try avoiding calculating the hash here as this is costly
    if (TransactionManager->LastMetaIndexParser != NULL)
-   {
-      indexRecords::checkSum * const R = TransactionManager->LastMetaIndexParser->Lookup(Target->MetaKey);
-      if (R != NULL)
-	 LocalHashes = R->Hashes;
-   }
+      LocalHashes = GetExpectedHashesFromFor(TransactionManager->LastMetaIndexParser, Target->MetaKey);
    if (LocalHashes.usable() == false)
    {
       FileFd fd(CurrentPackagesFile, FileFd::ReadOnly);
diff --git a/test/integration/framework b/test/integration/framework
index b253deb91..56c4a1216 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -835,7 +835,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"
diff --git a/test/integration/test-apt-update-expected-size b/test/integration/test-apt-update-expected-size
index 55bba8188..24ca85133 100755
--- a/test/integration/test-apt-update-expected-size
+++ b/test/integration/test-apt-update-expected-size
@@ -26,7 +26,9 @@ test_inreleasetoobig() {
 }
 
 test_packagestoobig() {
-	redatereleasefiles '+1hour'
+	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
diff --git a/test/integration/test-apt-update-file b/test/integration/test-apt-update-file
index 665f94fa5..94b604f0e 100755
--- a/test/integration/test-apt-update-file
+++ b/test/integration/test-apt-update-file
@@ -26,14 +26,29 @@ 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
+
+# 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
 
-# ensure that the hash of the uncompressed file was verified even on a local ims hit
+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-not-modified b/test/integration/test-apt-update-not-modified
index a490f00de..32818658f 100755
--- a/test/integration/test-apt-update-not-modified
+++ b/test/integration/test-apt-update-not-modified
@@ -133,6 +133,25 @@ Reading package lists..." aptget update
 
 	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
diff --git a/test/integration/test-apt-update-rollback b/test/integration/test-apt-update-rollback
index 6fd901715..6ecf322b2 100755
--- a/test/integration/test-apt-update-rollback
+++ b/test/integration/test-apt-update-rollback
@@ -158,7 +158,10 @@ test_inrelease_to_broken_gzip() {
     msgmsg "Test InRelease to broken gzip"
     start_with_good_inrelease
 
-    redatereleasefiles '+2hours'
+    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
@@ -166,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-transactions b/test/integration/test-apt-update-transactions
index 152e1617a..a5dac1737 100755
--- a/test/integration/test-apt-update-transactions
+++ b/test/integration/test-apt-update-transactions
@@ -29,6 +29,12 @@ restorefile() {
 }
 
 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
@@ -37,20 +43,27 @@ 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"
-	redatereleasefiles 'now'
 	rm -rf rootdir/var/lib/apt/lists
 	mkdir -p rootdir/var/lib/apt/lists/partial
 	listcurrentlistsdirectory > listsdir.lst
@@ -60,7 +73,6 @@ testsetup() {
 	rm -rf rootdir/var/lib/apt/lists
 	testsuccess aptget update -o Debug::pkgAcquire::Worker=1
 	listcurrentlistsdirectory > listsdir.lst
-	redatereleasefiles '+1hour'
 	testrun 'listsdir.lst'
 }
 
diff --git a/test/integration/test-cve-2013-1051-InRelease-parsing b/test/integration/test-cve-2013-1051-InRelease-parsing
index e38e40cc9..d99174553 100755
--- a/test/integration/test-cve-2013-1051-InRelease-parsing
+++ b/test/integration/test-cve-2013-1051-InRelease-parsing
@@ -39,10 +39,15 @@ 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
 testfailureequal 'Reading package lists...
-- 
cgit v1.2.3-70-g09d2


From 4cd86fc61960404ef7dd8a474c2dff2002016824 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 8 Jun 2015 16:08:53 +0200
Subject: remove debianism file-content verification
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The code requires every index file we download to have a Package field,
but that doesn't hold true for all index we might want to download in
the future. Some might not even be deb822 formatted files…

The check was needed as apt used to accept unverifiable files like
Translation-*, but nowadays it requires hashes for these as well. Even
for unsigned repositories we interpret the Release file as binding now,
which means this check isn't triggerable expect for repositories which
do not have a Release file at all – something which is highly discouraged!

Git-Dch: Ignore
---
 apt-pkg/acquire-item.cc | 39 ++-------------------------------------
 apt-pkg/acquire-item.h  |  3 ---
 2 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 511bbbc64..a1357fb15 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -2430,33 +2430,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
@@ -2557,20 +2530,12 @@ void pkgAcqIndex::StageDownloadDone(string const &Message, HashStringList const
 }
 									/*}}}*/
 // AcqIndex::StageDecompressDone - Final verification			/*{{{*/
-void pkgAcqIndex::StageDecompressDone(string const &Message,
+void pkgAcqIndex::StageDecompressDone(string const &,
                                       HashStringList const &,
-                                      pkgAcquire::MethodConfig const * const Cfg)
+                                      pkgAcquire::MethodConfig const * const)
 {
-   if(!ValidateFile(DestFile))
-   {
-      RenameOnError(InvalidFormat);
-      Failed(Message, Cfg);
-      return;
-   }
-
    // Done, queue for rename on transaction finished
    TransactionManager->TransactionStageCopy(this, DestFile, GetFinalFilename());
-
    return;
 }
 									/*}}}*/
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index e823a64d2..38a7a8662 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -965,9 +965,6 @@ class APT_HIDDEN pkgAcqIndex : public pkgAcqBaseIndex
    /** \brief Schedule file for verification after a IMS hit */
    void ReverifyAfterIMS();
 
-   /** \brief Validate the downloaded index file */
-   bool ValidateFile(std::string const &FileName);
-
    /** \brief Get the full pathname of the final file for the current URI */
    virtual std::string GetFinalFilename() const;
 
-- 
cgit v1.2.3-70-g09d2


From 1e0f0f28e1025f42a8172eb72f3e87984eb2b939 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 9 Jun 2015 11:59:22 +0200
Subject: configureable acquire targets to download additional files

First pass at making the acquire system capable of downloading files
based on configuration rather than hardcoded entries. It is now possible
to instruct 'deb' and 'deb-src' sources.list lines to download more than
just Packages/Translation-* and Sources files. Details on how to do that
can be found in the included documentation file.
---
 apt-pkg/contrib/configuration.cc                   |   4 +-
 apt-pkg/contrib/configuration.h                    |  11 +-
 apt-pkg/deb/debmetaindex.cc                        | 317 ++++++++++-----------
 apt-pkg/deb/debmetaindex.h                         |   8 -
 apt-pkg/init.cc                                    |  20 +-
 doc/acquire-additional-files.txt                   | 142 +++++++++
 test/integration/test-apt-acquire-additional-files |  54 ++++
 test/integration/test-apt-by-hash-update           |  12 +-
 8 files changed, 376 insertions(+), 192 deletions(-)
 create mode 100644 doc/acquire-additional-files.txt
 create mode 100755 test/integration/test-apt-acquire-additional-files

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 42e35d32a..2500ab631 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -259,7 +259,7 @@ vector<string> Configuration::FindVector(const char *Name) const
    return FindVector(Name, "");
 }
 #endif
-vector<string> Configuration::FindVector(const char *Name, std::string const &Default) const
+vector<string> Configuration::FindVector(const char *Name, std::string const &Default, bool const Keys) const
 {
    vector<string> Vec;
    const Item *Top = Lookup(Name);
@@ -272,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)
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 8d7d51037..eacc26fda 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -84,15 +84,8 @@ class Configuration
     *
     * \param Name of the parent node
     * \param Default list of values separated by commas */
-#if APT_PKG_ABI >= 413
-   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); };
-#else
-   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) const;
-   std::vector<std::string> FindVector(std::string const &Name) const { return FindVector(Name.c_str(), ""); };
-#endif
+   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);};
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index eb5e78e3b..8fef05ab0 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -23,25 +23,6 @@
 
 using namespace std;
 
-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;
-}
-
 string debReleaseIndex::MetaIndexInfo(const char *Type) const
 {
    string Info = ::URI::SiteOnly(URI) + ' ';
@@ -92,81 +73,6 @@ std::string debReleaseIndex::LocalFileName() const
    return "";
 }
 
-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;
-}
-   
-
-string debReleaseIndex::IndexURI(const char *Type, string const &Section, string const &Arch) const
-{
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      string Res;
-      if (Dist != "/")
-         Res = URI + Dist;
-      else 
-         Res = URI;
-      return Res + Type;
-   }
-   else
-      return URI + "dists/" + Dist + '/' + IndexURISuffix(Type, Section, Arch);
- }
-
-string debReleaseIndex::SourceIndexURISuffix(const char *Type, const string &Section) const
-{
-   string Res ="";
-   if (Dist[Dist.size() - 1] != '/')
-      Res += Section + "/source/";
-   return Res + Type;
-}
-
-string debReleaseIndex::SourceIndexURI(const char *Type, const string &Section) const
-{
-   string Res;
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      if (Dist != "/")
-         Res = URI + Dist;
-      else 
-         Res = URI;
-      return Res + Type;
-   }
-   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
-{
-   string Res;
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      if (Dist != "/")
-         Res = URI + Dist;
-      else 
-         Res = URI;
-      return Res + Type;
-   }
-   else
-      return URI + "dists/" + Dist + "/" + TranslationIndexURISuffix(Type, Section);
-}
-
 debReleaseIndex::debReleaseIndex(string const &URI, string const &Dist) :
 					metaIndex(URI, Dist, "deb"), Trusted(CHECK_TRUST)
 {}
@@ -184,73 +90,161 @@ debReleaseIndex::~debReleaseIndex() {
 			delete *S;
 }
 
-vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
-	vector <IndexTarget *>* IndexTargets = new vector <IndexTarget *>;
+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) {
-			char const * const ShortDesc = "Sources";
-			IndexTarget * const Target = new IndexTarget(
-			      SourceIndexURISuffix(ShortDesc, (*I)->Section),
-			      ShortDesc,
-			      Info(ShortDesc, (*I)->Section),
-			      SourceIndexURI(ShortDesc, (*I)->Section)
-			      );
-			IndexTargets->push_back (Target);
-		}
-	}
+   bool const flatArchive = (Dist[Dist.length() - 1] == '/');
+   std::string baseURI = URI;
+   if (flatArchive)
+   {
+      if (Dist != "/")
+         baseURI += Dist;
+   }
+   else
+      baseURI += "dists/" + Dist + "/";
+   std::string const Release = (Dist == "/") ? "" : Dist;
+   std::string const Site = ::URI::SiteOnly(URI);
+   std::vector<std::string> lang = APT::Configuration::getLanguages(true);
+   if (lang.empty())
+      lang.push_back("none");
+   map<string, vector<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 URI = APT_T_CONFIG(flatArchive ? "flatURI" : "URI");
+	 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 (URI.empty())
+	    continue;
 
-	// Only source release
-	if (IndexTargets->empty() == false && ArchEntries.size() == 1)
-		return IndexTargets;
+	 vector<debSectionEntry const*> const SectionEntries = src->second;
+	 for (vector<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" && URI.find("$(LANGUAGE)") != std::string::npos)
+		  continue;
+
+	       struct SubstVar subst[] = {
+		  { "$(SITE)", &Site },
+		  { "$(RELEASE)", &Release },
+		  { "$(COMPONENT)", &((*I)->Section) },
+		  { "$(LANGUAGE)", &(*l) },
+		  { NULL, NULL }
+	       };
+	       std::string const name = SubstVar(URI, subst);
+	       IndexTarget * Target;
+	       if (IsOptional == true)
+	       {
+		  Target = new OptionalIndexTarget(
+			name,
+			SubstVar(ShortDesc, subst),
+			SubstVar(LongDesc, subst),
+			baseURI + name
+			);
+	       }
+	       else
+	       {
+		  Target = new IndexTarget(
+			name,
+			SubstVar(ShortDesc, subst),
+			SubstVar(LongDesc, subst),
+			baseURI + name
+			);
+	       }
+	       IndexTargets->push_back(Target);
+
+	       if (URI.find("$(LANGUAGE)") == std::string::npos)
+		  break;
+	    }
 
-	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) {
-			char const * const ShortDesc = "Packages";
-			IndexTarget * const Target = new IndexTarget(
-			      IndexURISuffix(ShortDesc, (*I)->Section, a->first),
-			      ShortDesc,
-			      Info (ShortDesc, (*I)->Section, a->first),
-			      IndexURI(ShortDesc, (*I)->Section, a->first)
-			      );
-			IndexTargets->push_back (Target);
-			sections.insert((*I)->Section);
-		}
-	}
+	    if (URI.find("$(COMPONENT)") == std::string::npos)
+	       break;
+	 }
+      }
+   }
 
-	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) {
-			std::string const ShortDesc = "Translation-" + *l;
-			IndexTarget * const Target = new OptionalIndexTarget(
-			      TranslationIndexURISuffix(l->c_str(), *s),
-			      ShortDesc,
-			      Info (ShortDesc.c_str(), *s),
-			      TranslationIndexURI(l->c_str(), *s)
-			      );
-			IndexTargets->push_back(Target);
-		}
-	}
+   // Only source release
+   if (IndexTargets->empty() == false && ArchEntries.size() == 1)
+      return IndexTargets;
 
-	return IndexTargets;
+   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)
+   {
+#define APT_T_CONFIG(X) _config->Find(std::string("APT::Acquire::Targets::deb::") + *T + "::" + (X))
+      std::string const URI = APT_T_CONFIG(flatArchive ? "flatURI" : "URI");
+      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 (URI.empty())
+	 continue;
+
+      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) {
+
+	    for (vector<std::string>::const_iterator l = lang.begin(); l != lang.end(); ++l)
+	    {
+	       if (*l == "none" && URI.find("$(LANGUAGE)") != std::string::npos)
+		  continue;
+
+	       struct SubstVar subst[] = {
+		  { "$(SITE)", &Site },
+		  { "$(RELEASE)", &Release },
+		  { "$(COMPONENT)", &((*I)->Section) },
+		  { "$(LANGUAGE)", &(*l) },
+		  { "$(ARCHITECTURE)", &(a->first) },
+		  { NULL, NULL }
+	       };
+	       std::string const name = SubstVar(URI, subst);
+	       IndexTarget * Target;
+	       if (IsOptional == true)
+	       {
+		  Target = new OptionalIndexTarget(
+			name,
+			SubstVar(ShortDesc, subst),
+			SubstVar(LongDesc, subst),
+			baseURI + name
+			);
+	       }
+	       else
+	       {
+		  Target = new IndexTarget(
+			name,
+			SubstVar(ShortDesc, subst),
+			SubstVar(LongDesc, subst),
+			baseURI + name
+			);
+	       }
+	       IndexTargets->push_back(Target);
+
+	       if (URI.find("$(LANGUAGE)") == std::string::npos)
+		  break;
+	    }
+
+	    if (URI.find("$(COMPONENT)") == std::string::npos)
+	       break;
+	 }
+
+	 if (URI.find("$(ARCHITECTURE)") == std::string::npos)
+	    break;
+      }
+   }
+
+   return IndexTargets;
 }
 									/*}}}*/
 bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
@@ -361,17 +355,6 @@ 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)
 {}
diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index 94d005760..e1c1d91ef 100644
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -47,7 +47,6 @@ class APT_HIDDEN 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;
 
    std::string MetaIndexInfo(const char *Type) const;
    std::string MetaIndexFile(const char *Types) const;
@@ -58,12 +57,6 @@ class APT_HIDDEN debReleaseIndex : public metaIndex {
 #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);
@@ -71,7 +64,6 @@ class APT_HIDDEN 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 APT_HIDDEN debDebFileMetaIndex : public metaIndex
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index f756eab26..50ea2b49e 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -101,8 +101,26 @@ 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::URI", "$(COMPONENT)/binary-$(ARCHITECTURE)/Packages");
+   Cnf.CndSet("APT::Acquire::Targets::deb::Packages::flatURI", "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::URI", "$(COMPONENT)/i18n/Translation-$(LANGUAGE)");
+   Cnf.CndSet("APT::Acquire::Targets::deb::Translations::flatURI", "$(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::URI", "$(COMPONENT)/source/Sources");
+   Cnf.CndSet("APT::Acquire::Targets::deb-src::Sources::flatURI", "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);
+
    bool Res = true;
-   
+
    // Read an alternate config file
    const char *Cfg = getenv("APT_CONFIG");
    if (Cfg != 0 && strlen(Cfg) != 0)
diff --git a/doc/acquire-additional-files.txt b/doc/acquire-additional-files.txt
new file mode 100644
index 000000000..5a07c2bec
--- /dev/null
+++ b/doc/acquire-additional-files.txt
@@ -0,0 +1,142 @@
+# 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.
+
+Note that you can't download files from other sources. It must be files
+in the same repository and below the Release file. The Release file must
+also contain hashes for the file itself as well as for the compressed
+file if wanted, otherwise a download isn't even tried!
+
+
+# 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 {
+		URI "$(COMPONENT)/binary-$(ARCHITECTURE)/Packages";
+		ShortDescription "Packages";
+		Description "$(SITE) $(RELEASE)/$(COMPONENT) $(ARCHITECTURE) Packages";
+
+		flatURI "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 URI for 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 never shown or used.
+
+All targets have three main properties you can define:
+* URI: 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 should you try to 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{URI,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 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 {
+		URI "$(COMPONENT)/i18n/Translation-$(LANGUAGE)";
+		ShortDescription "Translation-$(LANGUAGE)";
+		Description "$(SITE) $(RELEASE)/$(COMPONENT) Translation-$(LANGUAGE)";
+
+		flatURI "$(LANGUAGE)";
+		flatDescription "$(SITE) $(RELEASE) Translation-$(LANGUAGE)";
+	};
+
+	deb-src::Sources {
+		URI "$(COMPONENT)/source/Sources";
+		ShortDescription "Sources";
+		Description "$(SITE) $(RELEASE)/$(COMPONENT) Sources";
+
+		flatURI "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 literally.
+
+* $(SITE): An identifier of the site we access, e.g.
+  "http://example.org/".
+* $(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.
+* $(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".
+
+These values are defined both for 'deb' as well as 'deb-src' targets.
+'deb' targets additional have the variable:
+
+* $(ARCHITECTURE): Values are all entries of configuration option
+  APT::Architectures (potentially modified by sources.list options),
+  e.g. "amd64", "i386" or "armel".
diff --git a/test/integration/test-apt-acquire-additional-files b/test/integration/test-apt-acquire-additional-files
new file mode 100755
index 000000000..150a50980
--- /dev/null
+++ b/test/integration/test-apt-acquire-additional-files
@@ -0,0 +1,54 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'amd64'
+configcompression '.' 'gz'
+
+buildsimplenativepackage 'foo' 'amd64' '1' 'unstable'
+
+setupaptarchive --no-update
+changetowebserver
+
+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 {
+	URI "\$(COMPONENT)/Contents-\$(ARCHITECTURE)";
+	ShortDescription "Contents";
+	Description "\$(SITE) \$(RELEASE)/\$(COMPONENT) \$(ARCHITECTURE) Contents";
+};
+EOF
+
+testsuccessequal "Hit http://localhost:8080 unstable InRelease
+Get:1 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*'
+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 {
+	URI "\$(COMPONENT)/Contents-\$(ARCHITECTURE).gz";
+	ShortDescription "Contents.gz";
+	Description "\$(SITE) \$(RELEASE)/\$(COMPONENT) \$(ARCHITECTURE) Contents.gz";
+};
+EOF
+
+testsuccessequal "Hit http://localhost:8080 unstable InRelease
+Get:1 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*'
+testsuccess cmp 'rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_Contents-amd64.gz' 'aptarchive/dists/unstable/main/Contents-amd64.gz'
diff --git a/test/integration/test-apt-by-hash-update b/test/integration/test-apt-by-hash-update
index 8300c532c..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,7 +24,7 @@ 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"
 testfailureequal "Reading package lists...
@@ -36,14 +34,18 @@ 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
-testsuccessequal "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
-- 
cgit v1.2.3-70-g09d2


From c69e8370947d765dd94f142d18dc11d5a76af443 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 9 Jun 2015 15:15:33 +0200
Subject: replace ULONG_MAX with c++ style std::numeric_limits
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For some reason travis seems to be unhappy about it claiming it
is not defined. Well, lets not think to deeply about it…

Git-Dch: Ignore
---
 methods/rred.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/methods/rred.cc b/methods/rred.cc
index 12cf2b4a5..54123ab9c 100644
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -405,12 +405,12 @@ class Patch {
 	    size_t s, e;
 	    errno = 0;
 	    s = strtoul(buffer, &m, 10);
-	    if (unlikely(m == buffer || s == ULONG_MAX || errno != 0))
+	    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 == ULONG_MAX || errno != 0))
+	       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);
-- 
cgit v1.2.3-70-g09d2


From 59148d9630bbbd53c6aa10da0fcdbd579797502a Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Wed, 10 Jun 2015 19:22:41 +0200
Subject: abstract the code to iterate over all targets a bit

We have two places in the code which need to iterate over targets and do
certain things with it. The first one is actually creating these targets
for download and the second instance pepares certain targets for
reading.

Git-Dch: Ignore
---
 apt-pkg/deb/debmetaindex.cc                        | 197 +++++++++++----------
 test/integration/framework                         |   7 +-
 test/integration/test-apt-acquire-additional-files |  33 ++++
 3 files changed, 142 insertions(+), 95 deletions(-)

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 8fef05ab0..c35f3b0a4 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -90,10 +90,11 @@ debReleaseIndex::~debReleaseIndex() {
 			delete *S;
 }
 
-vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() 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)
 {
-   vector <IndexTarget *>* IndexTargets = new vector <IndexTarget *>;
-
    bool const flatArchive = (Dist[Dist.length() - 1] == '/');
    std::string baseURI = URI;
    if (flatArchive)
@@ -108,7 +109,7 @@ vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const
    std::vector<std::string> lang = APT::Configuration::getLanguages(true);
    if (lang.empty())
       lang.push_back("none");
-   map<string, vector<debSectionEntry const*> >::const_iterator const src = ArchEntries.find("source");
+   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);
@@ -123,8 +124,8 @@ vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const
 	 if (URI.empty())
 	    continue;
 
-	 vector<debSectionEntry const*> const SectionEntries = src->second;
-	 for (vector<debSectionEntry const*>::const_iterator I = SectionEntries.begin();
+	 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)
@@ -139,27 +140,7 @@ vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const
 		  { "$(LANGUAGE)", &(*l) },
 		  { NULL, NULL }
 	       };
-	       std::string const name = SubstVar(URI, subst);
-	       IndexTarget * Target;
-	       if (IsOptional == true)
-	       {
-		  Target = new OptionalIndexTarget(
-			name,
-			SubstVar(ShortDesc, subst),
-			SubstVar(LongDesc, subst),
-			baseURI + name
-			);
-	       }
-	       else
-	       {
-		  Target = new IndexTarget(
-			name,
-			SubstVar(ShortDesc, subst),
-			SubstVar(LongDesc, subst),
-			baseURI + name
-			);
-	       }
-	       IndexTargets->push_back(Target);
+	       Call(baseURI, *T, URI, ShortDesc, LongDesc, IsOptional, subst);
 
 	       if (URI.find("$(LANGUAGE)") == std::string::npos)
 		  break;
@@ -171,10 +152,6 @@ vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const
       }
    }
 
-   // Only source release
-   if (IndexTargets->empty() == false && ArchEntries.size() == 1)
-      return IndexTargets;
-
    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)
    {
@@ -187,13 +164,13 @@ vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const
       if (URI.empty())
 	 continue;
 
-      for (map<string, vector<debSectionEntry const*> >::const_iterator a = ArchEntries.begin();
+      for (map<string, vector<debReleaseIndex::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();
+	 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)
@@ -209,27 +186,7 @@ vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const
 		  { "$(ARCHITECTURE)", &(a->first) },
 		  { NULL, NULL }
 	       };
-	       std::string const name = SubstVar(URI, subst);
-	       IndexTarget * Target;
-	       if (IsOptional == true)
-	       {
-		  Target = new OptionalIndexTarget(
-			name,
-			SubstVar(ShortDesc, subst),
-			SubstVar(LongDesc, subst),
-			baseURI + name
-			);
-	       }
-	       else
-	       {
-		  Target = new IndexTarget(
-			name,
-			SubstVar(ShortDesc, subst),
-			SubstVar(LongDesc, subst),
-			baseURI + name
-			);
-	       }
-	       IndexTargets->push_back(Target);
+	       Call(baseURI, *T, URI, ShortDesc, LongDesc, IsOptional, subst);
 
 	       if (URI.find("$(LANGUAGE)") == std::string::npos)
 		  break;
@@ -243,9 +200,51 @@ vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const
 	    break;
       }
    }
+}
+
+
+struct ComputeIndexTargetsClass
+{
+   vector <IndexTarget *> * const IndexTargets;
+
+   void operator()(std::string const &baseURI, std::string const &/*TargetName*/,
+	 std::string const &URI, std::string const &ShortDesc, std::string const &LongDesc,
+	 bool const IsOptional, struct SubstVar const * const subst)
+   {
+      std::string const name = SubstVar(URI, subst);
+      IndexTarget * Target;
+      if (IsOptional == true)
+      {
+	 Target = new OptionalIndexTarget(
+	       name,
+	       SubstVar(ShortDesc, subst),
+	       SubstVar(LongDesc, subst),
+	       baseURI + name
+	       );
+      }
+      else
+      {
+	 Target = new IndexTarget(
+	       name,
+	       SubstVar(ShortDesc, subst),
+	       SubstVar(LongDesc, subst),
+	       baseURI + name
+	       );
+      }
+      IndexTargets->push_back(Target);
+   }
 
-   return IndexTargets;
+   ComputeIndexTargetsClass() : IndexTargets(new vector <IndexTarget *>) {}
+};
+
+vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const
+{
+   ComputeIndexTargetsClass comp;
+   foreachTarget(URI, Dist, ArchEntries, comp);
+   return comp.IndexTargets;
 }
+
+
 									/*}}}*/
 bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
 {
@@ -303,45 +302,55 @@ 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;
+struct GetIndexFilesClass
+{
+   vector <pkgIndexFile *> * const Indexes;
+   std::string const URI;
+   std::string const Release;
+   bool const IsTrusted;
+
+   void operator()(std::string const &/*baseURI*/, std::string const &TargetName,
+	 std::string const &/*URI*/, std::string const &/*ShortDesc*/, std::string const &/*LongDesc*/,
+	 bool const /*IsOptional*/, struct SubstVar const * const subst)
+   {
+      if (TargetName == "Packages")
+      {
+	 Indexes->push_back(new debPackagesIndex(
+		  URI,
+		  Release,
+		  SubstVar("$(COMPONENT)", subst),
+		  IsTrusted,
+		  SubstVar("$(ARCHITECTURE)", subst)
+		  ));
+      }
+      else if (TargetName == "Sources")
+	 Indexes->push_back(new debSourcesIndex(
+		  URI,
+		  Release,
+		  SubstVar("$(COMPONENT)", subst),
+		  IsTrusted
+		  ));
+      else if (TargetName == "Translations")
+	 Indexes->push_back(new debTranslationsIndex(
+		  URI,
+		  Release,
+		  SubstVar("$(COMPONENT)", subst),
+		  SubstVar("$(LANGUAGE)", subst)
+		  ));
+   }
+
+   GetIndexFilesClass(std::string const &URI, std::string const &Release, bool const IsTrusted) :
+      Indexes(new vector <pkgIndexFile*>), URI(URI), Release(Release), IsTrusted(IsTrusted) {}
+};
+
+std::vector <pkgIndexFile *> *debReleaseIndex::GetIndexFiles()
+{
+   if (Indexes != NULL)
+      return Indexes;
+
+   GetIndexFilesClass comp(URI, Dist, IsTrusted());
+   foreachTarget(URI, Dist, ArchEntries, comp);
+   return Indexes = comp.Indexes;
 }
 
 void debReleaseIndex::PushSectionEntry(vector<string> const &Archs, const debSectionEntry *Entry) {
diff --git a/test/integration/framework b/test/integration/framework
index 56c4a1216..110758e82 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1531,6 +1531,11 @@ 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"
@@ -1538,7 +1543,7 @@ aptautotest_aptget_update() {
 	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 [ "$1" = 'testsuccess' ]; then
+	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
diff --git a/test/integration/test-apt-acquire-additional-files b/test/integration/test-apt-acquire-additional-files
index 150a50980..0e59233e9 100755
--- a/test/integration/test-apt-acquire-additional-files
+++ b/test/integration/test-apt-acquire-additional-files
@@ -6,6 +6,9 @@ TESTDIR=$(readlink -f $(dirname $0))
 
 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'
@@ -13,6 +16,11 @@ 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]
@@ -29,6 +37,12 @@ APT::Acquire::Targets::deb::Contents {
 };
 EOF
 
+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 http://localhost:8080 unstable InRelease
 Get:1 http://localhost:8080 unstable/main amd64 Contents [$(stat -c%s aptarchive/dists/unstable/main/Contents-amd64.gz) B]
 Reading package lists..." aptget update
@@ -46,9 +60,28 @@ APT::Acquire::Targets::deb::Contents {
 };
 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 http://localhost:8080 unstable InRelease
 Get:1 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*'
 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 http://localhost:8080 unstable InRelease
+Reading package lists..." aptget update
+
+testempty find rootdir/var/lib/apt/lists -name '*Contents*'
-- 
cgit v1.2.3-70-g09d2


From d3a869e35503638e3483228fbfc95b7143568ad0 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Wed, 10 Jun 2015 21:24:47 +0200
Subject: store all targets data in IndexTarget struct

We still need an API for the targets, so slowly prepare the IndexTargets
to let them take this job.

Git-Dch: Ignore
---
 apt-pkg/acquire-item.cc                            |  15 ++-
 apt-pkg/acquire-item.h                             |  31 ++----
 apt-pkg/deb/debmetaindex.cc                        | 114 ++++++++++-----------
 apt-pkg/init.cc                                    |  12 +--
 doc/acquire-additional-files.txt                   |  29 +++---
 test/integration/test-apt-acquire-additional-files |   4 +-
 6 files changed, 97 insertions(+), 108 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index a1357fb15..e92ccc08b 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -382,6 +382,15 @@ bool pkgAcqDiffIndex::TransactionState(TransactionStates const state)
 }
 									/*}}}*/
 
+// 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)
+{
+}
+									/*}}}*/
+
 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.
@@ -955,7 +964,7 @@ void pkgAcqMetaBase::QueueIndexes(bool const verify)			/*{{{*/
 	 if (TransactionManager->MetaIndexParser->Exists((*Target)->MetaKey) == false)
 	 {
 	    // optional targets that we do not have in the Release file are skipped
-	    if ((*Target)->IsOptional())
+	    if ((*Target)->IsOptional)
 	       continue;
 
 	    Status = StatAuthError;
@@ -2388,7 +2397,7 @@ 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;
@@ -2410,7 +2419,7 @@ void pkgAcqIndex::Failed(string const &Message,pkgAcquire::MethodConfig const *
       }
    }
 
-   if(Target->IsOptional() && GetExpectedHashes().empty() && Stage == STAGE_DOWNLOAD)
+   if(Target->IsOptional && GetExpectedHashes().empty() && Stage == STAGE_DOWNLOAD)
       Status = StatDone;
    else
       TransactionManager->AbortTransaction();
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 38a7a8662..a2571e1cd 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -28,6 +28,7 @@
 
 #include <string>
 #include <vector>
+#include <map>
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/indexfile.h>
@@ -49,7 +50,7 @@ class pkgSourceList;
 class IndexTarget;
 class pkgAcqMetaBase;
 
-class APT_HIDDEN IndexTarget						/*{{{*/
+class IndexTarget							/*{{{*/
 /** \brief Information about an index file. */
 {
    public:
@@ -63,30 +64,18 @@ class APT_HIDDEN IndexTarget						/*{{{*/
    std::string const ShortDesc;
 
    /** \brief The key by which this index file should be
-    *  looked up within the meta signature file.
-    */
+       looked up within the meta index file. */
    std::string const MetaKey;
 
-   virtual bool IsOptional() const {
-      return false;
-   }
+   /** \brief Is it okay if the file isn't found in the meta index */
+   bool const IsOptional;
 
-   IndexTarget(std::string const &MetaKey, std::string const &ShortDesc,
-	 std::string const &LongDesc, std::string const &URI) :
-      URI(URI), Description(LongDesc), ShortDesc(ShortDesc), MetaKey(MetaKey) {}
-};
-									/*}}}*/
-class APT_HIDDEN OptionalIndexTarget : public IndexTarget		/*{{{*/
-/** \brief Information about an optional index file. */
-{
-   public:
-   virtual bool IsOptional() const {
-      return true;
-   }
+   /** \brief Target specific options defined by the implementation */
+   std::map<std::string, std::string> const Options;
 
-   OptionalIndexTarget(std::string const &MetaKey, std::string const &ShortDesc,
-	 std::string const &LongDesc, std::string const &URI) :
-      IndexTarget(MetaKey, ShortDesc, LongDesc, URI) {}
+   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);
 };
 									/*}}}*/
 class pkgAcquire::Item : public WeakPointable				/*{{{*/
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index c35f3b0a4..f038f12f5 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -116,12 +116,12 @@ void foreachTarget(std::string const URI, std::string const Dist,
       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 URI = APT_T_CONFIG(flatArchive ? "flatURI" : "URI");
+	 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 (URI.empty())
+	 if (MetaKey.empty())
 	    continue;
 
 	 vector<debReleaseIndex::debSectionEntry const*> const SectionEntries = src->second;
@@ -130,23 +130,24 @@ void foreachTarget(std::string const URI, std::string const Dist,
 	 {
 	    for (vector<std::string>::const_iterator l = lang.begin(); l != lang.end(); ++l)
 	    {
-	       if (*l == "none" && URI.find("$(LANGUAGE)") != std::string::npos)
+	       if (*l == "none" && MetaKey.find("$(LANGUAGE)") != std::string::npos)
 		  continue;
 
-	       struct SubstVar subst[] = {
-		  { "$(SITE)", &Site },
-		  { "$(RELEASE)", &Release },
-		  { "$(COMPONENT)", &((*I)->Section) },
-		  { "$(LANGUAGE)", &(*l) },
-		  { NULL, NULL }
-	       };
-	       Call(baseURI, *T, URI, ShortDesc, LongDesc, IsOptional, subst);
-
-	       if (URI.find("$(LANGUAGE)") == std::string::npos)
+	       std::map<std::string, std::string> Options;
+	       Options.insert(std::make_pair("SITE", Site));
+	       Options.insert(std::make_pair("RELEASE", Release));
+	       Options.insert(std::make_pair("COMPONENT", (*I)->Section));
+	       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("CREATED_BY", *T));
+	       Call(MetaKey, ShortDesc, LongDesc, IsOptional, Options);
+
+	       if (MetaKey.find("$(LANGUAGE)") == std::string::npos)
 		  break;
 	    }
 
-	    if (URI.find("$(COMPONENT)") == std::string::npos)
+	    if (MetaKey.find("$(COMPONENT)") == std::string::npos)
 	       break;
 	 }
       }
@@ -156,12 +157,12 @@ void foreachTarget(std::string const URI, std::string const Dist,
    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::") + *T + "::" + (X))
-      std::string const URI = APT_T_CONFIG(flatArchive ? "flatURI" : "URI");
+      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 (URI.empty())
+      if (MetaKey.empty())
 	 continue;
 
       for (map<string, vector<debReleaseIndex::debSectionEntry const*> >::const_iterator a = ArchEntries.begin();
@@ -175,28 +176,28 @@ void foreachTarget(std::string const URI, std::string const Dist,
 
 	    for (vector<std::string>::const_iterator l = lang.begin(); l != lang.end(); ++l)
 	    {
-	       if (*l == "none" && URI.find("$(LANGUAGE)") != std::string::npos)
+	       if (*l == "none" && MetaKey.find("$(LANGUAGE)") != std::string::npos)
 		  continue;
 
-	       struct SubstVar subst[] = {
-		  { "$(SITE)", &Site },
-		  { "$(RELEASE)", &Release },
-		  { "$(COMPONENT)", &((*I)->Section) },
-		  { "$(LANGUAGE)", &(*l) },
-		  { "$(ARCHITECTURE)", &(a->first) },
-		  { NULL, NULL }
-	       };
-	       Call(baseURI, *T, URI, ShortDesc, LongDesc, IsOptional, subst);
-
-	       if (URI.find("$(LANGUAGE)") == std::string::npos)
+	       std::map<std::string, std::string> Options;
+	       Options.insert(std::make_pair("SITE", Site));
+	       Options.insert(std::make_pair("RELEASE", Release));
+	       Options.insert(std::make_pair("COMPONENT", (*I)->Section));
+	       Options.insert(std::make_pair("LANGUAGE", *l));
+	       Options.insert(std::make_pair("ARCHITECTURE", a->first));
+	       Options.insert(std::make_pair("BASE_URI", baseURI));
+	       Options.insert(std::make_pair("CREATED_BY", *T));
+	       Call(MetaKey, ShortDesc, LongDesc, IsOptional, Options);
+
+	       if (MetaKey.find("$(LANGUAGE)") == std::string::npos)
 		  break;
 	    }
 
-	    if (URI.find("$(COMPONENT)") == std::string::npos)
+	    if (MetaKey.find("$(COMPONENT)") == std::string::npos)
 	       break;
 	 }
 
-	 if (URI.find("$(ARCHITECTURE)") == std::string::npos)
+	 if (MetaKey.find("$(ARCHITECTURE)") == std::string::npos)
 	    break;
       }
    }
@@ -207,30 +208,23 @@ struct ComputeIndexTargetsClass
 {
    vector <IndexTarget *> * const IndexTargets;
 
-   void operator()(std::string const &baseURI, std::string const &/*TargetName*/,
-	 std::string const &URI, std::string const &ShortDesc, std::string const &LongDesc,
-	 bool const IsOptional, struct SubstVar const * const subst)
+   void operator()(std::string MetaKey, std::string ShortDesc, std::string LongDesc,
+	 bool const IsOptional, std::map<std::string, std::string> Options)
    {
-      std::string const name = SubstVar(URI, subst);
-      IndexTarget * Target;
-      if (IsOptional == true)
-      {
-	 Target = new OptionalIndexTarget(
-	       name,
-	       SubstVar(ShortDesc, subst),
-	       SubstVar(LongDesc, subst),
-	       baseURI + name
-	       );
-      }
-      else
+      for (std::map<std::string, std::string>::const_iterator O = Options.begin(); O != Options.end(); ++O)
       {
-	 Target = new IndexTarget(
-	       name,
-	       SubstVar(ShortDesc, subst),
-	       SubstVar(LongDesc, subst),
-	       baseURI + name
-	       );
+	 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 = new IndexTarget(
+	    MetaKey,
+	    ShortDesc,
+	    LongDesc,
+	    Options.find("BASE_URI")->second + MetaKey,
+	    IsOptional,
+	    Options
+	    );
       IndexTargets->push_back(Target);
    }
 
@@ -256,7 +250,7 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
 
    // special case for --print-uris
    vector <IndexTarget *> const * const targets = ComputeIndexTargets();
-#define APT_TARGET(X) IndexTarget("", X, MetaIndexInfo(X), MetaIndexURI(X))
+#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);
@@ -309,33 +303,33 @@ struct GetIndexFilesClass
    std::string const Release;
    bool const IsTrusted;
 
-   void operator()(std::string const &/*baseURI*/, std::string const &TargetName,
-	 std::string const &/*URI*/, std::string const &/*ShortDesc*/, std::string const &/*LongDesc*/,
-	 bool const /*IsOptional*/, struct SubstVar const * const subst)
+   void operator()(std::string const &/*URI*/, std::string const &/*ShortDesc*/, std::string const &/*LongDesc*/,
+	 bool const /*IsOptional*/, std::map<std::string, std::string> Options)
    {
+      std::string const TargetName = Options.find("CREATED_BY")->second;
       if (TargetName == "Packages")
       {
 	 Indexes->push_back(new debPackagesIndex(
 		  URI,
 		  Release,
-		  SubstVar("$(COMPONENT)", subst),
+		  Options.find("COMPONENT")->second,
 		  IsTrusted,
-		  SubstVar("$(ARCHITECTURE)", subst)
+		  Options.find("ARCHITECTURE")->second
 		  ));
       }
       else if (TargetName == "Sources")
 	 Indexes->push_back(new debSourcesIndex(
 		  URI,
 		  Release,
-		  SubstVar("$(COMPONENT)", subst),
+		  Options.find("COMPONENT")->second,
 		  IsTrusted
 		  ));
       else if (TargetName == "Translations")
 	 Indexes->push_back(new debTranslationsIndex(
 		  URI,
 		  Release,
-		  SubstVar("$(COMPONENT)", subst),
-		  SubstVar("$(LANGUAGE)", subst)
+		  Options.find("COMPONENT")->second,
+		  Options.find("LANGUAGE")->second
 		  ));
    }
 
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 50ea2b49e..e2239a906 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -101,19 +101,19 @@ 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::URI", "$(COMPONENT)/binary-$(ARCHITECTURE)/Packages");
-   Cnf.CndSet("APT::Acquire::Targets::deb::Packages::flatURI", "Packages");
+   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::URI", "$(COMPONENT)/i18n/Translation-$(LANGUAGE)");
-   Cnf.CndSet("APT::Acquire::Targets::deb::Translations::flatURI", "$(LANGUAGE)");
+   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::URI", "$(COMPONENT)/source/Sources");
-   Cnf.CndSet("APT::Acquire::Targets::deb-src::Sources::flatURI", "Sources");
+   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");
diff --git a/doc/acquire-additional-files.txt b/doc/acquire-additional-files.txt
index 5a07c2bec..ab833440b 100644
--- a/doc/acquire-additional-files.txt
+++ b/doc/acquire-additional-files.txt
@@ -33,11 +33,11 @@ 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 {
-		URI "$(COMPONENT)/binary-$(ARCHITECTURE)/Packages";
+		MetaKey "$(COMPONENT)/binary-$(ARCHITECTURE)/Packages";
 		ShortDescription "Packages";
 		Description "$(SITE) $(RELEASE)/$(COMPONENT) $(ARCHITECTURE) Packages";
 
-		flatURI "Packages";
+		flatMetaKey "Packages";
 		flatDescription "$(SITE) $(RELEASE) Packages";
 
 		Optional "false";
@@ -47,18 +47,18 @@ 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 URI for multiple types!
+types here and you can't download the same MetaKey form 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 never shown or used.
 
 All targets have three main properties you can define:
-* URI: The identifier of the file to be downloaded as used in the
+* 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 should you try to access directories above
-  the Release file (e.g. "../../").
+  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
@@ -69,7 +69,7 @@ All targets have three main properties you can define:
   progress lines.
 
 Additional optional properties:
-* flat{URI,Description}: APT supports two types of repositories:
+* 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
@@ -96,20 +96,20 @@ look like this:
 
 APT::Acquire::Targets {
 	deb::Translations {
-		URI "$(COMPONENT)/i18n/Translation-$(LANGUAGE)";
+		MetaKey "$(COMPONENT)/i18n/Translation-$(LANGUAGE)";
 		ShortDescription "Translation-$(LANGUAGE)";
 		Description "$(SITE) $(RELEASE)/$(COMPONENT) Translation-$(LANGUAGE)";
 
-		flatURI "$(LANGUAGE)";
+		flatMetaKey "$(LANGUAGE)";
 		flatDescription "$(SITE) $(RELEASE) Translation-$(LANGUAGE)";
 	};
 
 	deb-src::Sources {
-		URI "$(COMPONENT)/source/Sources";
+		MetaKey "$(COMPONENT)/source/Sources";
 		ShortDescription "Sources";
 		Description "$(SITE) $(RELEASE)/$(COMPONENT) Sources";
 
-		flatURI "Sources";
+		flatMetaKey "Sources";
 		flatDescription "$(SITE) $(RELEASE) Sources";
 
 		Optional "false";
@@ -133,10 +133,7 @@ printed literally.
   have a meaningful value here.
 * $(LANGUAGE): Values are all entries (expect "none") of configuration
   option Acquire::Languages, e.g. "en", "de" or "de_AT".
-
-These values are defined both for 'deb' as well as 'deb-src' targets.
-'deb' targets additional have the variable:
-
 * $(ARCHITECTURE): Values are all entries of configuration option
   APT::Architectures (potentially modified by sources.list options),
-  e.g. "amd64", "i386" or "armel".
+  e.g. "amd64", "i386" or "armel" for the 'deb' type. In type 'deb-src'
+  this variable has the value "source".
diff --git a/test/integration/test-apt-acquire-additional-files b/test/integration/test-apt-acquire-additional-files
index 0e59233e9..4a6845f40 100755
--- a/test/integration/test-apt-acquire-additional-files
+++ b/test/integration/test-apt-acquire-additional-files
@@ -31,7 +31,7 @@ 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 {
-	URI "\$(COMPONENT)/Contents-\$(ARCHITECTURE)";
+	MetaKey "\$(COMPONENT)/Contents-\$(ARCHITECTURE)";
 	ShortDescription "Contents";
 	Description "\$(SITE) \$(RELEASE)/\$(COMPONENT) \$(ARCHITECTURE) Contents";
 };
@@ -54,7 +54,7 @@ testsuccess cmp 'rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_Co
 # 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 {
-	URI "\$(COMPONENT)/Contents-\$(ARCHITECTURE).gz";
+	MetaKey "\$(COMPONENT)/Contents-\$(ARCHITECTURE).gz";
 	ShortDescription "Contents.gz";
 	Description "\$(SITE) \$(RELEASE)/\$(COMPONENT) \$(ARCHITECTURE) Contents.gz";
 };
-- 
cgit v1.2.3-70-g09d2


From dcbbb14df8c9a8a146697720874e9425c4b33792 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Wed, 10 Jun 2015 22:10:48 +0200
Subject: stop using IndexTarget pointers which are never freed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Creating and passing around a bunch of pointers of IndexTargets (and of
a vector of pointers of IndexTargets) is probably done to avoid the
'costly' copy of container, but we are really not in a timecritical
operation here and move semantics will help us even further in the
future. On the other hand we never do a proper cleanup of these
pointers, which is very dirty, even if structures aren't that big…

The changes will effecting many items only effect our own hidden class,
so we can do that without fearing breaking interfaces or anything.

Git-Dch: Ignore
---
 apt-pkg/acquire-item.cc     | 167 ++++++++++++++++++++++----------------------
 apt-pkg/acquire-item.h      |  46 ++++++------
 apt-pkg/deb/debmetaindex.cc |  16 ++---
 apt-pkg/deb/debmetaindex.h  |   2 +-
 4 files changed, 113 insertions(+), 118 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index e92ccc08b..05ea9c069 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -191,7 +191,7 @@ HashStringList pkgAcqIndexMergeDiffs::GetExpectedHashes() const
    if (State == StateFetchDiff)
       return patch.download_hashes;
    else if (State == StateApplyDiff)
-      return GetExpectedHashesFor(Target->MetaKey);
+      return GetExpectedHashesFor(Target.MetaKey);
    return HashStringList();
 }
 
@@ -266,20 +266,20 @@ std::string pkgAcqDiffIndex::GetFinalFilename() const
 }
 std::string pkgAcqIndex::GetFinalFilename() const
 {
-   std::string const FinalFile = GetFinalFileNameFromURI(Target->URI);
-   return GetCompressedFileName(Target->URI, FinalFile, CurrentCompressionExtension);
+   std::string const FinalFile = GetFinalFileNameFromURI(Target.URI);
+   return GetCompressedFileName(Target.URI, FinalFile, CurrentCompressionExtension);
 }
 std::string pkgAcqMetaSig::GetFinalFilename() const
 {
-   return GetFinalFileNameFromURI(Target->URI);
+   return GetFinalFileNameFromURI(Target.URI);
 }
 std::string pkgAcqBaseIndex::GetFinalFilename() const
 {
-   return GetFinalFileNameFromURI(Target->URI);
+   return GetFinalFileNameFromURI(Target.URI);
 }
 std::string pkgAcqMetaBase::GetFinalFilename() const
 {
-   return GetFinalFileNameFromURI(DataTarget.URI);
+   return GetFinalFileNameFromURI(Target.URI);
 }
 std::string pkgAcqArchive::GetFinalFilename() const
 {
@@ -289,17 +289,17 @@ std::string pkgAcqArchive::GetFinalFilename() const
 // pkgAcqTransactionItem::GetMetaKey and specialisations for child classes	/*{{{*/
 std::string pkgAcqTransactionItem::GetMetaKey() const
 {
-   return Target->MetaKey;
+   return Target.MetaKey;
 }
 std::string pkgAcqIndex::GetMetaKey() const
 {
    if (Stage == STAGE_DECOMPRESS_AND_VERIFY || CurrentCompressionExtension == "uncompressed")
-      return Target->MetaKey;
-   return Target->MetaKey + "." + CurrentCompressionExtension;
+      return Target.MetaKey;
+   return Target.MetaKey + "." + CurrentCompressionExtension;
 }
 std::string pkgAcqDiffIndex::GetMetaKey() const
 {
-   return Target->MetaKey + ".diff/Index";
+   return Target.MetaKey + ".diff/Index";
 }
 									/*}}}*/
 //pkgAcqTransactionItem::TransactionState and specialisations for child classes	/*{{{*/
@@ -373,7 +373,7 @@ bool pkgAcqDiffIndex::TransactionState(TransactionStates const state)
       case TransactionCommit:
 	 break;
       case TransactionAbort:
-	 std::string const Partial = GetPartialFileNameFromURI(Target->URI);
+	 std::string const Partial = GetPartialFileNameFromURI(Target.URI);
 	 unlink(Partial.c_str());
 	 break;
    }
@@ -396,16 +396,16 @@ class APT_HIDDEN NoActionItem : public pkgAcquire::Item			/*{{{*/
    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 * const Target;
+   IndexTarget const Target;
    public:
-   virtual std::string DescURI() const {return Target->URI;};
+   virtual std::string DescURI() const {return Target.URI;};
    virtual HashStringList GetExpectedHashes()  const {return HashStringList();};
 
-   NoActionItem(pkgAcquire * const Owner, IndexTarget const * const Target) :
+   NoActionItem(pkgAcquire * const Owner, IndexTarget const Target) :
       pkgAcquire::Item(Owner), Target(Target)
    {
       Status = StatDone;
-      DestFile = GetFinalFileNameFromURI(Target->URI);
+      DestFile = GetFinalFileNameFromURI(Target.URI);
    }
 };
 									/*}}}*/
@@ -669,7 +669,7 @@ std::string pkgAcquire::Item::HashSum() const				/*{{{*/
 									/*}}}*/
 
 pkgAcqTransactionItem::pkgAcqTransactionItem(pkgAcquire * const Owner,	/*{{{*/
-      pkgAcqMetaBase * const TransactionManager, IndexTarget const * const Target) :
+      pkgAcqMetaBase * const TransactionManager, IndexTarget const Target) :
    pkgAcquire::Item(Owner), Target(Target), TransactionManager(TransactionManager)
 {
    if (TransactionManager != this)
@@ -689,10 +689,10 @@ HashStringList pkgAcqTransactionItem::GetExpectedHashesFor(std::string const Met
 // AcqMetaBase - Constructor						/*{{{*/
 pkgAcqMetaBase::pkgAcqMetaBase(pkgAcquire * const Owner,
       pkgAcqMetaBase * const TransactionManager,
-      std::vector<IndexTarget*> const * const IndexTargets,
+      std::vector<IndexTarget> const IndexTargets,
       IndexTarget const &DataTarget,
       indexRecords * const MetaIndexParser)
-: pkgAcqTransactionItem(Owner, TransactionManager, NULL), DataTarget(DataTarget),
+: pkgAcqTransactionItem(Owner, TransactionManager, DataTarget),
    MetaIndexParser(MetaIndexParser), LastMetaIndexParser(NULL), IndexTargets(IndexTargets),
    AuthPass(false), IMSHit(false)
 {
@@ -953,31 +953,30 @@ void pkgAcqMetaBase::QueueIndexes(bool const verify)			/*{{{*/
    // at this point the real Items are loaded in the fetcher
    ExpectedAdditionalItems = 0;
 
-   vector <IndexTarget*>::const_iterator Target;
-   for (Target = IndexTargets->begin();
-        Target != IndexTargets->end();
+   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)
+	 if (TransactionManager->MetaIndexParser->Exists(Target->MetaKey) == false)
 	 {
 	    // optional targets that we do not have in the Release file are skipped
-	    if ((*Target)->IsOptional)
+	    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());
+	    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 (RealFileExists(GetFinalFileNameFromURI(Target->URI)))
 	 {
 	    if (TransactionManager->LastMetaIndexParser != NULL)
 	    {
-	       HashStringList const newFile = GetExpectedHashesFromFor(TransactionManager->MetaIndexParser, (*Target)->MetaKey);
-	       HashStringList const oldFile = GetExpectedHashesFromFor(TransactionManager->LastMetaIndexParser, (*Target)->MetaKey);
+	       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
@@ -990,15 +989,15 @@ void pkgAcqMetaBase::QueueIndexes(bool const verify)			/*{{{*/
 	    trypdiff = false; // no file to patch
 
 	 // check if we have patches available
-	 trypdiff &= TransactionManager->MetaIndexParser->Exists((*Target)->MetaKey + ".diff/Index");
+	 trypdiff &= TransactionManager->MetaIndexParser->Exists(Target->MetaKey + ".diff/Index");
       }
       // if we have no file to patch, no point in trying
-      trypdiff &= RealFileExists(GetFinalFileNameFromURI((*Target)->URI));
+      trypdiff &= RealFileExists(GetFinalFileNameFromURI(Target->URI));
 
       // no point in patching from local sources
       if (trypdiff)
       {
-	 std::string const proto = (*Target)->URI.substr(0, strlen("file:/"));
+	 std::string const proto = Target->URI.substr(0, strlen("file:/"));
 	 if (proto == "file:/" || proto == "copy:/" || proto == "cdrom:")
 	    trypdiff = false;
       }
@@ -1060,7 +1059,7 @@ bool pkgAcqMetaBase::VerifyVendor(string const &Message)		/*{{{*/
 	       // 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."),
-	       DataTarget.URI.c_str(), TimeToStr(invalid_since).c_str());
+	       Target.URI.c_str(), TimeToStr(invalid_since).c_str());
 	 if (ErrorText.empty())
 	    ErrorText = errmsg;
 	 return _error->Error("%s", errmsg.c_str());
@@ -1111,14 +1110,14 @@ bool pkgAcqMetaBase::VerifyVendor(string const &Message)		/*{{{*/
 pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire * const Owner,	/*{{{*/
       IndexTarget const &ClearsignedTarget,
       IndexTarget const &DetachedDataTarget, IndexTarget const &DetachedSigTarget,
-      const vector<IndexTarget*>* const IndexTargets,
+      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;
+   ExpectedAdditionalItems = IndexTargets.size() + 2;
    TransactionManager->Add(this);
 }
 									/*}}}*/
@@ -1167,8 +1166,8 @@ void pkgAcqMetaClearSig::Done(std::string const &Message,
 	 // 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);
+	 new NoActionItem(Owner, DetachedDataTarget);
+	 new NoActionItem(Owner, DetachedSigTarget);
       }
    }
 }
@@ -1251,7 +1250,7 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire * const Owner,		/*{{{*/
                                  pkgAcqMetaBase * const TransactionManager,
 				 IndexTarget const &DataTarget,
 				 IndexTarget const &DetachedSigTarget,
-				 vector<IndexTarget*> const * const IndexTargets,
+				 vector<IndexTarget> const IndexTargets,
 				 indexRecords * const MetaIndexParser) :
    pkgAcqMetaBase(Owner, TransactionManager, IndexTargets, DataTarget, MetaIndexParser),
    DetachedSigTarget(DetachedSigTarget)
@@ -1269,7 +1268,7 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire * const Owner,		/*{{{*/
    Desc.URI = DataTarget.URI;
 
    // we expect more item
-   ExpectedAdditionalItems = IndexTargets->size();
+   ExpectedAdditionalItems = IndexTargets.size();
    QueueURI(Desc);
 }
 									/*}}}*/
@@ -1284,7 +1283,7 @@ void pkgAcqMetaIndex::Done(string const &Message,			/*{{{*/
       // 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);
+      new pkgAcqMetaSig(Owner, TransactionManager, DetachedSigTarget, this);
    }
 }
 									/*}}}*/
@@ -1297,7 +1296,7 @@ void pkgAcqMetaIndex::Failed(string const &Message,
 
    _error->Warning(_("The repository '%s' does not have a Release file. "
                      "This is deprecated, please contact the owner of the "
-                     "repository."), DataTarget.Description.c_str());
+                     "repository."), Target.Description.c_str());
 
    // No Release file was present so fall
    // back to queueing Packages files without verification
@@ -1325,18 +1324,18 @@ void pkgAcqMetaIndex::Finished()					/*{{{*/
 									/*}}}*/
 std::string pkgAcqMetaIndex::DescURI() const				/*{{{*/
 {
-   return DataTarget.URI;
+   return Target.URI;
 }
 									/*}}}*/
 
 // AcqMetaSig::AcqMetaSig - Constructor					/*{{{*/
 pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire * const Owner,
       pkgAcqMetaBase * const TransactionManager,
-      IndexTarget const * const Target,
+      IndexTarget const Target,
       pkgAcqMetaIndex * const MetaIndex) :
    pkgAcqTransactionItem(Owner, TransactionManager, Target), MetaIndex(MetaIndex)
 {
-   DestFile = GetPartialFileNameFromURI(Target->URI);
+   DestFile = GetPartialFileNameFromURI(Target.URI);
 
    // remove any partial downloaded sig-file in partial/.
    // it may confuse proxies and is too small to warrant a
@@ -1349,10 +1348,10 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire * const Owner,
                 << TransactionManager << std::endl;
 
    // Create the item
-   Desc.Description = Target->Description;
+   Desc.Description = Target.Description;
    Desc.Owner = this;
-   Desc.ShortDesc = Target->ShortDesc;
-   Desc.URI = Target->URI;
+   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
@@ -1420,7 +1419,7 @@ void pkgAcqMetaSig::Failed(string const &Message,pkgAcquire::MethodConfig const
    {
       std::string downgrade_msg;
       strprintf(downgrade_msg, _("The repository '%s' is no longer signed."),
-                MetaIndex->DataTarget.Description.c_str());
+                MetaIndex->Target.Description.c_str());
       if(_config->FindB("Acquire::AllowDowngradeToInsecureRepositories"))
       {
          // meh, the users wants to take risks (we still mark the packages
@@ -1442,7 +1441,7 @@ void pkgAcqMetaSig::Failed(string const &Message,pkgAcquire::MethodConfig const
    else
       _error->Warning(_("The data from '%s' is not signed. Packages "
 	       "from that repository can not be authenticated."),
-	    MetaIndex->DataTarget.Description.c_str());
+	    MetaIndex->Target.Description.c_str());
 
    // ensures that a Release.gpg file in the lists/ is removed by the transaction
    TransactionManager->TransactionStageRemoval(this, DestFile);
@@ -1495,7 +1494,7 @@ void pkgAcqMetaSig::Failed(string const &Message,pkgAcquire::MethodConfig const
 // AcqBaseIndex - Constructor						/*{{{*/
 pkgAcqBaseIndex::pkgAcqBaseIndex(pkgAcquire * const Owner,
       pkgAcqMetaBase * const TransactionManager,
-      IndexTarget const * const Target)
+      IndexTarget const Target)
 : pkgAcqTransactionItem(Owner, TransactionManager, Target)
 {
 }
@@ -1510,15 +1509,15 @@ pkgAcqBaseIndex::pkgAcqBaseIndex(pkgAcquire * const Owner,
  */
 pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire * const Owner,
                                  pkgAcqMetaBase * const TransactionManager,
-                                 IndexTarget const * const Target)
+                                 IndexTarget const Target)
    : pkgAcqBaseIndex(Owner, TransactionManager, Target)
 {
    Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
 
    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);
 
@@ -1599,8 +1598,8 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string const &IndexDiffFile)	/*{{{*/
       return false;
    }
 
-   std::string const CurrentPackagesFile = GetFinalFileNameFromURI(Target->URI);
-   HashStringList const TargetFileHashes = GetExpectedHashesFor(Target->MetaKey);
+   std::string const CurrentPackagesFile = GetFinalFileNameFromURI(Target.URI);
+   HashStringList const TargetFileHashes = GetExpectedHashesFor(Target.MetaKey);
    if (TargetFileHashes.usable() == false || ServerHashes != TargetFileHashes)
    {
       if (Debug == true)
@@ -1614,7 +1613,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string const &IndexDiffFile)	/*{{{*/
    HashStringList LocalHashes;
    // try avoiding calculating the hash here as this is costly
    if (TransactionManager->LastMetaIndexParser != NULL)
-      LocalHashes = GetExpectedHashesFromFor(TransactionManager->LastMetaIndexParser, Target->MetaKey);
+      LocalHashes = GetExpectedHashesFromFor(TransactionManager->LastMetaIndexParser, Target.MetaKey);
    if (LocalHashes.usable() == false)
    {
       FileFd fd(CurrentPackagesFile, FileFd::ReadOnly);
@@ -1910,29 +1909,29 @@ void pkgAcqDiffIndex::Done(string const &Message,HashStringList const &Hashes,	/
  */
 pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire * const Owner,
                                    pkgAcqMetaBase * const TransactionManager,
-                                   IndexTarget const * const Target,
+                                   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);
 
    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 = GetFinalFileNameFromURI(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);
+      std::string const PartialFile = GetPartialFileNameFromURI(Target.URI);
       if (RealFileExists(PartialFile) == false)
       {
 	 if (symlink(GetFinalFilename().c_str(), PartialFile.c_str()) != 0)
@@ -1956,7 +1955,7 @@ void pkgAcqIndexDiffs::Failed(string const &Message,pkgAcquire::MethodConfig con
    if(Debug)
       std::clog << "pkgAcqIndexDiffs failed: " << Desc.URI << " with " << Message << std::endl
 		<< "Falling back to normal index file acquire" << std::endl;
-   DestFile = GetPartialFileNameFromURI(Target->URI);
+   DestFile = GetPartialFileNameFromURI(Target.URI);
    RenameOnError(PDiffError);
    std::string const patchname = GetDiffsPatchFileName(DestFile);
    if (RealFileExists(patchname))
@@ -1999,7 +1998,7 @@ void pkgAcqIndexDiffs::Finish(bool allDone)
 bool pkgAcqIndexDiffs::QueueNextDiff()					/*{{{*/
 {
    // calc sha1 of the just patched file
-   std::string const FinalFile = GetPartialFileNameFromURI(Target->URI);
+   std::string const FinalFile = GetPartialFileNameFromURI(Target.URI);
 
    if(!FileExists(FinalFile))
    {
@@ -2015,7 +2014,7 @@ bool pkgAcqIndexDiffs::QueueNextDiff()					/*{{{*/
    if(Debug)
       std::clog << "QueueNextDiff: " << FinalFile << " (" << LocalHashes.find(NULL)->toStr() << ")" << std::endl;
 
-   HashStringList const TargetFileHashes = GetExpectedHashesFor(Target->MetaKey);
+   HashStringList const TargetFileHashes = GetExpectedHashesFor(Target.MetaKey);
    if (unlikely(LocalHashes.usable() == false || TargetFileHashes.usable() == false))
    {
       Failed("Local/Expected hashes are not usable", NULL);
@@ -2049,9 +2048,9 @@ bool pkgAcqIndexDiffs::QueueNextDiff()					/*{{{*/
    }
 
    // queue the right diff
-   Desc.URI = Target->URI + ".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(Target->URI + ".diff/" + available_patches[0].file);
+   DestFile = GetPartialFileNameFromURI(Target.URI + ".diff/" + available_patches[0].file);
 
    if(Debug)
       std::clog << "pkgAcqIndexDiffs::QueueNextDiff(): " << Desc.URI << std::endl;
@@ -2069,7 +2068,7 @@ void pkgAcqIndexDiffs::Done(string const &Message, HashStringList const &Hashes,
 
    Item::Done(Message, Hashes, Cnf);
 
-   std::string const FinalFile = GetPartialFileNameFromURI(Target->URI);
+   std::string const FinalFile = GetPartialFileNameFromURI(Target.URI);
    std::string const PatchFile = GetDiffsPatchFileName(FinalFile);
 
    // success in downloading a diff, enter ApplyDiff state
@@ -2132,7 +2131,7 @@ std::string pkgAcqIndexDiffs::Custom600Headers() const			/*{{{*/
 // AcqIndexMergeDiffs::AcqIndexMergeDiffs - Constructor			/*{{{*/
 pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire * const Owner,
                                              pkgAcqMetaBase * const TransactionManager,
-                                             IndexTarget const * const Target,
+                                             IndexTarget const Target,
                                              DiffInfo const &patch,
                                              std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches)
   : pkgAcqBaseIndex(Owner, TransactionManager, Target),
@@ -2141,13 +2140,13 @@ pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire * const Owner,
    Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
 
    Desc.Owner = this;
-   Description = Target->Description;
-   Desc.ShortDesc = Target->ShortDesc;
+   Description = Target.Description;
+   Desc.ShortDesc = Target.ShortDesc;
 
-   Desc.URI = Target->URI + ".diff/" + patch.file + ".gz";
+   Desc.URI = Target.URI + ".diff/" + patch.file + ".gz";
    Desc.Description = Description + " " + patch.file + string(".pdiff");
 
-   DestFile = GetPartialFileNameFromURI(Target->URI + ".diff/" + patch.file);
+   DestFile = GetPartialFileNameFromURI(Target.URI + ".diff/" + patch.file);
 
    if(Debug)
       std::clog << "pkgAcqIndexMergeDiffs: " << Desc.URI << std::endl;
@@ -2174,7 +2173,7 @@ void pkgAcqIndexMergeDiffs::Failed(string const &Message,pkgAcquire::MethodConfi
    State = StateErrorDiff;
    if (Debug)
       std::clog << "Falling back to normal index file acquire" << std::endl;
-   DestFile = GetPartialFileNameFromURI(Target->URI);
+   DestFile = GetPartialFileNameFromURI(Target.URI);
    RenameOnError(PDiffError);
    std::string const patchname = GetMergeDiffsPatchFileName(DestFile, patch.file);
    if (RealFileExists(patchname))
@@ -2190,7 +2189,7 @@ void pkgAcqIndexMergeDiffs::Done(string const &Message, HashStringList const &Ha
 
    Item::Done(Message, Hashes, Cnf);
 
-   string const FinalFile = GetPartialFileNameFromURI(Target->URI);
+   string const FinalFile = GetPartialFileNameFromURI(Target.URI);
    if (State == StateFetchDiff)
    {
       Rename(DestFile, GetMergeDiffsPatchFileName(FinalFile, patch.file));
@@ -2241,7 +2240,7 @@ void pkgAcqIndexMergeDiffs::Done(string const &Message, HashStringList const &Ha
       for (std::vector<pkgAcqIndexMergeDiffs *>::const_iterator I = allPatches->begin();
 	    I != allPatches->end(); ++I)
       {
-	 std::string const PartialFile = GetPartialFileNameFromURI(Target->URI);
+	 std::string const PartialFile = GetPartialFileNameFromURI(Target.URI);
 	 std::string const patch = GetMergeDiffsPatchFileName(PartialFile, (*I)->patch.file);
 	 unlink(patch.c_str());
       }
@@ -2276,12 +2275,12 @@ std::string pkgAcqIndexMergeDiffs::Custom600Headers() const		/*{{{*/
 // AcqIndex::AcqIndex - Constructor					/*{{{*/
 pkgAcqIndex::pkgAcqIndex(pkgAcquire * const Owner,
                          pkgAcqMetaBase * const TransactionManager,
-                         IndexTarget const * const Target)
+                         IndexTarget const Target)
    : pkgAcqBaseIndex(Owner, TransactionManager, Target)
 {
    // 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 "
@@ -2293,12 +2292,12 @@ void pkgAcqIndex::AutoSelectCompression()
 {
    std::vector<std::string> types = APT::Configuration::getCompressionTypes();
    CompressionExtensions = "";
-   if (TransactionManager->MetaIndexParser != NULL && TransactionManager->MetaIndexParser->Exists(Target->MetaKey))
+   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" ||
              TransactionManager->MetaIndexParser->Exists(CompressedMetaKey) == true)
             CompressionExtensions.append(*t).append(" ");
@@ -2397,7 +2396,7 @@ 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;
@@ -2413,13 +2412,13 @@ void pkgAcqIndex::Failed(string const &Message,pkgAcquire::MethodConfig const *
    {
       if (CompressionExtensions.empty() == false)
       {
-	 Init(Target->URI, Desc.Description, Desc.ShortDesc);
+	 Init(Target.URI, Desc.Description, Desc.ShortDesc);
 	 Status = StatIdle;
 	 return;
       }
    }
 
-   if(Target->IsOptional && GetExpectedHashes().empty() && Stage == STAGE_DOWNLOAD)
+   if(Target.IsOptional && GetExpectedHashes().empty() && Stage == STAGE_DOWNLOAD)
       Status = StatDone;
    else
       TransactionManager->AbortTransaction();
@@ -2430,7 +2429,7 @@ void pkgAcqIndex::ReverifyAfterIMS()
 {
    // update destfile to *not* include the compression extension when doing
    // a reverify (as its uncompressed on disk already)
-   DestFile = GetCompressedFileName(Target->URI, GetPartialFileNameFromURI(Target->URI), CurrentCompressionExtension);
+   DestFile = GetCompressedFileName(Target.URI, GetPartialFileNameFromURI(Target.URI), CurrentCompressionExtension);
 
    // copy FinalFile into partial/ so that we check the hash again
    string FinalFile = GetFinalFilename();
@@ -2509,7 +2508,7 @@ void pkgAcqIndex::StageDownloadDone(string const &Message, HashStringList const
    // If we have compressed indexes enabled, queue for hash verification
    if (_config->FindB("Acquire::GzipIndexes",false))
    {
-      DestFile = GetPartialFileNameFromURI(Target->URI + '.' + CurrentCompressionExtension);
+      DestFile = GetPartialFileNameFromURI(Target.URI + '.' + CurrentCompressionExtension);
       EraseFileName = "";
       Stage = STAGE_DECOMPRESS_AND_VERIFY;
       Desc.URI = "copy:" + FileName;
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index a2571e1cd..790d1f3d8 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -55,23 +55,23 @@ class IndexTarget							/*{{{*/
 {
    public:
    /** \brief A URI from which the index file can be downloaded. */
-   std::string const URI;
+   std::string URI;
 
    /** \brief A description of the index file. */
-   std::string const Description;
+   std::string Description;
 
    /** \brief A shorter description of the index file. */
-   std::string const ShortDesc;
+   std::string ShortDesc;
 
    /** \brief The key by which this index file should be
        looked up within the meta index file. */
-   std::string const MetaKey;
+   std::string MetaKey;
 
    /** \brief Is it okay if the file isn't found in the meta index */
-   bool const IsOptional;
+   bool IsOptional;
 
    /** \brief Target specific options defined by the implementation */
-   std::map<std::string, std::string> const Options;
+   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,
@@ -374,7 +374,7 @@ class APT_HIDDEN pkgAcqTransactionItem: public pkgAcquire::Item		/*{{{*/
 /** \brief baseclass for the indexes files to manage them all together */
 {
    protected:
-   IndexTarget const * const Target;
+   IndexTarget const Target;
    HashStringList GetExpectedHashesFor(std::string const MetaKey) const;
 
    bool QueueURI(pkgAcquire::ItemDesc &Item);
@@ -392,13 +392,13 @@ class APT_HIDDEN pkgAcqTransactionItem: public pkgAcquire::Item		/*{{{*/
    };
    virtual bool TransactionState(TransactionStates const state);
 
-   virtual std::string DescURI() const { return Target->URI; }
+   virtual std::string DescURI() const { return Target.URI; }
    virtual HashStringList GetExpectedHashes() const;
    virtual std::string GetMetaKey() const;
    virtual bool HashesRequired() const;
 
 
-   pkgAcqTransactionItem(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager, IndexTarget const * const Target);
+   pkgAcqTransactionItem(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager, IndexTarget const Target);
    virtual ~pkgAcqTransactionItem();
 
    friend class pkgAcqMetaBase;
@@ -412,7 +412,6 @@ class APT_HIDDEN pkgAcqMetaBase : public pkgAcqTransactionItem		/*{{{*/
  protected:
    std::vector<pkgAcqTransactionItem*> Transaction;
 
-   IndexTarget const DataTarget;
  public:
    /** \brief A package-system-specific parser for the meta-index file. */
    indexRecords *MetaIndexParser;
@@ -422,7 +421,7 @@ class APT_HIDDEN pkgAcqMetaBase : public pkgAcqTransactionItem		/*{{{*/
    /** \brief The index files which should be looked up in the meta-index
     *  and then downloaded.
     */
-   const std::vector<IndexTarget*>* const IndexTargets;
+   std::vector<IndexTarget> const IndexTargets;
 
    /** \brief If \b true, the index's signature is currently being verified.
     */
@@ -504,7 +503,7 @@ class APT_HIDDEN pkgAcqMetaBase : public pkgAcqTransactionItem		/*{{{*/
    virtual std::string GetFinalFilename() const;
 
    pkgAcqMetaBase(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
-		  std::vector<IndexTarget*> const * const IndexTargets,
+		  std::vector<IndexTarget> const IndexTargets,
 		  IndexTarget const &DataTarget,
 		  indexRecords* const MetaIndexParser);
 };
@@ -541,7 +540,7 @@ class APT_HIDDEN pkgAcqMetaIndex : public pkgAcqMetaBase
    /** \brief Create a new pkgAcqMetaIndex. */
    pkgAcqMetaIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
 		   IndexTarget const &DataTarget, IndexTarget const &DetachedSigTarget,
-		   const std::vector<IndexTarget*>* const IndexTargets, indexRecords * const MetaIndexParser);
+		   std::vector<IndexTarget> const IndexTargets, indexRecords * const MetaIndexParser);
 
    friend class pkgAcqMetaSig;
 };
@@ -577,7 +576,7 @@ class APT_HIDDEN pkgAcqMetaSig : public pkgAcqTransactionItem
 		     pkgAcquire::MethodConfig const * const Cnf);
 
    /** \brief Create a new pkgAcqMetaSig. */
-   pkgAcqMetaSig(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager, IndexTarget const * const Target,
+   pkgAcqMetaSig(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager, IndexTarget const Target,
 	 pkgAcqMetaIndex * const MetaIndex);
    virtual ~pkgAcqMetaSig();
 };
@@ -602,7 +601,7 @@ public:
 		IndexTarget const &ClearsignedTarget,
 		IndexTarget const &DetachedDataTarget,
 		IndexTarget const &DetachedSigTarget,
-		std::vector<IndexTarget*> const * const IndexTargets,
+		std::vector<IndexTarget> const IndexTargets,
 		indexRecords * const MetaIndexParser);
    virtual ~pkgAcqMetaClearSig();
 };
@@ -617,7 +616,7 @@ class APT_HIDDEN pkgAcqBaseIndex : public pkgAcqTransactionItem
    virtual std::string GetFinalFilename() const;
 
    pkgAcqBaseIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
-                   IndexTarget const * const Target);
+                   IndexTarget const Target);
 };
 									/*}}}*/
 /** \brief An item that is responsible for fetching an index file of	{{{
@@ -653,7 +652,7 @@ class APT_HIDDEN pkgAcqDiffIndex : public pkgAcqBaseIndex
    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 DescURI() const {return Target.URI + "Index";};
    virtual std::string Custom600Headers() const;
    virtual std::string GetMetaKey() const;
 
@@ -680,7 +679,7 @@ class APT_HIDDEN pkgAcqDiffIndex : public pkgAcqBaseIndex
     *  \param ShortDesc A short description of the list file to download.
     */
    pkgAcqDiffIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
-                   IndexTarget const * const Target);
+                   IndexTarget const Target);
  private:
    APT_HIDDEN void QueueOnIMSHit() const;
 };
@@ -756,7 +755,7 @@ class APT_HIDDEN pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex
    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 std::string DescURI() const {return Target.URI + "Index";};
    virtual HashStringList GetExpectedHashes() const;
    virtual bool HashesRequired() const;
 
@@ -778,8 +777,7 @@ class APT_HIDDEN pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex
     *  check if it was the last one to complete the download step
     */
    pkgAcqIndexMergeDiffs(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
-                         IndexTarget const * const Target,
-                         DiffInfo const &patch,
+                         IndexTarget const Target, DiffInfo const &patch,
                          std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches);
 };
 									/*}}}*/
@@ -869,7 +867,7 @@ class APT_HIDDEN pkgAcqIndexDiffs : public pkgAcqBaseIndex
    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 std::string DescURI() const {return Target.URI + "IndexDiffs";};
    virtual HashStringList GetExpectedHashes() const;
    virtual bool HashesRequired() const;
 
@@ -892,7 +890,7 @@ class APT_HIDDEN pkgAcqIndexDiffs : public pkgAcqBaseIndex
     *  that depends on it.
     */
    pkgAcqIndexDiffs(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
-                    IndexTarget const * const Target,
+                    IndexTarget const Target,
 		    std::vector<DiffInfo> const &diffs=std::vector<DiffInfo>());
 };
 									/*}}}*/
@@ -969,7 +967,7 @@ class APT_HIDDEN pkgAcqIndex : public pkgAcqBaseIndex
    virtual std::string GetMetaKey() const;
 
    pkgAcqIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
-               IndexTarget const * const Target);
+               IndexTarget const Target);
 
    void Init(std::string const &URI, std::string const &URIDesc,
              std::string const &ShortDesc);
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index f038f12f5..44d66a725 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -93,7 +93,7 @@ debReleaseIndex::~debReleaseIndex() {
 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)
+      CallC &Call)
 {
    bool const flatArchive = (Dist[Dist.length() - 1] == '/');
    std::string baseURI = URI;
@@ -206,7 +206,7 @@ void foreachTarget(std::string const URI, std::string const Dist,
 
 struct ComputeIndexTargetsClass
 {
-   vector <IndexTarget *> * const IndexTargets;
+   vector <IndexTarget> IndexTargets;
 
    void operator()(std::string MetaKey, std::string ShortDesc, std::string LongDesc,
 	 bool const IsOptional, std::map<std::string, std::string> Options)
@@ -217,7 +217,7 @@ struct ComputeIndexTargetsClass
 	 ShortDesc = SubstVar(ShortDesc, std::string("$(") + O->first + ")", O->second);
 	 LongDesc = SubstVar(LongDesc, std::string("$(") + O->first + ")", O->second);
       }
-      IndexTarget * Target = new IndexTarget(
+      IndexTarget Target(
 	    MetaKey,
 	    ShortDesc,
 	    LongDesc,
@@ -225,13 +225,11 @@ struct ComputeIndexTargetsClass
 	    IsOptional,
 	    Options
 	    );
-      IndexTargets->push_back(Target);
+      IndexTargets.push_back(Target);
    }
-
-   ComputeIndexTargetsClass() : IndexTargets(new vector <IndexTarget *>) {}
 };
 
-vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const
+std::vector<IndexTarget> debReleaseIndex::ComputeIndexTargets() const
 {
    ComputeIndexTargetsClass comp;
    foreachTarget(URI, Dist, ArchEntries, comp);
@@ -249,7 +247,7 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
       iR->SetTrusted(false);
 
    // special case for --print-uris
-   vector <IndexTarget *> const * const targets = ComputeIndexTargets();
+   std::vector<IndexTarget> const targets = ComputeIndexTargets();
 #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"),
@@ -257,7 +255,7 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
 #undef APT_TARGET
    if (GetAll)
    {
-      for (vector <IndexTarget*>::const_iterator Target = targets->begin(); Target != targets->end(); ++Target)
+      for (std::vector<IndexTarget>::const_iterator Target = targets.begin(); Target != targets.end(); ++Target)
 	 new pkgAcqIndex(Owner, TransactionManager, *Target);
    }
 
diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index e1c1d91ef..4e630cf5d 100644
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -46,7 +46,7 @@ class APT_HIDDEN 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::vector<IndexTarget> ComputeIndexTargets() const;
 
    std::string MetaIndexInfo(const char *Type) const;
    std::string MetaIndexFile(const char *Types) const;
-- 
cgit v1.2.3-70-g09d2


From 261727f05ca7ff7d9d6d9b8927cb5c6ad293ebce Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Wed, 10 Jun 2015 23:53:36 +0200
Subject: rename Calculate- to GetIndexTargets and use it as official API

We need a general way to get from a sources.list entry to IndexTargets
and with this change we can move from pkgSourceList over the list of
metaIndexes it includes to the IndexTargets each metaIndex can have.

Git-Dch: Ignore
---
 apt-pkg/deb/debmetaindex.cc | 37 +++++++++++++++----------------------
 apt-pkg/deb/debmetaindex.h  |  5 ++++-
 apt-pkg/metaindex.h         |  6 ++----
 3 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 44d66a725..e1f86d20f 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -229,7 +229,7 @@ struct ComputeIndexTargetsClass
    }
 };
 
-std::vector<IndexTarget> debReleaseIndex::ComputeIndexTargets() const
+std::vector<IndexTarget> debReleaseIndex::GetIndexTargets() const
 {
    ComputeIndexTargetsClass comp;
    foreachTarget(URI, Dist, ArchEntries, comp);
@@ -247,7 +247,7 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
       iR->SetTrusted(false);
 
    // special case for --print-uris
-   std::vector<IndexTarget> const targets = ComputeIndexTargets();
+   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"),
@@ -396,6 +396,7 @@ class APT_HIDDEN 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)
       {
@@ -403,34 +404,23 @@ class APT_HIDDEN 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));
@@ -441,7 +431,10 @@ class APT_HIDDEN 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;
    }
 };
diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index 4e630cf5d..0b1b08432 100644
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -46,7 +46,7 @@ class APT_HIDDEN 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;
+   virtual std::vector<IndexTarget> GetIndexTargets() const;
 
    std::string MetaIndexInfo(const char *Type) const;
    std::string MetaIndexFile(const char *Types) const;
@@ -78,6 +78,9 @@ class APT_HIDDEN 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;
    }
diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index 6c3d2880b..4e5de8be0 100644
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -22,6 +22,7 @@ using std::string;
 #endif
 
 class pkgAcquire;
+class IndexTarget;
 
 class metaIndex
 {
@@ -40,16 +41,13 @@ class metaIndex
    virtual const char* GetType() const {return Type;}
 
    // interface to to query it
-#if APT_PKG_ABI >= 413
    /** \return the path of the local file (or "" if its not available) */
    virtual std::string LocalFileName() const;
-#else
-   std::string LocalFileName() const;
-#endif
 
    // 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<IndexTarget> GetIndexTargets() const = 0;
    virtual std::vector<pkgIndexFile *> *GetIndexFiles() = 0;
    virtual bool IsTrusted() const = 0;
 
-- 
cgit v1.2.3-70-g09d2


From 1da3b7b8e15b642135b54684e70a0c271471f07a Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 11 Jun 2015 10:56:31 +0200
Subject: show URI.Path in all acquire item descriptions

It is a rather strange sight that index items use SiteOnly which strips
the Path, while e.g. deb files are downloaded with NoUserPassword which
does not. Important to note here is that for the file transport Path is
pretty important as there is no Host which would be displayed by Site,
which always resulted in "interesting" unspecific errors for "file:".

Adding a 'middle' ground between the two which does show the Path but
potentially modifies it (it strips a pending / at the end if existing)
solves this "file:" issue, syncs the output and in the end helps to
identify which file is meant exactly in progress output and co as a
single site can have multiple repositories in different paths.
---
 apt-pkg/contrib/strutl.cc                          | 15 ++++++---
 apt-pkg/contrib/strutl.h                           |  1 +
 apt-pkg/deb/debindexfile.cc                        | 10 +++---
 apt-pkg/deb/debmetaindex.cc                        |  4 +--
 test/integration/test-apt-cache                    |  2 +-
 test/integration/test-apt-cli-show                 |  2 +-
 .../integration/test-apt-get-update-unauth-warning | 12 +++----
 .../test-apt-translation-has-no-packages           |  2 +-
 test/integration/test-apt-update-nofallback        |  6 ++--
 test/integration/test-apt-update-rollback          |  6 ++--
 .../test-bug-543966-downgrade-below-1000-pin       |  2 +-
 .../test-bug-595691-empty-and-broken-archive-files |  5 +--
 .../test-cve-2013-1051-InRelease-parsing           |  2 +-
 test/integration/test-policy-pinning               |  8 ++---
 test/integration/test-releasefile-verification     |  4 +--
 .../test-ubuntu-bug-1098738-apt-get-source-md5sum  | 28 ++++++++--------
 test/libapt/uri_test.cc                            | 39 ++++++++++++++++++++++
 17 files changed, 98 insertions(+), 50 deletions(-)

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 0db4c57b2..5731b5a2b 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1637,8 +1637,6 @@ URI::operator string()
 }
 									/*}}}*/
 // URI::SiteOnly - Return the schema and site for the URI		/*{{{*/
-// ---------------------------------------------------------------------
-/* */
 string URI::SiteOnly(const string &URI)
 {
    ::URI U(URI);
@@ -1648,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 d64270aaf..01bbfef72 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -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 185248619..20bf5ae50 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -57,7 +57,7 @@ string debSourcesIndex::SourceInfo(pkgSrcRecords::Parser const &Record,
 				   pkgSrcRecords::File const &File) const
 {
    string Res;
-   Res = ::URI::NoUserPassword(URI) + ' ';
+   Res = ::URI::ArchiveOnly(URI) + ' ';
    if (Dist[Dist.size() - 1] == '/')
    {
       if (Dist != "/")
@@ -116,7 +116,7 @@ string debSourcesIndex::Describe(bool Short) const
 /* */
 string debSourcesIndex::Info(const char *Type) const
 {
-   string Info = ::URI::NoUserPassword(URI) + ' ';
+   string Info = ::URI::ArchiveOnly(URI) + ' ';
    if (Dist[Dist.size() - 1] == '/')
    {
       if (Dist != "/")
@@ -210,7 +210,7 @@ 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) + ' ';
+   string Res = ::URI::ArchiveOnly(URI) + ' ';
    if (Dist[Dist.size() - 1] == '/')
    {
       if (Dist != "/")
@@ -248,7 +248,7 @@ string debPackagesIndex::Describe(bool Short) const
 /* */
 string debPackagesIndex::Info(const char *Type) const 
 {
-   string Info = ::URI::NoUserPassword(URI) + ' ';
+   string Info = ::URI::ArchiveOnly(URI) + ' ';
    if (Dist[Dist.size() - 1] == '/')
    {
       if (Dist != "/")
@@ -473,7 +473,7 @@ string debTranslationsIndex::Describe(bool Short) const
 /* */
 string debTranslationsIndex::Info(const char *Type) const 
 {
-   string Info = ::URI::NoUserPassword(URI) + ' ';
+   string Info = ::URI::ArchiveOnly(URI) + ' ';
    if (Dist[Dist.size() - 1] == '/')
    {
       if (Dist != "/")
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index e1f86d20f..d4e340be0 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -25,7 +25,7 @@ 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 != "/")
@@ -105,7 +105,7 @@ void foreachTarget(std::string const URI, std::string const Dist,
    else
       baseURI += "dists/" + Dist + "/";
    std::string const Release = (Dist == "/") ? "" : Dist;
-   std::string const Site = ::URI::SiteOnly(URI);
+   std::string const Site = ::URI::ArchiveOnly(URI);
    std::vector<std::string> lang = APT::Configuration::getLanguages(true);
    if (lang.empty())
       lang.push_back("none");
diff --git a/test/integration/test-apt-cache b/test/integration/test-apt-cache
index f3db8024f..97dc0f939 100755
--- a/test/integration/test-apt-cache
+++ b/test/integration/test-apt-cache
@@ -50,7 +50,7 @@ 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
+testsuccessequal "       foo |          1 | file:$(readlink -f .)/aptarchive unstable/main amd64 Packages" aptcache madison foo
 
 ### depends
 
diff --git a/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show
index 43072cf03..5f4ef1b48 100755
--- a/test/integration/test-apt-cli-show
+++ b/test/integration/test-apt-cli-show
@@ -32,7 +32,7 @@ Maintainer: Joe Sixpack <joe@example.org>
 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
diff --git a/test/integration/test-apt-get-update-unauth-warning b/test/integration/test-apt-get-update-unauth-warning
index 81c01ba3e..ada7f7a26 100755
--- a/test/integration/test-apt-get-update-unauth-warning
+++ b/test/integration/test-apt-get-update-unauth-warning
@@ -19,11 +19,11 @@ APTARCHIVE=$(readlink -f ./aptarchive)
 rm -f $APTARCHIVE/dists/unstable/*Release*
 
 # update without authenticated files leads to warning
-testfailureequal "Ign file: unstable InRelease
+testfailureequal "Ign file:$APTARCHIVE unstable InRelease
   File not found
-Err file: unstable Release
+Err 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
@@ -32,12 +32,12 @@ testequal 'lock
 partial' ls rootdir/var/lib/apt/lists
 
 # allow override
-testwarningequal "Ign file: unstable InRelease
+testwarningequal "Ign file:$APTARCHIVE unstable InRelease
   File not found
-Ign file: unstable Release
+Ign file:$APTARCHIVE unstable Release
   File not found
 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
 testfailureequal "WARNING: The following packages cannot be authenticated!
   foo
diff --git a/test/integration/test-apt-translation-has-no-packages b/test/integration/test-apt-translation-has-no-packages
index 440fd30cf..cf5b56243 100755
--- a/test/integration/test-apt-translation-has-no-packages
+++ b/test/integration/test-apt-translation-has-no-packages
@@ -38,4 +38,4 @@ testsuccessequal "foo:
   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-nofallback b/test/integration/test-apt-update-nofallback
index f132bcf8e..2ded73122 100755
--- a/test/integration/test-apt-update-nofallback
+++ b/test/integration/test-apt-update-nofallback
@@ -33,7 +33,7 @@ EOF
 
 assert_update_is_refused_and_last_good_state_used()
 {
-    testfailuremsg "E: The repository 'file: unstable Release' is no longer signed." aptget update
+    testfailuremsg "E: The repository 'file:${APTARCHIVE} unstable Release' is no longer signed." aptget update
 
     assert_repo_is_intact
 }
@@ -171,7 +171,7 @@ test_inrelease_to_invalid_inrelease()
     sed -i 's/^Codename:.*/Codename: evil!/' $APTARCHIVE/dists/unstable/InRelease
     inject_evil_package
 
-    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: 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>
 
@@ -195,7 +195,7 @@ test_release_gpg_to_invalid_release_release_gpg()
     echo "Some evil data" >>  $APTARCHIVE/dists/unstable/Release
     inject_evil_package
 
-    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: unstable Release: 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-rollback b/test/integration/test-apt-update-rollback
index 6ecf322b2..70619dd08 100755
--- a/test/integration/test-apt-update-rollback
+++ b/test/integration/test-apt-update-rollback
@@ -78,7 +78,7 @@ test_inrelease_to_valid_release() {
     rm $APTARCHIVE/dists/unstable/Release.gpg
 
     # update fails
-    testfailureequal "E: The repository 'file: unstable Release' 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
-    testfailureequal "E: The repository 'file: unstable Release' 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)"
@@ -144,7 +144,7 @@ test_inrelease_to_unauth_inrelease() {
 
     signreleasefiles 'Marvin Paranoid'
 
-    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: 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
 
diff --git a/test/integration/test-bug-543966-downgrade-below-1000-pin b/test/integration/test-bug-543966-downgrade-below-1000-pin
index e59231608..180393867 100755
--- a/test/integration/test-bug-543966-downgrade-below-1000-pin
+++ b/test/integration/test-bug-543966-downgrade-below-1000-pin
@@ -13,7 +13,7 @@ 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)"
 
 testsuccessequal "base-files:
   Installed: 5.0.0-1
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 486b8ba02..b42212f5e 100755
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -49,6 +49,7 @@ createemptyfile() {
 }
 
 testoverfile() {
+	local APTARCHIVE="$(readlink -f ./aptarchive)"
 	forcecompressor "$1"
 
 	createemptyfile 'en'
@@ -63,9 +64,9 @@ testoverfile() {
 	testaptgetupdate 'Reading package lists...' "empty archive Packages.$COMPRESS over file"
 
 	createemptyfile 'Packages'
-	testaptgetupdate "Err file:  Packages
+	testaptgetupdate "Err 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"
 }
diff --git a/test/integration/test-cve-2013-1051-InRelease-parsing b/test/integration/test-cve-2013-1051-InRelease-parsing
index d99174553..933cbbd92 100755
--- a/test/integration/test-cve-2013-1051-InRelease-parsing
+++ b/test/integration/test-cve-2013-1051-InRelease-parsing
@@ -12,7 +12,7 @@ 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
 
diff --git a/test/integration/test-policy-pinning b/test/integration/test-policy-pinning
index 2675b51bc..9cd54264b 100755
--- a/test/integration/test-policy-pinning
+++ b/test/integration/test-policy-pinning
@@ -20,7 +20,7 @@ testequalpolicy() {
 	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 $*
 }
@@ -105,11 +105,11 @@ 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
@@ -121,7 +121,7 @@ testequalpolicycoolstuff() {
  $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-releasefile-verification b/test/integration/test-releasefile-verification
index 469ed34d2..e8419524c 100755
--- a/test/integration/test-releasefile-verification
+++ b/test/integration/test-releasefile-verification
@@ -41,7 +41,7 @@ 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
 }
 
@@ -54,7 +54,7 @@ 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
 }
 
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 555d8fcaa..6abb5d12a 100755
--- a/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
+++ b/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
@@ -148,8 +148,8 @@ testok() {
 	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
@@ -175,11 +175,11 @@ testmismatch() {
 	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]
-Err http://localhost:8080/  $1 1.0 (dsc)
+Get:1 http://localhost:8080  $1 1.0 (dsc) [3 B]
+Err http://localhost:8080  $1 1.0 (dsc)
   Hash Sum mismatch
-Get:2 http://localhost:8080/  $1 1.0 (tar) [3 B]
-Err http://localhost:8080/  $1 1.0 (tar)
+Get:2 http://localhost:8080  $1 1.0 (tar) [3 B]
+Err http://localhost:8080  $1 1.0 (tar)
   Hash Sum mismatch
 E: Failed to fetch http://localhost:8080/${1}_1.0.dsc  Hash Sum mismatch
 
@@ -203,8 +203,8 @@ Download complete and in download only mode" aptget source -d "$@" -o Acquire::F
 	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
@@ -240,9 +240,9 @@ testok pkg-mixed-ok
 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]
-Err http://localhost:8080/  pkg-mixed-sha1-bad 1.0 (dsc)
+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 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
 
@@ -252,10 +252,10 @@ testsuccess --nomsg test ! -e pkg-mixed-sha1-bad_1.0.dsc -a -e pkg-mixed-sha1-ba
 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]
-Err http://localhost:8080/  pkg-mixed-sha2-bad 1.0 (tar)
+Get:1 http://localhost:8080  pkg-mixed-sha2-bad 1.0 (tar) [3 B]
+Err 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]
+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
diff --git a/test/libapt/uri_test.cc b/test/libapt/uri_test.cc
index 5d5ae9679..fe6015e65 100644
--- a/test/libapt/uri_test.cc
+++ b/test/libapt/uri_test.cc
@@ -13,6 +13,9 @@ TEST(URITest, BasicHTTP)
    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);
@@ -22,6 +25,9 @@ TEST(URITest, BasicHTTP)
    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)
 {
@@ -33,6 +39,9 @@ TEST(URITest, SingeSlashFile)
    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)
 {
@@ -44,6 +53,9 @@ TEST(URITest, BasicCDROM)
    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)
 {
@@ -55,6 +67,9 @@ TEST(URITest, RelativeGzip)
    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)
 {
@@ -66,6 +81,9 @@ TEST(URITest, NoSlashFTP)
    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)
 {
@@ -77,6 +95,9 @@ TEST(URITest, RFC2732)
    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);
@@ -86,6 +107,9 @@ TEST(URITest, RFC2732)
    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);
@@ -95,6 +119,9 @@ TEST(URITest, RFC2732)
    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);
@@ -104,6 +131,9 @@ TEST(URITest, RFC2732)
    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/");
@@ -114,6 +144,9 @@ TEST(URITest, RFC2732)
    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);
@@ -123,9 +156,15 @@ TEST(URITest, RFC2732)
    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));
 }
-- 
cgit v1.2.3-70-g09d2


From e3c1cfc767f17f5e9b2cd99f2658db3d6ac8edd9 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 11 Jun 2015 11:38:04 +0200
Subject: use IndexTarget to get to IndexFile

Removes a bunch of duplicated code in the deb-specific parts. Especially
the Description part is now handled centrally by IndexTarget instead of
being duplicated to the derivations of IndexFile.

Git-Dch: Ignore
---
 apt-pkg/acquire-item.cc     |   9 --
 apt-pkg/acquire-item.h      |  31 +---
 apt-pkg/deb/debindexfile.cc | 381 ++++----------------------------------------
 apt-pkg/deb/debindexfile.h  |  84 ++--------
 apt-pkg/deb/debmetaindex.cc |  56 ++-----
 apt-pkg/indexfile.cc        |  87 +++++++++-
 apt-pkg/indexfile.h         |  58 ++++++-
 7 files changed, 197 insertions(+), 509 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 05ea9c069..d4191f00e 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -382,15 +382,6 @@ bool pkgAcqDiffIndex::TransactionState(TransactionStates const state)
 }
 									/*}}}*/
 
-// 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)
-{
-}
-									/*}}}*/
-
 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.
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 790d1f3d8..b6d569737 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -21,6 +21,7 @@
 #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>
@@ -31,7 +32,6 @@
 #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>
@@ -47,37 +47,8 @@
 class indexRecords;
 class pkgRecords;
 class pkgSourceList;
-class IndexTarget;
 class pkgAcqMetaBase;
 
-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 Target specific options defined by the implementation */
-   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);
-};
-									/*}}}*/
 class pkgAcquire::Item : public WeakPointable				/*{{{*/
 /** \brief Represents the process by which a pkgAcquire object should
  *  retrieve a file or a collection of files.
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 20bf5ae50..3e60423ff 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -44,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)
 {
 }
 									/*}}}*/
@@ -56,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::ArchiveOnly(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 += " ";
@@ -80,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::ArchiveOnly(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	/*{{{*/
@@ -210,135 +93,40 @@ 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::ArchiveOnly(URI) + ' ';
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      if (Dist != "/")
-	 Res += Dist;
-   }
-   else
-      Res += Dist + '/' + Section;
-   
+   std::string const Dist = Target.Option("RELEASE");
+   string Res = Target.Option("SITE") + " " + Dist;
+   std::string const Component = Target.Option("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::ArchiveOnly(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("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("REPO_URI");
+   std::string Dist = Target.Option("RELEASE");
+   if (Dist.empty())
+      Dist = "/";
    ::URI Tmp(URI);
    if (Gen.SelectFile(PackageFile,Tmp.Host,*this) == false)
       return _error->Error("Problem with SelectFile %s",PackageFile.c_str());
@@ -370,7 +158,7 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 
       if (_error->PendingError() == true)
 	 return false;
-      Parser.LoadReleaseInfo(File,Rel,Section);
+      Parser.LoadReleaseInfo(File, Rel, Target.Option("COMPONENT"));
    }
    
    return true;
@@ -381,7 +169,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)
    {
@@ -411,113 +199,13 @@ pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const
 									/*}}}*/
 
 // TranslationsIndex::debTranslationsIndex - Contructor			/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-debTranslationsIndex::debTranslationsIndex(std::string const &URI, std::string const &Dist,
-						std::string const &Section, std::string 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
-{
-   std::string S;
-   if (Short == true)
-      strprintf(S,"%s",Info(TranslationFile().c_str()).c_str());
-   else
-      strprintf(S,"%s (%s)",Info(TranslationFile().c_str()).c_str(),
-	       IndexFile(Language.c_str()).c_str());
-   return S;
-}
-									/*}}}*/
-// TranslationsIndex::Info - One liner describing the index URI		/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debTranslationsIndex::Info(const char *Type) const 
-{
-   string Info = ::URI::ArchiveOnly(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.c_str()));
-}
-									/*}}}*/
-// TranslationsIndex::Exists - Check if the index is available		/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debTranslationsIndex::Exists() const
-{
-   return FileExists(IndexFile(Language.c_str()));
-}
-									/*}}}*/
-// 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.c_str()), 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		/*{{{*/
@@ -526,7 +214,7 @@ unsigned long debTranslationsIndex::Size() const
 bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 {
    // Check the translation file, if in use
-   string TranslationFile = IndexFile(Language.c_str());
+   string const TranslationFile = IndexFileName();
    if (FileExists(TranslationFile))
    {
      FileFd Trans(TranslationFile,FileFd::ReadOnly, FileFd::Extension);
@@ -535,7 +223,7 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
        return false;
      
      if (Prog != NULL)
-	Prog->SubProgress(0, Info(TranslationFile.c_str()));
+	Prog->SubProgress(0, Target.Description);
      if (Gen.SelectFile(TranslationFile,string(),*this) == false)
        return _error->Error("Problem with SelectFile %s",TranslationFile.c_str());
 
@@ -556,8 +244,8 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 /* */
 pkgCache::PkgFileIterator debTranslationsIndex::FindInCache(pkgCache &Cache) const
 {
-   string FileName = IndexFile(Language.c_str());
-   
+   string FileName = IndexFileName();
+
    pkgCache::PkgFileIterator File = Cache.FileBegin();
    for (; File.end() == false; ++File)
    {
@@ -580,10 +268,11 @@ pkgCache::PkgFileIterator debTranslationsIndex::FindInCache(pkgCache &Cache) con
 	 return pkgCache::PkgFileIterator(Cache);
       }
       return File;
-   }   
+   }
    return File;
 }
 									/*}}}*/
+
 // StatusIndex::debStatusIndex - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index 1e5882071..dd3f212b2 100644
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -30,19 +30,16 @@ class pkgCacheGenerator;
 
 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;};
@@ -54,91 +51,42 @@ class APT_HIDDEN debStatusIndex : public pkgIndexFile
    debStatusIndex(std::string File);
    virtual ~debStatusIndex();
 };
-    
-class APT_HIDDEN debPackagesIndex : public pkgIndexFile
-{
-   /** \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;
 
+class APT_HIDDEN debPackagesIndex : public pkgIndexTargetFile
+{
    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 APT_HIDDEN debTranslationsIndex : public pkgIndexFile
+class APT_HIDDEN debTranslationsIndex : public pkgIndexTargetFile
 {
-   /** \brief dpointer placeholder (for later in case we need it) */
-   void *d;
-
-   std::string const URI;
-   std::string const Dist;
-   std::string const Section;
-   std::string 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 const &URI,std::string const &Dist,std::string const &Section, std::string const &Language);
+   debTranslationsIndex(IndexTarget const &Target);
    virtual ~debTranslationsIndex();
 };
 
-class APT_HIDDEN 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,20 +94,14 @@ class APT_HIDDEN 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();
 };
 
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index d4e340be0..9108a5097 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -140,6 +140,7 @@ void foreachTarget(std::string const URI, std::string const Dist,
 	       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("CREATED_BY", *T));
 	       Call(MetaKey, ShortDesc, LongDesc, IsOptional, Options);
 
@@ -186,6 +187,7 @@ void foreachTarget(std::string const URI, std::string const Dist,
 	       Options.insert(std::make_pair("LANGUAGE", *l));
 	       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("CREATED_BY", *T));
 	       Call(MetaKey, ShortDesc, LongDesc, IsOptional, Options);
 
@@ -294,55 +296,25 @@ bool debReleaseIndex::IsTrusted() const
    return FileExists(VerifiedSigFile);
 }
 
-struct GetIndexFilesClass
+std::vector <pkgIndexFile *> *debReleaseIndex::GetIndexFiles()
 {
-   vector <pkgIndexFile *> * const Indexes;
-   std::string const URI;
-   std::string const Release;
-   bool const IsTrusted;
+   if (Indexes != NULL)
+      return Indexes;
 
-   void operator()(std::string const &/*URI*/, std::string const &/*ShortDesc*/, std::string const &/*LongDesc*/,
-	 bool const /*IsOptional*/, std::map<std::string, std::string> Options)
+   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 = Options.find("CREATED_BY")->second;
+      std::string const TargetName = T->Options.find("CREATED_BY")->second;
       if (TargetName == "Packages")
-      {
-	 Indexes->push_back(new debPackagesIndex(
-		  URI,
-		  Release,
-		  Options.find("COMPONENT")->second,
-		  IsTrusted,
-		  Options.find("ARCHITECTURE")->second
-		  ));
-      }
+	 Indexes->push_back(new debPackagesIndex(*T, istrusted));
       else if (TargetName == "Sources")
-	 Indexes->push_back(new debSourcesIndex(
-		  URI,
-		  Release,
-		  Options.find("COMPONENT")->second,
-		  IsTrusted
-		  ));
+	 Indexes->push_back(new debSourcesIndex(*T, istrusted));
       else if (TargetName == "Translations")
-	 Indexes->push_back(new debTranslationsIndex(
-		  URI,
-		  Release,
-		  Options.find("COMPONENT")->second,
-		  Options.find("LANGUAGE")->second
-		  ));
+	 Indexes->push_back(new debTranslationsIndex(*T));
    }
-
-   GetIndexFilesClass(std::string const &URI, std::string const &Release, bool const IsTrusted) :
-      Indexes(new vector <pkgIndexFile*>), URI(URI), Release(Release), IsTrusted(IsTrusted) {}
-};
-
-std::vector <pkgIndexFile *> *debReleaseIndex::GetIndexFiles()
-{
-   if (Indexes != NULL)
-      return Indexes;
-
-   GetIndexFilesClass comp(URI, Dist, IsTrusted());
-   foreachTarget(URI, Dist, ArchEntries, comp);
-   return Indexes = comp.Indexes;
+   return Indexes;
 }
 
 void debReleaseIndex::PushSectionEntry(vector<string> const &Archs, const debSectionEntry *Entry) {
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index 89615cb41..bbcd9246c 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>
@@ -48,27 +50,26 @@ pkgIndexFile::Type *pkgIndexFile::Type::GetType(const char *Type)
       if (strcmp(GlobalList[I]->Label,Type) == 0)
 	 return GlobalList[I];
    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,77 @@ 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(std::string const &Key) const		/*{{{*/
+{
+   std::map<std::string,std::string>::const_iterator const M = Options.find(Key);
+   if (M == Options.end())
+      return "";
+   return M->second;
+}
+									/*}}}*/
+
+pkgIndexTargetFile::pkgIndexTargetFile(IndexTarget const &Target, bool const Trusted) :/*{{{*/
+   pkgIndexFile(Trusted), Target(Target)
+{
+}
+									/*}}}*/
+std::string pkgIndexTargetFile::ArchiveURI(std::string File) const/*{{{*/
+{
+   return Target.Option("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 =_config->FindDir("Dir::State::lists") + URItoFileName(Target.URI);
+   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());
+}
+									/*}}}*/
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index 817165f08..e6e429c2c 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -28,6 +28,7 @@
 #include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/macros.h>
 
+#include <map>
 #include <string>
 
 #ifndef APT_8_CLEANER_HEADERS
@@ -40,17 +41,48 @@ 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 Target specific options defined by the implementation */
+   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);
+
+   std::string Option(std::string const &Key) const;
+};
+									/*}}}*/
+
 class pkgIndexFile
 {
    protected:
    bool Trusted;
-     
+
    public:
 
    class Type
    {
       public:
-      
+
       // Global list of Items supported
       static Type **GlobalList;
       static unsigned long GlobalListLen;
@@ -70,7 +102,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 +127,25 @@ class pkgIndexFile
    static std::string LanguageCode();
 
    bool IsTrusted() const { return Trusted; };
-   
-   pkgIndexFile(bool Trusted): Trusted(Trusted) {};
+
+   pkgIndexFile(bool Trusted);
    virtual ~pkgIndexFile() {};
 };
 
+class pkgIndexTargetFile : public pkgIndexFile
+{
+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);
+};
+
 #endif
-- 
cgit v1.2.3-70-g09d2


From 001c76fe204e17916a6c8b351ff30b67d32cb779 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 11 Jun 2015 11:59:16 +0200
Subject: use an enum instead of strings as IndexTarget::Option interface

Strings are easy to typo and we can keep the extensibility we require
here with a simple enum we can append to without endangering ABI.

Git-Dch: Ignore
---
 apt-pkg/deb/debindexfile.cc | 14 +++++++-------
 apt-pkg/deb/debmetaindex.cc |  2 +-
 apt-pkg/indexfile.cc        | 18 ++++++++++++++++--
 apt-pkg/indexfile.h         | 16 ++++++++++++++--
 4 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 3e60423ff..7aad65c0e 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -93,9 +93,9 @@ debPackagesIndex::debPackagesIndex(IndexTarget const &Target, bool const Trusted
 /* This is a shorter version that is designed to be < 60 chars or so */
 string debPackagesIndex::ArchiveInfo(pkgCache::VerIterator Ver) const
 {
-   std::string const Dist = Target.Option("RELEASE");
-   string Res = Target.Option("SITE") + " " + Dist;
-   std::string const Component = Target.Option("COMPONENT");
+   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;
 
@@ -115,7 +115,7 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 {
    string const PackageFile = IndexFileName();
    FileFd Pkg(PackageFile,FileFd::ReadOnly, FileFd::Extension);
-   debListParser Parser(&Pkg, Target.Option("ARCHITECTURE"));
+   debListParser Parser(&Pkg, Target.Option(IndexTarget::ARCHITECTURE));
 
    if (_error->PendingError() == true)
       return _error->Error("Problem opening %s",PackageFile.c_str());
@@ -123,8 +123,8 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
       Prog->SubProgress(0, Target.Description);
 
 
-   std::string const URI = Target.Option("REPO_URI");
-   std::string Dist = Target.Option("RELEASE");
+   std::string const URI = Target.Option(IndexTarget::REPO_URI);
+   std::string Dist = Target.Option(IndexTarget::RELEASE);
    if (Dist.empty())
       Dist = "/";
    ::URI Tmp(URI);
@@ -158,7 +158,7 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 
       if (_error->PendingError() == true)
 	 return false;
-      Parser.LoadReleaseInfo(File, Rel, Target.Option("COMPONENT"));
+      Parser.LoadReleaseInfo(File, Rel, Target.Option(IndexTarget::COMPONENT));
    }
    
    return true;
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 9108a5097..c05e7cdae 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -306,7 +306,7 @@ std::vector <pkgIndexFile *> *debReleaseIndex::GetIndexFiles()
    bool const istrusted = IsTrusted();
    for (std::vector<IndexTarget>::const_iterator T = Targets.begin(); T != Targets.end(); ++T)
    {
-      std::string const TargetName = T->Options.find("CREATED_BY")->second;
+      std::string const TargetName = T->Option(IndexTarget::CREATED_BY);
       if (TargetName == "Packages")
 	 Indexes->push_back(new debPackagesIndex(*T, istrusted));
       else if (TargetName == "Sources")
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index bbcd9246c..72d35ddcc 100644
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -120,8 +120,22 @@ IndexTarget::IndexTarget(std::string const &MetaKey, std::string const &ShortDes
 {
 }
 									/*}}}*/
-std::string IndexTarget::Option(std::string const &Key) const		/*{{{*/
+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(CREATED_BY);
+#undef APT_CASE
+   }
    std::map<std::string,std::string>::const_iterator const M = Options.find(Key);
    if (M == Options.end())
       return "";
@@ -136,7 +150,7 @@ pkgIndexTargetFile::pkgIndexTargetFile(IndexTarget const &Target, bool const Tru
 									/*}}}*/
 std::string pkgIndexTargetFile::ArchiveURI(std::string File) const/*{{{*/
 {
-   return Target.Option("REPO_URI") + File;
+   return Target.Option(IndexTarget::REPO_URI) + File;
 }
 									/*}}}*/
 std::string pkgIndexTargetFile::Describe(bool Short) const		/*{{{*/
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index e6e429c2c..c38cf0bf0 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -61,14 +61,26 @@ class IndexTarget							/*{{{*/
    /** \brief Is it okay if the file isn't found in the meta index */
    bool IsOptional;
 
-   /** \brief Target specific options defined by the implementation */
+   /** \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);
 
-   std::string Option(std::string const &Key) const;
+   enum OptionKeys {
+      SITE,
+      RELEASE,
+      COMPONENT,
+      LANGUAGE,
+      ARCHITECTURE,
+      BASE_URI,
+      REPO_URI,
+      CREATED_BY,
+   };
+   std::string Option(OptionKeys const Key) const;
 };
 									/*}}}*/
 
-- 
cgit v1.2.3-70-g09d2


From 8881b11eacd735148d087c8c0f53827cb537b582 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 11 Jun 2015 16:40:45 +0200
Subject: implement 'apt-get files' to access index targets

Downloading additional files is only half the job. We still need a way
to allow external tools to know where the files are they requested for
download given that we don't want them to choose their own location.

'apt-get files' is our answer to this showing by default in a deb822
format information about each IndexTarget with the potential to filter
the records based on lines and an option to change the output format.

The command serves also as an example on how to get to this information
via libapt.
---
 apt-pkg/deb/debmetaindex.cc                        | 17 +++--
 apt-pkg/indexfile.cc                               | 18 ++++-
 apt-pkg/indexfile.h                                |  3 +
 apt-private/private-cmndline.cc                    |  4 +
 cmdline/apt-get.cc                                 | 87 ++++++++++++++++++++++
 doc/acquire-additional-files.txt                   | 87 +++++++++++++++++++++-
 doc/apt-get.8.xml                                  | 15 ++++
 test/integration/test-apt-acquire-additional-files |  2 +
 8 files changed, 223 insertions(+), 10 deletions(-)

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index c05e7cdae..8e4c2be2d 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -136,11 +136,14 @@ void foreachTarget(std::string const URI, std::string const Dist,
 	       std::map<std::string, std::string> Options;
 	       Options.insert(std::make_pair("SITE", Site));
 	       Options.insert(std::make_pair("RELEASE", Release));
-	       Options.insert(std::make_pair("COMPONENT", (*I)->Section));
-	       Options.insert(std::make_pair("LANGUAGE", *l));
+	       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);
 
@@ -183,11 +186,15 @@ void foreachTarget(std::string const URI, std::string const Dist,
 	       std::map<std::string, std::string> Options;
 	       Options.insert(std::make_pair("SITE", Site));
 	       Options.insert(std::make_pair("RELEASE", Release));
-	       Options.insert(std::make_pair("COMPONENT", (*I)->Section));
-	       Options.insert(std::make_pair("LANGUAGE", *l));
-	       Options.insert(std::make_pair("ARCHITECTURE", a->first));
+	       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);
 
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index 72d35ddcc..33fb48e35 100644
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -133,8 +133,10 @@ std::string IndexTarget::Option(OptionKeys const EnumKey) const		/*{{{*/
       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);
    }
    std::map<std::string,std::string>::const_iterator const M = Options.find(Key);
    if (M == Options.end())
@@ -142,6 +144,20 @@ std::string IndexTarget::Option(OptionKeys const EnumKey) const		/*{{{*/
    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)
@@ -162,7 +178,7 @@ std::string pkgIndexTargetFile::Describe(bool Short) const		/*{{{*/
 									/*}}}*/
 std::string pkgIndexTargetFile::IndexFileName() const			/*{{{*/
 {
-   std::string const s =_config->FindDir("Dir::State::lists") + URItoFileName(Target.URI);
+   std::string const s = Target.Option(IndexTarget::FILENAME);
    if (FileExists(s))
       return s;
 
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index c38cf0bf0..220c415ac 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -79,8 +79,11 @@ class IndexTarget							/*{{{*/
       BASE_URI,
       REPO_URI,
       CREATED_BY,
+      TARGET_OF,
+      FILENAME,
    };
    std::string Option(OptionKeys const Key) const;
+   std::string Format(std::string format) const;
 };
 									/*}}}*/
 
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 41aab81f6..458051bf2 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -163,6 +163,10 @@ 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);
+   }
    else if (CmdMatches("clean", "autoclean", "check", "download", "changelog") ||
 	    CmdMatches("markauto", "unmarkauto")) // deprecated commands
       ;
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index c1f78523c..0fff2db58 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>
@@ -1602,6 +1603,91 @@ static bool DoChangelog(CommandLine &CmdL)
    return true;
 }
 									/*}}}*/
+// DoFiles - Lists all IndexTargets					/*{{{*/
+static std::string format_key(std::string key)
+{
+   // 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)
+   {
+      key[found] = '-';
+      key[found + 1] = ::toupper(key[found + 1]);
+   }
+   return key;
+}
+static bool DoFiles(CommandLine &CmdL)
+{
+   pkgCacheFile CacheFile;
+   pkgSourceList *SrcList = CacheFile.GetSourceList();
+
+   if (SrcList == NULL)
+      return false;
+
+   std::string const Format = _config->Find("APT::Get::Files::Format");
+   bool Filtered = CmdL.FileSize() > 1;
+   for (pkgSourceList::const_iterator S = SrcList->begin(); S != SrcList->end(); ++S)
+   {
+      std::vector<IndexTarget> const targets = (*S)->GetIndexTargets();
+      std::map<std::string, string> AddOptions;
+      AddOptions.insert(std::make_pair("TRUSTED", ((*S)->IsTrusted() ? "yes" : "no")));
+
+      for (std::vector<IndexTarget>::const_iterator T = targets.begin(); T != targets.end(); ++T)
+      {
+	 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: " << T->Option(IndexTarget::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 = T->Format(Format);
+	    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;
+	 }
+      }
+   }
+
+   return true;
+}
+									/*}}}*/
 // ShowHelp - Show a help screen					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -1716,6 +1802,7 @@ int main(int argc,const char *argv[])					/*{{{*/
 				   {"source",&DoSource},
                                    {"download",&DoDownload},
                                    {"changelog",&DoChangelog},
+				   {"files",&DoFiles},
 				   {"moo",&DoMoo},
 				   {"help",&ShowHelp},
                                    {0,0}};
diff --git a/doc/acquire-additional-files.txt b/doc/acquire-additional-files.txt
index ab833440b..a47dac2d4 100644
--- a/doc/acquire-additional-files.txt
+++ b/doc/acquire-additional-files.txt
@@ -47,11 +47,13 @@ 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 MetaKey form multiple types!
+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 never shown or used.
+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
@@ -123,11 +125,12 @@ by the acquire system. The following variables are known; note that
 unknown variables have no default value nor are they touched: They are
 printed literally.
 
-* $(SITE): An identifier of the site we access, e.g.
-  "http://example.org/".
+* $(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".
 * $(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.
@@ -137,3 +140,79 @@ printed literally.
   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 another variable contact us instead.
+
+# 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.
+
+Remarks on the 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.
+* Filename: The mentioned file doesn't need to exist, e.g. because the
+  file wasn't downloaded yet – or it does exist compressed. libapt users
+  are encouraged to use FileFd to open such files as it can handle
+  decompression transparently.
+* Trusted: As of the last 'apt-get update' call denoting if e.g. apt-get
+  would print the unauthenticated warning while installing packages
+  mentioned in this file (example assumes Packages file) [Not really
+  a property of the target itself, but of the metaIndex].
+* 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 implementation, 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..da077afa7 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -243,6 +243,21 @@
        </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/test/integration/test-apt-acquire-additional-files b/test/integration/test-apt-acquire-additional-files
index 4a6845f40..971cfac2e 100755
--- a/test/integration/test-apt-acquire-additional-files
+++ b/test/integration/test-apt-acquire-additional-files
@@ -48,6 +48,7 @@ Get:1 http://localhost:8080 unstable/main amd64 Contents [$(stat -c%s aptarchive
 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,
@@ -72,6 +73,7 @@ Get:1 http://localhost:8080 unstable/main amd64 Contents.gz [$(stat -c%s aptarch
 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
-- 
cgit v1.2.3-70-g09d2


From b07aeb1a6e24825e534167a737043441e871de9f Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Fri, 12 Jun 2015 02:08:53 +0200
Subject: store Release files data in the Cache

We used to read the Release file for each Packages file and store the
data in the PackageFile struct even through potentially many Packages
(and Translation-*) files could use the same data. The point of the
exercise isn't the duplicated data through. Having the Release files as
first-class citizens in the Cache allows us to properly track their
state as well as allows us to use the information also for files which
aren't in the cache, but where we know to which Release file they
belong (Sources are an example for this).

This modifies the pkgCache structs, especially the PackagesFile struct
which depending on how libapt users access the data in these structs can
mean huge breakage or no visible change. As a single data point:
aptitude seems to be fine with this. Even if there is breakage it is
trivial to fix in a backportable way while avoiding breakage for
everyone would be a huge pain for us.

Note that not all PackageFile structs have a corresponding ReleaseFile.
In particular the dpkg/status file as well as *.deb files have not. As
these have only a Archive property need, the Component property takes
over this duty and the ReleaseFile remains zero. This is also the reason
why it isn't needed nor particularily recommended to change from
PackagesFile to ReleaseFile blindly. Sticking with the earlier is
usually the better option.
---
 apt-pkg/acquire-item.cc              |   6 +-
 apt-pkg/cacheiterators.h             |  46 ++++++-
 apt-pkg/clean.cc                     |   2 +-
 apt-pkg/deb/debindexfile.cc          |  42 ++-----
 apt-pkg/deb/debindexfile.h           |   1 -
 apt-pkg/deb/deblistparser.cc         |  37 ------
 apt-pkg/deb/deblistparser.h          |   6 +-
 apt-pkg/deb/debmetaindex.cc          | 124 ++++++++++++++++++-
 apt-pkg/deb/debmetaindex.h           |   6 +
 apt-pkg/deb/dpkgpm.cc                |   4 +-
 apt-pkg/depcache.cc                  |   6 +-
 apt-pkg/edsp.cc                      |   2 +-
 apt-pkg/edsp/edspindexfile.cc        |   5 +-
 apt-pkg/edsp/edsplistparser.cc       |   4 +-
 apt-pkg/edsp/edsplistparser.h        |   4 +-
 apt-pkg/metaindex.cc                 |  17 +++
 apt-pkg/metaindex.h                  |   6 +
 apt-pkg/pkgcache.cc                  |  77 ++++++++----
 apt-pkg/pkgcache.h                   |  75 ++++++++++--
 apt-pkg/pkgcachegen.cc               | 226 +++++++++++++++++++++++++++--------
 apt-pkg/pkgcachegen.h                |  10 +-
 apt-pkg/policy.cc                    |  15 ++-
 apt-pkg/versionmatch.cc              |  45 +++----
 apt-pkg/versionmatch.h               |   4 +-
 cmdline/apt-cache.cc                 |  11 +-
 test/integration/framework           |   9 +-
 test/integration/test-policy-pinning |   2 +-
 27 files changed, 573 insertions(+), 219 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index d4191f00e..d6e9ccbe0 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -2568,7 +2568,7 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire * const Owner,pkgSourceList * const Sour
    // 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;
    }
@@ -2636,14 +2636,14 @@ bool pkgAcqArchive::QueueNext()
    {
       pkgCache::PkgFileIterator const PkgF = Vf.File();
       // Ignore not source sources
-      if ((PkgF->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(PkgF, Index) == false)
 	    continue;
-      LocalSource = (PkgF->Flags & pkgCache::Flag::LocalSource) == pkgCache::Flag::LocalSource;
+      LocalSource = PkgF.Flagged(pkgCache::Flag::LocalSource);
 
       // only try to get a trusted package from another source if that source
       // is also trusted
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index fe798799c..301da6fc4 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -367,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/clean.cc b/apt-pkg/clean.cc
index 6edce5b6d..0fca60ba9 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;
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 7aad65c0e..3a79cbc58 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -128,7 +128,7 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
    if (Dist.empty())
       Dist = "/";
    ::URI Tmp(URI);
-   if (Gen.SelectFile(PackageFile,Tmp.Host,*this) == false)
+   if (Gen.SelectFile(PackageFile, *this, Target.Option(IndexTarget::COMPONENT)) == false)
       return _error->Error("Problem with SelectFile %s",PackageFile.c_str());
 
    // Store the IMS information
@@ -136,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, Target.Option(IndexTarget::COMPONENT));
-   }
-   
    return true;
 }
 									/*}}}*/
@@ -221,17 +200,17 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
      debTranslationsParser TransParser(&Trans);
      if (_error->PendingError() == true)
        return false;
-     
+
      if (Prog != NULL)
 	Prog->SubProgress(0, Target.Description);
-     if (Gen.SelectFile(TranslationFile,string(),*this) == false)
+     if (Gen.SelectFile(TranslationFile, *this, Target.Option(IndexTarget::COMPONENT), pkgCache::Flag::NotSource) == 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());
    }
@@ -305,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;
 }
 									/*}}}*/
@@ -431,7 +409,7 @@ bool debDebPkgFileIndex::Merge(pkgCacheGenerator& Gen, OpProgress* Prog) const
 
    // and give it to the list parser
    debDebFileParser Parser(DebControl, DebFile);
-   if(Gen.SelectFile(DebFile, "local", *this, pkgCache::Flag::LocalSource) == 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();
diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index dd3f212b2..6b8c78e5a 100644
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -45,7 +45,6 @@ class APT_HIDDEN debStatusIndex : public pkgIndexFile
    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);
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index b80b57bc4..c5e77b0ff 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -951,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		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 6279d8399..420d5ff08 100644
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -80,9 +80,9 @@ class APT_HIDDEN 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);
+
+   bool LoadReleaseInfo(pkgCache::RlsFileIterator &FileI,FileFd &File,
+			std::string const §ion);
 
    APT_PUBLIC static const char *ParseDepends(const char *Start,const char *Stop,
 	 std::string &Package,std::string &Ver,unsigned int &Op);
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 8e4c2be2d..994b95849 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,6 +24,11 @@
 #include <set>
 #include <algorithm>
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <string.h>
+
 using namespace std;
 
 string debReleaseIndex::MetaIndexInfo(const char *Type) const
@@ -37,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
 {
@@ -339,6 +351,114 @@ debReleaseIndex::debSectionEntry::debSectionEntry (string const &Section,
 		bool const &IsSrc): Section(Section), IsSrc(IsSrc)
 {}
 
+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) 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 (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;
+}
+									/*}}}*/
+
 class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type
 {
    protected:
diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index 0b1b08432..7e9942710 100644
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -20,6 +20,8 @@ class pkgAcquire;
 class pkgIndexFile;
 class debDebPkgFileIndex;
 class IndexTarget;
+class pkgCacheGenerator;
+class OpProgress;
 
 class APT_HIDDEN debReleaseIndex : public metaIndex {
    public:
@@ -48,6 +50,10 @@ class APT_HIDDEN debReleaseIndex : public metaIndex {
    virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const;
    virtual std::vector<IndexTarget> GetIndexTargets() const;
 
+   virtual std::string Describe() const;
+   virtual pkgCache::RlsFileIterator FindInCache(pkgCache &Cache) 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;
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index a7a66c75d..6ee939edd 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -205,8 +205,10 @@ pkgCache::VerIterator FindNowVersion(const pkgCache::PkgIterator &Pkg)
    for (Ver = Pkg.VersionList(); Ver.end() == false; ++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)
+	 {
+	    if (F.Archive() != 0 && strcmp(F.Archive(), "now") == 0)
 	       return Ver;
+	 }
    return Ver;
 }
 									/*}}}*/
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index b73c336db..36e1ac9ec 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1685,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/edsp.cc b/apt-pkg/edsp.cc
index 3c6a7e30f..41cc2cdfe 100644
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -129,7 +129,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);
diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
index d00536362..43dd44a79 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());
diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc
index 212dc7840..d62abe709 100644
--- a/apt-pkg/edsp/edsplistparser.cc
+++ b/apt-pkg/edsp/edsplistparser.cc
@@ -86,8 +86,8 @@ 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;
 }
diff --git a/apt-pkg/edsp/edsplistparser.h b/apt-pkg/edsp/edsplistparser.h
index 86cd77606..abe2ef139 100644
--- a/apt-pkg/edsp/edsplistparser.h
+++ b/apt-pkg/edsp/edsplistparser.h
@@ -34,8 +34,8 @@ class APT_HIDDEN 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 §ion);
 
    edspListParser(FileFd *File, std::string const &Arch = "");
 
diff --git a/apt-pkg/metaindex.cc b/apt-pkg/metaindex.cc
index 31a8ec009..35ab6c53b 100644
--- a/apt-pkg/metaindex.cc
+++ b/apt-pkg/metaindex.cc
@@ -1,4 +1,5 @@
 // Include Files                                                       /*{{{*/
+#include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/metaindex.h>
 
@@ -22,6 +23,22 @@ std::string metaIndex::LocalFileName() const
 }
 #endif
 
+std::string metaIndex::Describe() const
+{
+   return "Release";
+}
+
+pkgCache::RlsFileIterator metaIndex::FindInCache(pkgCache &Cache) 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)
diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index 4e5de8be0..20c879a89 100644
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -23,6 +23,8 @@ using std::string;
 
 class pkgAcquire;
 class IndexTarget;
+class pkgCacheGenerator;
+class OpProgress;
 
 class metaIndex
 {
@@ -51,6 +53,10 @@ class metaIndex
    virtual std::vector<pkgIndexFile *> *GetIndexFiles() = 0;
    virtual bool IsTrusted() const = 0;
 
+   virtual std::string Describe() const;
+   virtual pkgCache::RlsFileIterator FindInCache(pkgCache &Cache) const;
+   virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
+
    metaIndex(std::string const &URI, std::string const &Dist,
              char const * const Type);
    virtual ~metaIndex();
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 864ae0f60..9fe382108 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,6 +84,7 @@ pkgCache::Header::Header()
    MaxDescFileSize = 0;
    
    FileList = 0;
+   RlsFileList = 0;
 #if APT_PKG_ABI < 413
    APT_IGNORE_DEPRECATED(StringList = 0;)
 #endif
@@ -102,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 &&
@@ -140,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();
@@ -814,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;
 }
@@ -828,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;
 }
@@ -861,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;
@@ -895,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();
@@ -908,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();
@@ -931,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)
@@ -948,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)
@@ -964,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;
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index b4d56611a..696b3b94d 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -133,6 +133,7 @@ class pkgCache								/*{{{*/
    struct Header;
    struct Group;
    struct Package;
+   struct ReleaseFile;
    struct PackageFile;
    struct Version;
    struct Description;
@@ -150,6 +151,7 @@ class pkgCache								/*{{{*/
    class DescIterator;
    class DepIterator;
    class PrvIterator;
+   class RlsFileIterator;
    class PkgFileIterator;
    class VerFileIterator;
    class DescFileIterator;
@@ -192,9 +194,11 @@ class pkgCache								/*{{{*/
       enum PkgFlags {Auto=(1<<0),Essential=(1<<3),Important=(1<<4)};
       enum PkgFFlags {
 	 NotSource=(1<<0), /*!< packages can't be fetched from here, e.g. dpkg/status file */
-	 NotAutomatic=(1<<1), /*!< archive has a default pin of 1 */
-	 ButAutomaticUpgrades=(1<<2), /*!< (together with the previous) archive has a default pin of 100 */
-	 LocalSource=(1<<3), /*!< local sources can't and will not be verified by hashes */
+	 LocalSource=(1<<1), /*!< local sources can't and will not be verified by hashes */
+      };
+      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 */
       };
    };
    
@@ -215,6 +219,7 @@ class pkgCache								/*{{{*/
    Package *PkgP;
    VerFile *VerFileP;
    DescFile *DescFileP;
+   ReleaseFile *RlsFileP;
    PackageFile *PkgFileP;
    Version *VerP;
    Description *DescP;
@@ -247,6 +252,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();
@@ -296,6 +303,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;
@@ -314,6 +322,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;
@@ -324,6 +333,9 @@ 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
@@ -482,15 +494,14 @@ struct pkgCache::Package
    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
 
@@ -498,13 +509,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 */
@@ -744,6 +789,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						/*{{{*/
@@ -755,6 +805,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 ba454f057..2d0e3960d 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;
 
@@ -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,
@@ -1072,13 +1074,47 @@ 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 &Component,
+				   unsigned long const Flags)
 {
    // Get some space for the structure
    map_pointer_t const idxFile = AllocateInMap(sizeof(*CurrentFile));
@@ -1088,18 +1124,24 @@ 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;
+   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++;
@@ -1174,35 +1216,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);
+      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)
@@ -1214,15 +1280,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)
@@ -1243,9 +1309,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)
@@ -1261,11 +1338,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()).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;
       
@@ -1288,13 +1417,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)
@@ -1339,6 +1468,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)
@@ -1349,8 +1479,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;
 
@@ -1442,8 +1571,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;
@@ -1455,28 +1584,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
@@ -1503,8 +1632,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)
@@ -1536,7 +1665,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;
 
@@ -1544,7 +1672,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)
@@ -1552,8 +1680,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)
diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index c4ace713d..2795d09d6 100644
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -69,7 +69,9 @@ class APT_HIDDEN pkgCacheGenerator					/*{{{*/
    DynamicMMap ⤅
    pkgCache Cache;
    OpProgress *Progress;
-   
+
+   std::string RlsFileName;
+   pkgCache::ReleaseFile *CurrentRlsFile;
    std::string PkgFileName;
    pkgCache::PackageFile *CurrentFile;
 
@@ -100,12 +102,14 @@ class APT_HIDDEN 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 &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);
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 00693ce54..bd40ad2d9 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -63,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;
       }
@@ -86,11 +86,11 @@ 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;
    }
 
@@ -170,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];
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/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 690b03bcc..3b8ebc96d 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -413,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;
@@ -446,6 +450,7 @@ 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) +
diff --git a/test/integration/framework b/test/integration/framework
index 110758e82..7b03c09ef 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -137,7 +137,14 @@ 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" "$@"
 }
diff --git a/test/integration/test-policy-pinning b/test/integration/test-policy-pinning
index 9cd54264b..9f7f457ae 100755
--- a/test/integration/test-policy-pinning
+++ b/test/integration/test-policy-pinning
@@ -22,7 +22,7 @@ testequalpolicy() {
      release a=now
  $(echo "$AP" | awk '{ printf("%3s\n",$0) }') file:${APTARCHIVE}  Packages
      release c=
-Pinned packages:" aptcache policy $*
+Pinned packages:" aptcache policy "$@"
 }
 
 testglobalpolicy() {
-- 
cgit v1.2.3-70-g09d2


From 3fd89e62e985c89b1f9a545ab72c20987b756aff Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Fri, 12 Jun 2015 12:06:29 +0200
Subject: implement default apt-get file --release-info mode

Selecting targets based on the Release they belong to isn't to
unrealistic. In fact, it is assumed to be the most used case so it is
made the default especially as this allows to bundle another thing we
have to be careful with: Filenames and only showing targets we have
acquired.

Closes: 752702
---
 apt-pkg/deb/debmetaindex.cc                        |  4 +-
 apt-pkg/deb/debmetaindex.h                         |  2 +-
 apt-pkg/indexfile.cc                               | 12 ++++
 apt-pkg/indexfile.h                                |  1 +
 apt-pkg/metaindex.cc                               |  2 +-
 apt-pkg/metaindex.h                                |  2 +-
 apt-pkg/pkgcachegen.cc                             |  4 +-
 apt-private/private-cmndline.cc                    |  1 +
 cmdline/apt-get.cc                                 | 26 ++++++++-
 doc/acquire-additional-files.txt                   | 65 +++++++++++++---------
 test/integration/test-apt-acquire-additional-files |  6 ++
 11 files changed, 88 insertions(+), 37 deletions(-)

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 994b95849..b328fcea8 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -422,7 +422,7 @@ bool debReleaseIndex::Merge(pkgCacheGenerator &Gen,OpProgress * /*Prog*/) const/
 }
 									/*}}}*/
 // ReleaseIndex::FindInCache - Find this index				/*{{{*/
-pkgCache::RlsFileIterator debReleaseIndex::FindInCache(pkgCache &Cache) const
+pkgCache::RlsFileIterator debReleaseIndex::FindInCache(pkgCache &Cache, bool const ModifyCheck) const
 {
    std::string ReleaseFile;
    bool const releaseExists = ReleaseFileName(this, ReleaseFile);
@@ -434,7 +434,7 @@ pkgCache::RlsFileIterator debReleaseIndex::FindInCache(pkgCache &Cache) const
 	 continue;
 
        // empty means the file does not exist by "design"
-       if (releaseExists == false && File->Size == 0)
+       if (ModifyCheck == false || (releaseExists == false && File->Size == 0))
 	  return File;
 
       struct stat St;
diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index 7e9942710..b448ecc53 100644
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -51,7 +51,7 @@ class APT_HIDDEN debReleaseIndex : public metaIndex {
    virtual std::vector<IndexTarget> GetIndexTargets() const;
 
    virtual std::string Describe() const;
-   virtual pkgCache::RlsFileIterator FindInCache(pkgCache &Cache) 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;
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index 33fb48e35..605bbeb47 100644
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -137,6 +137,18 @@ std::string IndexTarget::Option(OptionKeys const EnumKey) const		/*{{{*/
       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())
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index 220c415ac..042e5c2f7 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -81,6 +81,7 @@ class IndexTarget							/*{{{*/
       CREATED_BY,
       TARGET_OF,
       FILENAME,
+      EXISTING_FILENAME,
    };
    std::string Option(OptionKeys const Key) const;
    std::string Format(std::string format) const;
diff --git a/apt-pkg/metaindex.cc b/apt-pkg/metaindex.cc
index 35ab6c53b..3c1b696bd 100644
--- a/apt-pkg/metaindex.cc
+++ b/apt-pkg/metaindex.cc
@@ -28,7 +28,7 @@ std::string metaIndex::Describe() const
    return "Release";
 }
 
-pkgCache::RlsFileIterator metaIndex::FindInCache(pkgCache &Cache) const
+pkgCache::RlsFileIterator metaIndex::FindInCache(pkgCache &Cache, bool const) const
 {
    return pkgCache::RlsFileIterator(Cache);
 }
diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index 20c879a89..e1810fb27 100644
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -54,7 +54,7 @@ class metaIndex
    virtual bool IsTrusted() const = 0;
 
    virtual std::string Describe() const;
-   virtual pkgCache::RlsFileIterator FindInCache(pkgCache &Cache) const;
+   virtual pkgCache::RlsFileIterator FindInCache(pkgCache &Cache, bool const ModifyCheck) const;
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
 
    metaIndex(std::string const &URI, std::string const &Dist,
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 2d0e3960d..9db4ef41f 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -1224,7 +1224,7 @@ static bool CheckValidity(const string &CacheFile,
    {
       if (Debug == true)
 	 std::clog << "Checking RlsFile " << (*i)->Describe() << ": ";
-      pkgCache::RlsFileIterator const RlsFile = (*i)->FindInCache(Cache);
+      pkgCache::RlsFileIterator const RlsFile = (*i)->FindInCache(Cache, true);
       if (RlsFile.end() == true)
       {
 	 if (Debug == true)
@@ -1348,7 +1348,7 @@ static bool BuildCache(pkgCacheGenerator &Gen,
    {
       for (pkgSourceList::const_iterator i = List->begin(); i != List->end(); ++i)
       {
-	 if ((*i)->FindInCache(Gen.GetCache()).end() == false)
+	 if ((*i)->FindInCache(Gen.GetCache(), false).end() == false)
 	 {
 	    _error->Warning("Duplicate sources.list entry %s",
 		  (*i)->Describe().c_str());
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 458051bf2..11e88b1e7 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -166,6 +166,7 @@ static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const
    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
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 0fff2db58..a4cd3c377 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1628,15 +1628,34 @@ static bool DoFiles(CommandLine &CmdL)
       return 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::vector<IndexTarget> const targets = (*S)->GetIndexTargets();
       std::map<std::string, string> AddOptions;
-      AddOptions.insert(std::make_pair("TRUSTED", ((*S)->IsTrusted() ? "yes" : "no")));
+      if (ReleaseInfo)
+      {
+	 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 (std::vector<IndexTarget>::const_iterator T = targets.begin(); T != targets.end(); ++T)
       {
+	 std::string filename = T->Option(ReleaseInfo ? IndexTarget::EXISTING_FILENAME : IndexTarget::FILENAME);
+	 if (filename.empty())
+	    continue;
+
 	 std::ostringstream stanza;
 	 if (Filtered || Format.empty())
 	 {
@@ -1644,7 +1663,7 @@ static bool DoFiles(CommandLine &CmdL)
 	       << "ShortDesc: " << T->ShortDesc << "\n"
 	       << "Description: " << T->Description << "\n"
 	       << "URI: " << T->URI << "\n"
-	       << "Filename: " << T->Option(IndexTarget::FILENAME) << "\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";
@@ -1677,7 +1696,8 @@ static bool DoFiles(CommandLine &CmdL)
 	    cout << stanza.str();
 	 else
 	 {
-	    std::string out = T->Format(Format);
+	    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;
diff --git a/doc/acquire-additional-files.txt b/doc/acquire-additional-files.txt
index a47dac2d4..f9a16318d 100644
--- a/doc/acquire-additional-files.txt
+++ b/doc/acquire-additional-files.txt
@@ -18,12 +18,6 @@ might want to use and would therefore need to be downloaded as well
 This file describes the configuration scheme such a frontend can use to
 instruct the Acquire system to download those additional files.
 
-Note that you can't download files from other sources. It must be files
-in the same repository and below the Release file. The Release file must
-also contain hashes for the file itself as well as for the compressed
-file if wanted, otherwise a download isn't even tried!
-
-
 # The Configuration Stanza
 
 The Acquire system uses the same configuration settings to implement the
@@ -81,15 +75,17 @@ Additional optional properties:
 * 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.
+  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.
 
 
-Note that 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.
+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
 
@@ -123,10 +119,12 @@ APT::Acquire::Targets {
 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 literally.
+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".
+  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.
@@ -143,7 +141,7 @@ printed literally.
 
 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 another variable contact us instead.
+you have a need for other variables contact us.
 
 # Accessing files
 
@@ -170,29 +168,42 @@ 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.
 
-Remarks on the available fields:
+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.
-* Filename: The mentioned file doesn't need to exist, e.g. because the
-  file wasn't downloaded yet – or it does exist compressed. libapt users
-  are encouraged to use FileFd to open such files as it can handle
-  decompression transparently.
-* Trusted: As of the last 'apt-get update' call denoting if e.g. apt-get
-  would print the unauthenticated warning while installing packages
-  mentioned in this file (example assumes Packages file) [Not really
-  a property of the target itself, but of the metaIndex].
 * 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 implementation, but
-you should avoid using them and instead talk to us about a portable
+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
diff --git a/test/integration/test-apt-acquire-additional-files b/test/integration/test-apt-acquire-additional-files
index 971cfac2e..ffb9f3135 100755
--- a/test/integration/test-apt-acquire-additional-files
+++ b/test/integration/test-apt-acquire-additional-files
@@ -37,6 +37,12 @@ APT::Acquire::Targets::deb::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 
-- 
cgit v1.2.3-70-g09d2


From e185d8b3e39e3840f439cab7d5d265fd96d84c6f Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Fri, 12 Jun 2015 14:42:17 +0200
Subject: populate the Architecture field for PackageFiles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is mainly visible in the policy, so that you can now pin by b= and
let it only effect Packages files of this architecture and hence the
packages coming from it (which do not need to be from this architecture,
but very likely are in a normal repository setup).

If you should pin by architecture in this way is a different question…

Closes: 687255
---
 apt-pkg/deb/debindexfile.cc   |  8 ++++----
 apt-pkg/edsp/edspindexfile.cc |  2 +-
 apt-pkg/pkgcachegen.cc        | 10 ++++++++++
 apt-pkg/pkgcachegen.h         |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 3a79cbc58..f089cda81 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -128,7 +128,7 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
    if (Dist.empty())
       Dist = "/";
    ::URI Tmp(URI);
-   if (Gen.SelectFile(PackageFile, *this, Target.Option(IndexTarget::COMPONENT)) == 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
@@ -203,7 +203,7 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 
      if (Prog != NULL)
 	Prog->SubProgress(0, Target.Description);
-     if (Gen.SelectFile(TranslationFile, *this, Target.Option(IndexTarget::COMPONENT), pkgCache::Flag::NotSource) == false)
+     if (Gen.SelectFile(TranslationFile, *this, "", Target.Option(IndexTarget::COMPONENT), pkgCache::Flag::NotSource) == false)
        return _error->Error("Problem with SelectFile %s",TranslationFile.c_str());
 
      // Store the IMS information
@@ -284,7 +284,7 @@ bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 
    if (Prog != NULL)
       Prog->SubProgress(0,File);
-   if (Gen.SelectFile(File, *this, "now", 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
@@ -409,7 +409,7 @@ bool debDebPkgFileIndex::Merge(pkgCacheGenerator& Gen, OpProgress* Prog) const
 
    // and give it to the list parser
    debDebFileParser Parser(DebControl, DebFile);
-   if(Gen.SelectFile(DebFile, *this, "now", pkgCache::Flag::LocalSource) == 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();
diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
index 43dd44a79..a2ec0a19b 100644
--- a/apt-pkg/edsp/edspindexfile.cc
+++ b/apt-pkg/edsp/edspindexfile.cc
@@ -49,7 +49,7 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 
    if (Prog != NULL)
       Prog->SubProgress(0,File);
-   if (Gen.SelectFile(File, *this, "edsp") == false)
+   if (Gen.SelectFile(File, *this, "", "edsp") == false)
       return _error->Error("Problem with SelectFile %s",File.c_str());
 
    // Store the IMS information
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 9db4ef41f..ea0205944 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -1113,6 +1113,7 @@ bool pkgCacheGenerator::SelectReleaseFile(const string &File,const string &Site,
    added versions. The caller is responsible for setting the IMS fields. */
 bool pkgCacheGenerator::SelectFile(std::string const &File,
 				   pkgIndexFile const &Index,
+				   std::string const &Architecture,
 				   std::string const &Component,
 				   unsigned long const Flags)
 {
@@ -1133,6 +1134,15 @@ bool pkgCacheGenerator::SelectFile(std::string const &File,
    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;
diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 2795d09d6..ade93795b 100644
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -102,7 +102,7 @@ class APT_HIDDEN 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,pkgIndexFile const &Index, std::string const &Component, 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;};
-- 
cgit v1.2.3-70-g09d2


From d2cb5b153fb13d587b1ff632cab34ce0c403326e Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Fri, 12 Jun 2015 15:48:00 +0200
Subject: hide Translation-* in 'apt-cache policy' output
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Translation-* files are internally handled as PackageFiles which isn't
super nice, but giving them their own struct is a bit overkill so let it
be for the moment. They always appeared in the policy output because of
this through and now that they are properly linked to a ReleaseFile they
even display all the pinning information on them, but they don't contain
any packages which could be pinned… No problem, but useless and
potentially confusing output.

Adding a 'NoPackages' flag which can be set on those files and be used
in applications seems like a simple way to fix this display issue.
---
 apt-pkg/deb/debindexfile.cc | 2 +-
 apt-pkg/pkgcache.h          | 1 +
 cmdline/apt-cache.cc        | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index f089cda81..944cbe0bf 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -203,7 +203,7 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 
      if (Prog != NULL)
 	Prog->SubProgress(0, Target.Description);
-     if (Gen.SelectFile(TranslationFile, *this, "", Target.Option(IndexTarget::COMPONENT), pkgCache::Flag::NotSource) == false)
+     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
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 696b3b94d..3cc85f1e8 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -195,6 +195,7 @@ class pkgCache								/*{{{*/
       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 */
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 3b8ebc96d..c2f6dbd5c 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1638,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 &&
-- 
cgit v1.2.3-70-g09d2


From d56e2917f27a722b54685de13aeb1bb7592fc61b Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 13 Jun 2015 11:13:45 +0200
Subject: provide a public interface for acquiring changelogs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Provided is a specialized acquire item which given a version can figure
out the correct URI to try by itself and if not provides an error
message alongside with static methods to get just the URI it would try
to download if it should just be displayed or similar such.

The URI is constructed as follows:
Release files can provide an URI template in the "Changelogs" field,
otherwise we lookup a configuration item based on the "Label" or
"Origin" of the Release file to get a (hopefully known) default value
for now. This template should contain the string CHANGEPATH which is
replaced with the information about the version we want the changelog
for (e.g.  main/a/apt/apt_1.1). This middleway was choosen as this path
part was consistent over the three known implementations (+1 defunct),
while the rest of the URI varies widely between them.

The benefit of this construct is that it is now easy to get changelogs
for Debian packages on Ubuntu and vice versa – even at the moment where
the Changelogs field is present nowhere. Strictly better than what
apt-get had before as it would even fail to get changelogs from
security… Now it will notice that security identifies as Origin: Debian
and pick this setting (assuming again that no Changelogs field exists).
If on the other hand security would ship its changelogs in a different
location we could set it via the Label option overruling Origin.

Closes: 687147, 739854, 784027, 787190
---
 apt-pkg/acquire-item.cc                            | 211 +++++++++++++++++++++
 apt-pkg/acquire-item.h                             | 114 +++++++++++
 apt-pkg/init.cc                                    |   4 +
 cmdline/apt-get.cc                                 | 204 ++++----------------
 doc/apt-get.8.xml                                  |  16 +-
 doc/apt.conf.5.xml                                 |  27 +++
 doc/examples/configure-index                       |  11 +-
 test/integration/framework                         |  24 ++-
 test/integration/test-apt-get-changelog            | 104 +++++++---
 .../test-bug-722207-print-uris-even-if-very-quiet  |   3 +-
 test/integration/test-bug-738785-switch-protocol   |   7 +-
 vendor/ubuntu/apt.conf-01-vendor-ubuntu            |   6 -
 12 files changed, 507 insertions(+), 224 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index d6e9ccbe0..4bf4e62f8 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>
@@ -2836,6 +2837,216 @@ std::string pkgAcqArchive::ShortDesc() const				/*{{{*/
 }
 									/*}}}*/
 
+// 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);
+
+   if (Status == StatDone) // this happens if we queue the same changelog two times
+   {
+      Complete = true;
+      for (pkgAcquire::UriIterator I = Owner->UriBegin(); I != Owner->UriEnd(); ++I)
+	 if (I->URI == Desc.URI)
+	    if (DestFile != I->Owner->DestFile)
+	       if (symlink(I->Owner->DestFile.c_str(), DestFile.c_str()) != 0)
+	       {
+		  ; // ignore error, there isn't anthing we could do to handle the edgecase of an edgecase
+	       }
+   }
+}
+									/*}}}*/
+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					/*{{{*/
 pkgAcqFile::pkgAcqFile(pkgAcquire * const Owner,string const &URI, HashStringList const &Hashes,
 		       unsigned long long const Size,string const &Dsc,string const &ShortDesc,
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index b6d569737..606fd4173 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -1031,6 +1031,120 @@ class pkgAcqArchive : public pkgAcquire::Item
 		 std::string &StoreFilename);
 };
 									/*}}}*/
+/** \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.		{{{
  *
  *  The file is retrieved even if it is accessed via a URL type that
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index e2239a906..96966b249 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -119,6 +119,10 @@ bool pkgInitConfig(Configuration &Cnf)
    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
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index a4cd3c377..184b51d23 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1410,196 +1410,70 @@ 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());
-#if APT_PKG_ABI >= 413
-   path.append(Ver.SourcePkgName());
-   path.append("_");
-   path.append(StripEpoch(Ver.SourceVerStr()));
-#else
-   string srcpkg = rec.SourcePkg().empty() ? Ver.ParentPkg().Name() : rec.SourcePkg();
-   string ver = Ver.VerStr();
-   // if there is a source version it always wins
-   if (rec.SourceVer() != "")
-      ver = rec.SourceVer();
-   path += srcpkg + "_" + StripEpoch(ver);
-#endif
-   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)
-{
-   // get the binary deb server path
-   pkgCache::VerFileIterator Vf = Ver.FileList();
-   if (Vf.end() == true)
-      return false;
-   pkgCache::PkgFileIterator F = Vf.File();
-   pkgIndexFile *index;
-   pkgSourceList *SrcList = Cache.GetSourceList();
-   if(SrcList->FindIndex(F, index) == false)
-      return false;
-
-   // get archive uri for the binary deb
-   string path_without_dot_changelog = GetChangelogPath(Cache, Ver);
-   out_uri = index->ArchiveURI(path_without_dot_changelog + ".changelog");
-
-   // 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)
-   {
-      std::cout << '\'' << changelog_uri << '\'' << std::endl;
-      return true;
-   }
-   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);
-
-   // Disable drop-privs if "_apt" can not write to the target dir
-   CheckDropPrivsMustBeDisabled(Fetcher);
-
-   // 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)
-   {
-      string third_party_uri;
-      if (GuessThirdPartyChangelogUri(CacheFile, Ver, third_party_uri))
-      {
-         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 (itm->Status == pkgAcquire::Item::StatDone)
-      return true;
-
-   // error
-   return _error->Error("changelog download failed");
-}
-									/*}}}*/
 // DoChangelog - Get changelog from the command line			/*{{{*/
-// ---------------------------------------------------------------------
 static bool DoChangelog(CommandLine &CmdL)
 {
    CacheFile Cache;
    if (Cache.ReadOnlyOpen() == false)
       return 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);
 
-   if (_config->FindB("APT::Get::Print-URIs", false) == true)
+   bool const downOnly = _config->FindB("APT::Get::Download-Only", false);
+   bool const printOnly = _config->FindB("APT::Get::Print-URIs", false);
+
+   for (APT::VersionList::const_iterator Ver = verset.begin();
+        Ver != verset.end();
+        ++Ver)
    {
-      bool Success = true;
-      for (APT::VersionList::const_iterator Ver = verset.begin();
-	   Ver != verset.end(); ++Ver)
-	 Success &= DownloadChangelog(Cache, Fetcher, Ver, "");
-      return Success;
+      if (printOnly)
+	 new pkgAcqChangelog(&Fetcher, Ver, "/dev/null");
+      else if (downOnly)
+	 new pkgAcqChangelog(&Fetcher, Ver, ".");
+      else
+	 new pkgAcqChangelog(&Fetcher, Ver);
    }
 
-   AcqTextStatus Stat(std::cout, ScreenWidth,_config->FindI("quiet",0));
-   Fetcher.SetLog(&Stat);
+   if (printOnly == false)
+   {
+      // Disable drop-privs if "_apt" can not write to the target dir
+      CheckDropPrivsMustBeDisabled(Fetcher);
+      if (_error->PendingError() == true)
+	 return false;
 
-   bool const downOnly = _config->FindB("APT::Get::Download-Only", false);
+      bool Failed = false;
+      if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true)
+	 return false;
+   }
 
-   char tmpname[100];
-   const char* tmpdir = NULL;
-   if (downOnly == false)
+   if (downOnly == false || printOnly == true)
    {
-      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
+      bool Failed = false;
+      for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); ++I)
       {
-	 struct passwd const * const pw = getpwnam(SandboxUser.c_str());
-	 struct group const * const gr = getgrnam("root");
-	 if (pw != NULL && gr != NULL)
+	 if (printOnly)
 	 {
-	    // 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);
+	    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;
    }
 
-   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)
-      {
-         DisplayFileInPager(changelogfile);
-         // cleanup temp file
-	 unlink(changelogfile.c_str());
-      }
-   }
-   // clenaup tmp dir
-   if (tmpdir != NULL)
-      rmdir(tmpdir);
    return true;
 }
 									/*}}}*/
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index da077afa7..5b6788ed4 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -230,16 +230,12 @@
      </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>
 
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/test/integration/framework b/test/integration/framework
index 7b03c09ef..1b99929e2 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -520,6 +520,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}"
@@ -600,15 +606,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
 		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"
 }
@@ -876,6 +882,7 @@ getcodenamefromsuite() {
 }
 getreleaseversionfromsuite() { true; }
 getlabelfromsuite() { true; }
+getoriginfromsuite() { true; }
 
 generatereleasefiles() {
 	# $1 is the Date header and $2 is the ValidUntil header to be set
@@ -887,16 +894,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
@@ -1450,9 +1462,9 @@ testfilestats() {
 		msgpass
 	else
 		echo >&2
-		ls -ld >&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
 }
diff --git a/test/integration/test-apt-get-changelog b/test/integration/test-apt-get-changelog
index 7e81c71b6..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'
 
-testsuccessequal "'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'
 
-testsuccessequal "'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' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}: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' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}: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-bug-722207-print-uris-even-if-very-quiet b/test/integration/test-bug-722207-print-uris-even-if-very-quiet
index 2cad929cc..e51d72ccd 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,6 +12,7 @@ insertpackage 'unstable' 'apt' 'all' '2'
 insertsource 'unstable' 'apt' 'all' '2'
 insertsource 'unstable' 'apt2' 'all' '1'
 
+getoriginfromsuite() { echo 'Debian'; }
 setupaptarchive
 
 APTARCHIVE=$(readlink -f ./aptarchive)
@@ -22,7 +23,7 @@ testsuccessequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.d
 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 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
 'file://${APTARCHIVE}/apt_2.tar.gz' apt_2.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source apt -qq --print-uris
-testsuccessequal "'http://packages.debian.org/changelogs/pool/main/apt/apt_2/changelog'" aptget changelog 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
 
 testsuccessequal "'file://${APTARCHIVE}/apt_2.dsc' apt_2.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
 'file://${APTARCHIVE}/apt_2.tar.gz' apt_2.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
diff --git a/test/integration/test-bug-738785-switch-protocol b/test/integration/test-bug-738785-switch-protocol
index f6336ffe3..539080200 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
-testsuccessequal "'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
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";
-  };
-};
-- 
cgit v1.2.3-70-g09d2


From 9f697f69cf1adaced476598cfe08ab03c76c5d18 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 15 Jun 2015 12:51:22 +0200
Subject: ensure valid or remove destination file in file method

'file' isn't using the destination file per-se, but returns another name
via "Filename" header. It still should deal with destination files as
they could exist (pkgAcqFile e.g. creates links in that location) and
are potentially bogus.
---
 methods/file.cc | 44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/methods/file.cc b/methods/file.cc
index 353e54bd5..5d5fffa67 100644
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -48,8 +48,24 @@ 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.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;
@@ -65,6 +81,8 @@ bool FileMethod::Fetch(FetchItem *Itm)
    }
 
    // 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)
    {
@@ -73,29 +91,33 @@ bool FileMethod::Fetch(FetchItem *Itm)
 	 std::string const unfile = File.substr(0, File.length() - ext->length() - 1);
 	 if (stat(unfile.c_str(),&Buf) == 0)
 	 {
-	    FetchResult AltRes;
 	    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;
-
-	    URIDone(Res,&AltRes);
-	    return true;
+	    break;
 	 }
 	 // no break here as we could have situations similar to '.gz' vs '.tar.gz' here
       }
    }
 
-   if (Res.Filename.empty() == true)
+   if (Res.Filename.empty() == false)
+   {
+      Hashes Hash(Itm->ExpectedHashes);
+      FileFd Fd(Res.Filename, FileFd::ReadOnly);
+      Hash.AddFD(Fd);
+      Res.TakeHashes(Hash);
+   }
+
+   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(Itm->ExpectedHashes);
-   FileFd Fd(Res.Filename, FileFd::ReadOnly);
-   Hash.AddFD(Fd);
-   Res.TakeHashes(Hash);
-   URIDone(Res);
    return true;
 }
 									/*}}}*/
-- 
cgit v1.2.3-70-g09d2


From 08ea7806458de0995414eaae852e0a5985875642 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 15 Jun 2015 13:16:43 +0200
Subject: deal better with acquiring the same URI multiple times

This is an unlikely event for indexes and co, but it can happen quiet
easily e.g. for changelogs where you want to get the changelogs for
multiple binary package(version)s which happen to all be built from a
single source.

The interesting part is that the Acquire system actually detected this
already and set the item requesting the URI again to StatDone - expect
that this is hardly sufficient: an Item must be Complete=true as well
to be considered truely done and that is only the tip of the ::Done
handling iceberg. So instead of this StatDone hack we allow QItems to be
owned by multiple items and notify all owners about everything now,
so that for the point of each item they got it downloaded just for them.
---
 apt-pkg/acquire-item.cc                            |  25 +-
 apt-pkg/acquire-item.h                             |   1 +
 apt-pkg/acquire-worker.cc                          | 280 +++++++++++++--------
 apt-pkg/acquire-worker.h                           |   3 +
 apt-pkg/acquire.cc                                 | 126 ++++++++--
 apt-pkg/acquire.h                                  |  44 +++-
 .../test-acquire-same-file-multiple-times          |  80 ++++++
 test/integration/test-apt-get-download             |   2 +-
 8 files changed, 409 insertions(+), 152 deletions(-)
 create mode 100755 test/integration/test-acquire-same-file-multiple-times

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 4bf4e62f8..dc4f61b56 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -438,6 +438,11 @@ APT_PURE pkgAcquire * pkgAcquire::Item::GetOwner() const		/*{{{*/
    return Owner;
 }
 									/*}}}*/
+pkgAcquire::ItemDesc &pkgAcquire::Item::GetItemDesc()			/*{{{*/
+{
+   return Desc;
+}
+									/*}}}*/
 APT_CONST bool pkgAcquire::Item::IsTrusted() const			/*{{{*/
 {
    return false;
@@ -840,7 +845,7 @@ bool pkgAcqMetaBase::CheckDownloadDone(pkgAcqTransactionItem * const I, const st
       return false;
    }
 
-   if (FileName != I->DestFile)
+   if (FileName != I->DestFile && RealFileExists(I->DestFile) == false)
    {
       I->Local = true;
       I->Desc.URI = "copy:" + FileName;
@@ -2482,7 +2487,7 @@ void pkgAcqIndex::StageDownloadDone(string const &Message, HashStringList const
 
    // 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;
@@ -2760,7 +2765,7 @@ void pkgAcqArchive::Done(string const &Message, HashStringList const &Hashes,
    }
 
    // Reference filename
-   if (FileName != DestFile)
+   if (DestFile !=  FileName && RealFileExists(DestFile) == false)
    {
       StoreFilename = DestFile = FileName;
       Local = true;
@@ -2903,18 +2908,6 @@ void pkgAcqChangelog::Init(std::string const &DestDir, std::string const &DestFi
    strprintf(Desc.Description, "%s %s %s Changelog", URI::SiteOnly(Desc.URI).c_str(), SrcName.c_str(), SrcVersion.c_str());
    Desc.Owner = this;
    QueueURI(Desc);
-
-   if (Status == StatDone) // this happens if we queue the same changelog two times
-   {
-      Complete = true;
-      for (pkgAcquire::UriIterator I = Owner->UriBegin(); I != Owner->UriEnd(); ++I)
-	 if (I->URI == Desc.URI)
-	    if (DestFile != I->Owner->DestFile)
-	       if (symlink(I->Owner->DestFile.c_str(), DestFile.c_str()) != 0)
-	       {
-		  ; // ignore error, there isn't anthing we could do to handle the edgecase of an edgecase
-	       }
-   }
 }
 									/*}}}*/
 std::string pkgAcqChangelog::URI(pkgCache::VerIterator const &Ver)	/*{{{*/
@@ -3107,7 +3100,7 @@ void pkgAcqFile::Done(string const &Message,HashStringList const &CalcHashes,
       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 ||
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 606fd4173..9dbacc1ea 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -249,6 +249,7 @@ class pkgAcquire::Item : public WeakPointable				/*{{{*/
 
    /** \return the acquire process with which this item is associated. */
    pkgAcquire *GetOwner() const;
+   pkgAcquire::ItemDesc &GetItemDesc();
 
    /** \return \b true if this object is being fetched from a trusted source. */
    virtual bool IsTrusted() const;
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 099a1f87d..d6318a21b 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -258,18 +258,27 @@ bool pkgAcquire::Worker::RunMessages()
 
 	    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;
          }
 
@@ -286,14 +295,18 @@ bool pkgAcquire::Worker::RunMessages()
 	    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, TotalSize);
-
-	    // Display update before completion
-	    if (Log != 0 && Log->MorePulses == true)
-	       Log->Pulse(Itm->Owner->GetOwner());
+	    for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
+	    {
+	       (*O)->Start(Message, TotalSize);
 
-	    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;
 	 }
@@ -307,105 +320,110 @@ bool pkgAcquire::Worker::RunMessages()
 	       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());
+	       for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
+		  Log->Pulse((*O)->GetOwner());
 
-	    OwnerQ->ItemDone(Itm);
-
-	    HashStringList const ExpectedHashes = Owner->GetExpectedHashes();
-	    // see if we got hashes to verify
+	    std::string const filename = LookupTag(Message, "Filename", Itm->Owner->DestFile.c_str());
 	    HashStringList ReceivedHashes;
-	    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 (ExpectedHashes.usable() == true && ReceivedHashes.usable() == false)
-	    {
-	       std::string const filename = LookupTag(Message, "Filename", Owner->DestFile.c_str());
-	       if (filename.empty() == false && RealFileExists(filename))
+	       // see if we got hashes to verify
+	       for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type)
 	       {
-		  Hashes calc(ExpectedHashes);
-		  FileFd file(filename, FileFd::ReadOnly, FileFd::None);
-		  calc.AddFD(file);
-		  ReceivedHashes = calc.GetHashStringList();
+		  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();
+		  }
 	       }
 	    }
 
-	    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;
-	    }
+	    // 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;
 
-	    // decide if what we got is what we expected
-	    bool consideredOkay = false;
 	    bool const isIMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false) ||
 	       StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false);
-	    if (ExpectedHashes.usable())
+
+	    for (pkgAcquire::Queue::QItem::owner_iterator O = ItmOwners.begin(); O != ItmOwners.end(); ++O)
 	    {
-	       if (ReceivedHashes.usable() == false)
+	       pkgAcquire::Item * const Owner = *O;
+	       HashStringList const ExpectedHashes = Owner->GetExpectedHashes();
+	       if(_config->FindB("Debug::pkgAcquire::Auth", false) == true)
 	       {
-		  /* 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;
+		  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;
 	       }
-	       else if (ReceivedHashes == ExpectedHashes)
-		  consideredOkay = true;
-	       else
-		  consideredOkay = false;
 
-	    }
-	    else if (Owner->HashesRequired() == true)
-	       consideredOkay = false;
-	    else
-	       consideredOkay = true;
+	       // 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;
 
-	    if (consideredOkay == true)
-	    {
-	       Owner->Done(Message, ReceivedHashes, Config);
-	       ItemDone();
+	       }
+	       else if (Owner->HashesRequired() == true)
+		  consideredOkay = false;
+	       else
+		  consideredOkay = true;
 
-	       // Log that we are done
-	       if (Log != 0)
+	       if (consideredOkay == true)
 	       {
-		  if (isIMSHit)
+		  Owner->Done(Message, ReceivedHashes, Config);
+
+		  // Log that we are done
+		  if (Log != 0)
 		  {
-		     /* Hide 'hits' for local only sources - we also manage to
-			hide gets */
-		     if (Config->LocalOnly == false)
-			Log->IMSHit(Desc);
+		     if (isIMSHit)
+			Log->IMSHit(Owner->GetItemDesc());
+		     else
+			Log->Done(Owner->GetItemDesc());
 		  }
-		  else
-		     Log->Done(Desc);
 	       }
-	    }
-	    else
-	    {
-	       Owner->Status = pkgAcquire::Item::StatAuthError;
-	       Owner->Failed(Message,Config);
-	       ItemDone();
+	       else
+	       {
+		  Owner->Status = pkgAcquire::Item::StatAuthError;
+		  Owner->Failed(Message,Config);
 
-	       if (Log != 0)
-		  Log->Fail(Desc);
+		  if (Log != 0)
+		     Log->Fail(Owner->GetItemDesc());
+	       }
 	    }
+	    ItemDone();
 	    break;
 	 }
 
@@ -419,30 +437,32 @@ 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;
 
-	    // 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;
+	    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;
 
-	    Owner->Failed(Message,Config);
-	    ItemDone();
+	       (*O)->Failed(Message,Config);
 
-	    if (Log != 0)
-	       Log->Fail(Desc);
+	       if (Log != 0)
+		  Log->Fail((*O)->GetItemDesc());
+	    }
+	    ItemDone();
 
 	    break;
 	 }
@@ -578,16 +598,24 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item)
    Message.reserve(300);
    Message += "URI: " + Item->URI;
    Message += "\nFilename: " + Item->Owner->DestFile;
-   HashStringList const hsl = Item->Owner->GetExpectedHashes();
+
+   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))
@@ -686,3 +714,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..3a3ef706d 100644
--- a/apt-pkg/acquire-worker.h
+++ b/apt-pkg/acquire-worker.h
@@ -326,6 +326,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 0c815c005..14c8863dc 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>
@@ -682,7 +683,8 @@ bool pkgAcquire::Queue::Enqueue(ItemDesc &Item)
    for (; *I != 0; I = &(*I)->Next)
       if (Item.URI == (*I)->URI) 
       {
-	 Item.Owner->Status = Item::StatDone;
+	 (*I)->Owners.push_back(Item.Owner);
+	 Item.Owner->Status = (*I)->Owner->Status;
 	 return false;
       }
 
@@ -705,13 +707,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;
@@ -722,7 +724,7 @@ bool pkgAcquire::Queue::Dequeue(Item *Owner)
       else
 	 I = &(*I)->Next;
    }
-   
+
    return Res;
 }
 									/*}}}*/
@@ -799,9 +801,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
@@ -809,7 +814,7 @@ bool pkgAcquire::Queue::ItemDone(QItem *Itm)
       Dequeue(Itm->Owner);
       Owner->Bump();
    }
-   
+
    return Cycle();
 }
 									/*}}}*/
@@ -824,7 +829,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)
@@ -832,18 +837,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;
 }
 									/*}}}*/
@@ -855,6 +861,94 @@ 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			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -914,9 +1008,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;
       }
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index fc90624e1..02031dafd 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -68,9 +68,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>
@@ -390,13 +391,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;
 };
 									/*}}}*/
@@ -419,13 +420,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
        */
@@ -434,10 +448,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;
 
@@ -590,7 +618,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;};
    
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..d329a39cb
--- /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
+	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
+	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-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"
 }
-- 
cgit v1.2.3-70-g09d2


From ff86d7df6a53ff6283de4b9a858c1dad98ed887f Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 15 Jun 2015 13:36:11 +0200
Subject: call URIStart in cdrom and file method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

All other methods call it, so they should follow along even if the work
they do afterwards is hardly breathtaking and usually results in a
URIDone pretty soon, but the acquire system tells the individual item
about this via a virtual method call, so even through none of our
existing items contains any critical code in these, maybe one day they
might. Consistency at least once…

Which is also why this has a good sideeffect: file: and cdrom: requests
appear now in the 'apt-get update' output. Finally - it never made sense
to hide them for me. Okay, I guess it made before the new hit behavior,
but now that you can actually see the difference in an update it makes
sense to see if a file: repository changed or not as well.
---
 apt-pkg/acquire-item.cc                              | 13 ++++---------
 apt-pkg/acquire-worker.cc                            |  1 -
 methods/cdrom.cc                                     |  3 ++-
 methods/file.cc                                      | 18 ++++++++++--------
 test/integration/test-apt-cdrom                      |  6 ++++--
 test/integration/test-apt-get-update-unauth-warning  |  7 +++++++
 test/integration/test-apt-progress-fd                |  6 ++++--
 .../test-bug-595691-empty-and-broken-archive-files   | 20 ++++----------------
 .../test-bug-596498-trusted-unsigned-repo            |  8 +++++++-
 9 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index dc4f61b56..50936b627 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -519,19 +519,14 @@ 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");
-   unsigned long long const downloadedSize = Hashes.FileSize();
-   if (downloadedSize != 0)
+   if (FileSize == 0)
    {
-      if (Complete == false && !Local && FileName == DestFile)
+      unsigned long long const downloadedSize = Hashes.FileSize();
+      if (downloadedSize != 0)
       {
-	 if (Owner->Log != 0)
-	    Owner->Log->Fetched(Hashes.FileSize(),atoi(LookupTag(Message,"Resume-Point","0").c_str()));
+	 FileSize = downloadedSize;
       }
-
-      if (FileSize == 0)
-	 FileSize= downloadedSize;
    }
    Status = StatDone;
    ErrorText = string();
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index d6318a21b..ef195d44b 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -362,7 +362,6 @@ bool pkgAcquire::Worker::RunMessages()
 
 	    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)
 	    {
 	       pkgAcquire::Item * const Owner = *O;
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 10cb29f66..67265cfa3 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -260,7 +260,8 @@ 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;
diff --git a/methods/file.cc b/methods/file.cc
index 5d5fffa67..5c76ec122 100644
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -58,7 +58,10 @@ bool FileMethod::Fetch(FetchItem *Itm)
 	 {
 	    HashStringList const hsl = Itm->ExpectedHashes;
 	    if (Itm->ExpectedHashes.VerifyFile(File))
+	    {
+	       Res.Filename = Itm->DestFile;
 	       Res.IMSHit = true;
+	    }
 	 }
       }
    }
@@ -78,7 +81,14 @@ bool FileMethod::Fetch(FetchItem *Itm)
 	 if (filesize != 0 && filesize == Res.Size)
 	    Res.IMSHit = true;
       }
+
+      Hashes Hash(Itm->ExpectedHashes);
+      FileFd Fd(File, FileFd::ReadOnly);
+      Hash.AddFD(Fd);
+      Res.TakeHashes(Hash);
    }
+   if (Res.IMSHit == false)
+      URIStart(Res);
 
    // See if the uncompressed file exists and reuse it
    FetchResult AltRes;
@@ -103,14 +113,6 @@ bool FileMethod::Fetch(FetchItem *Itm)
       }
    }
 
-   if (Res.Filename.empty() == false)
-   {
-      Hashes Hash(Itm->ExpectedHashes);
-      FileFd Fd(Res.Filename, FileFd::ReadOnly);
-      Hash.AddFD(Fd);
-      Res.TakeHashes(Hash);
-   }
-
    if (AltRes.Filename.empty() == false)
       URIDone(Res,&AltRes);
    else if (Res.Filename.empty() == false)
diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom
index 34b35f745..6a218ffb8 100755
--- a/test/integration/test-apt-cdrom
+++ b/test/integration/test-apt-cdrom
@@ -136,13 +136,15 @@ aptcache show testing -o Acquire::Languages=en | grep -q '^Description-en: ' &&
 mv rootdir/media/cdrom-unmounted rootdir/media/cdrom-ejected
 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 cdrom://Debian APT Testdisk 0.8.15 stable InRelease
+Reading package lists...'
 mv rootdir/media/cdrom-ejected rootdir/media/cdrom-unmounted
 testcdromusage
 
 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 cdrom://Debian APT Testdisk 0.8.15 stable InRelease
+Reading package lists...'
 testcdromusage
 
 msgmsg 'Check that nothing touched our' 'CD-ROM'
diff --git a/test/integration/test-apt-get-update-unauth-warning b/test/integration/test-apt-get-update-unauth-warning
index ada7f7a26..1f4a14e23 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'
@@ -31,11 +32,17 @@ 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
 testwarningequal "Ign file:$APTARCHIVE unstable InRelease
   File not found
 Ign file:$APTARCHIVE unstable Release
   File not found
+Get:1 file:$APTARCHIVE unstable/main Sources [$(filesize 'Sources') B]
+Get:2 file:$APTARCHIVE unstable/main i386 Packages [$(filesize 'Packages') B]
+Get:3 file:$APTARCHIVE unstable/main Translation-en [$(filesize 'Translations') B]
 Reading package lists...
 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
diff --git a/test/integration/test-apt-progress-fd b/test/integration/test-apt-progress-fd
index 0c11aba7e..99b4ea050 100755
--- a/test/integration/test-apt-progress-fd
+++ b/test/integration/test-apt-progress-fd
@@ -16,6 +16,7 @@ setupaptarchive
 exec 3> apt-progress.log
 testsuccess aptget install testing=0.1 -y -o APT::Status-Fd=3
 testfileequal './apt-progress.log' 'dlstatus:1:0:Retrieving file 1 of 1
+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)
@@ -32,6 +33,7 @@ pmstatus:dpkg-exec:83.3333:Running dpkg'
 exec 3> apt-progress.log
 testsuccess aptget install testing=0.8.15 -y -o APT::Status-Fd=3
 testfileequal './apt-progress.log' 'dlstatus:1:0:Retrieving file 1 of 1
+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)
@@ -48,6 +50,7 @@ pmstatus:dpkg-exec:83.3333:Running dpkg'
 exec 3> apt-progress.log
 testsuccess aptget install testing=0.8.15 --reinstall -y -o APT::Status-Fd=3
 testfileequal './apt-progress.log' 'dlstatus:1:0:Retrieving file 1 of 1
+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)
@@ -73,9 +76,8 @@ 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
 testfileequal './apt-progress.log' 'dlstatus:1:0:Retrieving file 1 of 1
+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)
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 b42212f5e..3042d116d 100755
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -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
@@ -52,19 +46,13 @@ 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: file:$APTARCHIVE  Packages []
+Reading package lists..." "empty archive Packages.$COMPRESS over file"
 
 	createemptyfile 'Packages'
-	testaptgetupdate "Err file:$APTARCHIVE  Packages
+	testaptgetupdate "Get: file:$APTARCHIVE  Packages
+Err file:$APTARCHIVE  Packages
   Empty files can't be valid archives
 W: Failed to fetch ${COMPRESSOR}:${APTARCHIVE}/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 4eb77b9a4..1ff0f1d8d 100755
--- a/test/integration/test-bug-596498-trusted-unsigned-repo
+++ b/test/integration/test-bug-596498-trusted-unsigned-repo
@@ -15,13 +15,17 @@ 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'
 
 testsuccessequal "$PKGTEXT
+$DOWNLOG
 Download complete and in download only mode" aptget install cool --assume-no -d
 
 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
@@ -47,10 +51,12 @@ 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
 
 testsuccessequal "$PKGTEXT
+$DOWNLOG
 Download complete and in download only mode" aptget install cool --assume-no -d
-- 
cgit v1.2.3-70-g09d2


From 1eb1836f4b5397497bd34f0cf516e6e4e73117bf Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 15 Jun 2015 16:41:43 +0200
Subject: show item ID in Hit, Ign and Err lines as well

Again, consistency is the main sellingpoint here, but this way it is now
also easier to explain that some files move through different stages and
lines are printed for them hence multiple times: That is a bit hard to
believe if the number is changing all the time, but now that it keeps
consistent.
---
 apt-pkg/acquire-item.cc                            |  2 +-
 apt-private/acqprogress.cc                         | 38 +++++++++++++++-----
 apt-private/acqprogress.h                          |  3 +-
 po/apt-all.pot                                     | 12 ++++---
 po/ar.po                                           | 18 ++++++----
 po/ast.po                                          | 20 ++++++-----
 po/bg.po                                           | 20 ++++++-----
 po/bs.po                                           |  8 ++---
 po/ca.po                                           | 20 ++++++-----
 po/cs.po                                           | 20 ++++++-----
 po/cy.po                                           | 20 ++++++-----
 po/da.po                                           | 20 ++++++-----
 po/de.po                                           | 20 ++++++-----
 po/dz.po                                           | 20 ++++++-----
 po/el.po                                           | 20 ++++++-----
 po/es.po                                           | 20 ++++++-----
 po/eu.po                                           | 20 ++++++-----
 po/fi.po                                           | 20 ++++++-----
 po/fr.po                                           | 20 ++++++-----
 po/gl.po                                           | 20 ++++++-----
 po/he.po                                           | 12 ++++---
 po/hu.po                                           | 20 ++++++-----
 po/it.po                                           | 21 +++++++-----
 po/ja.po                                           | 20 ++++++-----
 po/km.po                                           | 20 ++++++-----
 po/ko.po                                           | 20 ++++++-----
 po/ku.po                                           | 16 +++++----
 po/lt.po                                           | 20 ++++++-----
 po/mr.po                                           | 20 ++++++-----
 po/nb.po                                           | 20 ++++++-----
 po/ne.po                                           | 20 ++++++-----
 po/nl.po                                           | 20 ++++++-----
 po/nn.po                                           | 20 ++++++-----
 po/pl.po                                           | 20 ++++++-----
 po/pt.po                                           | 20 ++++++-----
 po/pt_BR.po                                        | 20 ++++++-----
 po/ro.po                                           | 20 ++++++-----
 po/ru.po                                           | 20 ++++++-----
 po/sk.po                                           | 20 ++++++-----
 po/sl.po                                           | 20 ++++++-----
 po/sv.po                                           | 20 ++++++-----
 po/th.po                                           | 20 ++++++-----
 po/tl.po                                           | 20 ++++++-----
 po/tr.po                                           | 20 ++++++-----
 po/uk.po                                           | 20 ++++++-----
 po/vi.po                                           | 20 ++++++-----
 po/zh_CN.po                                        | 20 ++++++-----
 po/zh_TW.po                                        | 20 ++++++-----
 test/integration/test-apt-acquire-additional-files | 10 +++---
 test/integration/test-apt-cdrom                    |  4 +--
 .../integration/test-apt-get-update-unauth-warning | 14 ++++----
 test/integration/test-apt-update-ims               | 36 +++++++++----------
 test/integration/test-apt-update-not-modified      | 40 +++++++++++-----------
 .../test-bug-595691-empty-and-broken-archive-files | 14 ++++----
 test/integration/test-bug-602412-dequote-redirect  |  2 +-
 test/integration/test-pdiff-usage                  |  2 +-
 .../test-ubuntu-bug-1098738-apt-get-source-md5sum  |  8 ++---
 57 files changed, 618 insertions(+), 422 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 50936b627..5460280ec 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -405,7 +405,7 @@ class APT_HIDDEN NoActionItem : public pkgAcquire::Item			/*{{{*/
 // Acquire::Item::Item - Constructor					/*{{{*/
 APT_IGNORE_DEPRECATED_PUSH
 pkgAcquire::Item::Item(pkgAcquire * const Owner) :
-   FileSize(0), PartialSize(0), Mode(0), Complete(false), Local(false),
+   FileSize(0), PartialSize(0), Mode(0), ID(0), Complete(false), Local(false),
     QueueCounter(0), ExpectedAdditionalItems(0), Owner(Owner)
 {
    Owner->Add(this);
diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc
index 0c606e48e..dc92e3b2a 100644
--- a/apt-private/acqprogress.cc
+++ b/apt-private/acqprogress.cc
@@ -49,6 +49,16 @@ void AcqTextStatus::Start()
    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	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -57,9 +67,11 @@ void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
    if (Quiet > 1)
       return;
 
+   AssignItemID(Itm);
    clearLastLine();
 
-   out << _("Hit ") << Itm.Description;
+   // 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;
 }
@@ -72,15 +84,16 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
    Update = true;
    if (Itm.Owner->Complete == true)
       return;
-
-   Itm.Owner->ID = ID++;
+   AssignItemID(Itm);
 
    if (Quiet > 1)
       return;
 
    clearLastLine();
 
-   out << _("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)
       out << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
    out << std::endl;
@@ -89,9 +102,10 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
 // 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		/*{{{*/
@@ -106,19 +120,25 @@ void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm)
    if (Itm.Owner->Status == pkgAcquire::Item::StatIdle)
       return;
 
+   AssignItemID(Itm);
    clearLastLine();
 
    if (Itm.Owner->Status == pkgAcquire::Item::StatDone)
    {
-      out << _("Ign ") << Itm.Description << std::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)
-	 out << "  " << Itm.Owner->ErrorText << std::endl;
+	 out << std::endl << "  " << Itm.Owner->ErrorText;
+      out << std::endl;
    }
    else
    {
-      out << _("Err ") << Itm.Description << std::endl;
-      out << "  " << Itm.Owner->ErrorText << std::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;
diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h
index 7cf990c65..cbb06fbec 100644
--- a/apt-private/acqprogress.h
+++ b/apt-private/acqprogress.h
@@ -23,7 +23,8 @@ class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus
    unsigned long ID;
    unsigned long Quiet;
 
-   void clearLastLine();
+   APT_HIDDEN void clearLastLine();
+   APT_HIDDEN void AssignItemID(pkgAcquire::ItemDesc &Itm);
 
    public:
 
diff --git a/po/apt-all.pot b/po/apt-all.pot
index b68d801ea..73b033876 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -1529,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
diff --git a/po/ar.po b/po/ar.po
index e2b179d0e..3e71fef80 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1555,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
diff --git a/po/ast.po b/po/ast.po
index 1efbbc1d2..1995c12f6 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -1684,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
diff --git a/po/bg.po b/po/bg.po
index bbe6df3ae..7dff005e6 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1720,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
diff --git a/po/bs.po b/po/bs.po
index 9cd1adc85..abb9a570a 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -1555,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
diff --git a/po/ca.po b/po/ca.po
index cdb3ceeb8..065ad0ea7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1708,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
diff --git a/po/cs.po b/po/cs.po
index 76fc37b6b..3f6bcb4a7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1734,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
diff --git a/po/cy.po b/po/cy.po
index e29221cd1..b05bc7c59 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -1706,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
diff --git a/po/da.po b/po/da.po
index 53d3de059..d6b8e07a1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1749,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
diff --git a/po/de.po b/po/de.po
index 85b0cb7ac..d4ca0d5a0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1810,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
diff --git a/po/dz.po b/po/dz.po
index 8d1e57b35..a4c50d245 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -1674,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
diff --git a/po/el.po b/po/el.po
index e0750b61e..98e1f31c9 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1695,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
diff --git a/po/es.po b/po/es.po
index e094ccafa..a2a9a71e9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1820,20 +1820,24 @@ msgid "Full Text Search"
 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
diff --git a/po/eu.po b/po/eu.po
index e268f6059..f1e90411a 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1678,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
diff --git a/po/fi.po b/po/fi.po
index d58fb9b04..c40ed8e9e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1669,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
diff --git a/po/fr.po b/po/fr.po
index cb9d82856..ecb752f5e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1774,20 +1774,24 @@ msgid "Full Text Search"
 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
diff --git a/po/gl.po b/po/gl.po
index d6bb1e92e..2adaa302a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1706,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
diff --git a/po/he.po b/po/he.po
index b3ef8f831..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
diff --git a/po/hu.po b/po/hu.po
index 313f3a492..635184c75 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1714,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
diff --git a/po/it.po b/po/it.po
index 36173e92c..178754c52 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1766,21 +1766,24 @@ msgid "Full Text Search"
 msgstr "Ricerca sul testo"
 
 #: apt-private/acqprogress.cc:62
-msgid "Hit "
-msgstr "Trovato "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Trovato:%lu %s"
 
 #: apt-private/acqprogress.cc:83
-msgid "Get:"
-msgstr "Scaricamento di:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Scaricamento di:%lu %s"
 
-# (ndt) questa non so cosa voglia dire
 #: apt-private/acqprogress.cc:113
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:120
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
 
 #: apt-private/acqprogress.cc:143
 #, c-format
diff --git a/po/ja.po b/po/ja.po
index 6c49f2608..f8f55f8aa 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1750,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
diff --git a/po/km.po b/po/km.po
index 26bfe4361..8c72865f8 100644
--- a/po/km.po
+++ b/po/km.po
@@ -1652,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
diff --git a/po/ko.po b/po/ko.po
index 5479ab790..51cc27d61 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1666,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
diff --git a/po/ku.po b/po/ku.po
index c14ca94bd..540307937 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -1558,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
diff --git a/po/lt.po b/po/lt.po
index b85a0fbe1..1f485b28d 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1577,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
diff --git a/po/mr.po b/po/mr.po
index 286c5d859..24e470cef 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1656,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
diff --git a/po/nb.po b/po/nb.po
index 07247be4f..433e33909 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1684,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
diff --git a/po/ne.po b/po/ne.po
index 54dd771b4..4c6f2d098 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -1652,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
diff --git a/po/nl.po b/po/nl.po
index 8d226dfef..5c774fe8d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1776,20 +1776,24 @@ msgid "Full Text Search"
 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
diff --git a/po/nn.po b/po/nn.po
index b3622b6cd..0886c266a 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1668,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
diff --git a/po/pl.po b/po/pl.po
index 0dda22a47..1851fa805 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1749,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
diff --git a/po/pt.po b/po/pt.po
index a4b1105f8..4f05ada82 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1718,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
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0c4d92d02..5e2abd988 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1687,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
diff --git a/po/ro.po b/po/ro.po
index 63df026ab..9b0a1494a 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1695,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
diff --git a/po/ru.po b/po/ru.po
index 260bdd513..2028e5420 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1742,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
diff --git a/po/sk.po b/po/sk.po
index 912d1fcf7..631ddd826 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1716,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
diff --git a/po/sl.po b/po/sl.po
index 3210fa504..845fe3c5f 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1717,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
diff --git a/po/sv.po b/po/sv.po
index 70f4b2d2d..52f65b598 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1698,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
diff --git a/po/th.po b/po/th.po
index 147c3b8b8..60a468ea4 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1696,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
diff --git a/po/tl.po b/po/tl.po
index e3da79c8a..970b0b387 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -1677,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
diff --git a/po/tr.po b/po/tr.po
index 5d9c3cee3..1e6f38903 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1753,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
diff --git a/po/uk.po b/po/uk.po
index faeedf941..47976d39c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1736,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
diff --git a/po/vi.po b/po/vi.po
index 089d8461a..2edb52f22 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1752,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
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2ff5bcf01..6e9610ac9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1693,20 +1693,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
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e35910df2..201d9d675 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1646,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
diff --git a/test/integration/test-apt-acquire-additional-files b/test/integration/test-apt-acquire-additional-files
index ffb9f3135..3465c0a16 100755
--- a/test/integration/test-apt-acquire-additional-files
+++ b/test/integration/test-apt-acquire-additional-files
@@ -49,8 +49,8 @@ testequal "'http://localhost:8080/dists/unstable/InRelease' localhost:8080_dists
 '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 http://localhost:8080 unstable InRelease
-Get:1 http://localhost:8080 unstable/main amd64 Contents [$(stat -c%s aptarchive/dists/unstable/main/Contents-amd64.gz) B]
+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*'
@@ -74,8 +74,8 @@ testequal "'http://localhost:8080/dists/unstable/InRelease' localhost:8080_dists
 '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 http://localhost:8080 unstable InRelease
-Get:1 http://localhost:8080 unstable/main amd64 Contents.gz [$(stat -c%s aptarchive/dists/unstable/main/Contents-amd64.gz) B]
+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*'
@@ -89,7 +89,7 @@ testequal "'http://localhost:8080/dists/unstable/InRelease' localhost:8080_dists
 '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 http://localhost:8080 unstable InRelease
+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-cdrom b/test/integration/test-apt-cdrom
index 6a218ffb8..108805daa 100755
--- a/test/integration/test-apt-cdrom
+++ b/test/integration/test-apt-cdrom
@@ -136,14 +136,14 @@ aptcache show testing -o Acquire::Languages=en | grep -q '^Description-en: ' &&
 mv rootdir/media/cdrom-unmounted rootdir/media/cdrom-ejected
 msgmsg "ensure an update doesn't mess with cdrom sources"
 testsuccess aptget update
-testfileequal rootdir/tmp/testsuccess.output 'Hit cdrom://Debian APT Testdisk 0.8.15 stable InRelease
+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
 
 msgmsg 'and again to check that it withstands the temptation even if it could mount'
 testsuccess aptget update
-testfileequal rootdir/tmp/testsuccess.output 'Hit cdrom://Debian APT Testdisk 0.8.15 stable InRelease
+testfileequal rootdir/tmp/testsuccess.output 'Hit:1 cdrom://Debian APT Testdisk 0.8.15 stable InRelease
 Reading package lists...'
 testcdromusage
 
diff --git a/test/integration/test-apt-get-update-unauth-warning b/test/integration/test-apt-get-update-unauth-warning
index 1f4a14e23..5b81d56d2 100755
--- a/test/integration/test-apt-get-update-unauth-warning
+++ b/test/integration/test-apt-get-update-unauth-warning
@@ -20,9 +20,9 @@ APTARCHIVE=$(readlink -f ./aptarchive)
 rm -f $APTARCHIVE/dists/unstable/*Release*
 
 # update without authenticated files leads to warning
-testfailureequal "Ign file:$APTARCHIVE unstable InRelease
+testfailureequal "Ign:1 file:$APTARCHIVE unstable InRelease
   File not found
-Err file:$APTARCHIVE unstable Release
+Err:2 file:$APTARCHIVE unstable Release
   File not found
 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
@@ -36,13 +36,13 @@ filesize() {
 	stat -c%s "$(aptget files --no-release-info --format '$(URI)' "Created-By: $1" | cut -d'/' -f 3- ).gz"
 }
 # allow override
-testwarningequal "Ign file:$APTARCHIVE unstable InRelease
+testwarningequal "Ign:1 file:$APTARCHIVE unstable InRelease
   File not found
-Ign file:$APTARCHIVE unstable Release
+Ign:2 file:$APTARCHIVE unstable Release
   File not found
-Get:1 file:$APTARCHIVE unstable/main Sources [$(filesize 'Sources') B]
-Get:2 file:$APTARCHIVE unstable/main i386 Packages [$(filesize 'Packages') B]
-Get:3 file:$APTARCHIVE unstable/main Translation-en [$(filesize 'Translations') B]
+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:$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
diff --git a/test/integration/test-apt-update-ims b/test/integration/test-apt-update-ims
index 7385e701a..2b662171c 100755
--- a/test/integration/test-apt-update-ims
+++ b/test/integration/test-apt-update-ims
@@ -43,7 +43,7 @@ runtest() {
     testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
 
     # ensure that we still do a hash check for other files on ims hit of Release
-    if grep -q '^Hit .* InRelease$' expected.output || ! grep -q '^Ign .* Release\(\.gpg\)\?$' expected.output; then
+    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)"
@@ -55,7 +55,7 @@ runtest() {
 }
 
 msgmsg 'InRelease'
-EXPECT='Hit http://localhost:8080 unstable InRelease
+EXPECT='Hit:1 http://localhost:8080 unstable InRelease
 Reading package lists...'
 echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest
@@ -63,9 +63,9 @@ echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest
 
 msgmsg 'Release/Release.gpg'
-EXPECT='Ign http://localhost:8080 unstable InRelease
+EXPECT='Ign:1 http://localhost:8080 unstable InRelease
   404  Not Found
-Hit http://localhost:8080 unstable Release
+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
@@ -74,10 +74,10 @@ echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest
 
 msgmsg 'Release only'
-EXPECT="Ign http://localhost:8080 unstable InRelease
+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
 Reading package lists...
 W: The data from 'http://localhost:8080 unstable Release' is not signed. Packages from that repository can not be authenticated."
@@ -96,7 +96,7 @@ Valid-Until: $(date -d '-1 weeks' '+%a, %d %b %Y %H:%M:%S %Z')" '{}' \;
 signreleasefiles
 
 msgmsg 'expired InRelease'
-EXPECT='Hit http://localhost:8080 unstable 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'
@@ -104,9 +104,9 @@ echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest 'failure'
 
 msgmsg 'expired Release/Release.gpg'
-EXPECT='Ign http://localhost:8080 unstable InRelease
+EXPECT='Ign:1 http://localhost:8080 unstable InRelease
   404  Not Found
-Hit http://localhost:8080 unstable Release
+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
@@ -115,10 +115,10 @@ echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
 runtest 'failure'
 
 msgmsg 'expired Release only'
-EXPECT="Ign http://localhost:8080 unstable InRelease
+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
 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."
@@ -130,13 +130,13 @@ runtest 'failure' 'warning'
 
 
 msgmsg 'no Release at all'
-EXPECT="Ign http://localhost:8080 unstable InRelease
+EXPECT="Ign:1 http://localhost:8080 unstable InRelease
   404  Not Found
-Ign http://localhost:8080 unstable Release
+Ign:2 http://localhost:8080 unstable Release
   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
+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
diff --git a/test/integration/test-apt-update-not-modified b/test/integration/test-apt-update-not-modified
index 32818658f..6d176a655 100755
--- a/test/integration/test-apt-update-not-modified
+++ b/test/integration/test-apt-update-not-modified
@@ -20,14 +20,14 @@ methodtest() {
 	listcurrentlistsdirectory > listsdir.lst
 
 	# hit again with a good cache
-	testsuccessequal "Hit $1 unstable InRelease
+	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 unstable InRelease
+	testsuccessequal "Hit:1 $1 unstable InRelease
 Reading package lists..." aptget update
 	testfileequal 'listsdir-without-amd64.lst' "$(listcurrentlistsdirectory)"
 
@@ -42,9 +42,9 @@ Architecture: amd64
 Version: 1
 EOF
 	compressfile aptarchive/dists/unstable/main/binary-amd64/Packages
-	testfailureequal "Hit $1 unstable InRelease
-Get:1 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
-Err $1 unstable/main 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
 
@@ -54,8 +54,8 @@ E: Some index files failed to download. They have been ignored, or old ones used
 	cp -a aptarchive/dists.good aptarchive/dists
 
 	# … now everything is fine again
-	testsuccessequal "Hit $1 unstable InRelease
-Get:1 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
+	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)"
 
@@ -74,18 +74,18 @@ Reading package lists..." aptget update
 	listcurrentlistsdirectory > listsdir.lst
 
 	# hit again with a good cache
-	testsuccessequal "Ign $1 unstable InRelease
+	testsuccessequal "Ign:1 $1 unstable InRelease
   404  Not Found
-Hit $1 unstable Release
+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 unstable InRelease
+	testsuccessequal "Ign:1 $1 unstable InRelease
   404  Not Found
-Hit $1 unstable Release
+Hit:2 $1 unstable Release
 Reading package lists..." aptget update
 	testfileequal 'listsdir-without-amd64.lst' "$(listcurrentlistsdirectory)"
 
@@ -100,11 +100,11 @@ Architecture: amd64
 Version: 1
 EOF
 	compressfile aptarchive/dists/unstable/main/binary-amd64/Packages
-	testfailureequal "Ign $1 unstable InRelease
+	testfailureequal "Ign:1 $1 unstable InRelease
   404  Not Found
-Hit $1 unstable Release
-Get:1 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
-Err $1 unstable/main amd64 Packages
+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
 
@@ -115,18 +115,18 @@ E: Some index files failed to download. They have been ignored, or old ones used
 	find aptarchive/dists -name 'InRelease' -delete
 
 	# … now everything is fine again
-	testsuccessequal "Ign $1 unstable InRelease
+	testsuccessequal "Ign:1 $1 unstable InRelease
   404  Not Found
-Hit $1 unstable Release
-Get:1 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
+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 unstable InRelease
+	testsuccessequal "Ign:1 $1 unstable InRelease
   404  Not Found
-Get:1 $1 unstable Release [$(stat -c '%s' 'aptarchive/dists/unstable/Release') B]
+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'
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 3042d116d..47dd62712 100755
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -13,7 +13,7 @@ setupflataptarchive
 testaptgetupdate() {
 	rm -rf rootdir/var/lib/apt
 	aptget update >testaptgetupdate.diff 2>&1 || true
-	sed -i -e '/Ign /,+1d' -e '/Release/ d' -e 's#Get:[0-9]\+ #Get: #' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
+	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 $*"
@@ -47,12 +47,12 @@ testoverfile() {
 	forcecompressor "$1"
 
 	createemptyarchive 'Packages'
-	testaptgetupdate "Get: file:$APTARCHIVE  Packages []
+	testaptgetupdate "Get:2 file:$APTARCHIVE  Packages []
 Reading package lists..." "empty archive Packages.$COMPRESS over file"
 
 	createemptyfile 'Packages'
-	testaptgetupdate "Get: file:$APTARCHIVE  Packages
-Err file:$APTARCHIVE  Packages
+	testaptgetupdate "Get:2 file:$APTARCHIVE  Packages
+Err:2 file:$APTARCHIVE  Packages
   Empty files can't be valid archives
 W: Failed to fetch ${COMPRESSOR}:${APTARCHIVE}/Packages.$COMPRESS  Empty files can't be valid archives
 
@@ -63,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-602412-dequote-redirect b/test/integration/test-bug-602412-dequote-redirect
index ca2378c19..b9d232f90 100755
--- a/test/integration/test-bug-602412-dequote-redirect
+++ b/test/integration/test-bug-602412-dequote-redirect
@@ -21,7 +21,7 @@ testrun() {
 	testsuccess --nomsg aptget update
 
 	# check that I-M-S header is kept in redirections
-	testsuccessequal "Hit $1 unstable InRelease
+	testsuccessequal "Hit:1 $1 unstable InRelease
 Reading package lists..." aptget update
 
 	msgtest 'Test redirection works in' 'package download'
diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage
index 3295d5497..e5fe21e0f 100755
--- a/test/integration/test-pdiff-usage
+++ b/test/integration/test-pdiff-usage
@@ -98,7 +98,7 @@ SHA256-Download:
 	msgmsg "Testcase: index is already up-to-date: $*"
 	find rootdir/var/lib/apt/lists -name '*diff_Index' -type f -delete
 	testsuccess aptget update "$@"
-	testequal 'Hit http://localhost:8080  InRelease
+	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
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 6abb5d12a..48a7f0562 100755
--- a/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
+++ b/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
@@ -176,10 +176,10 @@ testmismatch() {
 Building dependency tree...
 Need to get 6 B of source archives.
 Get:1 http://localhost:8080  $1 1.0 (dsc) [3 B]
-Err http://localhost:8080  $1 1.0 (dsc)
+Err:1 http://localhost:8080  $1 1.0 (dsc)
   Hash Sum mismatch
 Get:2 http://localhost:8080  $1 1.0 (tar) [3 B]
-Err http://localhost:8080  $1 1.0 (tar)
+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
 
@@ -242,7 +242,7 @@ 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]
-Err http://localhost:8080  pkg-mixed-sha1-bad 1.0 (dsc)
+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
 
@@ -253,7 +253,7 @@ 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]
-Err http://localhost:8080  pkg-mixed-sha2-bad 1.0 (tar)
+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
-- 
cgit v1.2.3-70-g09d2


From 9d2a8a7388cf3b0bbbe92f6b0b30a533e1167f40 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 15 Jun 2015 23:06:56 +0200
Subject: condense parallel requests with the same hashes to one

It shouldn't be too common, but sometimes people have multiple mirrors
in the sources or otherwise repositories with the same content. Now that
we gracefully can handle multiple requests to the same URI, we can also
fold multiple requests with the same expected hashes into one. Note that
this isn't trying to find oppertunities for merging, but just merges if
it happens to encounter the oppertunity for it.

This is most obvious in the new testcase actually as it needs to delay
the action to give the acquire system enough time to figure out that
they can be merged.
---
 apt-pkg/acquire.cc                                 |  5 +-
 apt-private/acqprogress.cc                         |  6 +-
 test/integration/framework                         |  8 ++-
 test/integration/skip-aptwebserver                 | 25 -------
 .../test-acquire-same-file-multiple-times          |  4 +-
 .../test-acquire-same-repository-multiple-times    | 81 ++++++++++++++++++++++
 test/integration/test-apt-get-source               | 42 ++++++-----
 test/integration/test-apt-get-source-arch          | 23 +++---
 test/integration/test-apt-get-source-multisources  | 12 ++--
 .../integration/test-apt-get-update-unauth-warning | 37 +++++++++-
 test/integration/test-apt-progress-fd              |  4 --
 test/integration/test-apt-update-ims               | 18 +++++
 .../test-bug-722207-print-uris-even-if-very-quiet  | 12 ++--
 test/integration/test-bug-738785-switch-protocol   | 22 +++---
 14 files changed, 198 insertions(+), 101 deletions(-)
 delete mode 100755 test/integration/skip-aptwebserver
 create mode 100755 test/integration/test-acquire-same-repository-multiple-times

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 14c8863dc..34afab181 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -680,9 +680,12 @@ 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())
       {
+	 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;
diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc
index dc92e3b2a..f6c3d1204 100644
--- a/apt-private/acqprogress.cc
+++ b/apt-private/acqprogress.cc
@@ -116,14 +116,10 @@ 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;
-
    AssignItemID(Itm);
    clearLastLine();
 
-   if (Itm.Owner->Status == pkgAcquire::Item::StatDone)
+   if (Itm.Owner->Status == pkgAcquire::Item::StatDone || Itm.Owner->Status == pkgAcquire::Item::StatIdle)
    {
       // TRANSLATOR: Very short word to be displayed for files in 'apt-get update'
       // which failed to download, but the error is ignored (compare "Err:")
diff --git a/test/integration/framework b/test/integration/framework
index 1b99929e2..d8f7567d9 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -245,7 +245,7 @@ setupenvironment() {
 	echo "Dir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf
 	echo "Dir::state::status \"${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/status\";" >> 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
@@ -786,6 +786,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
@@ -793,8 +795,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
 }
 
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-acquire-same-file-multiple-times b/test/integration/test-acquire-same-file-multiple-times
index d329a39cb..526765521 100755
--- a/test/integration/test-acquire-same-file-multiple-times
+++ b/test/integration/test-acquire-same-file-multiple-times
@@ -45,7 +45,7 @@ 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
+	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
@@ -57,7 +57,7 @@ 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
+	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
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..bfeaf88db
--- /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.2
+	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-apt-get-source b/test/integration/test-apt-get-source
index 9db24370f..22f01b997 100755
--- a/test/integration/test-apt-get-source
+++ b/test/integration/test-apt-get-source
@@ -34,43 +34,40 @@ APTARCHIVE=$(readlink -f ./aptarchive)
 # normal operation gets highest version number
 HEADER="Reading package lists...
 Building dependency tree..."
+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
-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
+$DOWNLOAD2" aptget source -q --print-uris foo
 
 # select by release: suite
 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
+$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
 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
 testsuccessequal "$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
+$DOWNLOAD1" aptget source -q --print-uris foo=1.0
 
 # select by release with no binary package (Bug#731102) but ensure to get
 # highest version
+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
 testfailureequal "$HEADER
@@ -78,11 +75,12 @@ 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
+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
-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
+$DOWNLOAD001" aptget source -q --print-uris -t unstable foo=0.0.1
 
 testsuccessequal "$HEADER
-Need to get 0 B of source archives.
+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 c75798209..f54bb6012 100755
--- a/test/integration/test-apt-get-source-arch
+++ b/test/integration/test-apt-get-source-arch
@@ -28,31 +28,30 @@ 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
 testsuccessequal "$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
+$DOWNLOAD10" aptget source -q --print-uris foo:amd64
 
 # pick :i386
 testsuccessequal "$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
+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
 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
 testsuccessequal "$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
+$DOWNLOAD10" aptget source -q --print-uris foo:i386=1.0
 
 # error on unknown arch
 testfailureequal "$HEADER
diff --git a/test/integration/test-apt-get-source-multisources b/test/integration/test-apt-get-source-multisources
index 03d0400a0..887a30685 100755
--- a/test/integration/test-apt-get-source-multisources
+++ b/test/integration/test-apt-get-source-multisources
@@ -20,11 +20,11 @@ APTARCHIVE=$(readlink -f ./aptarchive)
 HEADER="Reading package lists...
 Building dependency tree..."
 testsuccessequal "$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
+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 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
+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 5b81d56d2..fcabf244a 100755
--- a/test/integration/test-apt-get-update-unauth-warning
+++ b/test/integration/test-apt-get-update-unauth-warning
@@ -20,8 +20,10 @@ APTARCHIVE=$(readlink -f ./aptarchive)
 rm -f $APTARCHIVE/dists/unstable/*Release*
 
 # update without authenticated files leads to warning
-testfailureequal "Ign:1 file:$APTARCHIVE unstable InRelease
+testfailureequal "Get:1 file:$APTARCHIVE unstable InRelease
+Ign:1 file:$APTARCHIVE unstable InRelease
   File not found
+Get:2 file:$APTARCHIVE unstable Release
 Err:2 file:$APTARCHIVE unstable Release
   File not found
 W: The repository 'file:$APTARCHIVE unstable Release' does not have a Release file. This is deprecated, please contact the owner of the repository.
@@ -36,10 +38,41 @@ filesize() {
 	stat -c%s "$(aptget files --no-release-info --format '$(URI)' "Created-By: $1" | cut -d'/' -f 3- ).gz"
 }
 # allow override
-testwarningequal "Ign:1 file:$APTARCHIVE 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
+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]
diff --git a/test/integration/test-apt-progress-fd b/test/integration/test-apt-progress-fd
index 99b4ea050..e30d503cb 100755
--- a/test/integration/test-apt-progress-fd
+++ b/test/integration/test-apt-progress-fd
@@ -16,7 +16,6 @@ setupaptarchive
 exec 3> apt-progress.log
 testsuccess aptget install testing=0.1 -y -o APT::Status-Fd=3
 testfileequal './apt-progress.log' 'dlstatus:1:0:Retrieving file 1 of 1
-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)
@@ -33,7 +32,6 @@ pmstatus:dpkg-exec:83.3333:Running dpkg'
 exec 3> apt-progress.log
 testsuccess aptget install testing=0.8.15 -y -o APT::Status-Fd=3
 testfileequal './apt-progress.log' 'dlstatus:1:0:Retrieving file 1 of 1
-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)
@@ -50,7 +48,6 @@ pmstatus:dpkg-exec:83.3333:Running dpkg'
 exec 3> apt-progress.log
 testsuccess aptget install testing=0.8.15 --reinstall -y -o APT::Status-Fd=3
 testfileequal './apt-progress.log' 'dlstatus:1:0:Retrieving file 1 of 1
-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)
@@ -77,7 +74,6 @@ pmstatus:dpkg-exec:75:Running dpkg'
 exec 3> apt-progress.log
 testsuccess aptget install testing2:i386 -y -o APT::Status-Fd=3
 testfileequal './apt-progress.log' 'dlstatus:1:0:Retrieving file 1 of 1
-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)
diff --git a/test/integration/test-apt-update-ims b/test/integration/test-apt-update-ims
index 2b662171c..33b4ed1b9 100755
--- a/test/integration/test-apt-update-ims
+++ b/test/integration/test-apt-update-ims
@@ -134,6 +134,24 @@ 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
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 e51d72ccd..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
@@ -21,11 +21,11 @@ testsuccessequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.d
 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 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/apt_2.tar.gz' apt_2.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source 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
 
-testsuccessequal "'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-738785-switch-protocol b/test/integration/test-bug-738785-switch-protocol
index 539080200..e86f28824 100755
--- a/test/integration/test-bug-738785-switch-protocol
+++ b/test/integration/test-bug-738785-switch-protocol
@@ -39,18 +39,15 @@ 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
 testfailureequal "E: The method driver $(readlink -f './../')/rootdir/usr/lib/apt/methods/https could not be found.
@@ -59,8 +56,7 @@ 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'
-- 
cgit v1.2.3-70-g09d2


From 533fe3d13927798c17bdef84eba60ed9441d9608 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 15 Jun 2015 23:59:14 +0200
Subject: allow ratelimiting progress reporting for testcases

Progress reports once in a while which is a bit to unpredictable for
testcases, so we enforce a steady progress for them in the hope that
this makes the tests (mostly test-apt-progress-fd) a bit more stable.

Git-Dch: Ignore
---
 apt-pkg/acquire.cc                                 | 14 ++++++++-----
 test/integration/framework                         | 23 ++++++++++++----------
 .../test-acquire-same-repository-multiple-times    |  2 +-
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 34afab181..5e5bec95c 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -955,7 +955,7 @@ std::string pkgAcquire::Queue::QItem::Custom600Headers() const		/*{{{*/
 // AcquireStatus::pkgAcquireStatus - Constructor			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-pkgAcquireStatus::pkgAcquireStatus() : d(NULL), Percent(0), Update(true), MorePulses(false)
+pkgAcquireStatus::pkgAcquireStatus() : d(NULL), Percent(-1), Update(true), MorePulses(false)
 {
    Start();
 }
@@ -1054,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) 
@@ -1078,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();
diff --git a/test/integration/framework b/test/integration/framework
index d8f7567d9..5d949009f 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -273,16 +273,19 @@ 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\";" >> aptconfig.conf # Added to test multiarch before dpkg is ready for it…
-	fi
-	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
+	{
+		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
diff --git a/test/integration/test-acquire-same-repository-multiple-times b/test/integration/test-acquire-same-repository-multiple-times
index bfeaf88db..a46e0d73c 100755
--- a/test/integration/test-acquire-same-repository-multiple-times
+++ b/test/integration/test-acquire-same-repository-multiple-times
@@ -32,7 +32,7 @@ cat >$NEWMETHODS/file <<EOF
 while read line; do
 	echo "\$line"
 	if [ -z "\$line" ]; then
-		sleep 0.2
+		sleep 0.5
 	fi
 done | $OLDMETHODS/file
 EOF
-- 
cgit v1.2.3-70-g09d2


From c8a4ce6cbed57ae108dc955d4a850f9b129a0693 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 16 Jun 2015 16:22:46 +0200
Subject: add d-pointer, virtual destructors and de-inline de/constructors

To have a chance to keep the ABI for a while we need all three to team
up. One of them missing and we might loose, so ensuring that they are
available is a very tedious but needed task once in a while.

Git-Dch: Ignore
---
 apt-pkg/acquire-item.cc         |  11 +++-
 apt-pkg/acquire-item.h          |  16 ++++--
 apt-pkg/acquire-method.cc       |   6 +-
 apt-pkg/acquire-method.h        |   9 ++-
 apt-pkg/acquire-worker.h        |   1 -
 apt-pkg/acquire.cc              |   9 +++
 apt-pkg/acquire.h               |  10 +---
 apt-pkg/algorithms.h            |   6 +-
 apt-pkg/aptconfiguration.h      |  21 ++++---
 apt-pkg/cachefile.h             |   1 -
 apt-pkg/cacheset.cc             |  15 ++++-
 apt-pkg/cacheset.h              |  24 +++++---
 apt-pkg/cdrom.cc                |   6 ++
 apt-pkg/cdrom.h                 |  11 +++-
 apt-pkg/clean.cc                |   1 +
 apt-pkg/clean.h                 |   2 +
 apt-pkg/deb/debindexfile.cc     |   1 +
 apt-pkg/deb/debindexfile.h      |   8 ++-
 apt-pkg/deb/debmetaindex.cc     |   2 +
 apt-pkg/deb/debmetaindex.h      |   3 +-
 apt-pkg/deb/debrecords.cc       |   7 +++
 apt-pkg/deb/debrecords.h        |  15 +++--
 apt-pkg/deb/debsrcrecords.cc    |   4 ++
 apt-pkg/deb/debsrcrecords.h     |   4 +-
 apt-pkg/deb/debversion.h        |   1 -
 apt-pkg/depcache.h              |   6 +-
 apt-pkg/edsp.cc                 | 123 ++++++++++++++++++++--------------------
 apt-pkg/edsp.h                  |  42 +++++---------
 apt-pkg/edsp/edspindexfile.cc   |   2 +
 apt-pkg/edsp/edspindexfile.h    |   1 +
 apt-pkg/edsp/edsplistparser.cc  |   2 +
 apt-pkg/edsp/edsplistparser.h   |   2 +
 apt-pkg/edsp/edspsystem.h       |   2 +-
 apt-pkg/indexcopy.cc            |  10 ++++
 apt-pkg/indexcopy.h             |  23 ++++++--
 apt-pkg/indexfile.cc            |   3 +
 apt-pkg/indexfile.h             |   6 +-
 apt-pkg/indexrecords.h          |   3 -
 apt-pkg/install-progress.cc     |   6 ++
 apt-pkg/install-progress.h      |  11 +++-
 apt-pkg/metaindex.h             |   1 +
 apt-pkg/orderlist.h             |   4 +-
 apt-pkg/packagemanager.h        |   2 +-
 apt-pkg/pkgcache.cc             |   2 +
 apt-pkg/pkgcache.h              |   5 +-
 apt-pkg/pkgcachegen.cc          |   3 +
 apt-pkg/pkgcachegen.h           |  17 +++---
 apt-pkg/pkgrecords.cc           |   3 +
 apt-pkg/pkgrecords.h            |   8 ++-
 apt-pkg/pkgsystem.cc            |   2 +
 apt-pkg/pkgsystem.h             |   5 +-
 apt-pkg/policy.cc               |   2 +
 apt-pkg/policy.h                |   5 +-
 apt-pkg/sourcelist.h            |   4 +-
 apt-pkg/srcrecords.h            |   1 -
 apt-pkg/tagfile.h               |   2 -
 apt-pkg/version.cc              |   3 +
 apt-pkg/version.h               |   2 +-
 test/libapt/acqprogress_test.cc |  46 ++++++++-------
 59 files changed, 348 insertions(+), 205 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 5460280ec..3313aaabc 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -438,7 +438,7 @@ APT_PURE pkgAcquire * pkgAcquire::Item::GetOwner() const		/*{{{*/
    return Owner;
 }
 									/*}}}*/
-pkgAcquire::ItemDesc &pkgAcquire::Item::GetItemDesc()			/*{{{*/
+APT_CONST pkgAcquire::ItemDesc &pkgAcquire::Item::GetItemDesc()		/*{{{*/
 {
    return Desc;
 }
@@ -1098,6 +1098,7 @@ bool pkgAcqMetaBase::VerifyVendor(string const &Message)		/*{{{*/
    return true;
 }
 									/*}}}*/
+pkgAcqMetaBase::~pkgAcqMetaBase() {}
 
 pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire * const Owner,	/*{{{*/
       IndexTarget const &ClearsignedTarget,
@@ -1319,6 +1320,7 @@ std::string pkgAcqMetaIndex::DescURI() const				/*{{{*/
    return Target.URI;
 }
 									/*}}}*/
+pkgAcqMetaIndex::~pkgAcqMetaIndex() {}
 
 // AcqMetaSig::AcqMetaSig - Constructor					/*{{{*/
 pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire * const Owner,
@@ -1491,6 +1493,7 @@ pkgAcqBaseIndex::pkgAcqBaseIndex(pkgAcquire * const Owner,
 {
 }
 									/*}}}*/
+pkgAcqBaseIndex::~pkgAcqBaseIndex() {}
 
 // AcqDiffIndex::AcqDiffIndex - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
@@ -1893,6 +1896,7 @@ void pkgAcqDiffIndex::Done(string const &Message,HashStringList const &Hashes,	/
    return;
 }
 									/*}}}*/
+pkgAcqDiffIndex::~pkgAcqDiffIndex() {}
 
 // AcqIndexDiffs::AcqIndexDiffs - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
@@ -2119,6 +2123,7 @@ std::string pkgAcqIndexDiffs::Custom600Headers() const			/*{{{*/
    return patchhashes.str();
 }
 									/*}}}*/
+pkgAcqIndexDiffs::~pkgAcqIndexDiffs() {}
 
 // AcqIndexMergeDiffs::AcqIndexMergeDiffs - Constructor			/*{{{*/
 pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire * const Owner,
@@ -2263,6 +2268,7 @@ std::string pkgAcqIndexMergeDiffs::Custom600Headers() const		/*{{{*/
    return patchhashes.str();
 }
 									/*}}}*/
+pkgAcqIndexMergeDiffs::~pkgAcqIndexMergeDiffs() {}
 
 // AcqIndex::AcqIndex - Constructor					/*{{{*/
 pkgAcqIndex::pkgAcqIndex(pkgAcquire * const Owner,
@@ -2539,6 +2545,7 @@ void pkgAcqIndex::StageDecompressDone(string const &,
    return;
 }
 									/*}}}*/
+pkgAcqIndex::~pkgAcqIndex() {}
 
 
 // AcqArchive::AcqArchive - Constructor					/*{{{*/
@@ -2836,6 +2843,7 @@ std::string pkgAcqArchive::ShortDesc() const				/*{{{*/
    return Desc.ShortDesc;
 }
 									/*}}}*/
+pkgAcqArchive::~pkgAcqArchive() {}
 
 // AcqChangelog::pkgAcqChangelog - Constructors				/*{{{*/
 pkgAcqChangelog::pkgAcqChangelog(pkgAcquire * const Owner, pkgCache::VerIterator const &Ver,
@@ -3156,3 +3164,4 @@ string pkgAcqFile::Custom600Headers() const				/*{{{*/
    return "";
 }
 									/*}}}*/
+pkgAcqFile::~pkgAcqFile() {}
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 9dbacc1ea..df1380b5e 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -1,6 +1,5 @@
 // -*- 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
@@ -345,6 +344,7 @@ class pkgAcquire::Item : public WeakPointable				/*{{{*/
 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;
@@ -380,7 +380,6 @@ class APT_HIDDEN pkgAcqMetaBase : public pkgAcqTransactionItem		/*{{{*/
 /** \brief the manager of a transaction */
 {
    void *d;
-
  protected:
    std::vector<pkgAcqTransactionItem*> Transaction;
 
@@ -478,6 +477,7 @@ class APT_HIDDEN pkgAcqMetaBase : public pkgAcqTransactionItem		/*{{{*/
 		  std::vector<IndexTarget> const IndexTargets,
 		  IndexTarget const &DataTarget,
 		  indexRecords* const MetaIndexParser);
+   virtual ~pkgAcqMetaBase();
 };
 									/*}}}*/
 /** \brief An item that is responsible for downloading the meta-index	{{{
@@ -493,7 +493,6 @@ class APT_HIDDEN pkgAcqMetaBase : public pkgAcqTransactionItem		/*{{{*/
 class APT_HIDDEN pkgAcqMetaIndex : public pkgAcqMetaBase
 {
    void *d;
-
    protected:
    IndexTarget const DetachedSigTarget;
 
@@ -513,6 +512,7 @@ class APT_HIDDEN pkgAcqMetaIndex : public pkgAcqMetaBase
    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;
 };
@@ -589,6 +589,7 @@ class APT_HIDDEN pkgAcqBaseIndex : public pkgAcqTransactionItem
 
    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,6 +653,7 @@ class APT_HIDDEN pkgAcqDiffIndex : public pkgAcqBaseIndex
     */
    pkgAcqDiffIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
                    IndexTarget const Target);
+   virtual ~pkgAcqDiffIndex();
  private:
    APT_HIDDEN void QueueOnIMSHit() const;
 };
@@ -751,6 +753,7 @@ class APT_HIDDEN pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex
    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 {{{
@@ -864,6 +867,7 @@ class APT_HIDDEN pkgAcqIndexDiffs : public pkgAcqBaseIndex
    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	{{{
@@ -940,8 +944,10 @@ class APT_HIDDEN pkgAcqIndex : public pkgAcqBaseIndex
 
    pkgAcqIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
                IndexTarget const Target);
+   virtual ~pkgAcqIndex();
 
-   void Init(std::string const &URI, std::string const &URIDesc,
+   private:
+   APT_HIDDEN void Init(std::string const &URI, std::string const &URIDesc,
              std::string const &ShortDesc);
 };
 									/*}}}*/
@@ -1030,6 +1036,7 @@ class pkgAcqArchive : public pkgAcquire::Item
    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			{{{
@@ -1211,6 +1218,7 @@ class pkgAcqFile : public pkgAcquire::Item
 	      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 a8fc75f8e..d3aff4d5e 100644
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -478,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 6480eb4b5..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
diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h
index 3a3ef706d..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
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 5e5bec95c..75df858a8 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -1143,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 02031dafd..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
@@ -626,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.h b/apt-pkg/algorithms.h
index 2ac28c0d7..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						/*{{{*/
@@ -156,7 +156,7 @@ class pkgProblemResolver						/*{{{*/
    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/cacheset.cc b/apt-pkg/cacheset.cc
index 0ad99713a..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) {
@@ -812,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 97aee8c2d..1a6feb5f7 100644
--- a/apt-pkg/cacheset.h
+++ b/apt-pkg/cacheset.h
@@ -50,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 };
 
@@ -203,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 {					/*{{{*/
@@ -263,8 +264,9 @@ 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); }
@@ -292,6 +294,7 @@ APT_IGNORE_DEPRECATED_POP
 
 private:
 	CacheSetHelper::PkgSelector ConstructedBy;
+	void *d;
 };
 									/*}}}*/
 template<class Container> class PackageContainer : public PackageContainerInterface {/*{{{*/
@@ -355,7 +358,7 @@ 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) {}
 APT_IGNORE_DEPRECATED_PUSH
 	APT_DEPRECATED PackageContainer(Constructor const &by) : PackageContainerInterface((CacheSetHelper::PkgSelector)by) {}
@@ -552,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;
@@ -564,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; }
@@ -701,6 +706,11 @@ APT_IGNORE_DEPRECATED_PUSH
 	}
 APT_IGNORE_DEPRECATED_POP
 
+	VersionContainerInterface();
+	virtual ~VersionContainerInterface();
+private:
+	void *d;
+
 protected:								/*{{{*/
 
 	/** \brief returns the candidate version of the package
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 8cec4b78e..de5cd0657 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -1022,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 0fca60ba9..d05ae83b9 100644
--- a/apt-pkg/clean.cc
+++ b/apt-pkg/clean.cc
@@ -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/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 944cbe0bf..0fffa52b0 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -576,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 6b8c78e5a..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
@@ -30,6 +29,7 @@ class pkgCacheGenerator;
 
 class APT_HIDDEN debStatusIndex : public pkgIndexFile
 {
+   void *d;
    protected:
    std::string File;
 
@@ -53,6 +53,7 @@ class APT_HIDDEN debStatusIndex : public pkgIndexFile
 
 class APT_HIDDEN debPackagesIndex : public pkgIndexTargetFile
 {
+   void *d;
    public:
 
    virtual const Type *GetType() const APT_CONST;
@@ -71,6 +72,7 @@ class APT_HIDDEN debPackagesIndex : public pkgIndexTargetFile
 
 class APT_HIDDEN debTranslationsIndex : public pkgIndexTargetFile
 {
+   void *d;
    public:
 
    virtual const Type *GetType() const APT_CONST;
@@ -86,6 +88,7 @@ class APT_HIDDEN debTranslationsIndex : public pkgIndexTargetFile
 
 class APT_HIDDEN debSourcesIndex : public pkgIndexTargetFile
 {
+   void *d;
    public:
 
    virtual const Type *GetType() const APT_CONST;
@@ -145,6 +148,7 @@ class APT_HIDDEN debDebPkgFileIndex : public pkgIndexFile
 class APT_HIDDEN debDscFileIndex : public pkgIndexFile
 {
  private:
+   void *d;
    std::string DscFile;
  public:
    virtual const Type *GetType() const APT_CONST;
@@ -157,7 +161,7 @@ class APT_HIDDEN debDscFileIndex : public pkgIndexFile
    };
 
    debDscFileIndex(std::string &DscFile);
-   virtual ~debDscFileIndex() {};
+   virtual ~debDscFileIndex();
 };
 
 class APT_HIDDEN debDebianSourceDirIndex : public debDscFileIndex
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index b328fcea8..34fc98838 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -459,6 +459,8 @@ pkgCache::RlsFileIterator debReleaseIndex::FindInCache(pkgCache &Cache, bool con
 }
 									/*}}}*/
 
+debDebFileMetaIndex::~debDebFileMetaIndex() {}
+
 class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type
 {
    protected:
diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index b448ecc53..f2706e08a 100644
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -75,6 +75,7 @@ class APT_HIDDEN debReleaseIndex : public metaIndex {
 class APT_HIDDEN debDebFileMetaIndex : public metaIndex
 {
  private:
+    void *d;
    std::string DebFile;
    debDebPkgFileIndex *DebIndex;
  public:
@@ -94,7 +95,7 @@ class APT_HIDDEN 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 335bcfda0..f527042e4 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -51,6 +51,7 @@ bool debRecordParser::Jump(pkgCache::DescFileIterator const &Desc)
 									/*}}}*/
 debRecordParser::~debRecordParser() {}
 
+debRecordParserBase::debRecordParserBase() : Parser() {}
 // RecordParserBase::FileName - Return the archive filename on the site	/*{{{*/
 string debRecordParserBase::FileName()
 {
@@ -207,3 +208,9 @@ bool debDebFileRecordParser::LoadContent()
       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 38e071940..8efcec8cd 100644
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -27,6 +27,7 @@
 
 class APT_HIDDEN debRecordParserBase : public pkgRecords::Parser
 {
+   void *d;
  protected:
    pkgTagSection Section;
 
@@ -50,12 +51,13 @@ class APT_HIDDEN debRecordParserBase : public pkgRecords::Parser
 
    virtual void GetRec(const char *&Start,const char *&Stop);
 
-   debRecordParserBase() : Parser() {}
+   debRecordParserBase();
    virtual ~debRecordParserBase();
 };
 
 class APT_HIDDEN debRecordParser : public debRecordParserBase
 {
+   void *d;
  protected:
    FileFd File;
    pkgTagFile Tags;
@@ -71,20 +73,21 @@ class APT_HIDDEN debRecordParser : public debRecordParserBase
 // custom record parser that reads deb files directly
 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 &) { return LoadContent(); }
-   bool Jump(pkgCache::DescFileIterator const &) { return LoadContent(); }
+   bool Jump(pkgCache::VerFileIterator const &);
+   bool Jump(pkgCache::DescFileIterator const &);
 
  public:
-   virtual std::string FileName() { return debFileName; }
+   virtual std::string FileName();
 
-   debDebFileRecordParser(std::string FileName)
-      : debRecordParserBase(), debFileName(FileName) {};
+   debDebFileRecordParser(std::string FileName);
+   virtual ~debDebFileRecordParser();
 };
 
 #endif
diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index ca6d09896..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
diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h
index cd246d624..7aeb2db88 100644
--- a/apt-pkg/deb/debsrcrecords.h
+++ b/apt-pkg/deb/debsrcrecords.h
@@ -56,9 +56,7 @@ class APT_HIDDEN debSrcRecordParser : public pkgSrcRecords::Parser
    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();
 };
 
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/depcache.h b/apt-pkg/depcache.h
index 20d263c67..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
@@ -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 41cc2cdfe..25d53747c 100644
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -39,60 +39,15 @@
 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());
@@ -147,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;
@@ -183,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)
 {
@@ -235,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,
@@ -365,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();
@@ -390,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;
@@ -443,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 a2ec0a19b..5d9383e94 100644
--- a/apt-pkg/edsp/edspindexfile.cc
+++ b/apt-pkg/edsp/edspindexfile.cc
@@ -81,3 +81,5 @@ 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 8c18d8cbd..0f63b7b2a 100644
--- a/apt-pkg/edsp/edspindexfile.h
+++ b/apt-pkg/edsp/edspindexfile.h
@@ -30,6 +30,7 @@ class APT_HIDDEN 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 d62abe709..d1c0cf7e8 100644
--- a/apt-pkg/edsp/edsplistparser.cc
+++ b/apt-pkg/edsp/edsplistparser.cc
@@ -92,3 +92,5 @@ APT_CONST bool edspListParser::LoadReleaseInfo(pkgCache::RlsFileIterator & /*Fil
    return true;
 }
 									/*}}}*/
+
+edspListParser::~edspListParser() {}
diff --git a/apt-pkg/edsp/edsplistparser.h b/apt-pkg/edsp/edsplistparser.h
index abe2ef139..ef5179e68 100644
--- a/apt-pkg/edsp/edsplistparser.h
+++ b/apt-pkg/edsp/edsplistparser.h
@@ -27,6 +27,7 @@ class FileFd;
 
 class APT_HIDDEN edspListParser : public debListParser
 {
+   void *d;
    public:
    virtual bool NewVersion(pkgCache::VerIterator &Ver);
    virtual std::string Description();
@@ -38,6 +39,7 @@ class APT_HIDDEN edspListParser : public debListParser
 			std::string const §ion);
 
    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.h b/apt-pkg/edsp/edspsystem.h
index 06a63f40c..1e27d2cb0 100644
--- a/apt-pkg/edsp/edspsystem.h
+++ b/apt-pkg/edsp/edspsystem.h
@@ -42,7 +42,7 @@ class APT_HIDDEN edspSystem : public pkgSystem
 			  pkgIndexFile *&Found) const;
 
    edspSystem();
-   ~edspSystem();
+   virtual ~edspSystem();
 };
 
 #endif
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 461aa4217..120d061ad 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -770,4 +770,14 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,	/*{{{*/
 }
 									/*}}}*/
 
+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 729b0c8cb..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
@@ -54,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(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(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								/*{{{*/
@@ -106,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 605bbeb47..b3c5cf229 100644
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -227,3 +227,6 @@ 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 042e5c2f7..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.
@@ -90,6 +89,7 @@ class IndexTarget							/*{{{*/
 
 class pkgIndexFile
 {
+   void *d;
    protected:
    bool Trusted;
 
@@ -145,11 +145,12 @@ class pkgIndexFile
    bool IsTrusted() const { return Trusted; };
 
    pkgIndexFile(bool Trusted);
-   virtual ~pkgIndexFile() {};
+   virtual ~pkgIndexFile();
 };
 
 class pkgIndexTargetFile : public pkgIndexFile
 {
+   void *d;
 protected:
    IndexTarget const Target;
 
@@ -162,6 +163,7 @@ public:
    virtual unsigned long Size() const;
 
    pkgIndexTargetFile(IndexTarget const &Target, bool const Trusted);
+   virtual ~pkgIndexTargetFile();
 };
 
 #endif
diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h
index 6ed5f0c2b..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
 
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.h b/apt-pkg/metaindex.h
index e1810fb27..760c7dd15 100644
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -28,6 +28,7 @@ class OpProgress;
 
 class metaIndex
 {
+   void *d;
    protected:
    std::vector <pkgIndexFile *> *Indexes;
    const char *Type;
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.h b/apt-pkg/packagemanager.h
index fce0ad301..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
@@ -146,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 9fe382108..dc7698edd 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -1059,3 +1059,5 @@ bool pkgCache::PrvIterator::IsMultiArchImplicit() const
    return false;
 }
 									/*}}}*/
+
+pkgCache::~pkgCache() {}
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 3cc85f1e8..b7bf26c2a 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -266,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);
 };
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index ea0205944..54e2ef19c 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -1720,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 ade93795b..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.
@@ -123,9 +122,10 @@ class APT_HIDDEN pkgCacheGenerator					/*{{{*/
    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,
@@ -151,7 +151,9 @@ class APT_HIDDEN 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);};
@@ -182,10 +184,7 @@ class APT_HIDDEN pkgCacheGenerator::ListParser
     * \param Hash of the currently parsed version
     * \param Ver to compare with
     */
-#if APT_PKG_ABI >= 413
-   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;
@@ -197,8 +196,8 @@ class APT_HIDDEN 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 bcc05baba..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						/*{{{*/
@@ -106,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 bd40ad2d9..6da6ed606 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -439,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.h b/apt-pkg/sourcelist.h
index 998357509..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
@@ -54,6 +53,7 @@ class metaIndex;
 
 class pkgSourceList
 {
+   void *d;
    public:
 
    // List of supported source list types
@@ -118,7 +118,7 @@ class pkgSourceList
 
    pkgSourceList();
    pkgSourceList(std::string File);
-   ~pkgSourceList();      
+   virtual ~pkgSourceList();
 };
 
 #endif
diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index c931e17b7..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
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 118954541..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
@@ -47,7 +46,6 @@ class pkgTagSection
    APT_DEPRECATED unsigned int TagCount;
 #endif
 
-   // dpointer placeholder (for later in case we need it)
    pkgTagSectionPrivate *d;
 
    protected:
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/test/libapt/acqprogress_test.cc b/test/libapt/acqprogress_test.cc
index c634733d4..dc31423fc 100644
--- a/test/libapt/acqprogress_test.cc
+++ b/test/libapt/acqprogress_test.cc
@@ -25,21 +25,23 @@ TEST(AcqProgress, IMSHit)
    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";
-   hit.Owner = NULL;
+   TestItem hitO(&Acq);
+   hit.Owner = &hitO;
 
    EXPECT_EQ("", out.str());
    Stat.IMSHit(hit);
-   EXPECT_EQ("Hit Example File from example.org\n", out.str());
+   EXPECT_EQ("Hit:1 Example File from example.org\n", out.str());
    Stat.IMSHit(hit);
-   EXPECT_EQ("Hit Example File from example.org\n"
-	     "Hit Example File from example.org\n", out.str());
+   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 Example File from example.org\n"
-	     "Hit Example File from example.org\n", out.str());
+   EXPECT_EQ("Hit:1 Example File from example.org\n"
+	     "Hit:1 Example File from example.org\n", out.str());
 }
 TEST(AcqProgress, FetchNoFileSize)
 {
@@ -61,10 +63,10 @@ TEST(AcqProgress, FetchNoFileSize)
    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:2 Example File from example.org\n", out.str());
+	     "Get:1 Example File from example.org\n", out.str());
    Stat.Stop();
    EXPECT_EQ("Get:1 Example File from example.org\n"
-	     "Get:2 Example File from example.org\n", out.str());
+	     "Get:1 Example File from example.org\n", out.str());
 }
 TEST(AcqProgress, FetchFileSize)
 {
@@ -88,10 +90,10 @@ TEST(AcqProgress, FetchFileSize)
    fetchO.FileSize = 42;
    Stat.Fetch(fetch);
    EXPECT_EQ("Get:1 Example File from example.org [100 B]\n"
-	     "Get:2 Example File from example.org [42 B]\n", out.str());
+	     "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:2 Example File from example.org [42 B]\n", out.str());
+	     "Get:1 Example File from example.org [42 B]\n", out.str());
 }
 TEST(AcqProgress, Fail)
 {
@@ -112,30 +114,34 @@ TEST(AcqProgress, Fail)
 
    EXPECT_EQ("", out.str());
    Stat.Fail(fetch);
-   EXPECT_EQ("", out.str());
+   EXPECT_EQ("Ign:1 Example File from example.org\n", out.str());
    fetchO.Status = pkgAcquire::Item::StatDone;
    Stat.Fail(fetch);
-   EXPECT_EQ("Ign Example File from example.org\n", out.str());
+   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 Example File from example.org\n"
-	     "Err Example File from example.org\n"
+   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 Example File from example.org\n"
-	     "Err Example File from example.org\n"
+   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 Example File from example.org\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 Example File from example.org\n"
-	     "Err Example File from example.org\n"
+   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 Example File from example.org\n"
+	     "Ign:1 Example File from example.org\n"
 	     "  An error test!\n", out.str());
 }
 TEST(AcqProgress, Pulse)
-- 
cgit v1.2.3-70-g09d2